Skip to content
Snippets Groups Projects
Commit 5d49bf1b authored by Tom Tromey's avatar Tom Tromey
Browse files

Simplify tui_update_source_windows_with_line

This changes tui_update_source_windows_with_line to take a
symtab_and_line, rather than separate parameters, and then updates the
caller.

gdb/ChangeLog
2019-12-20  Tom Tromey  <tom@tromey.com>

	* tui/tui.c (tui_show_source): Update.
	* tui/tui-winsource.h (tui_update_source_windows_with_line): Update.
	* tui/tui-winsource.c (tui_update_source_windows_with_line): Take
	a symtab_symbol_info, not a separate symtab and line.  Simplify.

Change-Id: I8803a0a6fd2938ceee859aea53a57ce582f3e80d
parent 88180c08
No related branches found
No related tags found
No related merge requests found
2019-12-20 Tom Tromey <tom@tromey.com>
* tui/tui.c (tui_show_source): Update.
* tui/tui-winsource.h (tui_update_source_windows_with_line): Update.
* tui/tui-winsource.c (tui_update_source_windows_with_line): Take
a symtab_symbol_info, not a separate symtab and line. Simplify.
2019-12-20 Tom Tromey <tom@tromey.com> 2019-12-20 Tom Tromey <tom@tromey.com>
   
* tui/tui-winsource.c (tui_update_source_windows_with_addr): * tui/tui-winsource.c (tui_update_source_windows_with_addr):
......
...@@ -214,39 +214,19 @@ tui_update_source_windows_with_addr (struct gdbarch *gdbarch, CORE_ADDR addr) ...@@ -214,39 +214,19 @@ tui_update_source_windows_with_addr (struct gdbarch *gdbarch, CORE_ADDR addr)
win_info->update_source_window (gdbarch, sal); win_info->update_source_window (gdbarch, sal);
} }
/* Function to ensure that the source and/or disassemly windows /* Function to ensure that the source and/or disassembly windows
reflect the input address. */ reflect the symtab and line. */
void void
tui_update_source_windows_with_line (struct symtab *s, int line) tui_update_source_windows_with_line (struct symtab_and_line sal)
{ {
struct gdbarch *gdbarch; if (!sal.symtab)
CORE_ADDR pc;
struct symtab_and_line sal;
if (!s)
return; return;
sal.pspace = current_program_space; find_line_pc (sal.symtab, sal.line, &sal.pc);
sal.symtab = s; struct gdbarch *gdbarch = get_objfile_arch (SYMTAB_OBJFILE (sal.symtab));
sal.line = line;
gdbarch = get_objfile_arch (SYMTAB_OBJFILE (s));
switch (tui_current_layout ()) for (struct tui_source_window_base *win_info : tui_source_windows ())
{ win_info->update_source_window (gdbarch, sal);
case DISASSEM_COMMAND:
case DISASSEM_DATA_COMMAND:
find_line_pc (s, line, &pc);
tui_update_source_windows_with_addr (gdbarch, pc);
break;
default:
find_line_pc (s, line, &pc);
sal.pc = pc;
TUI_SRC_WIN->update_source_window (gdbarch, sal);
if (tui_current_layout () == SRC_DISASSEM_COMMAND)
TUI_DISASM_WIN->update_source_window (gdbarch, sal);
break;
}
} }
void void
......
...@@ -227,8 +227,7 @@ extern void tui_update_all_breakpoint_info (struct breakpoint *being_deleted); ...@@ -227,8 +227,7 @@ extern void tui_update_all_breakpoint_info (struct breakpoint *being_deleted);
/* 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_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_and_line sal);
int);
/* Extract some source text from PTR. LINE_NO is the line number. If /* Extract some source text from PTR. LINE_NO is the line number. If
it is positive, it is printed at the start of the line. FIRST_COL it is positive, it is printed at the start of the line. FIRST_COL
......
...@@ -634,7 +634,7 @@ tui_show_source () ...@@ -634,7 +634,7 @@ tui_show_source ()
/* Make sure that the source window is displayed. */ /* Make sure that the source window is displayed. */
tui_add_win_to_layout (SRC_WIN); tui_add_win_to_layout (SRC_WIN);
tui_update_source_windows_with_line (cursal.symtab, cursal.line); tui_update_source_windows_with_line (cursal);
tui_update_locator_fullname (cursal.symtab); tui_update_locator_fullname (cursal.symtab);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment