Changeset 80ec409

Timestamp:

Aug 12, 2020, 4:20:03 PM (3 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:

0240cd69

Parents:

980fb4e

Message:

The exception context is now stored on the stack. It is not used just yet.

Location:

libcfa/src

Files:

• concurrency/invoke.h (modified) (3 diffs)
• exception.c (modified) (2 diffs)

libcfa/src/concurrency/invoke.h

@@ -26 +26 @@
 #ifndef _INVOKE_H_
 #define _INVOKE_H_
+
+        struct __cfaehm_try_resume_node;
+        struct __cfaehm_base_exception_t;
+        struct exception_context_t {
+                struct __cfaehm_try_resume_node * top_resume;
+                struct __cfaehm_base_exception_t * current_exception;
+        };
 
         struct __stack_context_t {
@@ -51 +58 @@
                 // base of stack
                 void * base;
+
+                // Information for exception handling.
+                struct exception_context_t exception_context;
         };
 
@@ -84 +94 @@
         };
 
-        static inline struct __stack_t * __get_stack( struct $coroutine * cor ) { return (struct __stack_t*)(((uintptr_t)cor->stack.storage) & ((uintptr_t)-2)); }
+        static inline struct __stack_t * __get_stack( struct $coroutine * cor ) {
+                return (struct __stack_t*)(((uintptr_t)cor->stack.storage) & ((uintptr_t)-2));
+        }
 
         // struct which calls the monitor is accepting

libcfa/src/exception.c

@@ -28 +28 @@
 #include <unwind.h>
 #include <bits/debug.hfa>
+#include "concurrency/invoke.h"
 #include "stdhdr/assert.h"
 
@@ -59 +60 @@
 
 // Temperary global exception context. Does not work with concurency.
-struct exception_context_t {
-        struct __cfaehm_try_resume_node * top_resume;
-
-        exception_t * current_exception;
-} static shared_stack = {NULL, NULL};
+static struct exception_context_t shared_stack = {NULL, NULL};
 
 // Get the current exception context.