diff options
| author | Orjan Friberg <orjanf@axis.com> | 2004-04-26 09:02:41 +0000 |
|---|---|---|
| committer | Orjan Friberg <orjanf@axis.com> | 2004-04-26 09:02:41 +0000 |
| commit | a42575dd3d96711e1044137f63f8dd837d19316e (patch) | |
| tree | 70afd3ddaae4b4520afce60db0fa6bfd82702cb2 /gdb/breakpoint.c | |
| parent | b5706aa80899c5055b0d66234e492dbc2455f7d0 (diff) | |
| download | gdb-a42575dd3d96711e1044137f63f8dd837d19316e.tar.gz | |
2004-04-26 Orjan Friberg <orjanf@axis.com>
From Paul Koning <pkoning@equallogic.com>:
* breakpoint.c (free_valchain): New function.
(insert_bp_location, delete_breakpoint): Use free_valchain.
(remove_breakpoint): Do not remove the valchain.
(bpstat_stop_status): If not stopped by watchpoint, skip
watchpoints when generating stop status list.
* infrun.c (handle_inferior_event): Make
stepped_after_stopped_by_watchpoint a global variable.
* remote.c (remote_stopped_data_address): Return watch data
address rather than zero if stepped_after_stopped_by_watchpoint is
set.
Diffstat (limited to 'gdb/breakpoint.c')
| -rw-r--r-- | gdb/breakpoint.c | 41 |
1 files changed, 29 insertions, 12 deletions
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index c38720a8197..95b08144487 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -746,6 +746,23 @@ insert_catchpoint (struct ui_out *uo, void *args) return 0; } +/* Helper routine: free the value chain for a breakpoint (watchpoint). */ + +static void free_valchain (struct bp_location *b) +{ + struct value *v; + struct value *n; + + /* Free the saved value chain. We will construct a new one + the next time the watchpoint is inserted. */ + for (v = b->owner->val_chain; v; v = n) + { + n = v->next; + value_free (v); + } + b->owner->val_chain = NULL; +} + /* Insert a low-level "breakpoint" of some type. BPT is the breakpoint. Any error messages are printed to TMP_ERROR_STREAM; and DISABLED_BREAKS, PROCESS_WARNING, and HW_BREAKPOINT_ERROR are used to report problems. @@ -920,6 +937,8 @@ insert_bp_location (struct bp_location *bpt, if (within_current_scope) { + free_valchain (bpt); + /* Evaluate the expression and cut the chain of values produced off from the value chain. @@ -1505,15 +1524,6 @@ remove_breakpoint (struct bp_location *b, insertion_state_t is) if ((is == mark_uninserted) && (b->inserted)) warning ("Could not remove hardware watchpoint %d.", b->owner->number); - - /* Free the saved value chain. We will construct a new one - the next time the watchpoint is inserted. */ - for (v = b->owner->val_chain; v; v = n) - { - n = v->next; - value_free (v); - } - b->owner->val_chain = NULL; } else if ((b->owner->type == bp_catch_fork || b->owner->type == bp_catch_vfork || @@ -2616,10 +2626,15 @@ bpstat_stop_status (CORE_ADDR bp_addr, ptid_t ptid) if (!breakpoint_enabled (b) && b->enable_state != bp_permanent) continue; + /* Hardware watchpoints are treated as non-existent if the reason we + stopped wasn't a hardware watchpoint (we didn't stop on some data + address). Otherwise gdb won't stop on a break instruction in the code + (not from a breakpoint) when a hardware watchpoint has been defined. */ if (b->type != bp_watchpoint - && b->type != bp_hardware_watchpoint - && b->type != bp_read_watchpoint - && b->type != bp_access_watchpoint + && !((b->type == bp_hardware_watchpoint + || b->type == bp_read_watchpoint + || b->type == bp_access_watchpoint) + && target_stopped_data_address () != 0) && b->type != bp_hardware_breakpoint && b->type != bp_catch_fork && b->type != bp_catch_vfork @@ -6881,6 +6896,8 @@ delete_breakpoint (struct breakpoint *bpt) if (bpt->loc->inserted) remove_breakpoint (bpt->loc, mark_inserted); + free_valchain (bpt->loc); + if (breakpoint_chain == bpt) breakpoint_chain = bpt->next; |