Changeset 3ecfa13 for libcfa/src/interpose.cfa

Timestamp:

Feb 8, 2020, 3:21:45 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

8c9da33

Parents:

0f5da65 (diff), 74330e7 (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 (modified) (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 : Thu Jan 30 17:47:32 2020
-// Update Count     : 156
+// Last Modified On : Sat Feb  8 08:40:34 2020
+// Update Count     : 163
 //
 
@@ -29 +29 @@
 #include "bits/signal.hfa"                                                              // sigHandler_?
 #include "startup.hfa"                                                                  // STARTUP_PRIORITY_CORE
+#include <assert.h>
 
 //=============================================================================================
@@ -40 +41 @@
 
 typedef void (* generic_fptr_t)(void);
-generic_fptr_t interpose_symbol( const char * symbol, const char * version ) {
+generic_fptr_t interpose_symbol( const char symbol[], const char version[] ) {
         const char * error;
 
@@ -145 +146 @@
 extern "C" {
         void abort( void ) __attribute__(( __nothrow__, __leaf__, __noreturn__ )) {
-                abort( false, NULL ); // FIX ME: 0p does not work
+                abort( false, "%s", "" );
         }
 
@@ -161 +162 @@
 
 void * kernel_abort( void ) __attribute__(( __nothrow__, __leaf__, __weak__ )) { return 0p; }
-void kernel_abort_msg( void * data, char * buffer, int size ) __attribute__(( __nothrow__, __leaf__, __weak__ )) {}
+void kernel_abort_msg( void * data, char buffer[], int size ) __attribute__(( __nothrow__, __leaf__, __weak__ )) {}
 // See concurrency/kernel.cfa for strong definition used in multi-processor mode.
 int kernel_abort_lastframe( void ) __attribute__(( __nothrow__, __leaf__, __weak__ )) { return 4; }
@@ -169 +170 @@
 
 static void __cfaabi_backtrace( int start ) {
-        enum {
-                Frames = 50,                                                                    // maximum number of stack frames
-        };
+        enum { Frames = 50, };                                                          // maximum number of stack frames
         int last = kernel_abort_lastframe();                            // skip last N stack frames
 
         void * array[Frames];
         size_t size = backtrace( array, Frames );
-        char ** messages = backtrace_symbols( array, size );
+        char ** messages = backtrace_symbols( array, size ); // does not demangle names
 
         *index( messages[0], '(' ) = '\0';                                      // find executable name
@@ -184 +183 @@
                 char * name = 0p, * offset_begin = 0p, * offset_end = 0p;
 
-                for ( char * p = messages[i]; *p; ++p ) {               // find parantheses and +offset
+                for ( char * p = messages[i]; *p; p += 1 ) {    // find parantheses and +offset
                         //__cfaabi_bits_print_nolock( "X %s\n", p);
                         if ( *p == '(' ) {
@@ -228 +227 @@
         __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
 
-        if ( fmt ) {
-                va_list args;
-                va_start( args, fmt );
-
-                len = vsnprintf( abort_text, abort_text_size, fmt, args );
-                va_end( args );
-                __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
-
-                if ( fmt[strlen( fmt ) - 1] != '\n' ) {                 // add optional newline if missing at the end of the format text
-                        __cfaabi_dbg_write( "\n", 1 );
-                }
+        assert( fmt );
+        va_list args;
+        va_start( args, fmt );
+
+        len = vsnprintf( abort_text, abort_text_size, fmt, args );
+        va_end( args );
+        __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
+
+        if ( fmt[strlen( fmt ) - 1] != '\n' ) {                         // add optional newline if missing at the end of the format text
+                __cfaabi_dbg_write( "\n", 1 );
         }