Changeset 057298e

Timestamp:

Apr 6, 2020, 1:30:10 PM (3 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:

7030dab, ed12051, f1b6671

Parents:

ebe0f0d (diff), 73530d9 (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) (7 diffs)

libcfa/src/exception.c

@@ -10 +10 @@
 // Created On       : Mon Jun 26 15:13:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr Apr 02 14:47:00 2020
-// Update Count     : 13
+// Last Modified On : Fri Apr 03 11:57:00 2020
+// Update Count     : 14
 //
 
@@ -31 +31 @@
 // FIX ME: temporary hack to keep ARM build working
 #ifndef _URC_FATAL_PHASE1_ERROR
-#define _URC_FATAL_PHASE1_ERROR 2
+#define _URC_FATAL_PHASE1_ERROR 3
 #endif // ! _URC_FATAL_PHASE1_ERROR
 #ifndef _URC_FATAL_PHASE2_ERROR
@@ -39 +39 @@
 #include "lsda.h"
 
+/* The exception class for our exceptions. Because of the vendor component
+ * its value would not be standard.
+ * Vendor: UWPL
+ * Language: CFA\0
+ */
+const _Unwind_Exception_Class __cfaehm_exception_class = 0x4c50575500414643;
 
 // Base exception vtable is abstract, you should not have base exceptions.
@@ -116 +122 @@
 // May have to move to cfa for constructors and destructors (references).
 
+// How to clean up an exception in various situations.
+static void __cfaehm_exception_cleanup(
+                _Unwind_Reason_Code reason,
+                struct _Unwind_Exception * exception) {
+        switch (reason) {
+        case _URC_FOREIGN_EXCEPTION_CAUGHT:
+                // This one we could clean-up to allow cross-language exceptions.
+        case _URC_FATAL_PHASE1_ERROR:
+        case _URC_FATAL_PHASE2_ERROR:
+        default:
+                abort();
+        }
+}
+
+// We need a piece of storage to raise the exception, for now its a single
+// piece.
+static struct _Unwind_Exception this_exception_storage;
+
 struct __cfaehm_node {
         struct __cfaehm_node * next;
@@ -142 +166 @@
         // Copy the exception to storage.
         except->virtual_table->copy( context->current_exception, except );
+
+        // Set up the exception storage.
+        this_exception_storage.exception_class = __cfaehm_exception_class;
+        this_exception_storage.exception_cleanup = __cfaehm_exception_cleanup;
 }
 
@@ -175 +203 @@
         if ( *(void**)except ) __cfaehm_delete_exception( *(exception_t **)except );
 }
-
-
-// We need a piece of storage to raise the exception
-struct _Unwind_Exception this_exception_storage;
 
 // Function needed by force unwind
@@ -201 +225 @@
                 abort();
         }
-
 
         // Call stdlibc to raise the exception