Changes in libcfa/src/exception.c [979df46:8ad5752]

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 : Andrew Beach
-// Last Modified On : Tue Apr 14 12:01:00 2020
-// Update Count     : 18
+// Last Modified On : Thr May 21 12:18:00 2020
+// Update Count     : 20
 //
 
@@ -80 +80 @@
 }
 
-void __cfaehm_throw_resume(exception_t * except) {
+void __cfaehm_throw_resume(exception_t * except, void (*defaultHandler)(exception_t *)) {
         struct exception_context_t * context = this_exception_context();
 
@@ -96 +96 @@
         }
 
+        // No handler found, fall back to the default operation.
         __cfadbg_print_safe(exception, "Unhandled exception\n");
-
-        // Fall back to termination:
-        __cfaehm_throw_terminate(except);
-        // TODO: Default handler for resumption.
+        defaultHandler(except);
 }
 
@@ -239 +237 @@
 }
 
+static void __cfaehm_cleanup_default( exception_t ** except ) {
+        __cfaehm_delete_exception( *except );
+        *except = NULL;
+}
+
 // The exception that is being thrown must already be stored.
-static __attribute__((noreturn)) void __cfaehm_begin_unwind(void) {
-        if ( ! this_exception_context()->current_exception ) {
+static void __cfaehm_begin_unwind(void(*defaultHandler)(exception_t *)) {
+        struct exception_context_t * context = this_exception_context();
+        struct _Unwind_Exception * storage = &this_exception_storage;
+        if ( NULL == context->current_exception ) {
                 printf("UNWIND ERROR missing exception in begin unwind\n");
                 abort();
@@ -247 +252 @@
 
         // Call stdlibc to raise the exception
-        _Unwind_Reason_Code ret = _Unwind_RaiseException( &this_exception_storage );
+        __cfadbg_print_safe(exception, "Begin unwinding (storage &p, context %p)\n", storage, context);
+        _Unwind_Reason_Code ret = _Unwind_RaiseException( storage );
 
         // If we reach here it means something happened. For resumption to work we need to find a way
@@ -256 +262 @@
         // the whole stack.
 
+        // We did not simply reach the end of the stack without finding a handler. This is an error.
+        if ( ret != _URC_END_OF_STACK ) {
+                printf("UNWIND ERROR %d after raise exception\n", ret);
+                abort();
+        }
+
         // No handler found, go to the default operation.
-        // Currently this will always be a cancellation.
-        if ( ret == _URC_END_OF_STACK ) {
-                __cfadbg_print_safe(exception, "Uncaught exception %p\n", &this_exception_storage);
-
-                __cfaehm_cancel_stack(this_exception_context()->current_exception);
-        }
-
-        // We did not simply reach the end of the stack without finding a handler. This is an error.
-        printf("UNWIND ERROR %d after raise exception\n", ret);
+        __cfadbg_print_safe(exception, "Uncaught exception %p\n", storage);
+
+        __attribute__((cleanup(__cfaehm_cleanup_default)))
+        exception_t * exception = context->current_exception;
+        defaultHandler( exception );
+}
+
+void __cfaehm_throw_terminate( exception_t * val, void (*defaultHandler)(exception_t *) ) {
+        __cfadbg_print_safe(exception, "Throwing termination exception\n");
+
+        __cfaehm_allocate_exception( val );
+        __cfaehm_begin_unwind( defaultHandler );
+}
+
+static __attribute__((noreturn)) void __cfaehm_rethrow_adapter( exception_t * except ) {
+        // TODO: Print some error message.
+        (void)except;
         abort();
-}
-
-void __cfaehm_throw_terminate( exception_t * val ) {
-        __cfadbg_print_safe(exception, "Throwing termination exception\n");
-
-        __cfaehm_allocate_exception( val );
-        __cfaehm_begin_unwind();
 }
 
@@ -279 +292 @@
         __cfadbg_print_safe(exception, "Rethrowing termination exception\n");
 
-        __cfaehm_begin_unwind();
+        __cfaehm_begin_unwind( __cfaehm_rethrow_adapter );
+        abort();
 }