diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/stack.c | 10 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/backtrace.c | 40 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/backtrace.exp | 48 |
5 files changed, 103 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 521d101..3f37153 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-01-06 Andrew Burgess <andrew.burgess@embecosm.com> + + * stack.c (print_frame_info): Move disassemble_next_line code + inside source_print block. + 2020-01-06 Eli Zaretskii <eliz@gnu.org> * gdbsupport/gdb_wait.c: Include <signal.h> instead of diff --git a/gdb/stack.c b/gdb/stack.c index a90120a..92784c9 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -1153,12 +1153,12 @@ print_frame_info (const frame_print_options &fp_opts, print_source_lines (sal.symtab, sal.line, sal.line + 1, 0); } - } - /* If disassemble-next-line is set to on and there is line debug - messages, output assembly codes for next line. */ - if (disassemble_next_line == AUTO_BOOLEAN_TRUE) - do_gdb_disassembly (get_frame_arch (frame), -1, sal.pc, sal.end); + /* If disassemble-next-line is set to on and there is line debug + messages, output assembly codes for next line. */ + if (disassemble_next_line == AUTO_BOOLEAN_TRUE) + do_gdb_disassembly (get_frame_arch (frame), -1, sal.pc, sal.end); + } if (set_current_sal) { diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index ba857a4..3f24364 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-01-06 Andrew Burgess <andrew.burgess@embecosm.com> + + * gdb.base/backtrace.c: New file. + * gdb.base/backtrace.exp: New file. + 2020-01-05 Andrew Burgess <andrew.burgess@embecosm.com> * gdb.tui/list.exp: Test 'focus next' after 'list main'. diff --git a/gdb/testsuite/gdb.base/backtrace.c b/gdb/testsuite/gdb.base/backtrace.c new file mode 100644 index 0000000..bae8b1a --- /dev/null +++ b/gdb/testsuite/gdb.base/backtrace.c @@ -0,0 +1,40 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2019-2020 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/>. */ + +int __attribute__((noinline,noclone)) +baz () +{ + return 0; /* Break here. */ +} + +int __attribute__((noinline,noclone)) +bar () +{ + return baz (); +} + +int __attribute__((noinline,noclone)) +foo () +{ + return bar (); +} + +int +main () +{ + return foo (); +} diff --git a/gdb/testsuite/gdb.base/backtrace.exp b/gdb/testsuite/gdb.base/backtrace.exp new file mode 100644 index 0000000..17e3b61 --- /dev/null +++ b/gdb/testsuite/gdb.base/backtrace.exp @@ -0,0 +1,48 @@ +# Copyright 2019-2020 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/>. + +# A place for miscellaneous tests related to backtrace. + +standard_testfile + +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { + return -1 +} + +if ![runto_main] then { + fail "can't run to main" + return 0 +} + +# Run to the breakpoint at return. +gdb_breakpoint [gdb_get_line_number "Break here."] +gdb_continue_to_breakpoint "Break here." + +# Backtrace with the default options. +gdb_test "bt" \ + [multi_line \ + "#0\[ \t\]*baz \\(\\) at \[^\r\n\]+" \ + "#1\[ \t\]*$hex in bar \\(\\) at \[^\r\n\]+" \ + "#2\[ \t\]*$hex in foo \\(\\) at \[^\r\n\]+" \ + "#3\[ \t\]*$hex in main \\(\\) at \[^\r\n\]+" ] + +# Backtrace with 'set disassemble-next-line on'. This shouldn't make +# any difference to the backtrace. +gdb_test "with disassemble-next-line on -- bt" \ + [multi_line \ + "#0\[ \t\]*baz \\(\\) at \[^\r\n\]+" \ + "#1\[ \t\]*$hex in bar \\(\\) at \[^\r\n\]+" \ + "#2\[ \t\]*$hex in foo \\(\\) at \[^\r\n\]+" \ + "#3\[ \t\]*$hex in main \\(\\) at \[^\r\n\]+" ] |