Changeset 44aad8f for libcfa/src/exception.c

Timestamp:

Apr 27, 2020, 4:36:58 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:

c59a346

Parents:

038be32 (diff), c680a4b (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

File:

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

libcfa/src/exception.c

@@ -83 +83 @@
         struct exception_context_t * context = this_exception_context();
 
-        __cfaabi_dbg_print_safe("Throwing resumption exception\n");
+        __cfadbg_print_safe(exception, "Throwing resumption exception\n");
 
         __attribute__((cleanup(reset_top_resume)))
@@ -96 +96 @@
         }
 
-        __cfaabi_dbg_print_safe("Unhandled exception\n");
+        __cfadbg_print_safe(exception, "Unhandled exception\n");
 
         // Fall back to termination:
@@ -180 +180 @@
         struct exception_context_t * context = this_exception_context();
 
-        __cfaabi_dbg_print_safe("Deleting Exception\n");
+        __cfadbg_print_safe(exception, "Deleting Exception\n");
 
         // Remove the exception from the list.
@@ -218 +218 @@
                 void * stop_param) {
         // Verify actions follow the rules we expect.
-        verify((actions & _UA_CLEANUP_PHASE) && actions & (_UA_FORCE_UNWIND));
+        verify((actions & _UA_CLEANUP_PHASE) && (actions & _UA_FORCE_UNWIND));
         verify(!(actions & (_UA_SEARCH_PHASE | _UA_HANDER_FRAME)));
 
@@ -261 +261 @@
 
 void __cfaehm_throw_terminate( exception_t * val ) {
-        __cfaabi_dbg_print_safe("Throwing termination exception\n");
+        __cfadbg_print_safe(exception, "Throwing termination exception\n");
 
         __cfaehm_allocate_exception( val );
@@ -268 +268 @@
 
 void __cfaehm_rethrow_terminate(void) {
-        __cfaabi_dbg_print_safe("Rethrowing termination exception\n");
+        __cfadbg_print_safe(exception, "Rethrowing termination exception\n");
 
         __cfaehm_begin_unwind();
@@ -284 +284 @@
 {
 
-        //__cfaabi_dbg_print_safe("CFA: 0x%lx\n", _Unwind_GetCFA(context));
-        __cfaabi_dbg_print_safe("Personality function (%d, %x, %llu, %p, %p):",
+        //__cfadbg_print_safe(exception, "CFA: 0x%lx\n", _Unwind_GetCFA(context));
+        __cfadbg_print_safe(exception, "Personality function (%d, %x, %llu, %p, %p):",
                         version, actions, exception_class, unwind_exception, unwind_context);
 
@@ -294 +294 @@
         if (actions & _UA_SEARCH_PHASE) {
                 verify(actions == _UA_SEARCH_PHASE);
-                __cfaabi_dbg_print_safe(" lookup phase");
+                __cfadbg_print_safe(exception, " lookup phase");
         // ... we are in clean-up phase.
         } else {
                 verify(actions & _UA_CLEANUP_PHASE);
-                __cfaabi_dbg_print_safe(" cleanup phase");
+                __cfadbg_print_safe(exception, " cleanup phase");
                 // We shouldn't be the handler frame during forced unwind.
                 if (actions & _UA_HANDLER_FRAME) {
                         verify(!(actions & _UA_FORCE_UNWIND));
-                        __cfaabi_dbg_print_safe(" (handler frame)");
+                        __cfadbg_print_safe(exception, " (handler frame)");
                 } else if (actions & _UA_FORCE_UNWIND) {
-                        __cfaabi_dbg_print_safe(" (force unwind)");
+                        __cfadbg_print_safe(exception, " (force unwind)");
                 }
         }
@@ -345 +345 @@
                         void * ep = (void*)lsd_info.Start + callsite_start + callsite_len;
                         void * ip = (void*)instruction_ptr;
-                        __cfaabi_dbg_print_safe("\nfound %p - %p (%p, %p, %p), looking for %p\n",
+                        __cfadbg_print_safe(exception, "\nfound %p - %p (%p, %p, %p), looking for %p\n",
                                         bp, ep, ls, cs, cl, ip);
 #endif // __CFA_DEBUG_PRINT__
@@ -360 +360 @@
                 if ( 0 == callsite_landing_pad ) {
                         // Nothing to do, move along
-                        __cfaabi_dbg_print_safe(" no landing pad");
+                        __cfadbg_print_safe(exception, " no landing pad");
                 } else if (actions & _UA_SEARCH_PHASE) {
                         // In search phase, these means we found a potential handler we must check.
@@ -398 +398 @@
                                 // Based on the return value, check if we matched the exception
                                 if (ret == _URC_HANDLER_FOUND) {
-                                        __cfaabi_dbg_print_safe(" handler found\n");
+                                        __cfadbg_print_safe(exception, " handler found\n");
                                 } else {
-                                        __cfaabi_dbg_print_safe(" no handler\n");
+                                        __cfadbg_print_safe(exception, " no handler\n");
                                 }
                                 return ret;
@@ -406 +406 @@
 
                         // This is only a cleanup handler, ignore it
-                        __cfaabi_dbg_print_safe(" no action");
+                        __cfadbg_print_safe(exception, " no action");
                 } else {
                         // In clean-up phase, no destructors here but this could be the handler.
@@ -428 +428 @@
                         _Unwind_SetIP( unwind_context, ((lsd_info.LPStart) + (callsite_landing_pad)) );
 
-                        __cfaabi_dbg_print_safe(" action\n");
+                        __cfadbg_print_safe(exception, " action\n");
 
                         // Return have some action to run
@@ -435 +435 @@
         }
         // No handling found
-        __cfaabi_dbg_print_safe(" table end reached\n");
+        __cfadbg_print_safe(exception, " table end reached");
 
         UNWIND:
-        __cfaabi_dbg_print_safe(" unwind\n");
+        __cfadbg_print_safe(exception, " unwind\n");
 
         // Keep unwinding the stack