Changeset 5f95b5f for src/libcfa

Timestamp:

Feb 6, 2018, 10:29:52 AM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

69ce455

Parents:

7323573 (diff), 6bfe5cc (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:

• src/libcfa/interpose.c (modified) (9 diffs)

src/libcfa/interpose.c

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 21 22:27:33 2017
-// Update Count     : 1
+// Last Modified On : Mon Feb  5 23:40:04 2018
+// Update Count     : 17
 //
 
@@ -32 +32 @@
 #include "bits/signal.h"
 #include "startup.h"
-
-void __cfaabi_interpose_startup(void)  __attribute__(( constructor( STARTUP_PRIORITY_CORE ) ));
 
 typedef void (*generic_fptr_t)(void);
@@ -92 +90 @@
 void sigHandler_abort( __CFA_SIGPARMS__ );
 
-void __cfaabi_interpose_startup() {
-        const char *version = NULL;
-
-        INIT_REALRTN( abort, version );
-        INIT_REALRTN( exit, version );
-
-        __kernel_sigaction( SIGSEGV, sigHandler_segv , SA_SIGINFO );      // Failure handler
-        __kernel_sigaction( SIGBUS , sigHandler_segv , SA_SIGINFO );      // Failure handler
-        __kernel_sigaction( SIGABRT, sigHandler_abort, SA_SIGINFO );      // Failure handler
+extern "C" {
+        void __cfaabi_interpose_startup(void)  __attribute__(( constructor( STARTUP_PRIORITY_CORE ) ));
+        void __cfaabi_interpose_startup( void ) {
+                const char *version = NULL;
+
+                INIT_REALRTN( abort, version );
+                INIT_REALRTN( exit, version );
+
+                __kernel_sigaction( SIGSEGV, sigHandler_segv , SA_SIGINFO ); // Failure handler
+                __kernel_sigaction( SIGBUS , sigHandler_segv , SA_SIGINFO ); // Failure handler
+                __kernel_sigaction( SIGABRT, sigHandler_abort, SA_SIGINFO ); // Failure handler
+        }
 }
 
@@ -108 +109 @@
 
 extern "C" {
-        void abort (void) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
+        void abort( void ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
                 abortf( NULL );
         }
 
-        void exit (int __status) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
+        void exit( int __status ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
                 libc_exit(__status);
         }
@@ -121 +122 @@
 }
 
-void * kernel_abort    (void) __attribute__ ((__nothrow__, __leaf__, __weak__)) { return NULL; }
-void   kernel_abort_msg(void * data, char * buffer, int size) __attribute__ ((__nothrow__, __leaf__, __weak__)) {}
+void * kernel_abort    ( void ) __attribute__ ((__nothrow__, __leaf__, __weak__)) { return NULL; }
+void   kernel_abort_msg( void * data, char * buffer, int size ) __attribute__ ((__nothrow__, __leaf__, __weak__)) {}
 
 enum { abort_text_size = 1024 };
@@ -133 +134 @@
                 int len;
 
-                if( fmt ) {
+                if ( fmt ) {
                         va_list args;
                         va_start( args, fmt );
@@ -142 +143 @@
 
                         __cfaabi_dbg_bits_write( abort_text, len );
-                        __cfaabi_dbg_bits_write( "\n", 1 );
+                        //__cfaabi_dbg_bits_write( "\n", 1 );
                 }
 
@@ -162 +163 @@
         enum { Frames = 50 };
         void * array[Frames];
-        int size = backtrace( array, Frames );
+        size_t size = backtrace( array, Frames );
         char ** messages = backtrace_symbols( array, size );
 
@@ -176 +177 @@
 
                 for ( char *p = messages[i]; *p; ++p ) {
+                        //__cfaabi_dbg_bits_print_nolock( "X %s\n", p);
                         // find parantheses and +offset
                         if ( *p == '(' ) {