Changeset 21ad568 for libcfa/src

Timestamp:

Dec 14, 2023, 1:55:49 PM (11 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

ca9d65e

Parents:

610354a (diff), 142930b (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

libcfa/src

Files:

• exception.c (modified) (5 diffs)
• exception.h (modified) (2 diffs)

libcfa/src/exception.c

@@ -55 +55 @@
 }
 
-struct __cfaehm_base_exception_t * __cfaehm_get_current_exception(void) {
-        return this_exception_context()->current_exception;
-}
 
 // RESUMPTION ================================================================
@@ -312 +309 @@
                 struct _Unwind_Context * unwind_context)
 {
-        //__cfadbg_print_safe(exception, "CFA: 0x%lx\n", _Unwind_GetCFA(context));
+        //! __cfadbg_print_safe(exception, "CFA: 0x%lx\n", _Unwind_GetCFA(unwind_context));
         __cfadbg_print_safe(exception, "Personality function (%d, %x, %llu, %p, %p):",
                         version, actions, exception_class, unwind_exception, unwind_context);
@@ -482 +479 @@
 // and simply linked from libcfa but there is one problem left, see the exception table for details
 __attribute__((noinline))
-int __cfaehm_try_terminate(void (*try_block)(),
-                __attribute__((unused)) void (*catch_block)(int index, exception_t * except),
+void __cfaehm_try_terminate(void (*try_block)(),
+                void (*catch_block)(int index, exception_t * except),
                 __attribute__((unused)) int (*match_block)(exception_t * except)) {
         //! volatile int xy = 0;
-        //! printf("%p %p %p\n", &try_block, &match_block, &xy);
+        //! printf("%p %p %p %p\n", &try_block, &catch_block, &match_block, &xy);
 
         // Setup the personality routine and exception table.
@@ -510 +507 @@
 
         // Normal return for when there is no throw.
-        return 0;
+        return;
 
         // Exceptionnal path
@@ -521 +518 @@
         asm volatile (".CATCH:");
 
-        return EXCEPT_TO_NODE( this_exception_context()->current_exception )->handler_index;
+        // Exception handler
+        // Note: Saving the exception context on the stack breaks termination exceptions.
+        catch_block( EXCEPT_TO_NODE( this_exception_context()->current_exception )->handler_index,
+                     this_exception_context()->current_exception );
 }
 

libcfa/src/exception.h

@@ -43 +43 @@
 extern struct __cfavir_type_info __cfatid_exception_t;
 
-struct __cfaehm_base_exception_t * __cfaehm_get_current_exception(void);
 
 void __cfaehm_cancel_stack(exception_t * except) __attribute__((noreturn));
@@ -58 +57 @@
 
 // Function catches termination exceptions.
-int __cfaehm_try_terminate(
+void __cfaehm_try_terminate(
         void (*try_block)(),
         void (*catch_block)(int index, exception_t * except),