Changeset 3eb5a478 for libcfa/src/exception.c

Timestamp:

Apr 2, 2020, 3:00:55 PM (4 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

0f3d844

Parents:

6d43cdde

Message:

Fixed the disabled exceptions/resume test. Added more tests in exceptions/interact, one of which is disabled.

File:

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

libcfa/src/exception.c

@@ -10 +10 @@
 // Created On       : Mon Jun 26 15:13:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Mar 27 10:19:00 2020
-// Update Count     : 12
+// Last Modified On : Thr Apr 02 14:47:00 2020
+// Update Count     : 13
 //
 
@@ -53 +53 @@
 // Temperary global exception context. Does not work with concurency.
 struct exception_context_t {
-    struct __cfaehm_try_resume_node * top_resume;
-    struct __cfaehm_try_resume_node * current_resume;
-
-    exception_t * current_exception;
-    int current_handler_index;
-} static shared_stack = {NULL, NULL, NULL, 0};
+        struct __cfaehm_try_resume_node * top_resume;
+
+        exception_t * current_exception;
+        int current_handler_index;
+} static shared_stack = {NULL, NULL, 0};
 
 // Get the current exception context.
@@ -75 +74 @@
         __cfaabi_dbg_print_safe("Throwing resumption exception\n");
 
-        struct __cfaehm_try_resume_node * original_head = context->current_resume;
-        struct __cfaehm_try_resume_node * current =
-                (original_head) ? original_head->next : context->top_resume;
+        struct __cfaehm_try_resume_node * original_head = context->top_resume;
+        struct __cfaehm_try_resume_node * current = context->top_resume;
 
         for ( ; current ; current = current->next) {
-                context->current_resume = current;
+                context->top_resume = current->next;
                 if (current->handler(except)) {
-                        context->current_resume = original_head;
+                        context->top_resume = original_head;
                         return;
                 }
@@ -88 +86 @@
 
         __cfaabi_dbg_print_safe("Unhandled exception\n");
-        context->current_resume = original_head;
+        context->top_resume = original_head;
 
         // Fall back to termination: