From: Tom Tromey Date: Sun, 16 Jun 2019 22:31:56 +0000 (-0600) Subject: Don't use TUI_DISASM_WIN in tui_disasm_window method X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f83d391c5aa3304faf8ef1384a6c64f082653260;p=binutils-gdb.git Don't use TUI_DISASM_WIN in tui_disasm_window method The previous patch made it clear that the diassembly window scrolling method was written to assume there could only ever be a single disassembly window. This changes that spot to use "this" rather than the TUI_DISASM_WIN global. gdb/ChangeLog 2019-06-25 Tom Tromey * tui/tui-disasm.c (tui_disasm_window::do_scroll_vertical): Use "this", not TUI_DISASM_WIN. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 109cdd467d1..56b49cd4a95 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-06-25 Tom Tromey + + * tui/tui-disasm.c (tui_disasm_window::do_scroll_vertical): Use + "this", not TUI_DISASM_WIN. + 2019-06-25 Tom Tromey * tui/tui-winsource.h (tui_horizontal_source_scroll): Don't diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c index 838f36cf295..efb9d1cb628 100644 --- a/gdb/tui/tui-disasm.c +++ b/gdb/tui/tui-disasm.c @@ -393,7 +393,7 @@ tui_disasm_window::do_scroll_vertical val.loa = LOA_ADDRESS; val.u.addr = tui_find_disassembly_address (gdbarch, pc, dir); - tui_update_source_window_as_is (TUI_DISASM_WIN, gdbarch, + tui_update_source_window_as_is (this, gdbarch, NULL, val, FALSE); } }