Changes in src/libcfa/exception.c [e9145a3:cbce272]

File:

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

src/libcfa/exception.c

@@ -10 +10 @@
 // Created On       : Mon Jun 26 15:13:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr Aug 17 15:45:00 2017
-// Update Count     : 7
+// Last Modified On : Fri Aug  4 15:20:00 2017
+// Update Count     : 6
 //
 
@@ -23 +23 @@
 #include <stdio.h>
 #include <unwind.h>
-#include <libhdr/libdebug.h>
 
 // FIX ME: temporary hack to keep ARM build working
@@ -80 +79 @@
 void __cfaehm__throw_resume(exception * except) {
 
-        LIB_DEBUG_PRINT_SAFE("Throwing resumption exception\n");
+        // DEBUG
+        printf("Throwing resumption exception\n");
 
         struct __cfaehm__try_resume_node * original_head = shared_stack.current_resume;
@@ -94 +94 @@
         }
 
-        LIB_DEBUG_PRINT_SAFE("Unhandled exception\n");
+        printf("Unhandled exception\n");
         shared_stack.current_resume = original_head;
 
@@ -106 +106 @@
 
 void __cfaehm__try_resume_setup(struct __cfaehm__try_resume_node * node,
-                        _Bool (*handler)(exception * except)) {
+                        int (*handler)(exception * except)) {
         node->next = shared_stack.top_resume;
         node->handler = handler;
@@ -154 +154 @@
         struct exception_context_t * context = this_exception_context();
 
-        LIB_DEBUG_PRINT_SAFE("Deleting Exception\n");
+        // DEBUG
+        printf( "Deleting Exception\n");
 
         // Remove the exception from the list.
@@ -234 +235 @@
 
 void __cfaehm__throw_terminate( exception * val ) {
-        LIB_DEBUG_PRINT_SAFE("Throwing termination exception\n");
+        // DEBUG
+        printf("Throwing termination exception\n");
 
         __cfaehm__allocate_exception( val );
@@ -241 +243 @@
 
 void __cfaehm__rethrow_terminate(void) {
-        LIB_DEBUG_PRINT_SAFE("Rethrowing termination exception\n");
+        // DEBUG
+        printf("Rethrowing termination exception\n");
 
         __cfaehm__begin_unwind();
@@ -254 +257 @@
 {
 
-        //LIB_DEBUG_PRINT_SAFE("CFA: 0x%lx\n", _Unwind_GetCFA(context));
-        LIB_DEBUG_PRINT_SAFE("Personality function (%d, %x, %llu, %p, %p):", version, actions, exceptionClass, unwind_exception, context);
+        // DEBUG
+        //printf("CFA: 0x%lx\n", _Unwind_GetCFA(context));
+        printf("Personality function (%d, %x, %llu, %p, %p):", version, actions, exceptionClass, unwind_exception, context);
 
         // If we've reached the end of the stack then there is nothing much we can do...
         if( actions & _UA_END_OF_STACK ) return _URC_END_OF_STACK;
 
+        // DEBUG
         if (actions & _UA_SEARCH_PHASE) {
-                LIB_DEBUG_PRINT_SAFE(" lookup phase");
-        }
+                printf(" lookup phase");
+        }
+        // DEBUG
         else if (actions & _UA_CLEANUP_PHASE) {
-                LIB_DEBUG_PRINT_SAFE(" cleanup phase");
+                printf(" cleanup phase");
         }
         // Just in case, probably can't actually happen
@@ -300 +306 @@
                 // Have we reach the correct frame info yet?
                 if( lsd_info.Start + callsite_start + callsite_len < instruction_ptr ) {
-#ifdef __CFA_DEBUG_PRINT__
+                        //DEBUG BEGIN
                         void * ls = (void*)lsd_info.Start;
                         void * cs = (void*)callsite_start;
@@ -307 +313 @@
                         void * ep = (void*)lsd_info.Start + callsite_start + callsite_len;
                         void * ip = (void*)instruction_ptr;
-                        LIB_DEBUG_PRINT_SAFE("\nfound %p - %p (%p, %p, %p), looking for %p\n", bp, ep, ls, cs, cl, ip);
-#endif // __CFA_DEBUG_PRINT__
+                        printf("\nfound %p - %p (%p, %p, %p), looking for %p\n", bp, ep, ls, cs, cl, ip);
+                        //DEBUG END
                         continue;
                 }
@@ -356 +362 @@
 
                                         // Based on the return value, check if we matched the exception
-                                        if( ret == _URC_HANDLER_FOUND) {
-                                                LIB_DEBUG_PRINT_SAFE(" handler found\n");
-                                        } else {
-                                                LIB_DEBUG_PRINT_SAFE(" no handler\n");
-                                        }
+                                        if( ret == _URC_HANDLER_FOUND) printf(" handler found\n");
+                                        else printf(" no handler\n");
                                         return ret;
                                 }
 
                                 // This is only a cleanup handler, ignore it
-                                LIB_DEBUG_PRINT_SAFE(" no action");
+                                printf(" no action");
                         }
                         else if (actions & _UA_CLEANUP_PHASE) {
@@ -385 +388 @@
                                 _Unwind_SetIP( context, ((lsd_info.LPStart) + (callsite_landing_pad)) );
 
-                                LIB_DEBUG_PRINT_SAFE(" action\n");
+                                // DEBUG
+                                printf(" action\n");
 
                                 // Return have some action to run
@@ -393 +397 @@
 
                 // Nothing to do, move along
-                LIB_DEBUG_PRINT_SAFE(" no landing pad");
+                printf(" no landing pad");
         }
         // No handling found
-        LIB_DEBUG_PRINT_SAFE(" table end reached\n");
-
+        printf(" table end reached\n");
+
+        // DEBUG
         UNWIND:
-        LIB_DEBUG_PRINT_SAFE(" unwind\n");
+        printf(" unwind\n");
 
         // Keep unwinding the stack