aboutsummaryrefslogtreecommitdiff
path: root/gdb/testsuite/gdb.tui
diff options
context:
space:
mode:
authorAndrew Burgess <andrew.burgess@embecosm.com>2020-01-11 01:38:28 +0000
committerAndrew Burgess <andrew.burgess@embecosm.com>2020-01-24 00:10:33 +0000
commit733d0a679536628eb1be4b4b8aa6384de24ff1f1 (patch)
tree9a8f6e77b400a79b40433763852d33b78e77b423 /gdb/testsuite/gdb.tui
parent2f267673f0fdee9287e6d404ecd4f2d29da0d2f2 (diff)
downloadgdb-733d0a679536628eb1be4b4b8aa6384de24ff1f1.zip
gdb-733d0a679536628eb1be4b4b8aa6384de24ff1f1.tar.gz
gdb-733d0a679536628eb1be4b4b8aa6384de24ff1f1.tar.bz2
gdb/tui: asm window handles invalid memory and scrolls better
This started as a patch to enable the asm window to handle attempts to disassemble invalid memory, but it ended up expanding into a significant rewrite of how the asm window handles scrolling. These two things ended up being tied together as it was impossible to correctly test scrolling into invalid memory when the asm window would randomly behave weirdly while scrolling. Things that should work nicely now; scrolling to the bottom or top of the listing with PageUp, PageDown, Up Arrow, Down Arrow and we should be able to scroll past small areas of memory that don't have symbols associated with them. It should also be possible to scroll to the start of a section even if there's no symbol at the start of the section. Adding tests for this scrolling was a little bit of a problem. First I would have liked to add tests for PageUp / PageDown, but the tuiterm library we use doesn't support these commands right now due to only emulating a basic ascii terminal. Changing this to emulate a more complex terminal would require adding support for more escape sequence control codes, so I've not tried to tackle that in this patch. Next, I would have liked to test scrolling to the start or end of the assembler listing and then trying to scroll even more, however, this is a problem because in a well behaving GDB a scroll at the start/end has no effect. What we need to do is: - Move to start of assembler listing, - Send scroll up command, - Wait for all curses output, - Ensure the assembler listing is unchanged, we're still at the start of the listing. The problem is that there is no curses output, so how long do we wait at step 3? The same problem exists for scrolling to the bottom of the assembler listing. However, when scrolling down you can at least see the end coming, so I added a test for this case, however, this feels like an area of code that is massively under tested. gdb/ChangeLog: PR tui/9765 * minsyms.c (lookup_minimal_symbol_by_pc_section): Update header comment, add extra parameter, and update to store previous symbol when appropriate. * minsyms.h (lookup_minimal_symbol_by_pc_section): Update comment, add extra parameter. * tui/tui-disasm.c (tui_disassemble): Update header comment, remove unneeded parameter, add try/catch around gdb_print_insn, rewrite to add items to asm_lines vector. (tui_find_backward_disassembly_start_address): New function. (tui_find_disassembly_address): Updated throughout. (tui_disasm_window::set_contents): Update for changes to tui_disassemble. (tui_disasm_window::do_scroll_vertical): No need to adjust the number of lines to scroll. gdb/testsuite/ChangeLog: PR tui/9765 * gdb.tui/tui-layout-asm.exp: Add scrolling test for asm window. Change-Id: I323987c8fd316962c937e73c17d952ccd3cfa66c
Diffstat (limited to 'gdb/testsuite/gdb.tui')
-rw-r--r--gdb/testsuite/gdb.tui/tui-layout-asm.exp42
1 files changed, 42 insertions, 0 deletions
diff --git a/gdb/testsuite/gdb.tui/tui-layout-asm.exp b/gdb/testsuite/gdb.tui/tui-layout-asm.exp
index cec2735..40f46ea 100644
--- a/gdb/testsuite/gdb.tui/tui-layout-asm.exp
+++ b/gdb/testsuite/gdb.tui/tui-layout-asm.exp
@@ -32,3 +32,45 @@ if {![Term::prepare_for_tui]} {
# 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 "<main>"
+
+# Scroll the ASM window down using the down arrow key. In an ideal
+# world we'd like to use PageDown here, but currently our terminal
+# library doesn't support such advanced things.
+set testname "scroll to end of assembler"
+set down_count 0
+while (1) {
+ # Grab the second line, this is about to become the first line.
+ set line [Term::get_line 2]
+
+ # Except, if the second line is blank then we are at the end of
+ # the available asm output. Pressing down again _shouldn't_
+ # change the output, however, if GDB is working, and we press down
+ # then the screen won't change, so the call to Term::wait_for
+ # below will just timeout. So for now we avoid testing the edge
+ # case.
+ if {[regexp -- "^\\| +\\|$" $line]} {
+ # Second line is blank, we're at the end of the assembler.
+ pass $testname
+ break
+ }
+
+ # Send the down key to GDB.
+ send_gdb "\033\[B"
+ incr down_count
+ if {[Term::wait_for [string_to_regexp $line]] \
+ && [Term::get_line 1] == $line} {
+ # We scrolled successfully.
+ } else {
+ fail "$testname (scroll failed)"
+ Term::dump_screen
+ break
+ }
+
+ if { $down_count > 250 } {
+ # Maybe we should accept this as a pass in case a target
+ # really does have loads of assembler to scroll through.
+ fail "$testname (too much assembler)"
+ Term::dump_screen
+ break
+ }
+}