Changeset a9b657a for src/libcfa/concurrency/invoke.c

Timestamp:

Mar 10, 2017, 11:01:31 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

dc0557d

Parents:

c857ad3 (diff), 149d297 (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:/u/cforall/software/cfa/cfa-cc

File:

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

src/libcfa/concurrency/invoke.c

@@ -91 +91 @@
         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
+            uint32_t mxcr;                              // SSE Status and Control bits (control bits are preserved across function calls)
+            uint16_t fcw;                               // X97 FPU control word (preserved across function calls)
+            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
@@ -108 +110 @@
       struct FakeStack {
             void *fixedRegisters[5];                    // fixed registers rbx, r12, r13, r14, r15
-            uint32_t mxcr;                                  // SSE Status and Control bits (control bits are preserved across function calls)
-            uint16_t fcw;                                   // X97 FPU control word (preserved across function calls)
-            void *rturn;                                      // where to go on return from uSwitch
+            uint32_t mxcr;                              // SSE Status and Control bits (control bits are preserved across function calls)
+            uint16_t fcw;                               // X97 FPU control word (preserved across function calls)
+            void *rturn;                                // where to go on return from uSwitch
             void *dummyReturn;                          // NULL return address to provide proper alignment
       };