Changes in libcfa/src/exception.c [851fd92:979df46]

File:

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

libcfa/src/exception.c

@@ -121 +121 @@
 
 
-// TERMINATION ===============================================================
-
-// MEMORY MANAGEMENT (still for integers)
-// May have to move to cfa for constructors and destructors (references).
+// MEMORY MANAGEMENT =========================================================
 
 // How to clean up an exception in various situations.
@@ -203 +200 @@
 }
 
-// If this isn't a rethrow (*except==0), delete the provided exception.
-void __cfaehm_cleanup_terminate( void * except ) {
-        if ( *(void**)except ) __cfaehm_delete_exception( *(exception_t **)except );
-}
+// CANCELLATION ==============================================================
 
 // Function needed by force unwind
@@ -228 +222 @@
 }
 
+// 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.
+        _Unwind_Reason_Code ret;
+        ret = _Unwind_ForcedUnwind( &this_exception_storage, _Stop_Fn, (void*)0x22 );
+        printf("UNWIND ERROR %d after force unwind\n", ret);
+        abort();
+}
+
+
+// TERMINATION ===============================================================
+
+// If this isn't a rethrow (*except==0), delete the provided exception.
+void __cfaehm_cleanup_terminate( void * except ) {
+        if ( *(void**)except ) __cfaehm_delete_exception( *(exception_t **)except );
+}
+
 // The exception that is being thrown must already be stored.
 static __attribute__((noreturn)) void __cfaehm_begin_unwind(void) {
@@ -245 +256 @@
         // the whole stack.
 
+        // No handler found, go to the default operation.
+        // Currently this will always be a cancellation.
         if ( ret == _URC_END_OF_STACK ) {
-                // No proper handler was found. This can be handled in many ways, C++ calls std::terminate.
-                // Here we force unwind the stack, basically raising a cancellation.
-                printf("Uncaught exception %p\n", &this_exception_storage);
-
-                ret = _Unwind_ForcedUnwind( &this_exception_storage, _Stop_Fn, (void*)0x22 );
-                printf("UNWIND ERROR %d after force unwind\n", ret);
-                abort();
+                __cfadbg_print_safe(exception, "Uncaught exception %p\n", &this_exception_storage);
+
+                __cfaehm_cancel_stack(this_exception_context()->current_exception);
         }