Ignore:
Timestamp:
Mar 5, 2020, 2:40:28 PM (20 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
Children:
87f572e
Parents:
5452673 (diff), f9723e8 (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/exception.c

    r5452673 r331eacb  
    7272// Used in the personality function, way down in termination.
    7373// struct _Unwind_Context * -> _Unwind_Reason_Code(*)(exception_t *)
     74#if defined( __x86_64 )
    7475#define MATCHER_FROM_CONTEXT(ptr_to_context) \
    7576        (*(_Unwind_Reason_Code(**)(exception_t *))(_Unwind_GetCFA(ptr_to_context) + 8))
    76 
     77#elif defined( __i386 )
     78#define MATCHER_FROM_CONTEXT(ptr_to_context) \
     79        (*(_Unwind_Reason_Code(**)(exception_t *))(_Unwind_GetCFA(ptr_to_context) + 24))
     80#endif
    7781
    7882// RESUMPTION ================================================================
Note: See TracChangeset for help on using the changeset viewer.