From 611aa2b284bbfd7e29b585bc03d31ec6e57c5bf3 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 18 Jun 2013 19:57:48 +0000 Subject: 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) : 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. --- gdb/break-catch-sig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gdb/break-catch-sig.c') diff --git a/gdb/break-catch-sig.c b/gdb/break-catch-sig.c index c162cc20ff3..02d8b4ab6f9 100644 --- a/gdb/break-catch-sig.c +++ b/gdb/break-catch-sig.c @@ -351,7 +351,7 @@ signal_catchpoint_print_recreate (struct breakpoint *b, struct ui_file *fp) catchpoints. */ static enum bpstat_signal_value -signal_catchpoint_explains_signal (struct breakpoint *b) +signal_catchpoint_explains_signal (struct breakpoint *b, enum gdb_signal sig) { return BPSTAT_SIGNAL_PASS; } -- cgit v1.2.1