diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-06-18 19:57:49 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2013-06-18 19:57:49 +0000 |
| commit | 427cd150eed8c0dd4f0d0a1105448b4ebe36da6d (patch) | |
| tree | ed94cd3b70e5de75895c7abcb57bc78ad1f83911 /gdb/infrun.c | |
| parent | c31f39360b3865a248055587778301e85da250fc (diff) | |
| download | gdb-427cd150eed8c0dd4f0d0a1105448b4ebe36da6d.zip gdb-427cd150eed8c0dd4f0d0a1105448b4ebe36da6d.tar.gz gdb-427cd150eed8c0dd4f0d0a1105448b4ebe36da6d.tar.bz2 | |
Fix PR cli/15603
This fixes PR cli/15603.
The bug here is that when a software watchpoint is being used, gdb
will stop responding to C-c. This is a regression caused by the
"catch signal" patch.
The problem is that software watchpoints always end up on the bpstat
list. However, this makes bpstat_explains_signal return
BPSTAT_SIGNAL_HIDE, causing infrun to think that the signal is not a
"random signal".
The fix is to change bpstat_explains_signal to handle this better. I
chose to do it in a "clean API" way, by passing the signal value to
bpstat_explains_signal and then adding an explains_signal method for
watchpoints, which handles the specifics.
Built and regtested on x86-64 Fedora 18.
New test case included.
* break-catch-sig.c (signal_catchpoint_explains_signal): Add 'sig'
argument.
* breakpoint.c (bpstat_explains_signal): Add 'sig' argument.
Special case signals other than GDB_SIGNAL_TRAP.
(explains_signal_watchpoint): New function.
(base_breakpoint_explains_signal): Add 'sig' argument.
(initialize_breakpoint_ops): Set 'explains_signal' method for
watchpoints.
* breakpoint.h (struct breakpoint_ops) <explains_signal>: Add
signal argument.
(bpstat_explains_signal): Likewise.
* infrun.c (handle_syscall_event, handle_inferior_event): Update.
* gdb.base/random-signal.c: New file.
* gdb.base/random-signal.exp: New file.
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 51a032b..720c4ed 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) |