Changeset b067d9b for libcfa/src/interpose.cfa

Timestamp:

Oct 29, 2019, 4:01:24 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

773db65, 9421f3d8

Parents:

7951100 (diff), 8364209 (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/interpose.cfa (moved) (moved from src/libcfa/interpose.c ) (8 diffs)

libcfa/src/interpose.cfa

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May  5 11:37:35 2018
-// Update Count     : 111
+// Last Modified On : Sun Jul 14 22:57:16 2019
+// Update Count     : 116
 //
 
@@ -25 +25 @@
 }
 
-#include "bits/debug.h"
-#include "bits/defs.h"
-#include "bits/signal.h"                                                                // sigHandler_?
-#include "startup.h"                                                                    // STARTUP_PRIORITY_CORE
+#include "bits/debug.hfa"
+#include "bits/defs.hfa"
+#include "bits/signal.hfa"                                                              // sigHandler_?
+#include "startup.hfa"                                                                  // STARTUP_PRIORITY_CORE
 
 //=============================================================================================
 // Interposing helpers
 //=============================================================================================
+
+void preload_libgcc(void) {
+        dlopen( "libgcc_s.so.1", RTLD_NOW );
+        if ( const char * error = dlerror() ) abort( "interpose_symbol : internal error pre-loading libgcc, %s\n", error );
+}
 
 typedef void (* generic_fptr_t)(void);
@@ -76 +81 @@
 //=============================================================================================
 
-void sigHandler_segv ( __CFA_SIGPARMS__ );
-void sigHandler_ill  ( __CFA_SIGPARMS__ );
-void sigHandler_fpe  ( __CFA_SIGPARMS__ );
-void sigHandler_abort( __CFA_SIGPARMS__ );
-void sigHandler_term ( __CFA_SIGPARMS__ );
+void sigHandler_segv( __CFA_SIGPARMS__ );
+void sigHandler_ill ( __CFA_SIGPARMS__ );
+void sigHandler_fpe ( __CFA_SIGPARMS__ );
+void sigHandler_abrt( __CFA_SIGPARMS__ );
+void sigHandler_term( __CFA_SIGPARMS__ );
 
 struct {
@@ -91 +96 @@
         void __cfaabi_interpose_startup( void ) {
                 const char *version = NULL;
+
+                preload_libgcc();
 
 #pragma GCC diagnostic push
@@ -103 +110 @@
                 __cfaabi_sigaction( SIGILL , sigHandler_ill  , SA_SIGINFO );
                 __cfaabi_sigaction( SIGFPE , sigHandler_fpe  , SA_SIGINFO );
-                __cfaabi_sigaction( SIGABRT, sigHandler_abort, SA_SIGINFO | SA_RESETHAND);
+                __cfaabi_sigaction( SIGABRT, sigHandler_abrt, SA_SIGINFO | SA_RESETHAND);
                 __cfaabi_sigaction( SIGTERM, sigHandler_term , SA_SIGINFO );
                 __cfaabi_sigaction( SIGINT , sigHandler_term , SA_SIGINFO );
@@ -197 +204 @@
                         if ( *p == '(' ) {
                                 name = p;
-                        }
-                        else if ( *p == '+' ) {
+                        } else if ( *p == '+' ) {
                                 offset_begin = p;
-                        }
-                        else if ( *p == ')' ) {
+                        } else if ( *p == ')' ) {
                                 offset_end = p;
                                 break;
@@ -216 +221 @@
 
                         __cfaabi_dbg_bits_print_nolock( "(%i) %s : %s + %s %s\n", frameNo, messages[i], name, offset_begin, offset_end);
-                }
-                // otherwise, print the whole line
-                else {
+                } else {                                                                                // otherwise, print the whole line
                         __cfaabi_dbg_bits_print_nolock( "(%i) %s\n", frameNo, messages[i] );
                 }
@@ -251 +254 @@
 }
 
-void sigHandler_abort( __CFA_SIGPARMS__ ) {
+void sigHandler_abrt( __CFA_SIGPARMS__ ) {
         __cfaabi_backtrace();