From be26efc22b85eeb183cf81f6e9c49678c30825a6 Mon Sep 17 00:00:00 2001 From: vprus Date: Fri, 30 Nov 2007 10:03:16 +0000 Subject: [PATCH] * infrun.c (handle_inferior_event): Don't ignore beakpoints if trap_expected is set. --- gdb/ChangeLog | 5 +++++ gdb/infrun.c | 23 ++++++----------------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6e257fe97b..4850791c44 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2007-11-30 Vladimir Prus + * infrun.c (handle_inferior_event): Don't + ignore beakpoints if trap_expected is set. + +2007-11-30 Vladimir Prus + Make insert_breakpoints return void. * breakpoint.h (insert_breakpoints): Change return type to void. diff --git a/gdb/infrun.c b/gdb/infrun.c index 62d6d1e3a4..1e3839add5 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -1964,23 +1964,12 @@ handle_inferior_event (struct execution_control_state *ecs) return; } - /* Don't even think about breakpoints if just proceeded over a - breakpoint. */ - if (stop_signal == TARGET_SIGNAL_TRAP && trap_expected) - { - if (debug_infrun) - fprintf_unfiltered (gdb_stdlog, "infrun: trap expected\n"); - bpstat_clear (&stop_bpstat); - } - else - { - /* See if there is a breakpoint at the current PC. */ - stop_bpstat = bpstat_stop_status (stop_pc, ecs->ptid); - - /* Following in case break condition called a - function. */ - stop_print_frame = 1; - } + /* See if there is a breakpoint at the current PC. */ + stop_bpstat = bpstat_stop_status (stop_pc, ecs->ptid); + + /* Following in case break condition called a + function. */ + stop_print_frame = 1; /* NOTE: cagney/2003-03-29: These two checks for a random signal at one stage in the past included checks for an inferior -- 2.11.0