Changeset cd02108 for libcfa/src/concurrency

Timestamp:

Aug 12, 2020, 1:39:41 PM (4 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

Location:

libcfa/src/concurrency

Files:

• invoke.c (modified) (1 diff)
• kernel.cfa (modified) (1 diff)

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];