Changes in libcfa/src/exception.c [851fd92:73530d9]

File:

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

libcfa/src/exception.c

@@ -10 +10 @@
 // Created On       : Mon Jun 26 15:13:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Apr 14 12:01:00 2020
-// Update Count     : 18
+// Last Modified On : Fri Apr 03 11:57:00 2020
+// Update Count     : 14
 //
 
@@ -28 +28 @@
 #include <unwind.h>
 #include <bits/debug.hfa>
-#include "stdhdr/assert.h"
 
 // FIX ME: temporary hack to keep ARM build working
@@ -76 +75 @@
 // RESUMPTION ================================================================
 
-static void reset_top_resume(struct __cfaehm_try_resume_node ** store) {
-        this_exception_context()->top_resume = *store;
-}
-
 void __cfaehm_throw_resume(exception_t * except) {
         struct exception_context_t * context = this_exception_context();
 
-        __cfadbg_print_safe(exception, "Throwing resumption exception\n");
-
-        __attribute__((cleanup(reset_top_resume)))
+        __cfaabi_dbg_print_safe("Throwing resumption exception\n");
+
         struct __cfaehm_try_resume_node * original_head = context->top_resume;
         struct __cfaehm_try_resume_node * current = context->top_resume;
@@ -92 +86 @@
                 context->top_resume = current->next;
                 if (current->handler(except)) {
+                        context->top_resume = original_head;
                         return;
                 }
         }
 
-        __cfadbg_print_safe(exception, "Unhandled exception\n");
+        __cfaabi_dbg_print_safe("Unhandled exception\n");
+        context->top_resume = original_head;
 
         // Fall back to termination:
@@ -180 +176 @@
         struct exception_context_t * context = this_exception_context();
 
-        __cfadbg_print_safe(exception, "Deleting Exception\n");
+        __cfaabi_dbg_print_safe("Deleting Exception\n");
 
         // Remove the exception from the list.
@@ -217 +213 @@
                 struct _Unwind_Context * unwind_context,
                 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_HANDER_FRAME)));
-
-        if ( actions & _UA_END_OF_STACK ) {
-                exit(1);
-        } else {
-                return _URC_NO_REASON;
-        }
+        if ( actions & _UA_END_OF_STACK  ) exit(1);
+        if ( actions & _UA_CLEANUP_PHASE ) return _URC_NO_REASON;
+
+        return _URC_FATAL_PHASE2_ERROR;
 }
 
@@ -261 +252 @@
 
 void __cfaehm_throw_terminate( exception_t * val ) {
-        __cfadbg_print_safe(exception, "Throwing termination exception\n");
+        __cfaabi_dbg_print_safe("Throwing termination exception\n");
 
         __cfaehm_allocate_exception( val );
@@ -268 +259 @@
 
 void __cfaehm_rethrow_terminate(void) {
-        __cfadbg_print_safe(exception, "Rethrowing termination exception\n");
+        __cfaabi_dbg_print_safe("Rethrowing termination exception\n");
 
         __cfaehm_begin_unwind();
@@ -284 +275 @@
 {
 
-        //__cfadbg_print_safe(exception, "CFA: 0x%lx\n", _Unwind_GetCFA(context));
-        __cfadbg_print_safe(exception, "Personality function (%d, %x, %llu, %p, %p):",
+        //__cfaabi_dbg_print_safe("CFA: 0x%lx\n", _Unwind_GetCFA(context));
+        __cfaabi_dbg_print_safe("Personality function (%d, %x, %llu, %p, %p):",
                         version, actions, exception_class, unwind_exception, unwind_context);
 
-        // Verify that actions follow the rules we expect.
-        // This function should never be called at the end of the stack.
-        verify(!(actions & _UA_END_OF_STACK));
-        // Either only the search phase flag is set or...
+        // If we've reached the end of the stack then there is nothing much we can do...
+        if (actions & _UA_END_OF_STACK) return _URC_END_OF_STACK;
+
         if (actions & _UA_SEARCH_PHASE) {
-                verify(actions == _UA_SEARCH_PHASE);
-                __cfadbg_print_safe(exception, " lookup phase");
-        // ... we are in clean-up phase.
-        } else {
-                verify(actions & _UA_CLEANUP_PHASE);
-                __cfadbg_print_safe(exception, " cleanup phase");
-                // We shouldn't be the handler frame during forced unwind.
-                if (actions & _UA_HANDLER_FRAME) {
-                        verify(!(actions & _UA_FORCE_UNWIND));
-                        __cfadbg_print_safe(exception, " (handler frame)");
-                } else if (actions & _UA_FORCE_UNWIND) {
-                        __cfadbg_print_safe(exception, " (force unwind)");
-                }
+                __cfaabi_dbg_print_safe(" lookup phase");
+        }
+        else if (actions & _UA_CLEANUP_PHASE) {
+                __cfaabi_dbg_print_safe(" cleanup phase");
+        }
+        // Just in case, probably can't actually happen
+        else {
+                printf(" error\n");
+                return _URC_FATAL_PHASE1_ERROR;
         }
 
@@ -345 +331 @@
                         void * ep = (void*)lsd_info.Start + callsite_start + callsite_len;
                         void * ip = (void*)instruction_ptr;
-                        __cfadbg_print_safe(exception, "\nfound %p - %p (%p, %p, %p), looking for %p\n",
+                        __cfaabi_dbg_print_safe("\nfound %p - %p (%p, %p, %p), looking for %p\n",
                                         bp, ep, ls, cs, cl, ip);
 #endif // __CFA_DEBUG_PRINT__
@@ -360 +346 @@
                 if ( 0 == callsite_landing_pad ) {
                         // Nothing to do, move along
-                        __cfadbg_print_safe(exception, " no landing pad");
+                        __cfaabi_dbg_print_safe(" no landing pad");
                 } else if (actions & _UA_SEARCH_PHASE) {
                         // In search phase, these means we found a potential handler we must check.
@@ -398 +384 @@
                                 // Based on the return value, check if we matched the exception
                                 if (ret == _URC_HANDLER_FOUND) {
-                                        __cfadbg_print_safe(exception, " handler found\n");
+                                        __cfaabi_dbg_print_safe(" handler found\n");
                                 } else {
-                                        __cfadbg_print_safe(exception, " no handler\n");
+                                        __cfaabi_dbg_print_safe(" no handler\n");
                                 }
                                 return ret;
@@ -406 +392 @@
 
                         // This is only a cleanup handler, ignore it
-                        __cfadbg_print_safe(exception, " no action");
-                } else {
+                        __cfaabi_dbg_print_safe(" no action");
+                } else if (actions & _UA_CLEANUP_PHASE) {
                         // In clean-up phase, no destructors here but this could be the handler.
 
@@ -428 +414 @@
                         _Unwind_SetIP( unwind_context, ((lsd_info.LPStart) + (callsite_landing_pad)) );
 
-                        __cfadbg_print_safe(exception, " action\n");
+                        __cfaabi_dbg_print_safe(" action\n");
 
                         // Return have some action to run
@@ -435 +421 @@
         }
         // No handling found
-        __cfadbg_print_safe(exception, " table end reached");
+        __cfaabi_dbg_print_safe(" table end reached\n");
 
         UNWIND:
-        __cfadbg_print_safe(exception, " unwind\n");
+        __cfaabi_dbg_print_safe(" unwind\n");
 
         // Keep unwinding the stack
@@ -445 +431 @@
 
 #pragma GCC push_options
-#pragma GCC optimize(0)
+#pragma GCC optimize("O0")
 
 // Try statements are hoisted out see comments for details. While this could probably be unique
@@ -542 +528 @@
         "       .quad __gcfa_personality_v0\n"
 #else // then __i386
-        "       .long __gcfa_personality_v0\n"
+        "   .long __gcfa_personality_v0\n"
 #endif
 );