espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-20 18:08:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use start_line_or_addr in TUI windows

Browse Source 
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
This commit is contained in:
Tom Tromey
2019-11-12 17:40:33 -07:00
parent 61c33f105c
commit 57e4b379e9
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gdb/ChangeLog
View File

@ -1,3 +1,12 @@
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> 2019-12-20 Tom Tromey <tom@tromey.com>
* tui/tui-winsource.h (struct tui_source_window_base) * tui/tui-winsource.h (struct tui_source_window_base)

2
gdb/tui/tui-disasm.c
View File

@ -325,7 +325,7 @@ tui_disasm_window::do_scroll_vertical (int num_to_scroll)
CORE_ADDR pc; CORE_ADDR pc;
struct tui_line_or_address val; 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) if (num_to_scroll >= 0)
num_to_scroll++; num_to_scroll++;
else else

4
gdb/tui/tui-source.c
View File

@ -147,14 +147,14 @@ tui_source_window::do_scroll_vertical (int num_to_scroll)
s = cursal.symtab; s = cursal.symtab;
l.loa = LOA_LINE; 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; + num_to_scroll;
const std::vector<off_t> *offsets; const std::vector<off_t> *offsets;
if (g_source_cache.get_line_charpos (s, &offsets) if (g_source_cache.get_line_charpos (s, &offsets)
&& l.u.line_no > offsets->size ()) && l.u.line_no > offsets->size ())
/* line = s->nlines - win_info->content_size + 1; */ /* line = s->nlines - win_info->content_size + 1; */
/* elz: fix for dts 23398. */ /* 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) if (l.u.line_no <= 0)
l.u.line_no = 1; l.u.line_no = 1;

2
gdb/tui/tui-winsource.c
View File

@ -413,7 +413,7 @@ tui_source_window_base::refill ()
: cursal.symtab); : 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. */ /* Scroll the source forward or backward horizontally. */