aboutsummaryrefslogtreecommitdiff
path: root/gdb/breakpoint.c
diff options
context:
space:
mode:
authorMichael Snyder <msnyder@vmware.com>2000-03-28 19:29:56 +0000
committerMichael Snyder <msnyder@vmware.com>2000-03-28 19:29:56 +0000
commitc690268831e756bd469004f19e1ce542dc3cea9b (patch)
tree3bebd802b9a18d0a48f2b55e9fef8ef8fae9da0e /gdb/breakpoint.c
parent03905a3cee57ec7c823bef52eba7e46073911d2b (diff)
downloadgdb-c690268831e756bd469004f19e1ce542dc3cea9b.zip
gdb-c690268831e756bd469004f19e1ce542dc3cea9b.tar.gz
gdb-c690268831e756bd469004f19e1ce542dc3cea9b.tar.bz2
2000-03-28 Peter Schauer <pes@regent.e-technik.tu-muenchen.de>
* breakpoint.c (insert_breakpoints, do_enable_breakpoint): Reselect the saved frame silently after frame selection for watchpoint evaluation. (insert_breakpoints): Add missing space in `Hardware watchpoint deleted' message. Do not reinsert hardware watchpoint if it is already marked for deletion at next stop.
Diffstat (limited to 'gdb/breakpoint.c')
-rw-r--r--gdb/breakpoint.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 4e0fc67..c5ebf64 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -918,6 +918,7 @@ insert_breakpoints ()
b->type == bp_read_watchpoint ||
b->type == bp_access_watchpoint)
&& b->enable == enabled
+ && b->disposition != del_at_next_stop
&& !b->inserted
&& !b->duplicate)
{
@@ -1020,7 +1021,7 @@ insert_breakpoints ()
}
else
{
- printf_filtered ("Hardware watchpoint %d deleted", b->number);
+ printf_filtered ("Hardware watchpoint %d deleted ", b->number);
printf_filtered ("because the program has left the block \n");
printf_filtered ("in which its expression is valid.\n");
if (b->related_breakpoint)
@@ -1031,7 +1032,7 @@ insert_breakpoints ()
/* Restore the frame and level. */
if ((saved_frame != selected_frame) ||
(saved_level != selected_frame_level))
- select_and_print_frame (saved_frame, saved_level);
+ select_frame (saved_frame, saved_level);
if (val)
return_val = val; /* remember failure */
@@ -7587,8 +7588,7 @@ have been allocated for other watchpoints.\n", bpt->number);
}
if (save_selected_frame_level >= 0)
- select_and_print_frame (save_selected_frame,
- save_selected_frame_level);
+ select_frame (save_selected_frame, save_selected_frame_level);
value_free_to_mark (mark);
}
if (modify_breakpoint_hook)