Changes in libcfa/src/exception.c [ed395761:8f910430]

File:

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

libcfa/src/exception.c

@@ -27 +27 @@
 #include "stdhdr/assert.h"
 #include "virtual.h"
+
+#if defined( __ARM_ARCH )
+#warning FIX ME: temporary hack to keep ARM build working
+#ifndef _URC_FATAL_PHASE1_ERROR
+#define _URC_FATAL_PHASE1_ERROR 3
+#endif // ! _URC_FATAL_PHASE1_ERROR
+#ifndef _URC_FATAL_PHASE2_ERROR
+#define _URC_FATAL_PHASE2_ERROR 2
+#endif // ! _URC_FATAL_PHASE2_ERROR
+#endif // __ARM_ARCH
+
 #include "lsda.h"
 
@@ -256 +267 @@
         // the whole stack.
 
-#if defined( __x86_64 ) || defined( __i386 )
         // We did not simply reach the end of the stack without finding a handler. This is an error.
         if ( ret != _URC_END_OF_STACK ) {
-#else // defined( __ARM_ARCH )
-        // The return code from _Unwind_RaiseException seems to be corrupt on ARM at end of stack.
-        // This workaround tries to keep default exception handling working. 
-        if ( ret == _URC_FATAL_PHASE1_ERROR || ret == _URC_FATAL_PHASE2_ERROR ) {
-#endif
                 printf("UNWIND ERROR %d after raise exception\n", ret);
                 abort();
@@ -296 +301 @@
 }
 
-#if defined( __x86_64 ) || defined( __i386 ) || defined( __ARM_ARCH )
+#if defined( __x86_64 ) || defined( __i386 )
 // This is our personality routine. For every stack frame annotated with
 // ".cfi_personality 0x3,__gcfa_personality_v0" this function will be called twice when unwinding.
@@ -414 +419 @@
                                     _Unwind_GetCFA(unwind_context) + 24;
 #                               elif defined( __ARM_ARCH )
-                                    _Unwind_GetCFA(unwind_context) + 40;
+#                                   warning FIX ME: check if anything needed for ARM
+                                    42;
 #                               endif
                                 int (*matcher)(exception_t *) = *(int(**)(exception_t *))match_pos;
@@ -531 +537 @@
         // HEADER
         ".LFECFA1:\n"
-#if defined( __x86_64 ) || defined( __i386 )
         "       .globl  __gcfa_personality_v0\n"
-#else // defined( __ARM_ARCH )
-        "       .global __gcfa_personality_v0\n"
-#endif
         "       .section        .gcc_except_table,\"a\",@progbits\n"
         // TABLE HEADER (important field is the BODY length at the end)
@@ -567 +569 @@
         // No clue what this does specifically
         "       .section        .data.rel.local.CFA.ref.__gcfa_personality_v0,\"awG\",@progbits,CFA.ref.__gcfa_personality_v0,comdat\n"
-#if defined( __x86_64 ) || defined( __i386 )
         "       .align 8\n"
-#else // defined( __ARM_ARCH )
-        "       .align 3\n"
-#endif
         "       .type CFA.ref.__gcfa_personality_v0, @object\n"
         "       .size CFA.ref.__gcfa_personality_v0, 8\n"
@@ -577 +575 @@
 #if defined( __x86_64 )
         "       .quad __gcfa_personality_v0\n"
-#elif defined( __i386 )
+#else // then __i386
         "       .long __gcfa_personality_v0\n"
-#else // defined( __ARM_ARCH )
-        "       .xword __gcfa_personality_v0\n"
 #endif
 );
@@ -587 +583 @@
         // HEADER
         ".LFECFA1:\n"
-#if defined( __x86_64 ) || defined( __i386 )
         "       .globl  __gcfa_personality_v0\n"
-#else // defined( __ARM_ARCH )
-        "       .global __gcfa_personality_v0\n"
-#endif
         "       .section        .gcc_except_table,\"a\",@progbits\n"
         // TABLE HEADER (important field is the BODY length at the end)
@@ -620 +612 @@
 #pragma GCC pop_options
 
+#elif defined( __ARM_ARCH )
+_Unwind_Reason_Code __gcfa_personality_v0(
+                int version,
+                _Unwind_Action actions,
+                unsigned long long exception_class,
+                struct _Unwind_Exception * unwind_exception,
+                struct _Unwind_Context * unwind_context) {
+        return _URC_CONTINUE_UNWIND;
+}
+
+__attribute__((noinline))
+void __cfaehm_try_terminate(void (*try_block)(),
+                void (*catch_block)(int index, exception_t * except),
+                __attribute__((unused)) int (*match_block)(exception_t * except)) {
+}
 #else
         #error unsupported hardware architecture
-#endif // __x86_64 || __i386 || __ARM_ARCH
+#endif // __x86_64 || __i386