diff mbox

[pushed] Display "main" on initial TUI startup

Message ID 20191220162012.7FC7C281DA@gnutoolchain-gerrit.osci.io
State New
Headers show

Commit Message

Simon Marchi (Code Review) Dec. 20, 2019, 4:20 p.m. UTC 
The original change was created by Tom Tromey.

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

Display "main" on initial TUI startup

I noticed that even when there's a symbol file, "tui enable" won't
show "main" by default.  I think it should, and this patch fixes this.

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

	* tui/tui.c (tui_enable): Call tui_display_main.

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

	* gdb.tui/list.exp: Check for source on initial listing.

Change-Id: Ic7bfc930e1179f5b61111e30a2dae46a98b00064
---
M gdb/ChangeLog
M gdb/testsuite/ChangeLog
M gdb/testsuite/gdb.tui/list.exp
M gdb/tui/tui.c
4 files changed, 11 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e471536..1034aa8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@ 
 2019-12-20  Tom Tromey  <tom@tromey.com>
 
+	* tui/tui.c (tui_enable): Call tui_display_main.
+
+2019-12-20  Tom Tromey  <tom@tromey.com>
+
 	* tui/tui-disasm.c (tui_get_begin_asm_address): Use
 	get_current_source_symtab_and_line, and main_name.
 
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 4f8d851..f25787c 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@ 
+2019-12-20  Tom Tromey  <tom@tromey.com>
+
+	* gdb.tui/list.exp: Check for source on initial listing.
+
 2019-12-11  Tom Tromey  <tromey@adacore.com>
 
 	* gdb.xml/tdesc-arch.exp (set_arch): Add "trans_mode" parameter.
diff --git a/gdb/testsuite/gdb.tui/list.exp b/gdb/testsuite/gdb.tui/list.exp
index 6efe193..08153c6 100644
--- a/gdb/testsuite/gdb.tui/list.exp
+++ b/gdb/testsuite/gdb.tui/list.exp
@@ -28,7 +28,7 @@ 
     unsupported "TUI not supported"
 }
 
-Term::check_contents "initial source listing" "No Source Available"
+Term::check_contents "initial source listing" "21 *return 0"
 
 Term::command "layout asm"
 Term::check_contents "asm window shows main" "$hex <main>"
diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c
index a0d2e4c..dbc890a 100644
--- a/gdb/tui/tui.c
+++ b/gdb/tui/tui.c
@@ -513,6 +513,8 @@ 
 
   if (deprecated_safe_get_selected_frame ())
     tui_show_frame_info (deprecated_safe_get_selected_frame ());
+  else
+    tui_display_main ();
 
   /* Restore TUI keymap.  */
   tui_set_key_mode (tui_current_key_mode);