mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-01-12 12:16:04 +08:00
ddfe970e6b
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.
104 lines
3.7 KiB
Plaintext
104 lines
3.7 KiB
Plaintext
# Copyright 2010-2018 Free Software Foundation, Inc.
|
|
|
|
# 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/>.
|
|
load_lib dwarf.exp
|
|
|
|
# Test DW_OP_GNU_implicit_pointer.
|
|
|
|
# This test can only be run on targets which support DWARF-2 and use gas.
|
|
if {![dwarf2_support]} {
|
|
return 0
|
|
}
|
|
|
|
standard_testfile .S
|
|
set csrcfile ${testfile}.c
|
|
set opts {}
|
|
|
|
if [info exists COMPILE] {
|
|
# make check RUNTESTFLAGS='gdb.dwarf2/implptr.exp COMPILE=1 CC_FOR_TARGET=gcc\ -m32'
|
|
set srcfile ${csrcfile}
|
|
lappend opts debug optimize=-O2
|
|
} elseif {![is_x86_like_target]} {
|
|
# This test can only be run on x86 targets.
|
|
return 0
|
|
}
|
|
|
|
if {[prepare_for_testing "failed to prepare" ${testfile} $srcfile $opts]} {
|
|
return -1
|
|
}
|
|
|
|
# Additional test to verify the referenced CU is not aged out.
|
|
gdb_test_no_output "maintenance set dwarf max-cache-age 0"
|
|
|
|
if ![runto_main] {
|
|
return -1
|
|
}
|
|
|
|
# Test various pointer depths in bar.
|
|
proc implptr_test_bar {} {
|
|
global csrcfile
|
|
set line [gdb_get_line_number "bar breakpoint" $csrcfile]
|
|
gdb_test "break implptr.c:$line" "Breakpoint 2.*" \
|
|
"set bar breakpoint for implptr"
|
|
gdb_continue_to_breakpoint "continue to bar breakpoint for implptr"
|
|
gdb_test "print j" " = \\(intp\\) <synthetic pointer>" "print j in implptr:bar"
|
|
gdb_test {print sizeof (j[0])} " = 4" {print sizeof (j[0]) in implptr:bar}
|
|
gdb_test "print *j" " = 5" "print *j in implptr:bar"
|
|
gdb_test "print **k" " = 5" "print **k in implptr:bar"
|
|
gdb_test "print ***l" " = 5" "print ***l in implptr:bar"
|
|
}
|
|
|
|
# Test implicit pointer offset.
|
|
proc implptr_test_baz {} {
|
|
global csrcfile
|
|
set line [gdb_get_line_number "baz breakpoint" $csrcfile]
|
|
gdb_test "break implptr.c:$line" "Breakpoint 3.*" \
|
|
"set baz breakpoint for implptr"
|
|
gdb_continue_to_breakpoint "continue to baz breakpoint for implptr"
|
|
|
|
# We are breaking in an inlined function. GDB should appear to
|
|
# have stopped "in" the inlined function.
|
|
gdb_test "up" "#1 foo .*"
|
|
gdb_test {p p[0].y} " = 92" "sanity check element 0"
|
|
gdb_test {p p[1].y} " = 46" "sanity check element 1"
|
|
gdb_test "down" "#0 add .*"
|
|
gdb_test "p a->y" " = 92" "check element 0 for the offset"
|
|
gdb_test "p b->y" " = 46" "check element 1 for the offset"
|
|
gdb_continue_to_breakpoint "ignore the second baz breakpoint"
|
|
}
|
|
|
|
# Test some values in foo.
|
|
proc implptr_test_foo {} {
|
|
global csrcfile
|
|
set line [gdb_get_line_number "foo breakpoint" $csrcfile]
|
|
gdb_test "break implptr.c:$line" "Breakpoint 4.*" \
|
|
"set foo breakpoint for implptr"
|
|
gdb_continue_to_breakpoint "continue to foo breakpoint for implptr"
|
|
gdb_test "print p\[0].x" " = \\(int \\*\\) <synthetic pointer>" \
|
|
"print p\[0].x in implptr:foo"
|
|
gdb_test "print *p\[0].x" " = 69" \
|
|
"print *p\[0].x in implptr:foo"
|
|
gdb_test "print/d *(((char *) p\[0].x) + 1)" " = 0" \
|
|
"print byte inside *p\[0].x in implptr:foo"
|
|
gdb_test "print *(p\[0].x + 10)" \
|
|
"access outside bounds of object referenced via synthetic pointer" \
|
|
"print invalid offset from *p\[0].x in implptr:foo"
|
|
gdb_test "print j" " = 69" \
|
|
"print j in implptr:foo"
|
|
}
|
|
|
|
implptr_test_bar
|
|
implptr_test_baz
|
|
implptr_test_foo
|