Changeset b947fb2

Timestamp:

Jul 26, 2017, 12:35:39 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

15d1cc3, a5f0529, d746bc8

Parents:

33218c6

Message:

temporary hacks to allow build on ARM

File:

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

src/libcfa/exception.c

@@ -9 +9 @@
 // Author           : Andrew Beach
 // Created On       : Mon Jun 26 15:13:00 2017
-// Last Modified By : Andrew Beach
-// Last Modified On : Tus Jul 11 16:36:00 2017
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Jul 26 10:37:51 2017
+// Update Count     : 2
 //
 
@@ -21 +21 @@
 #include <stdio.h>
 #include <unwind.h>
+
+// FIX ME: temporary hack to keep ARM build working
+#ifndef _URC_FATAL_PHASE1_ERROR
+#define _URC_FATAL_PHASE1_ERROR 2
+#endif // ! _URC_FATAL_PHASE1_ERROR
+#ifndef _URC_FATAL_PHASE2_ERROR
+#define _URC_FATAL_PHASE2_ERROR 2
+#endif // ! _URC_FATAL_PHASE2_ERROR
 
 #include "lsda.h"
@@ -35 +43 @@
 
 
-// This macro should be the only thing that needs to change across machines.
-// Used in the personality function, way down in termination.
+// This macro should be the only thing that needs to change across machines.  Used in the personality function, way down
+// in termination.
 // struct _Unwind_Context * -> _Unwind_Reason_Code(*)(exception *)
 #define MATCHER_FROM_CONTEXT(ptr_to_context) \
@@ -69 +77 @@
 }
 
-/* Do we control where exceptions get thrown even with concurency?
- * If not these are not quite thread safe, the cleanup hook has to be added
- * after the node is built but before it is made the top node.
- */
+// Do we control where exceptions get thrown even with concurency?  If not these are not quite thread safe, the cleanup
+// hook has to be added after the node is built but before it is made the top node.
+
 void __cfaehm__try_resume_setup(struct __cfaehm__try_resume_node * node,
                         int (*handler)(exception * except)) {
@@ -89 +96 @@
 // Requires -fexceptions to work.
 
-// Global which defines the current exception
-// Currently an int just to make matching easier
+// Global which defines the current exception.  Currently an int just to make matching easier.
 //int this_exception; (became shared_stack.current_exception)
 
@@ -121 +127 @@
         _Unwind_Reason_Code ret = _Unwind_RaiseException( &this_exception_storage );
 
-        // If we reach here it means something happened
-        // For resumption to work we need to find a way to return back to here
-        // Most of them will probably boil down to setting a global flag and making the phase 1 either stop or fail.
-        // Causing an error on purpose may help avoiding unnecessary work but it might have some weird side effects.
-        // If we just pretend no handler was found that would work but may be expensive for no reason since we will always
-        // search the whole stack
+        // If we reach here it means something happened.  For resumption to work we need to find a way to return back to
+        // here.  Most of them will probably boil down to setting a global flag and making the phase 1 either stop or
+        // fail.  Causing an error on purpose may help avoiding unnecessary work but it might have some weird side
+        // effects.  If we just pretend no handler was found that would work but may be expensive for no reason since we
+        // will always search the whole stack.
 
         if( ret == _URC_END_OF_STACK ) {
-                // No proper handler was found
-                // This can be handled in several way
-                // C++ calls std::terminate
-                // Here we force unwind the stack, basically raising a cancellation
+                // No proper handler was found.  This can be handled in several way.  C++ calls std::terminate Here we
+                // force unwind the stack, basically raising a cancellation.
                 printf("Uncaught exception %p\n", &this_exception_storage);
 
@@ -140 +143 @@
         }
 
-        // We did not simply reach the end of the stack without finding a handler,
-        // Something wen't wrong
+        // We did not simply reach the end of the stack without finding a handler.  Something wen't wrong
         printf("UNWIND ERROR %d after raise exception\n", ret);
         abort();
@@ -154 +156 @@
 }
 
-// This is our personality routine
-// For every stack frame anotated with ".cfi_personality 0x3,__gcfa_personality_v0"
-// This function will be called twice when unwinding
-// Once in the search phased and once in the cleanup phase
+// This is our personality routine.  For every stack frame anotated with ".cfi_personality 0x3,__gcfa_personality_v0".
+// This function will be called twice when unwinding.  Once in the search phased and once in the cleanup phase.
 _Unwind_Reason_Code __gcfa_personality_v0 (
                 int version, _Unwind_Action actions, unsigned long long exceptionClass,
@@ -293 +293 @@
                                 // I assume this sets the instruction pointer to the adress of the landing pad
                                 // It doesn't actually set it, it only state the value that needs to be set once we return _URC_INSTALL_CONTEXT
-                                _Unwind_SetIP( context, lsd_info.LPStart + callsite_landing_pad );
+                                _Unwind_SetIP( context, ((lsd_info.LPStart) + (callsite_landing_pad)) );
 
                                 // DEBUG
@@ -317 +317 @@
 }
 
-// Try statements are hoisted out see comments for details
-// With this could probably be unique and simply linked from
-// libcfa but there is one problem left, see the exception table
-// for details
+// Try statements are hoisted out see comments for details.  With this could probably be unique and simply linked from
+// libcfa but there is one problem left, see the exception table for details
 __attribute__((noinline))
 void __cfaehm__try_terminate(void (*try_block)(),
@@ -328 +326 @@
         //! printf("%p %p %p %p\n", &try_block, &catch_block, &match_block, &xy);
 
-        // Setup statments
-        // These 2 statments won't actually result in any code,
-        // they only setup global tables.
-        // However, they clobber gcc cancellation support from gcc.
-        // We can replace the personality routine but replacing the exception
-        // table gcc generates is not really doable, it generates labels based
-        // on how the assembly works.
+        // Setup statments: These 2 statments won't actually result in any code, they only setup global tables.
+        // However, they clobber gcc cancellation support from gcc.  We can replace the personality routine but
+        // replacing the exception table gcc generates is not really doable, it generates labels based on how the
+        // assembly works.
+
         // Setup the personality routine
         asm volatile (".cfi_personality 0x3,__gcfa_personality_v0");
@@ -340 +336 @@
         asm volatile (".cfi_lsda 0x3, .LLSDACFA2");
 
-        // Label which defines the start of the area for which the handler is setup
+        // Label which defines the start of the area for which the handler is setup.
         asm volatile (".TRYSTART:");
 
@@ -354 +350 @@
         // Exceptionnal path
         CATCH : __attribute__(( unused ));
-        // Label which defines the end of the area for which the handler is setup
+        // Label which defines the end of the area for which the handler is setup.
         asm volatile (".TRYEND:");
-        // Label which defines the start of the exception landing pad
-        // basically what will be called when the exception is caught
-        // Note, if multiple handlers are given, the multiplexing should be done
-        // by the generated code, not the exception runtime
+        // Label which defines the start of the exception landing pad.  Basically what is called when the exception is
+        // caught.  Note, if multiple handlers are given, the multiplexing should be done by the generated code, not the
+        // exception runtime.
         asm volatile (".CATCH:");
 
         // Exception handler
-        catch_block(shared_stack.current_handler_index,
-                    &shared_stack.current_exception);
-}
-
-// Exception table data we need to generate
-// While this is almost generic, the custom data refers to
-// foo_try_match try match, which is no way generic
-// Some more works need to be done if we want to have a single
-// call to the try routine
+        catch_block( shared_stack.current_handler_index,
+                    &shared_stack.current_exception );
+}
+
+// Exception table data we need to generate.  While this is almost generic, the custom data refers to foo_try_match try
+// match, which is no way generic.  Some more works need to be done if we want to have a single call to the try routine.
+
+#if defined( __x86_64__ ) || defined( __i386__ )
 asm (
         //HEADER
@@ -394 +388 @@
 //      "       .section        .note.GNU-stack,\"x\",@progbits\n"
 );
+#endif // __x86_64__ || __i386__