forked from Imagelibrary/binutils-gdb
Don't elide all inlined frames
This patch essentially causes GDB to treat inlined frames like "normal"
frames from the user's perspective. This means, for example, that when a
user sets a breakpoint in an inlined function, GDB will now actually stop
"in" that function.
Using the test case from breakpoints/17534,
3 static inline void NVIC_EnableIRQ(int IRQn)
4 {
5 volatile int y;
6 y = IRQn;
7 }
8
9 __attribute__( ( always_inline ) ) static inline void __WFI(void)
10 {
11 __asm volatile ("nop");
12 }
13
14 int main(void) {
15
16 x= 42;
17
18 if (x)
19 NVIC_EnableIRQ(16);
20 else
21 NVIC_EnableIRQ(18);
(gdb) b NVIC_EnableIRQ
Breakpoint 1 at 0x4003e4: NVIC_EnableIRQ. (2 locations)
(gdb) r
Starting program: 17534
Breakpoint 1, main () at 17534.c:19
19 NVIC_EnableIRQ(16);
Because skip_inline_frames currently skips every inlined frame, GDB "stops"
in the caller. This patch adds a new parameter to skip_inline_frames
that allows us to pass in a bpstat stop chain. The breakpoint locations
on the stop chain can be used to determine if we've stopped inside an inline
function (due to a user breakpoint). If we have, we do not elide the frame.
With this patch, GDB now reports that the inferior has stopped inside the
inlined function:
(gdb) r
Starting program: 17534
Breakpoint 1, NVIC_EnableIRQ (IRQn=16) at 17534.c:6
6 y = IRQn;
Many thanks to Jan and Pedro for guidance on this.
gdb/ChangeLog:
* breakpoint.c (build_bpstat_chain): New function, moved from
bpstat_stop_status.
(bpstat_stop_status): Add optional parameter, `stop_chain'.
If no stop chain is passed, call build_bpstat_chain to build it.
* breakpoint.h (build_bpstat_chain): Declare.
(bpstat_stop_status): Move documentation here from breakpoint.c.
* infrun.c (handle_signal_stop): Before eliding inlined frames,
build the stop chain and pass it to skip_inline_frames.
Pass this stop chain to bpstat_stop_status.
* inline-frame.c: Include breakpoint.h.
(stopped_by_user_bp_inline_frame): New function.
(skip_inline_frames): Add parameter `stop_chain'.
Move documention to inline-frame.h.
If non-NULL, use stopped_by_user_bp_inline_frame to determine
whether the frame should be elided.
* inline-frame.h (skip_inline_frames): Add parameter `stop_chain'.
Add moved documentation and update for new parameter.
gdb/testsuite/ChangeLog:
* gdb.ada/bp_inlined_func.exp: Update inlined frame locations
in expected breakpoint stop locations.
* gdb.dwarf2/implptr.exp (implptr_test_baz): Use up/down to
move to proper scope to test variable values.
* gdb.opt/inline-break.c (inline_func1, not_inline_func1)
(inline_func2, not_inline_func2, inline_func3, not_inline_func3):
New functions.
(main): Call not_inline_func3.
* gdb.opt/inline-break.exp: Start inferior and set breakpoints at
inline_func1, inline_func2, and inline_func3. Test that when each
breakpoint is hit, GDB properly reports both the stop location
and the backtrace. Repeat tests for temporary breakpoints.
This commit is contained in:
Keith Seitz
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user