Changes in libcfa/src/exception.c [8108ba8:13600e8]

File:

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

libcfa/src/exception.c

@@ -9 +9 @@
 // Author           : Andrew Beach
 // Created On       : Mon Jun 26 15:13:00 2017
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed Feb 24 13:40:00 2021
-// Update Count     : 36
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 10 16:45:22 2023
+// Update Count     : 69
 //
 
@@ -27 +27 @@
 #include "stdhdr/assert.h"
 #include "virtual.h"
+
+extern void __cabi_abort( const char fmt[], ... );
 
 #pragma GCC visibility push(default)
@@ -123 +125 @@
 
 // Creates a copy of the indicated exception and sets current_exception to it.
-static void __cfaehm_allocate_exception( exception_t * except ) {
+void __cfaehm_allocate_exception( exception_t * except ) {
         struct exception_context_t * context = this_exception_context();
 
@@ -192 +194 @@
 
         if ( actions & _UA_END_OF_STACK ) {
-                abort();
+                __cabi_abort(
+                        "Propagation failed to find a matching handler.\n"
+                        "Possible cause is a missing try block with appropriate catch clause for specified exception type.\n"
+                        "Last exception name or message: %s.\n",
+                        NODE_TO_EXCEPT( UNWIND_TO_NODE( unwind_exception ) )->
+                                virtual_table->msg( NODE_TO_EXCEPT( UNWIND_TO_NODE( unwind_exception ) ) )
+                );
         } else {
                 return _URC_NO_REASON;
@@ -209 +217 @@
         struct exception_context_t * context = this_exception_context();
         struct __cfaehm_node * node = EXCEPT_TO_NODE(context->current_exception);
-
-        // Preform clean-up of any extra active exceptions.
-        while ( node->next ) {
-                struct __cfaehm_node * to_free = node->next;
-                node->next = to_free->next;
-                exception_t * except = NODE_TO_EXCEPT( to_free );
-                except->virtual_table->free( except );
-            free( to_free );
-        }
 
         _Unwind_Reason_Code ret;
@@ -239 +238 @@
 
 // The exception that is being thrown must already be stored.
-static void __cfaehm_begin_unwind(void(*defaultHandler)(exception_t *)) {
+void __cfaehm_begin_unwind(void(*defaultHandler)(exception_t *)) {
         struct exception_context_t * context = this_exception_context();
         if ( NULL == context->current_exception ) {
@@ -568 +567 @@
         "       .hidden CFA.ref.__gcfa_personality_v0\n"
         "       .weak   CFA.ref.__gcfa_personality_v0\n"
-        // No clue what this does specifically
-        "       .section        .data.rel.local.CFA.ref.__gcfa_personality_v0,\"awG\",@progbits,CFA.ref.__gcfa_personality_v0,comdat\n"
 #if defined( __x86_64 ) || defined( __i386 )
         "       .align 8\n"