Changes in libcfa/src/exception.c [d119d613:ba70330]

File:

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

libcfa/src/exception.c

@@ -209 +209 @@
                 void * stop_param) {
         // Verify actions follow the rules we expect.
-        verify(actions & _UA_CLEANUP_PHASE);
-        verify(actions & _UA_FORCE_UNWIND);
-        verify(!(actions & _UA_SEARCH_PHASE));
-        verify(!(actions & _UA_HANDLER_FRAME));
+        verify((actions & _UA_CLEANUP_PHASE) && (actions & _UA_FORCE_UNWIND));
+        verify(!(actions & (_UA_SEARCH_PHASE | _UA_HANDLER_FRAME)));
 
         if ( actions & _UA_END_OF_STACK ) {
-                abort();
+                exit(1);
         } else {
                 return _URC_NO_REASON;
@@ -221 +219 @@
 }
 
-__attribute__((weak)) _Unwind_Reason_Code
-__cfaehm_cancellation_unwind( struct _Unwind_Exception * exception ) {
-        return _Unwind_ForcedUnwind( exception, _Stop_Fn, (void*)0x22 );
-}
+static struct _Unwind_Exception cancel_exception_storage;
 
 // Cancel the current stack, prefroming approprate clean-up and messaging.
 void __cfaehm_cancel_stack( exception_t * exception ) {
-        __cfaehm_allocate_exception( exception );
-
-        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 );
-        }
-
+        // TODO: Detect current stack and pick a particular stop-function.
         _Unwind_Reason_Code ret;
-        ret = __cfaehm_cancellation_unwind( &node->unwind_exception );
+        ret = _Unwind_ForcedUnwind( &cancel_exception_storage, _Stop_Fn, (void*)0x22 );
         printf("UNWIND ERROR %d after force unwind\n", ret);
         abort();