Changeset 9b81fed3

Timestamp:

May 13, 2019, 4:55:33 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

264e691, 881f590

Parents:

fdbd4fd (diff), 768b3b4f (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:

• CtxSwitch-i386.S (modified) (1 diff)
• invoke.c (modified) (1 diff)

libcfa/src/concurrency/CtxSwitch-i386.S

@@ -67 +67 @@
         // argument is now at 8 + 12 = 20(%esp)
 
-        movl 28(%esp),%eax
+        movl 20(%esp),%eax
 
         // Load new context from the "to" area.

libcfa/src/concurrency/invoke.c

@@ -123 +123 @@
 
         struct FakeStack {
-            void *fixedRegisters[3];                    // fixed registers ebx, edi, esi (popped on 1st uSwitch, values unimportant)
+            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 *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
         };