Changeset 58fe85a for libcfa/src/concurrency/invoke.c

Timestamp:

Jan 7, 2021, 3:27:00 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

2b4daf2, 64aeca0

Parents:

3c64c668 (diff), eef8dfb (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' into park_unpark

File:

• libcfa/src/concurrency/invoke.c (modified) (6 diffs)

libcfa/src/concurrency/invoke.c

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb  9 16:37:42 2018
-// Update Count     : 5
+// Last Modified On : Sat Oct 24 14:35:28 2020
+// Update Count     : 32
 //
 
@@ -109 +109 @@
 
         struct FakeStack {
-            void *fixedRegisters[3];              // fixed registers ebx, edi, esi (popped on 1st uSwitch, values unimportant)
-            void *rturn;                          // where to go on return from uSwitch
-            void *dummyReturn;                    // fake return compiler would have pushed on call to uInvoke
-            void *argument[3];                    // for 16-byte ABI, 16-byte alignment starts here
-            void *padding;                        // padding to force 16-byte alignment, as "base" is 16-byte aligned
+            void *fixedRegisters[3];                                            // fixed registers ebx, edi, esi (popped on 1st uSwitch, values unimportant)
+            void *rturn;                                                                        // where to go on return from uSwitch
+            void *dummyReturn;                                                          // fake return compiler would have pushed on call to uInvoke
+            void *argument[3];                                                          // for 16-byte ABI, 16-byte alignment starts here
+            void *padding;                                                                      // padding to force 16-byte alignment, as "base" is 16-byte aligned
         };
 
@@ -122 +122 @@
 
         fs->dummyReturn = NULL;
-        fs->argument[0] = main;     // argument to invoke
-        fs->argument[1] = this;     // argument to invoke
+        fs->argument[0] = main;                                                         // argument to invoke
+        fs->argument[1] = this;                                                         // argument to invoke
         fs->rturn = invoke;
 
@@ -129 +129 @@
 
         struct FakeStack {
-                void *fixedRegisters[5];            // fixed registers rbx, r12, r13, r14, r15
-                void *rturn;                        // where to go on return from uSwitch
-                void *dummyReturn;                  // NULL return address to provide proper alignment
+                void *fixedRegisters[5];                                                // fixed registers rbx, r12, r13, r14, r15
+                void *rturn;                                                                    // where to go on return from uSwitch
+                void *dummyReturn;                                                              // NULL return address to provide proper alignment
         };
 
         cor->context.SP = (char *)stack->base - sizeof( struct FakeStack );
-        cor->context.FP = NULL;         // terminate stack with NULL fp
+        cor->context.FP = NULL;                                                         // terminate stack with NULL fp
 
         struct FakeStack *fs = (struct FakeStack *)cor->context.SP;
@@ -141 +141 @@
         fs->dummyReturn = NULL;
         fs->rturn = __cfactx_invoke_stub;
-        fs->fixedRegisters[0] = main;
-        fs->fixedRegisters[1] = this;
+        fs->fixedRegisters[0] = main;                                           // argument to invoke
+        fs->fixedRegisters[1] = this;                                           // argument to invoke
         fs->fixedRegisters[2] = invoke;
 
-#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)
+#elif defined( __ARM_ARCH_32 )
+#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
-                void *intRegs[9];                       // integer/pointer registers
-                void *arg[2];                           // placeholder for this pointer
+                float fpRegs[16];                                                               // floating point registers
+                void * intRegs[9];                                                              // integer/pointer registers
+                void * arg[2];                                                                  // placeholder for this pointer
         };
 
@@ -162 +170 @@
         fs->arg[1] = invoke;
 
+#elif defined( __ARM_ARCH )
+        struct FakeStack {
+                void * intRegs[12];                                                             // x19-x30 integer registers
+                double fpRegs[8];                                                               // v8-v15 floating point
+        };
+
+        cor->context.SP = (char *)stack->base - sizeof( struct FakeStack );
+        cor->context.FP = NULL;
+
+        struct FakeStack *fs = (struct FakeStack *)cor->context.SP;
+
+        fs->intRegs[0] = main;                                                          // argument to invoke x19 => x0
+        fs->intRegs[1] = this;                                                          // argument to invoke x20 => x1
+        fs->intRegs[2] = invoke;
+        fs->intRegs[11] = __cfactx_invoke_stub;                         // link register x30 => ret moves to pc
 #else
         #error uknown hardware architecture