forked from Imagelibrary/binutils-gdb
83b9557361
This is a patch for a very related inline function problem. 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);
This happens because skip_inline_frames automatically skips every inlined
frame. Based on a suggestion by Jan, this patch introduces a new function,
breakpoint_for_stop, which attempts to ascertain which breakpoint, if any,
caused a particular stop in the inferior. That breakpoint is then passed
to skip_inline_frames so that it can decide if a particular inlined frame
should be skipped.
I've had to separate the bpstat chain building from bpstat_stop_status --
py-finish-breakpoint.exp did not like me calling bpstat_stop_status multiple
times. So I've added the ability to allocate the chain separately and
optionally pass it to bpstat_stop_status, which remains otherwise unchanged.
With this patch, GDB now correctly 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;
gdb/ChangeLog:
* breakpoint.c (bpstat_explains_signal): Add output parameter for
breakpoint and save the breakpoint if one is found to explain
the signal.
All callers updated.
(build_bpstat_chain): New function, moved from bpstat_stop_status.
(breakpoint_for_stop): New function.
(bpstat_stop_status): Add new optional parameter for the bpstat chain.
If this new parameter is NULL, call build_bpstat_chain.
All callers updated.
* breakpoint.h (breakpoint_for_stop): Declare.
(bpstat_explains_signal): Update declaration.
* infrun.c (handle_signal_stop): Before calling skip_inline_frames,
use breakpoint_for_stop to find the breakpoint that caused us
to stop.
Save the bpstat chain for later invocation of bpstat_stop_status.
* inline-frame.c: Include linespec.h.
(skip_inline_frames): Add struct breakpoint parameter.
Re-parse the location of the breakpoint causing the stop, if any,
and only skip frames that did not cause the stop.
* inline-frame.h (skip_inline_frames): Update declaration.
gdb/testsuite/ChangeLog:
* 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.
63 lines
2.0 KiB
C
63 lines
2.0 KiB
C
/* Definitions for inline frame support.
|
|
|
|
Copyright (C) 2008-2017 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#if !defined (INLINE_FRAME_H)
|
|
#define INLINE_FRAME_H 1
|
|
|
|
struct frame_info;
|
|
struct frame_unwind;
|
|
|
|
/* The inline frame unwinder. */
|
|
|
|
extern const struct frame_unwind inline_frame_unwind;
|
|
|
|
/* Skip all inlined functions whose call sites are at the current PC.
|
|
Frames for the hidden functions will not appear in the backtrace until the
|
|
user steps into them. */
|
|
|
|
void skip_inline_frames (ptid_t ptid, struct breakpoint *bpt);
|
|
|
|
/* Forget about any hidden inlined functions in PTID, which is new or
|
|
about to be resumed. If PTID is minus_one_ptid, forget about all
|
|
hidden inlined functions. */
|
|
|
|
void clear_inline_frame_state (ptid_t ptid);
|
|
|
|
/* Step into an inlined function by unhiding it. */
|
|
|
|
void step_into_inline_frame (ptid_t ptid);
|
|
|
|
/* Return the number of hidden functions inlined into the current
|
|
frame. */
|
|
|
|
int inline_skipped_frames (ptid_t ptid);
|
|
|
|
/* If one or more inlined functions are hidden, return the symbol for
|
|
the function inlined into the current frame. */
|
|
|
|
struct symbol *inline_skipped_symbol (ptid_t ptid);
|
|
|
|
/* Return the number of functions inlined into THIS_FRAME. Some of
|
|
the callees may not have associated frames (see
|
|
skip_inline_frames). */
|
|
|
|
int frame_inlined_callees (struct frame_info *this_frame);
|
|
|
|
#endif /* !defined (INLINE_FRAME_H) */
|