Changes in / [730f4f1:7c6b262]

Files:

• libcfa/src/exception.c (modified) (4 diffs)
• tests/exceptions/.expect/resume.txt (modified) (1 diff)
• tests/exceptions/.expect/terminate.txt (modified) (1 diff)
• tests/exceptions/resume.cfa (modified) (1 diff)
• tests/exceptions/terminate.cfa (modified) (1 diff)

libcfa/src/exception.c

@@ -121 +121 @@
 
 
-// MEMORY MANAGEMENT =========================================================
+// TERMINATION ===============================================================
+
+// MEMORY MANAGEMENT (still for integers)
+// May have to move to cfa for constructors and destructors (references).
 
 // How to clean up an exception in various situations.
@@ -200 +203 @@
 }
 
-// CANCELLATION ==============================================================
+// 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 );
+}
 
 // Function needed by force unwind
@@ -222 +228 @@
 }
 
-// Cancel the current stack, prefroming approprate clean-up and messaging.
-static __attribute__((noreturn)) 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) {
@@ -257 +245 @@
         // the whole stack.
 
-        // 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);
+                // 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();
         }
 

tests/exceptions/.expect/resume.txt

@@ -4 +4 @@
 end of try clause
 Exiting: simple try clause
-
-catch-all
 
 throwing child exception

tests/exceptions/.expect/terminate.txt

@@ -3 +3 @@
 simple catch
 Exiting: simple catch clause
-
-catch-all
 
 throwing child exception

tests/exceptions/resume.cfa

@@ -19 +19 @@
                 loud_exit a = "simple catch clause";
                 printf("simple catch\n");
-        }
-        printf("\n");
-
-        // Throw catch-all test.
-        try {
-                throwResume &(zen){};
-        } catchResume (exception_t * error) {
-                printf("catch-all\n");
         }
         printf("\n");

tests/exceptions/terminate.cfa

@@ -17 +17 @@
                 printf("end of try clause\n");
         } catch (zen * error) {
-                loud_exit a = "simple catch clause";
+        loud_exit a = "simple catch clause";
                 printf("simple catch\n");
-        }
-        printf("\n");
-
-        // Throw catch-all test.
-        try {
-                throw &(zen){};
-        } catch (exception_t * error) {
-                printf("catch-all\n");
         }
         printf("\n");