equal
deleted
inserted
replaced
49 #include "runtime/safepointMechanism.hpp" |
49 #include "runtime/safepointMechanism.hpp" |
50 #include "runtime/sharedRuntime.hpp" |
50 #include "runtime/sharedRuntime.hpp" |
51 #include "runtime/stubRoutines.hpp" |
51 #include "runtime/stubRoutines.hpp" |
52 #include "runtime/thread.inline.hpp" |
52 #include "runtime/thread.inline.hpp" |
53 #include "runtime/timer.hpp" |
53 #include "runtime/timer.hpp" |
|
54 #include "utilities/debug.hpp" |
54 #include "utilities/events.hpp" |
55 #include "utilities/events.hpp" |
55 #include "utilities/vmError.hpp" |
56 #include "utilities/vmError.hpp" |
56 |
57 |
57 // put OS-includes here |
58 // put OS-includes here |
58 # include <sys/types.h> |
59 # include <sys/types.h> |
263 } |
264 } |
264 // Return control to the HTM abort handler. |
265 // Return control to the HTM abort handler. |
265 return true; |
266 return true; |
266 } |
267 } |
267 } |
268 } |
|
269 |
|
270 #ifdef CAN_SHOW_REGISTERS_ON_ASSERT |
|
271 if ((sig == SIGSEGV || sig == SIGBUS) && info != NULL && info->si_addr == g_assert_poison) { |
|
272 handle_assert_poison_fault(ucVoid, info->si_addr); |
|
273 return 1; |
|
274 } |
|
275 #endif |
268 |
276 |
269 JavaThread* thread = NULL; |
277 JavaThread* thread = NULL; |
270 VMThread* vmthread = NULL; |
278 VMThread* vmthread = NULL; |
271 if (os::Linux::signal_handlers_are_installed) { |
279 if (os::Linux::signal_handlers_are_installed) { |
272 if (t != NULL) { |
280 if (t != NULL) { |