diff options
Diffstat (limited to 'gdb/infrun.c')
| -rw-r--r-- | gdb/infrun.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/gdb/infrun.c b/gdb/infrun.c index 51a032b8ae5..720c4ed07dc 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -3124,7 +3124,8 @@ handle_syscall_event (struct execution_control_state *ecs) = bpstat_stop_status (get_regcache_aspace (regcache), stop_pc, ecs->ptid, &ecs->ws); - sval = bpstat_explains_signal (ecs->event_thread->control.stop_bpstat); + sval = bpstat_explains_signal (ecs->event_thread->control.stop_bpstat, + GDB_SIGNAL_TRAP); ecs->random_signal = sval == BPSTAT_SIGNAL_NO; if (!ecs->random_signal) @@ -3374,7 +3375,8 @@ handle_inferior_event (struct execution_control_state *ecs) stop_pc, ecs->ptid, &ecs->ws); sval - = bpstat_explains_signal (ecs->event_thread->control.stop_bpstat); + = bpstat_explains_signal (ecs->event_thread->control.stop_bpstat, + GDB_SIGNAL_TRAP); ecs->random_signal = sval == BPSTAT_SIGNAL_NO; if (!ecs->random_signal) @@ -3673,7 +3675,8 @@ handle_inferior_event (struct execution_control_state *ecs) = bpstat_stop_status (get_regcache_aspace (get_current_regcache ()), stop_pc, ecs->ptid, &ecs->ws); ecs->random_signal - = (bpstat_explains_signal (ecs->event_thread->control.stop_bpstat) + = (bpstat_explains_signal (ecs->event_thread->control.stop_bpstat, + GDB_SIGNAL_TRAP) == BPSTAT_SIGNAL_NO); /* Note that this may be referenced from inside @@ -4248,7 +4251,8 @@ handle_inferior_event (struct execution_control_state *ecs) if (debug_infrun && ecs->event_thread->suspend.stop_signal == GDB_SIGNAL_TRAP - && (bpstat_explains_signal (ecs->event_thread->control.stop_bpstat) + && (bpstat_explains_signal (ecs->event_thread->control.stop_bpstat, + GDB_SIGNAL_TRAP) == BPSTAT_SIGNAL_NO) && stopped_by_watchpoint) fprintf_unfiltered (gdb_stdlog, @@ -4277,7 +4281,8 @@ handle_inferior_event (struct execution_control_state *ecs) if (ecs->event_thread->suspend.stop_signal == GDB_SIGNAL_TRAP) ecs->random_signal - = !((bpstat_explains_signal (ecs->event_thread->control.stop_bpstat) + = !((bpstat_explains_signal (ecs->event_thread->control.stop_bpstat, + GDB_SIGNAL_TRAP) != BPSTAT_SIGNAL_NO) || stopped_by_watchpoint || ecs->event_thread->control.trap_expected @@ -4288,7 +4293,8 @@ handle_inferior_event (struct execution_control_state *ecs) { enum bpstat_signal_value sval; - sval = bpstat_explains_signal (ecs->event_thread->control.stop_bpstat); + sval = bpstat_explains_signal (ecs->event_thread->control.stop_bpstat, + ecs->event_thread->suspend.stop_signal); ecs->random_signal = (sval == BPSTAT_SIGNAL_NO); if (sval == BPSTAT_SIGNAL_HIDE) |