Changes in doc/working/exception/impl/except.c [4a58895:6b72040]

File:

• doc/working/exception/impl/except.c (modified) (3 diffs)

doc/working/exception/impl/except.c

@@ -4 +4 @@
 
 #include "lsda.h"
+
+// This macro should be the only thing that needs to change across machines.
+// struct _Unwind_Context * -> _Unwind_Reason_Code(*)()
+#define MATCHER_FROM_CONTEXT(ptr_to_context) \
+        (*(_Unwind_Reason_Code(**)())(_Unwind_GetCFA(ptr_to_context) + 8))
+
 
 //Global which defines the current exception
@@ -17 +23 @@
                      struct _Unwind_Exception* unwind_exception, struct _Unwind_Context* context)
 {
+        printf("CFA: 0x%lx\n", _Unwind_GetCFA(context));
+
         //DEBUG
         printf("Personality function (%d, %x, %llu, %p, %p):", version, actions, exceptionClass, unwind_exception, context);
@@ -111 +119 @@
 
                                         //Get a function pointer from the relative offset and call it
-                                        _Unwind_Reason_Code (*matcher)() = (_Unwind_Reason_Code (*)())lsd_info.LPStart + imatcher;                                      
+                                        // _Unwind_Reason_Code (*matcher)() = (_Unwind_Reason_Code (*)())lsd_info.LPStart + imatcher;                                   
+
+                                        _Unwind_Reason_Code (*matcher)() =
+                                                MATCHER_FROM_CONTEXT(context);
                                         _Unwind_Reason_Code ret = matcher();