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

Change tui_update_source_window to be a method

Browse Source 
This changes tui_update_source_window to be a method on
tui_source_window_base.

gdb/ChangeLog
2019-08-16  Tom Tromey  <tom@tromey.com>

	* tui/tui-winsource.h (struct tui_source_window_base)
	<update_source_window>: Declare.
	(tui_update_source_window): Don't declare.
	* tui/tui-winsource.c
	(tui_source_window_base::update_source_window): Rename from
	tui_update_source_window.
	(tui_source_window_base::rerender): Update.
	* tui/tui-source.c (tui_source_window::maybe_update): Update.
	* tui/tui-disasm.c (tui_show_disassem)
	(tui_show_disassem_and_update_source)
	(tui_disasm_window::maybe_update): Update.
This commit is contained in:
Tom Tromey
2019-07-11 18:24:07 -06:00
parent ed8358e949
commit 017f982820
5 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gdb/ChangeLog
View File

@ -1,3 +1,17 @@
2019-08-16 Tom Tromey <tom@tromey.com>
* tui/tui-winsource.h (struct tui_source_window_base)
<update_source_window>: Declare.
(tui_update_source_window): Don't declare.
* tui/tui-winsource.c
(tui_source_window_base::update_source_window): Rename from
tui_update_source_window.
(tui_source_window_base::rerender): Update.
* tui/tui-source.c (tui_source_window::maybe_update): Update.
* tui/tui-disasm.c (tui_show_disassem)
(tui_show_disassem_and_update_source)
(tui_disasm_window::maybe_update): Update.
2019-08-16 Tom Tromey <tom@tromey.com> 2019-08-16 Tom Tromey <tom@tromey.com>
* tui/tui-winsource.h (struct tui_source_window_base) * tui/tui-winsource.h (struct tui_source_window_base)

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

@ -257,7 +257,7 @@ tui_show_disassem (struct gdbarch *gdbarch, CORE_ADDR start_addr)
val.loa = LOA_ADDRESS; val.loa = LOA_ADDRESS;
val.u.addr = start_addr; val.u.addr = start_addr;
tui_update_source_window (TUI_DISASM_WIN, gdbarch, s, val); TUI_DISASM_WIN->update_source_window (gdbarch, s, val);
/* If the focus was in the src win, put it in the asm win, if the /* If the focus was in the src win, put it in the asm win, if the
source view isn't split. */ source view isn't split. */
@ -285,7 +285,7 @@ tui_show_disassem_and_update_source (struct gdbarch *gdbarch,
sal = find_pc_line (start_addr, 0); sal = find_pc_line (start_addr, 0);
val.loa = LOA_LINE; val.loa = LOA_LINE;
val.u.line_no = sal.line; val.u.line_no = sal.line;
tui_update_source_window (TUI_SRC_WIN, gdbarch, sal.symtab, val); TUI_SRC_WIN->update_source_window (gdbarch, sal.symtab, val);
if (sal.symtab) if (sal.symtab)
{ {
set_current_source_symtab_and_line (sal); set_current_source_symtab_and_line (sal);
@ -418,8 +418,7 @@ tui_disasm_window::maybe_update (struct frame_info *fi, symtab_and_line sal,
a.loa = LOA_ADDRESS; a.loa = LOA_ADDRESS;
a.u.addr = low; a.u.addr = low;
if (!addr_is_displayed (addr)) if (!addr_is_displayed (addr))
tui_update_source_window (this, get_frame_arch (fi), update_source_window (get_frame_arch (fi), sal.symtab, a);
sal.symtab, a);
else else
{ {
a.u.addr = addr; a.u.addr = addr;

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

@ -317,8 +317,7 @@ tui_source_window::maybe_update (struct frame_info *fi, symtab_and_line sal,
l.u.line_no = start_line; l.u.line_no = start_line;
if (!(source_already_displayed if (!(source_already_displayed
&& line_is_displayed (line_no))) && line_is_displayed (line_no)))
tui_update_source_window (this, get_frame_arch (fi), update_source_window (get_frame_arch (fi), sal.symtab, l);
sal.symtab, l);
else else
{ {
l.u.line_no = line_no; l.u.line_no = line_no;

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

@ -70,13 +70,13 @@ tui_display_main ()
/* Function to display source in the source window. This function /* Function to display source in the source window. This function
initializes the horizontal scroll to 0. */ initializes the horizontal scroll to 0. */
void void
tui_update_source_window (struct tui_source_window_base *win_info, tui_source_window_base::update_source_window
struct gdbarch *gdbarch, (struct gdbarch *gdbarch,
struct symtab *s, struct symtab *s,
struct tui_line_or_address line_or_addr) struct tui_line_or_address line_or_addr)
{ {
win_info->horizontal_offset = 0; horizontal_offset = 0;
win_info->update_source_window_as_is (gdbarch, s, line_or_addr); update_source_window_as_is (gdbarch, s, line_or_addr);
} }
@ -325,8 +325,7 @@ tui_source_window_base::rerender ()
= get_current_source_symtab_and_line (); = get_current_source_symtab_and_line ();
line_or_addr = start_line_or_addr; line_or_addr = start_line_or_addr;
tui_update_source_window (this, gdbarch, update_source_window (gdbarch, cursal.symtab, line_or_addr);
cursal.symtab, line_or_addr);
} }
else if (deprecated_safe_get_selected_frame () != NULL) else if (deprecated_safe_get_selected_frame () != NULL)
{ {
@ -347,7 +346,7 @@ tui_source_window_base::rerender ()
line.loa = LOA_ADDRESS; line.loa = LOA_ADDRESS;
find_line_pc (s, cursal.line, &line.u.addr); find_line_pc (s, cursal.line, &line.u.addr);
} }
tui_update_source_window (this, gdbarch, s, line); update_source_window (gdbarch, s, line);
} }
else else
erase_source_content (); erase_source_content ();

6
gdb/tui/tui-winsource.h
View File

@ -138,6 +138,9 @@ public:
void update_source_window_as_is (struct gdbarch *gdbarch, void update_source_window_as_is (struct gdbarch *gdbarch,
struct symtab *s, struct symtab *s,
struct tui_line_or_address line_or_addr); struct tui_line_or_address line_or_addr);
void update_source_window (struct gdbarch *gdbarch,
struct symtab *s,
struct tui_line_or_address line_or_addr);
/* Erase the source content. */ /* Erase the source content. */
virtual void erase_source_content () = 0; virtual void erase_source_content () = 0;
@ -247,9 +250,6 @@ extern bool tui_update_breakpoint_info (struct tui_source_window_base *win,
/* Function to display the "main" routine. */ /* Function to display the "main" routine. */
extern void tui_display_main (void); extern void tui_display_main (void);
extern void tui_update_source_window (struct tui_source_window_base *,
struct gdbarch *, struct symtab *,
struct tui_line_or_address);
extern void tui_update_source_windows_with_addr (struct gdbarch *, CORE_ADDR); extern void tui_update_source_windows_with_addr (struct gdbarch *, CORE_ADDR);
extern void tui_update_source_windows_with_line (struct symtab *, extern void tui_update_source_windows_with_line (struct symtab *,
int); int);