Changeset 25a1cb0 for libcfa/src/exception.c

Timestamp:

Sep 1, 2020, 1:18:10 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

86c1f1c3, a77496cb

Parents:

8d8ac3b (diff), d3aa64f1 (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) (7 diffs)

libcfa/src/exception.c

@@ -10 +10 @@
 // Created On       : Mon Jun 26 15:13:00 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug 21 11:27:56 2020
-// Update Count     : 29
+// Last Modified On : Sat Aug 29 15:52:22 2020
+// Update Count     : 34
 //
 
@@ -18 +18 @@
 
 #include "exception.h"
-
-// Implementation of the secret header is hardware dependent.
-#if defined( __x86_64 ) || defined( __i386 )
-#elif defined( __ARM_ARCH )
-#warning FIX ME: check if anything needed for ARM
-#else
-#warning Exception Handling: No known architecture detected.
-#endif
 
 #include <stdlib.h>
@@ -34 +26 @@
 #include "stdhdr/assert.h"
 
-// FIX ME: temporary hack to keep ARM build working
+#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
@@ -41 +34 @@
 #define _URC_FATAL_PHASE2_ERROR 2
 #endif // ! _URC_FATAL_PHASE2_ERROR
+#endif // __ARM_ARCH
 
 #include "lsda.h"
@@ -209 +203 @@
                 void * stop_param) {
         // Verify actions follow the rules we expect.
-        verify((actions & _UA_CLEANUP_PHASE) && (actions & _UA_FORCE_UNWIND));
-        verify(!(actions & (_UA_SEARCH_PHASE | _UA_HANDLER_FRAME)));
+        verify(actions & _UA_CLEANUP_PHASE);
+        verify(actions & _UA_FORCE_UNWIND);
+        verify(!(actions & _UA_SEARCH_PHASE));
+        verify(!(actions & _UA_HANDLER_FRAME));
 
         if ( actions & _UA_END_OF_STACK ) {
-                exit(1);
+                abort();
         } else {
                 return _URC_NO_REASON;
@@ -219 +215 @@
 }
 
-static struct _Unwind_Exception cancel_exception_storage;
+__attribute__((weak)) _Unwind_Reason_Code
+__cfaehm_cancellation_unwind( struct _Unwind_Exception * exception ) {
+        return _Unwind_ForcedUnwind( exception, _Stop_Fn, (void*)0x22 );
+}
 
 // Cancel the current stack, prefroming approprate clean-up and messaging.
 void __cfaehm_cancel_stack( exception_t * exception ) {
-        // TODO: Detect current stack and pick a particular stop-function.
+        __cfaehm_allocate_exception( exception );
+
+        struct exception_context_t * context = this_exception_context();
+        struct __cfaehm_node * node = EXCEPT_TO_NODE(context->current_exception);
+
+        // Preform clean-up of any extra active exceptions.
+        while ( node->next ) {
+                struct __cfaehm_node * to_free = node->next;
+                node->next = to_free->next;
+                exception_t * except = NODE_TO_EXCEPT( to_free );
+                except->virtual_table->free( except );
+            free( to_free );
+        }
+
         _Unwind_Reason_Code ret;
-        ret = _Unwind_ForcedUnwind( &cancel_exception_storage, _Stop_Fn, (void*)0x22 );
+        ret = __cfaehm_cancellation_unwind( &node->unwind_exception );
         printf("UNWIND ERROR %d after force unwind\n", ret);
         abort();
@@ -608 +620 @@
 
 #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