Changeset 9b81fed


Ignore:
Timestamp:
May 13, 2019, 4:55:33 PM (3 years ago)
Author:
Aaron Moss <a3moss@…>
Branches:
arm-eh, cleanup-dtors, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
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:
2 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/concurrency/CtxSwitch-i386.S

    rfdbd4fd r9b81fed  
    6767        // argument is now at 8 + 12 = 20(%esp)
    6868
    69         movl 28(%esp),%eax
     69        movl 20(%esp),%eax
    7070
    7171        // Load new context from the "to" area.
  • libcfa/src/concurrency/invoke.c

    rfdbd4fd r9b81fed  
    123123
    124124        struct FakeStack {
    125             void *fixedRegisters[3];                    // fixed registers ebx, edi, esi (popped on 1st uSwitch, values unimportant)
     125            void *fixedRegisters[3];              // fixed registers ebx, edi, esi (popped on 1st uSwitch, values unimportant)
    126126            void *rturn;                          // where to go on return from uSwitch
    127             void *dummyReturn;                          // fake return compiler would have pushed on call to uInvoke
    128             void *argument[3];                          // for 16-byte ABI, 16-byte alignment starts here
    129             void *padding;                              // padding to force 16-byte alignment, as "base" is 16-byte aligned
     127            void *dummyReturn;                    // fake return compiler would have pushed on call to uInvoke
     128            void *argument[3];                    // for 16-byte ABI, 16-byte alignment starts here
     129            void *padding;                        // padding to force 16-byte alignment, as "base" is 16-byte aligned
    130130        };
    131131
Note: See TracChangeset for help on using the changeset viewer.