Patchwork [pushed] Don't call tui_show_source from tui_ui_out

login
register
mail settings
Submitter Simon Marchi (Code Review)
Date Dec. 20, 2019, 4:20 p.m.
Message ID <20191220162015.411CC281EB@gnutoolchain-gerrit.osci.io>
Download mbox | patch
Permalink /patch/37003/
State New
Headers show

Comments

Simon Marchi (Code Review) - Dec. 20, 2019, 4:20 p.m.
Sourceware to Gerrit sync has submitted this change.

Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/652
......................................................................

Don't call tui_show_source from tui_ui_out

This removes the call to tui_show_source from tui_ui_out.  This always
seemed like a hack, and now that the TUI is using the proper
observers, it seems not to be needed.

The rest of the logic remains, unfortunately, because it is needed to
suppress some gdb output in the TUI case.  We could probably find a
nicer way to do this (maybe a ui_out_flag), but I haven't attempted
this.

This was the last caller of tui_show_source, so this is removed as
well.

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

	* tui/tui.c (tui_show_source): Remove.
	* tui/tui.h (tui_show_source): Don't declare.
	* tui/tui-out.c (tui_ui_out::do_field_string): Don't call
	tui_show_source.

Change-Id: Id71098e597ee4ebfef0429562baa45f537bd2c2b
---
M gdb/ChangeLog
M gdb/tui/tui-out.c
M gdb/tui/tui.c
M gdb/tui/tui.h
4 files changed, 8 insertions(+), 18 deletions(-)

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fa17958..0f35def 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@ 
 2019-12-20  Tom Tromey  <tom@tromey.com>
 
+	* tui/tui.c (tui_show_source): Remove.
+	* tui/tui.h (tui_show_source): Don't declare.
+	* tui/tui-out.c (tui_ui_out::do_field_string): Don't call
+	tui_show_source.
+
+2019-12-20  Tom Tromey  <tom@tromey.com>
+
 	* tui/tui-stack.h (tui_show_frame_info): Return bool.
 	* tui/tui-stack.c (tui_show_frame_info): Return bool.
 	* tui/tui-hooks.c (tui_refresh_frame_and_register_information):
diff --git a/gdb/tui/tui-out.c b/gdb/tui/tui-out.c
index 95543ff..22b4996 100644
--- a/gdb/tui/tui-out.c
+++ b/gdb/tui/tui-out.c
@@ -60,10 +60,7 @@ 
   m_start_of_line++;
 
   if (fldname && m_line > 0 && strcmp (fldname, "fullname") == 0)
-    {
-      tui_show_source ();
-      return;
-    }
+    return;
 
   cli_ui_out::do_field_string (fldno, width, align, fldname, string, style);
 }
diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c
index dbc890a..f33ff44 100644
--- a/gdb/tui/tui.c
+++ b/gdb/tui/tui.c
@@ -629,18 +629,6 @@ 
 #endif
 
 void
-tui_show_source ()
-{
-  struct symtab_and_line cursal = get_current_source_symtab_and_line ();
-
-  /* Make sure that the source window is displayed.  */
-  tui_add_win_to_layout (SRC_WIN);
-
-  tui_update_source_windows_with_line (cursal);
-  tui_update_locator_fullname (cursal.symtab);
-}
-
-void
 tui_show_assembly (struct gdbarch *gdbarch, CORE_ADDR addr)
 {
   tui_add_win_to_layout (DISASSEM_WIN);
diff --git a/gdb/tui/tui.h b/gdb/tui/tui.h
index 0ac1fb4..06f3ef1 100644
--- a/gdb/tui/tui.h
+++ b/gdb/tui/tui.h
@@ -83,6 +83,4 @@ 
 
 extern int tui_active;
 
-extern void tui_show_source ();
-
 #endif /* TUI_TUI_H */