Changeset c40157e

Timestamp:

Dec 12, 2023, 4:12:45 PM (12 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

96b0e49, b1f2007

Parents:

f277ab6c

Message:

Minimal change to get exceptions running the old way while a fix is found. Or even more details on the problem.

Files:

• libcfa/src/exception.c (modified) (2 diffs)
• libcfa/src/exception.h (modified) (1 diff)
• src/ControlStruct/ExceptTranslate.cpp (modified) (1 diff)

libcfa/src/exception.c

@@ -414 +414 @@
                                 _Unwind_Word match_pos =
 #                               if defined( __x86_64 )
-                                    _Unwind_GetCFA(unwind_context);
+                                    _Unwind_GetCFA(unwind_context) + 8;
 #                               elif defined( __i386 )
-                                    _Unwind_GetCFA(unwind_context) + 8;
+                                    _Unwind_GetCFA(unwind_context) + 24;
 #                               elif defined( __ARM_ARCH )
-                                    _Unwind_GetCFA(unwind_context) + 16;
+                                    _Unwind_GetCFA(unwind_context) + 40;
 #                               endif
                                 int (*matcher)(exception_t *) = *(int(**)(exception_t *))match_pos;
@@ -483 +483 @@
 __attribute__((noinline))
 int __cfaehm_try_terminate(void (*try_block)(),
+                __attribute__((unused)) void (*catch_block)(int index, exception_t * except),
                 __attribute__((unused)) int (*match_block)(exception_t * except)) {
         //! volatile int xy = 0;

libcfa/src/exception.h

@@ -60 +60 @@
 int __cfaehm_try_terminate(
         void (*try_block)(),
+        void (*catch_block)(int index, exception_t * except),
         int (*match_block)(exception_t * except));
 

src/ControlStruct/ExceptTranslate.cpp

@@ -496 +496 @@
                                 {
                                         new ast::VariableExpr( loc, try_wrapper ),
+                                        new ast::VariableExpr( loc, terminate_catch ),
                                         new ast::VariableExpr( loc, terminate_match ),
                                 }