Changeset cd02108

Timestamp:

Aug 12, 2020, 1:39:41 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

419c434

Parents:

5bcdc8c (diff), dab09ad (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Files:

• benchmark/io/http/options.cfa (modified) (1 diff)
• libcfa/prelude/bootloader.cf (modified) (1 diff)
• libcfa/src/concurrency/invoke.c (modified) (1 diff)
• libcfa/src/concurrency/kernel.cfa (modified) (1 diff)
• libcfa/src/parseargs.cfa (modified) (3 diffs)
• libcfa/src/parseargs.hfa (modified) (2 diffs)
• tests/.expect/declarationSpecifier.x64.txt (modified) (1 diff)
• tests/.expect/declarationSpecifier.x86.txt (modified) (1 diff)
• tests/.expect/gccExtensions.x64.txt (modified) (1 diff)
• tests/.expect/gccExtensions.x86.txt (modified) (1 diff)
• tests/pybin/tools.py (modified) (1 diff)

benchmark/io/http/options.cfa ¶

@@ -10 +10 @@
 
 #include <kernel.hfa>
-
-#include "parseargs.hfa"
-
+#include <parseargs.hfa>
 
 Options options @= {

libcfa/prelude/bootloader.cf ¶

@@ -1 +1 @@
 extern "C" { static inline int invoke_main(int argc, char* argv[], char* envp[]); }
+int cfa_args_argc;
+char ** cfa_args_argv;
+char ** cfa_args_envp;
 
 int main(int argc, char* argv[], char* envp[]) {
+        cfa_args_argc = argc;
+        cfa_args_argv = argv;
+        cfa_args_envp = envp;
         return invoke_main(argc, argv, envp);
 }

libcfa/src/concurrency/invoke.c ¶

@@ -146 +146 @@
 
 #elif defined( __ARM_ARCH )
-#error ARM needs to be upgrade to use to parameters like X86/X64 (A.K.A. : I broke this and do not know how to fix it)
+#error ARM needs to be upgrade to use two parameters like X86/X64 (A.K.A. : I broke this and do not know how to fix it)
+        // More details about the error:
+        // To avoid the thunk problem, I changed the invoke routine to pass the main explicitly
+        // instead of relying on an assertion. This effectively hoists any required thunk one level
+        // which was enough to get to global scope in most cases.
+        // This means that __cfactx_invoke_... now takes two parameters and the FakeStack needs
+        // to be adjusted as a consequence of that.
+        // I don't know how to do that for ARM, hence the #error
+
         struct FakeStack {
                 float fpRegs[16];                       // floating point registers

libcfa/src/concurrency/kernel.cfa ¶

@@ -532 +532 @@
                 unsigned total   = this.total;
                 processor * proc = &this.list`first;
+                // Thread fence is unnecessary, but gcc-8 and older incorrectly reorder code without it
+                __atomic_thread_fence(__ATOMIC_SEQ_CST);
                 if(l != __atomic_load_n(&this.lock, __ATOMIC_SEQ_CST)) { Pause(); continue; }
                 return [idle, total, proc];

libcfa/src/parseargs.cfa ¶

@@ -25 +25 @@
 #include "limits.hfa"
 
+extern int cfa_args_argc;
+extern char ** cfa_args_argv;
+extern char ** cfa_args_envp;
+
 void printopt(FILE * out, int width, int max, char sn, const char * ln, const char * help) {
         int hwidth = max - (11 + width);
@@ -35 +39 @@
                 fprintf(out, "%*s%.*s\n", width + 11, "", hwidth, help);
         }
+}
+
+void parse_args( cfa_option options[], size_t opt_count, const char * usage, char ** & left ) {
+        parse_args(cfa_args_argc, cfa_args_argv, options, opt_count, usage, left );
 }
 
@@ -182 +190 @@
 }
 
-bool parse(const char * arg, size_t & value) {
+bool parse(const char * arg, unsigned long & value) {
         char * end;
         unsigned long long int r = strtoull(arg, &end, 10);
         if(*end != '\0') return false;
-        if(r > (size_t)MAX) return false;
-
-        value = r;
-        return true;
+        if(r > (unsigned long)MAX) return false;
+
+        value = r;
+        return true;
+}
+
+bool parse(const char * arg, unsigned long long & value) {
+        char * end;
+        unsigned long long int r = strtoull(arg, &end, 10);
+        if(*end != '\0') return false;
+        if(r > (unsigned long long)MAX) return false;
+
+        value = r;
+        return true;
 }
 

libcfa/src/parseargs.hfa ¶

@@ -31 +31 @@
 }
 
+void parse_args( cfa_option options[], size_t opt_count, const char * usage, char ** & left );
 void parse_args( int argc, char * argv[], cfa_option options[], size_t opt_count, const char * usage, char ** & left );
 
@@ -40 +41 @@
 bool parse(const char *, int & );
 bool parse(const char *, unsigned & );
-bool parse(const char *, size_t & );
+bool parse(const char *, unsigned long & );
+bool parse(const char *, unsigned long long & );
 bool parse(const char *, double & );

tests/.expect/declarationSpecifier.x64.txt ¶

@@ -1129 +1129 @@
 static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return _X4mainFi_iPPKc__1((signed int )argc, (const char **)argv); }
 static inline signed int invoke_main(signed int argc, char **argv, char **envp);
+signed int _X13cfa_args_argci_1;
+char **_X13cfa_args_argvPPc_1;
+char **_X13cfa_args_envpPPc_1;
 signed int main(signed int _X4argci_1, char **_X4argvPPc_1, char **_X4envpPPc_1){
     __attribute__ ((unused)) signed int _X12_retval_maini_1;
     {
+        ((void)(_X13cfa_args_argci_1=_X4argci_1));
+    }
+
+    {
+        ((void)(_X13cfa_args_argvPPc_1=_X4argvPPc_1));
+    }
+
+    {
+        ((void)(_X13cfa_args_envpPPc_1=_X4envpPPc_1));
+    }
+
+    {
         signed int _tmp_cp_ret4;
         ((void)(_X12_retval_maini_1=(((void)(_tmp_cp_ret4=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret4)) /* ?{} */);

tests/.expect/declarationSpecifier.x86.txt ¶

@@ -1129 +1129 @@
 static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return _X4mainFi_iPPKc__1((signed int )argc, (const char **)argv); }
 static inline signed int invoke_main(signed int argc, char **argv, char **envp);
+signed int _X13cfa_args_argci_1;
+char **_X13cfa_args_argvPPc_1;
+char **_X13cfa_args_envpPPc_1;
 signed int main(signed int _X4argci_1, char **_X4argvPPc_1, char **_X4envpPPc_1){
     __attribute__ ((unused)) signed int _X12_retval_maini_1;
     {
+        ((void)(_X13cfa_args_argci_1=_X4argci_1));
+    }
+
+    {
+        ((void)(_X13cfa_args_argvPPc_1=_X4argvPPc_1));
+    }
+
+    {
+        ((void)(_X13cfa_args_envpPPc_1=_X4envpPPc_1));
+    }
+
+    {
         signed int _tmp_cp_ret4;
         ((void)(_X12_retval_maini_1=(((void)(_tmp_cp_ret4=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret4)) /* ?{} */);

tests/.expect/gccExtensions.x64.txt ¶

@@ -321 +321 @@
 static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return _X4mainFi_iPPKc__1((signed int )argc, (const char **)argv); }
 static inline signed int invoke_main(signed int argc, char **argv, char **envp);
+signed int _X13cfa_args_argci_1;
+char **_X13cfa_args_argvPPc_1;
+char **_X13cfa_args_envpPPc_1;
 signed int main(signed int _X4argci_1, char **_X4argvPPc_1, char **_X4envpPPc_1){
     __attribute__ ((unused)) signed int _X12_retval_maini_1;
     {
+        ((void)(_X13cfa_args_argci_1=_X4argci_1));
+    }
+
+    {
+        ((void)(_X13cfa_args_argvPPc_1=_X4argvPPc_1));
+    }
+
+    {
+        ((void)(_X13cfa_args_envpPPc_1=_X4envpPPc_1));
+    }
+
+    {
         signed int _tmp_cp_ret4;
         ((void)(_X12_retval_maini_1=(((void)(_tmp_cp_ret4=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret4)) /* ?{} */);

tests/.expect/gccExtensions.x86.txt ¶

@@ -299 +299 @@
 static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return _X4mainFi_iPPKc__1((signed int )argc, (const char **)argv); }
 static inline signed int invoke_main(signed int argc, char **argv, char **envp);
+signed int _X13cfa_args_argci_1;
+char **_X13cfa_args_argvPPc_1;
+char **_X13cfa_args_envpPPc_1;
 signed int main(signed int _X4argci_1, char **_X4argvPPc_1, char **_X4envpPPc_1){
     __attribute__ ((unused)) signed int _X12_retval_maini_1;
     {
+        ((void)(_X13cfa_args_argci_1=_X4argci_1));
+    }
+
+    {
+        ((void)(_X13cfa_args_argvPPc_1=_X4argvPPc_1));
+    }
+
+    {
+        ((void)(_X13cfa_args_envpPPc_1=_X4envpPPc_1));
+    }
+
+    {
         signed int _tmp_cp_ret4;
         ((void)(_X12_retval_maini_1=(((void)(_tmp_cp_ret4=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret4)) /* ?{} */);

tests/pybin/tools.py ¶

@@ -246 +246 @@
 # transform path to canonical form
 def canonical_path(path):
-        abspath = os.path.abspath(__main__.__file__)
+        abspath = os.path.abspath(os.path.realpath(__main__.__file__))
         dname = os.path.dirname(abspath)
         return os.path.join(dname, os.path.normpath(path) )