diff options
| author | Tom Tromey <tom@tromey.com> | 2019-11-12 17:40:33 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-12-20 09:15:52 -0700 |
| commit | 57e4b379e96383c4c7ee0aa0bb9b81018688f47d (patch) | |
| tree | 5b6970a79ed4b5c34ca8209227fbf26d3d8e52af | |
| parent | 61c33f105c71d27386e5b3cc6e1c5f71efe7ed01 (diff) | |
| download | gdb-57e4b379e96383c4c7ee0aa0bb9b81018688f47d.zip gdb-57e4b379e96383c4c7ee0aa0bb9b81018688f47d.tar.gz gdb-57e4b379e96383c4c7ee0aa0bb9b81018688f47d.tar.bz2 | |
Use start_line_or_addr in TUI windows
A few spots in the TUI source and disassembly windows referred to
content[0], where start_line_or_addr is equivalent. This patch makes
this substitution.
gdb/ChangeLog
2019-12-20 Tom Tromey <tom@tromey.com>
* tui/tui-winsource.c (tui_source_window_base::refill): Use
start_line_or_addr.
* tui/tui-source.c (tui_source_window::do_scroll_vertical): Use
start_line_or_addr.
* tui/tui-disasm.c (tui_disasm_window::do_scroll_vertical): Use
start_line_or_addr.
Change-Id: I1fa807321cd7ad88b3cc5e41cc50f4d4e2d46271
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/tui/tui-disasm.c | 2 | ||||
| -rw-r--r-- | gdb/tui/tui-source.c | 4 | ||||
| -rw-r--r-- | gdb/tui/tui-winsource.c | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2994728..fef0cfc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,14 @@ 2019-12-20 Tom Tromey <tom@tromey.com> + * tui/tui-winsource.c (tui_source_window_base::refill): Use + start_line_or_addr. + * tui/tui-source.c (tui_source_window::do_scroll_vertical): Use + start_line_or_addr. + * tui/tui-disasm.c (tui_disasm_window::do_scroll_vertical): Use + start_line_or_addr. + +2019-12-20 Tom Tromey <tom@tromey.com> + * tui/tui-winsource.h (struct tui_source_window_base) <set_contents>: Return bool. * tui/tui-winsource.c diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c index 080253c..8a46bba 100644 --- a/gdb/tui/tui-disasm.c +++ b/gdb/tui/tui-disasm.c @@ -325,7 +325,7 @@ tui_disasm_window::do_scroll_vertical (int num_to_scroll) CORE_ADDR pc; struct tui_line_or_address val; - pc = content[0].line_or_addr.u.addr; + pc = start_line_or_addr.u.addr; if (num_to_scroll >= 0) num_to_scroll++; else diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c index 78afc62..113195d 100644 --- a/gdb/tui/tui-source.c +++ b/gdb/tui/tui-source.c @@ -147,14 +147,14 @@ tui_source_window::do_scroll_vertical (int num_to_scroll) s = cursal.symtab; l.loa = LOA_LINE; - l.u.line_no = content[0].line_or_addr.u.line_no + l.u.line_no = start_line_or_addr.u.line_no + num_to_scroll; const std::vector<off_t> *offsets; if (g_source_cache.get_line_charpos (s, &offsets) && l.u.line_no > offsets->size ()) /* line = s->nlines - win_info->content_size + 1; */ /* elz: fix for dts 23398. */ - l.u.line_no = content[0].line_or_addr.u.line_no; + l.u.line_no = start_line_or_addr.u.line_no; if (l.u.line_no <= 0) l.u.line_no = 1; diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index fad8d7b..708c2fe 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -413,7 +413,7 @@ tui_source_window_base::refill () : cursal.symtab); } - update_source_window_as_is (gdbarch, s, content[0].line_or_addr); + update_source_window_as_is (gdbarch, s, start_line_or_addr); } /* Scroll the source forward or backward horizontally. */ |