aboutsummaryrefslogtreecommitdiff
path: root/gdb/tui
diff options
context:
space:
mode:
authorAndrew Burgess <andrew.burgess@embecosm.com>2020-01-24 12:46:56 +0000
committerAndrew Burgess <andrew.burgess@embecosm.com>2020-01-31 00:41:06 +0000
commit42330a681af23a80d3e1f201d2a65886875e74bd (patch)
tree7c08bfb403ba2b4f930125483344aaa5227d675b /gdb/tui
parent7a27a45bc66f38cbaee868092f0aaa55ef8d4564 (diff)
downloadgdb-42330a681af23a80d3e1f201d2a65886875e74bd.zip
gdb-42330a681af23a80d3e1f201d2a65886875e74bd.tar.gz
gdb-42330a681af23a80d3e1f201d2a65886875e74bd.tar.bz2
gdb/tui: Disassembler scrolling of very small programs
In TUI mode, if the disassembly output for the program is less than one screen long, then currently if the user scrolls down until on the last assembly instruction is displayed and then tries to scroll up using Page-Up, the display doesn't update - they are stuck viewing the last line. If the user tries to scroll up using the Up-Arrow, then the display scrolls normally. What is happening is on the Page-Up we ask GDB to scroll backward the same number of lines as the height of the TUI ASM window. The back scanner, which looks for a good place to start disassembling, fails to find a starting address which will provide the requested number of new lines before we get back to the original starting address (which is not surprising, our whole program contains less than a screen height of instructions), as a result the back scanner gives up and returns the original starting address. When we scroll with Up-Arrow we only ask the back scanner to find 1 new instruction, which it manages to do, so this scroll works. The solution here is, when we fail to find enough instructions, to return the lowest address we did manage to find. This will ensure we jump to the lowest possible address in the disassembly output. gdb/ChangeLog: 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. gdb/testsuite/ChangeLog: PR tui/9765 * gdb.tui/tui-layout-asm-short-prog.S: New file. * gdb.tui/tui-layout-asm-short-prog.exp: New file. Change-Id: I6a6a7972c68a0559e9717fd8d82870b669a40af3
Diffstat (limited to 'gdb/tui')
-rw-r--r--gdb/tui/tui-disasm.c2
1 files changed, 1 insertions, 1 deletions
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;