Changeset 289c7d2 for libcfa/src/exception.c

Timestamp:

Mar 5, 2020, 3:51:44 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

bc9384ac

Parents:

a037f85 (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:

• libcfa/src/exception.c (modified) (1 diff)

libcfa/src/exception.c

@@ -72 +72 @@
 // Used in the personality function, way down in termination.
 // struct _Unwind_Context * -> _Unwind_Reason_Code(*)(exception_t *)
+#if defined( __x86_64 )
 #define MATCHER_FROM_CONTEXT(ptr_to_context) \
         (*(_Unwind_Reason_Code(**)(exception_t *))(_Unwind_GetCFA(ptr_to_context) + 8))
-
+#elif defined( __i386 )
+#define MATCHER_FROM_CONTEXT(ptr_to_context) \
+        (*(_Unwind_Reason_Code(**)(exception_t *))(_Unwind_GetCFA(ptr_to_context) + 24))
+#endif
 
 // RESUMPTION ================================================================