diff options
Diffstat (limited to 'gdb/breakpoint.c')
| -rw-r--r-- | gdb/breakpoint.c | 79 |
1 files changed, 38 insertions, 41 deletions
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index d1955ec..721afd2 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -5308,54 +5308,21 @@ need_moribund_for_location_type (struct bp_location *loc) && !target_supports_stopped_by_hw_breakpoint ())); } - -/* Get a bpstat associated with having just stopped at address - BP_ADDR in thread PTID. - - Determine whether we stopped at a breakpoint, etc, or whether we - don't understand this stop. Result is a chain of bpstat's such - that: - - if we don't understand the stop, the result is a null pointer. - - if we understand why we stopped, the result is not null. - - Each element of the chain refers to a particular breakpoint or - watchpoint at which we have stopped. (We may have stopped for - several reasons concurrently.) - - Each element of the chain has valid next, breakpoint_at, - commands, FIXME??? fields. */ +/* See breakpoint.h. */ bpstat -bpstat_stop_status (const address_space *aspace, - CORE_ADDR bp_addr, ptid_t ptid, +build_bpstat_chain (const address_space *aspace, CORE_ADDR bp_addr, const struct target_waitstatus *ws) { - struct breakpoint *b = NULL; - struct bp_location *bl; - struct bp_location *loc; - /* First item of allocated bpstat's. */ + struct breakpoint *b; bpstat bs_head = NULL, *bs_link = &bs_head; - /* Pointer to the last thing in the chain currently. */ - bpstat bs; - int ix; - int need_remove_insert; - int removed_any; - - /* First, build the bpstat chain with locations that explain a - target stop, while being careful to not set the target running, - as that may invalidate locations (in particular watchpoint - locations are recreated). Resuming will happen here with - breakpoint conditions or watchpoint expressions that include - inferior function calls. */ ALL_BREAKPOINTS (b) { if (!breakpoint_enabled (b)) continue; - for (bl = b->loc; bl != NULL; bl = bl->next) + for (bp_location *bl = b->loc; bl != NULL; bl = bl->next) { /* For hardware watchpoints, we look only at the first location. The watchpoint_check function will work on the @@ -5374,8 +5341,8 @@ bpstat_stop_status (const address_space *aspace, /* Come here if it's a watchpoint, or if the break address matches. */ - bs = new bpstats (bl, &bs_link); /* Alloc a bpstat to - explain stop. */ + bpstat bs = new bpstats (bl, &bs_link); /* Alloc a bpstat to + explain stop. */ /* Assume we stop. Should we find a watchpoint that is not actually triggered, or if the condition of the breakpoint @@ -5400,12 +5367,15 @@ bpstat_stop_status (const address_space *aspace, if (!target_supports_stopped_by_sw_breakpoint () || !target_supports_stopped_by_hw_breakpoint ()) { - for (ix = 0; VEC_iterate (bp_location_p, moribund_locations, ix, loc); ++ix) + bp_location *loc; + + for (int ix = 0; + VEC_iterate (bp_location_p, moribund_locations, ix, loc); ++ix) { if (breakpoint_location_address_match (loc, aspace, bp_addr) && need_moribund_for_location_type (loc)) { - bs = new bpstats (loc, &bs_link); + bpstat bs = new bpstats (loc, &bs_link); /* For hits of moribund locations, we should just proceed. */ bs->stop = 0; bs->print = 0; @@ -5414,6 +5384,33 @@ bpstat_stop_status (const address_space *aspace, } } + return bs_head; +} + +/* See breakpoint.h. */ + +bpstat +bpstat_stop_status (const address_space *aspace, + CORE_ADDR bp_addr, ptid_t ptid, + const struct target_waitstatus *ws, + bpstat stop_chain) +{ + struct breakpoint *b = NULL; + /* First item of allocated bpstat's. */ + bpstat bs_head = stop_chain; + bpstat bs; + int need_remove_insert; + int removed_any; + + /* First, build the bpstat chain with locations that explain a + target stop, while being careful to not set the target running, + as that may invalidate locations (in particular watchpoint + locations are recreated). Resuming will happen here with + breakpoint conditions or watchpoint expressions that include + inferior function calls. */ + if (bs_head == NULL) + bs_head = build_bpstat_chain (aspace, bp_addr, ws); + /* A bit of special processing for shlib breakpoints. We need to process solib loading here, so that the lists of loaded and unloaded libraries are correct before we handle "catch load" and |