diff options
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.tui/tui-layout-asm-short-prog.S | 22 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.tui/tui-layout-asm-short-prog.exp | 51 | ||||
| -rw-r--r-- | gdb/tui/tui-disasm.c | 2 |
5 files changed, 87 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 46acb63..5bdca27 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2020-01-31 Andrew Burgess <andrew.burgess@embecosm.com> + PR tui/9765 + * tui/tui-disasm.c (tui_find_disassembly_address): If we don't + have enough lines to fill the screen, still return the lowest + address we found. + +2020-01-31 Andrew Burgess <andrew.burgess@embecosm.com> + * tui/tui-win.c (_initialize_tui_win): Update help text for '+', '-', '<', and '>' commands. diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 2d0a173..a6ae5e9 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2020-01-31 Andrew Burgess <andrew.burgess@embecosm.com> + + PR tui/9765 + * gdb.tui/tui-layout-asm-short-prog.S: New file. + * gdb.tui/tui-layout-asm-short-prog.exp: New file. + 2020-01-29 Luis Machado <luis.machado@linaro.org> * gdb.arch/aarch64-brk-patterns.c: New source file. diff --git a/gdb/testsuite/gdb.tui/tui-layout-asm-short-prog.S b/gdb/testsuite/gdb.tui/tui-layout-asm-short-prog.S new file mode 100644 index 0000000..7705ef13 --- /dev/null +++ b/gdb/testsuite/gdb.tui/tui-layout-asm-short-prog.S @@ -0,0 +1,22 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 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/>. */ + + .global _start +_start: + .rept 5 + nop + .endr diff --git a/gdb/testsuite/gdb.tui/tui-layout-asm-short-prog.exp b/gdb/testsuite/gdb.tui/tui-layout-asm-short-prog.exp new file mode 100644 index 0000000..d0b871f --- /dev/null +++ b/gdb/testsuite/gdb.tui/tui-layout-asm-short-prog.exp @@ -0,0 +1,51 @@ +# Copyright 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/>. + +# Ensure that 'layout asm' can scroll away from the last line of a +# very short program using a page up sized scroll. + +load_lib "tuiterm.exp" + +standard_testfile tui-layout-asm-short-prog.S + +if {[build_executable "failed to prepare" ${testfile} ${srcfile} \ + {debug additional_flags=-nostdlib \ + additional_flags=-nostartfiles}] == -1} { + return -1 +} + +Term::clean_restart 24 80 $testfile +if {![Term::prepare_for_tui]} { + unsupported "TUI not supported" +} + +# This puts us into TUI mode, and should display the ASM window. +Term::command "layout asm" +Term::check_box_contents "check asm box contents" 0 0 80 15 "<_start>" + +# Record the first line of output, we'll need this later. +set first_line [Term::get_line 1] + +# Scroll forward a large amount, this should take us to the last +# instruction in the program. +Term::command "+ 13" +Term::check_box_contents "check asm box contents again" 0 0 80 15 \ + "^ *$hex\[^\n\]+\n +\n" + +# Now scroll backward again, we should return to the start of the +# program. +Term::command "- 13" +gdb_assert {[string eq "$first_line" [Term::get_line 1]]} \ + "check first line is back" diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c index 726b7c2..547d2c9 100644 --- a/gdb/tui/tui-disasm.c +++ b/gdb/tui/tui-disasm.c @@ -268,7 +268,7 @@ tui_find_disassembly_address (struct gdbarch *gdbarch, CORE_ADDR pc, int from) if (asm_lines.size () < max_lines) { if (!possible_new_low.has_value ()) - return pc; + return new_low; /* Take the best possible match we have. */ new_low = *possible_new_low; |