Changeset 4fa44e7 for libcfa/src

Timestamp:

May 12, 2020, 1:59:33 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

1b143de

Parents:

504a7dc (diff), 730f4f1 (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' into relaxed_ready

Location:

libcfa/src

Files:

• Makefile.in (modified) (1 diff)
• exception.c (modified) (4 diffs)

libcfa/src/Makefile.in

@@ -308 +308 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DIST_BWLIMIT = @DIST_BWLIMIT@
 DLLTOOL = @DLLTOOL@
 DRIVER_DIR = @DRIVER_DIR@

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.
+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) {
@@ -245 +257 @@
         // 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);
         }