Changeset 9640813

Timestamp:

Mar 20, 2020, 4:40:54 PM (5 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

7a0f1d25

Parents:

8ef95679

Message:

Clean-up in exception.c. Moved platform checks to the top of the file.

File:

• libcfa/src/exception.c (modified) (6 diffs)

libcfa/src/exception.c

@@ -14 +14 @@
 //
 
+// Normally we would get this from the CFA prelude.
 #include <stddef.h> // for size_t
 
 #include "exception.h"
 
-// Implementation of the secret header.
+// Implementation of the secret header is hardware dependent.
+#if !( defined( __x86_64 ) || defined( __i386 ) )
+#error Exception Handling: No known architecture detected.
+#endif
 
 #include <stdlib.h>
@@ -68 +72 @@
 //}
 
-
-// This macro should be the only thing that needs to change across machines.
-// 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 ================================================================
@@ -354 +347 @@
                                         cur_ptr = read_uleb128(cur_ptr, &imatcher);
 
-                                        _Unwind_Reason_Code (*matcher)(exception_t *) =
-                                                MATCHER_FROM_CONTEXT(context);
+#                                       if defined( __x86_64 )
+                                        _Unwind_Word match_pos = _Unwind_GetCFA(context) + 8;
+#                                       elif defined( __i386 )
+                                        _Unwind_Word match_pos = _Unwind_GetCFA(context) + 24;
+#                                       endif
+                                        int (*matcher)(exception_t *) = *(int(**)(exception_t *))match_pos;
+
                                         int index = matcher(shared_stack.current_exception);
                                         _Unwind_Reason_Code ret = (0 == index)
@@ -468 +466 @@
 
 #ifdef __PIC__
-#if defined( __i386 ) || defined( __x86_64 )
 asm (
         // HEADER
@@ -514 +511 @@
 #endif
 );
-#else
-#error Exception Handling: unknown architecture for position independent code.
-#endif // __i386 || __x86_64
 #else // __PIC__
-#if defined( __i386 ) || defined( __x86_64 )
 asm (
         // HEADER
@@ -547 +540 @@
         "       .section        .note.GNU-stack,\"x\",@progbits\n"
 );
-#else
-#error Exception Handling: unknown architecture for position dependent code.
-#endif // __i386 || __x86_64
 #endif // __PIC__