Merge branch 'arm-reg-load-fix' of https://github.com/dyninst/dyninst …

…into dev
dyninst · Oct 19, 2019 · 0b1c693 · 0b1c693
2 parents e18f430 + 4c5254e
commit 0b1c693
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/dyninstAPI/src/pcEventHandler.C b/dyninstAPI/src/pcEventHandler.C
@@ -583,6 +583,11 @@ PCEventHandler::handleRTSignal(EventSignal::const_ptr ev, PCProcess *evProc) con
     // the RT library, assume it did not.
 
     if( evProc->runtime_lib.size() == 0 ) return NotRTSignal;
+    if (ev->getSignal() != DYNINST_BREAKPOINT_SIGNUM) {
+            proccontrol_printf("%s[%d]: signal %d is not RT library signal\n",
+                    FILE__, __LINE__, ev->getSignal());
+            return NotRTSignal;
+    }
 
     Address sync_event_breakpoint_addr = evProc->getRTEventBreakpointAddr();
     Address sync_event_id_addr = evProc->getRTEventIdAddr();

diff --git a/dyninstAPI_RT/h/dyninstAPI_RT.h b/dyninstAPI_RT/h/dyninstAPI_RT.h
@@ -51,7 +51,7 @@
 #define SYN_INST_BUF_SIZE (1024*1024*1)
 #endif
 
-#define DYNINST_BREAKPOINT_SIGNUM SIGBUS
+#define DYNINST_BREAKPOINT_SIGNUM (SIGRTMIN+4)
 
 #include <stdio.h>
 #include "dyninstRTExport.h"