[runtime] fix trace handler (#24)

* [runtime] fix trace handler * [runtime/trace] fix headers * [runtime/trace] cleanup * [runtime/trace] cleanup * [runtime/trace] cleanup * [runtime/trace] cleanup * [cmake] cleanup * [runtime/trace] install more handlers * [runtime/trace] fix headers * [runtime/trace] add header * [runtime/trace] fix syntax * [runtime/trace] fix syntax * [cmake] toss in dbghelp.lib * [cmake] fix configuration * [cmake] only add lib on win32
flang-compiler · Dec 23, 2017 · 086ca05 · 086ca05
1 parent 7666f00
commit 086ca05
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 1,614 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -342,7 +342,10 @@ macro(add_flang_library name)
   endif( LLVM_COMMON_DEPENDS )
 
   llvm_config( ${name} ${LLVM_LINK_COMPONENTS} )
-  target_link_libraries( ${name} ${LLVM_COMMON_LIBS} )
+  if(WIN32)
+    list(APPEND LLVM_COMMON_LIBS Dbghelp.lib)
+  endif()
+  target_link_libraries( ${name} ${LLVM_COMMON_LIBS})
 #  link_system_libs( ${name} )  # getd of cmake warning messages
 
   install(TARGETS ${name}

diff --git a/runtime/flangrti/CMakeLists.txt b/runtime/flangrti/CMakeLists.txt
@@ -161,8 +161,6 @@ SET(PGC_SRC_FILES
   tanh.c
   trace_lin.c
   trace.c
-  trace/c_interface.cxx
-  trace/StackWalker.cpp
   anint.c
   dnint.c
   idnint.c

diff --git a/runtime/flangrti/trace/StackWalker.cpp b/runtime/flangrti/trace/StackWalker.cpp
diff --git a/runtime/flangrti/trace/c_interface.cxx b/runtime/flangrti/trace/c_interface.cxx
diff --git a/runtime/flangrti/trace/c_interface.h b/runtime/flangrti/trace/c_interface.h
diff --git a/runtime/flangrti/trace/stackwalker.h b/runtime/flangrti/trace/stackwalker.h
diff --git a/runtime/flangrti/trace_lin.c b/runtime/flangrti/trace_lin.c
@@ -194,12 +194,57 @@ __abort_sig_init(void)
 }
 
 #else
-#include "trace/c_interface.h"
-void __abort_trace(int skip)
-{ }
+#include <Windows.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <tchar.h>
+#include <DbgHelp.h>
+
+void
+__abort_trace(int skip)
+{
+     unsigned int   i;
+     void         * stack[ 100 ];
+     unsigned short frames;
+     SYMBOL_INFO  * symbol;
+     HANDLE         process;
+
+     process = GetCurrentProcess();
+
+     SymInitialize( process, NULL, TRUE );
+
+     frames               = CaptureStackBackTrace( 0, 100, stack, NULL );
+     symbol               = ( SYMBOL_INFO * )calloc( sizeof( SYMBOL_INFO ) + 256 * sizeof( char ), 1 );
+     symbol->MaxNameLen   = 255;
+     symbol->SizeOfStruct = sizeof( SYMBOL_INFO );
 
-void __abort_sig_init(void)
+     for( i = 0; i < frames; i++ )
+     {
+         SymFromAddr( process, ( DWORD64 )( stack[ i ] ), 0, symbol );
+
+         printf( "%i: %s - 0x%0X\n", frames - i - 1, symbol->Name, symbol->Address );
+     }  
+
+     free( symbol );
+
+    exit(1);
+}
+
+void
+__abort_sig_init(void)
 { 
-  _install_win32_handlers();
+    signal(SIGSEGV , __abort_trace);
+    signal(SIGILL , __abort_trace);
+    signal(SIGABRT, __abort_trace);
+    signal(SIGFPE, __abort_trace);
+/*
+    SIGABRT	Abnormal termination
+    SIGFPE	Floating-point error
+    SIGILL	Illegal instruction
+    SIGINT	CTRL+C signal
+    SIGSEGV	Illegal storage access
+    SIGTERM	Termination request
+
+*/
 }
 #endif