Changes in src/main.cc [b542bfb:46f6134]

File:

• src/main.cc (modified) (5 diffs)

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug 29 17:34:39 2016
-// Update Count     : 426
+// Last Modified On : Sat Aug 20 12:52:22 2016
+// Update Count     : 403
 //
 
@@ -75 +75 @@
 static void dump( list< Declaration * > & translationUnit, ostream & out = cout );
 
-void backtrace( int start ) {                                                   // skip first N stack frames
+void sigSegvBusHandler( int sig_num ) {
         enum { Frames = 50 };
         void * array[Frames];
         int size = backtrace( array, Frames );
+
+        cerr << "*CFA runtime error* program cfa-cpp terminated with "
+                 <<     (sig_num == SIGSEGV ? "segment fault" : "bus error")
+                 << " backtrace:" << endl;
+
         char ** messages = backtrace_symbols( array, size );
 
-        // skip last 2 stack frames after main
-        for ( int i = start; i < size - 2 && messages != nullptr; i += 1 ) {
+        // skip first stack frame (points here)
+        for ( int i = 2; i < size - 2 && messages != nullptr; i += 1 ) {
                 char * mangled_name = nullptr, * offset_begin = nullptr, * offset_end = nullptr;
                 for ( char *p = messages[i]; *p; ++p ) {        // find parantheses and +offset
@@ -96 +101 @@
 
                 // if line contains symbol, attempt to demangle
-                int frameNo = i - start;
                 if ( mangled_name && offset_begin && offset_end && mangled_name < offset_begin ) {
                         *mangled_name++ = '\0';
@@ -102 +106 @@
                         *offset_end++ = '\0';
 
-                        int status, frameNo = i - start;
+                        int status;
                         char * real_name = __cxxabiv1::__cxa_demangle( mangled_name, 0, 0, &status );
                         if ( status == 0 ) {                                            // demangling successful ?
-                                cerr << "(" << frameNo << ") " << messages[i] << " : "
+                                cerr << "(" << i - 2 << ") " << messages[i] << " : "
                                          << real_name << "+" << offset_begin << offset_end << endl;
 
                         } else {                                                                        // otherwise, output mangled name
-                                cerr << "(" << frameNo << ") " << messages[i] << " : "
+                                cerr << "(" << i - 2 << ") " << messages[i] << " : "
                                          << mangled_name << "+" << offset_begin << offset_end << endl;
                         } // if
                         free( real_name );
                 } else {                                                                                // otherwise, print the whole line
-                        cerr << "(" << frameNo << ") " << messages[i] << endl;
+                        cerr << "(" << i - 2 << ") " << messages[i] << endl;
                 } // if
         } // for
-
         free( messages );
-} // backtrace
-
-void sigSegvBusHandler( int sig_num ) {
-        cerr << "*CFA runtime error* program cfa-cpp terminated with "
-                 <<     (sig_num == SIGSEGV ? "segment fault" : "bus error")
-                 << " backtrace:" << endl;
-        backtrace( 2 );                                                                         // skip first 2 stack frames
         exit( EXIT_FAILURE );
 } // sigSegvBusHandler
-
-void sigAbortHandler( int sig_num ) {
-        backtrace( 6 );                                                                         // skip first 6 stack frames
-        signal( SIGABRT, SIG_DFL);                                                      // reset default signal handler
-    raise( SIGABRT );                                                                   // reraise SIGABRT
-} // sigAbortHandler
-
 
 int main( int argc, char * argv[] ) {
@@ -144 +133 @@
         signal( SIGSEGV, sigSegvBusHandler );
         signal( SIGBUS, sigSegvBusHandler );
-        signal( SIGABRT, sigAbortHandler );
 
         parse_cmdline( argc, argv, filename );                          // process command-line arguments