From aa67235e6e50c06efdbc751137d2afbe0b37b80d Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Fri, 11 May 2007 20:01:31 +0000 Subject: [PATCH] * breakpoint.c (remove_breakpoint): Do not remove software breakpoints in unmapped overlay sections. --- gdb/ChangeLog | 5 +++++ gdb/breakpoint.c | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index be0bc8fe3f1..a78ade4955e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2007-05-11 Ulrich Weigand + + * breakpoint.c (remove_breakpoint): Do not remove software + breakpoints in unmapped overlay sections. + 2007-05-11 Ulrich Weigand * spu-tdep.c: Include "observer.h". diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 176a17cdbe5..59cb151b516 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -1587,8 +1587,14 @@ remove_breakpoint (struct bp_location *b, insertion_state_t is) don't know what the overlay manager might do. */ if (b->loc_type == bp_loc_hardware_breakpoint) val = target_remove_hw_breakpoint (&b->target_info); - else + + /* However, we should remove *software* breakpoints only + if the section is still mapped, or else we overwrite + wrong code with the saved shadow contents. */ + else if (section_is_mapped (b->section)) val = target_remove_breakpoint (&b->target_info); + else + val = 0; } else { -- 2.30.2