From 9590364f9dffc0fbb29f00690bae3df8b2c92cf3 Mon Sep 17 00:00:00 2001
From: Tom de Vries <tdevries@suse.de>
Date: Sun, 26 Nov 2023 08:49:28 +0100
Subject: [PATCH v2] [gdb/tui] Show regs when switching to regs layout

When starting gdb in CLI mode, running to main and switching into the TUI regs
layout:
...
$ gdb -q a.out -ex start -ex "layout regs"
...
we get:
...
+---------------------------------+
|                                 |
| [ Register Values Unavailable ] |
|                                 |
+---------------------------------+
...

Fix this by handling this case in tui_data_window::rerender.

Tested on x86_64-linux.

PR tui/28600
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=28600
---
 gdb/testsuite/gdb.tui/regs.exp | 10 ++++++----
 gdb/tui/tui-regs.c             | 14 +++++++++++---
 gdb/tui/tui-regs.h             |  6 +++++-
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/gdb/testsuite/gdb.tui/regs.exp b/gdb/testsuite/gdb.tui/regs.exp
index 520f6ddba96..0be99625b9f 100644
--- a/gdb/testsuite/gdb.tui/regs.exp
+++ b/gdb/testsuite/gdb.tui/regs.exp
@@ -41,10 +41,12 @@ Term::command "layout regs"
 Term::check_box "register box" 0 0 80 8
 Term::check_box "source box in regs layout" 0 7 80 8
 
-set text [Term::get_line 1]
-# Just check for any register window content at all.
-Term::check_contents "any register contents" "\\|.*\[^ \].*\\|"
-
+# The current frame is main, check that registers are available.
+set re_reg_vals_unavailable \
+    [string_to_regexp {[ Register Values Unavailable ]}]
+gdb_assert \
+    { ![Term::check_region_contents_p 0 0 80 8 $re_reg_vals_unavailable] } \
+    "Register values available"
 
 # Check that we can successfully cause the register window to appear
 # using the 'tui reg next' and 'tui reg prev' commands.
diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index 4c6ea8aff0d..da2c9a26995 100644
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -192,7 +192,7 @@ tui_data_window::show_registers (const reggroup *group)
       m_regs_content.clear ();
     }
 
-  rerender ();
+  rerender (false);
 }
 
 
@@ -415,10 +415,18 @@ tui_data_window::erase_data_content (const char *prompt)
 /* See tui-regs.h.  */
 
 void
-tui_data_window::rerender ()
+tui_data_window::rerender (bool toplevel)
 {
   if (m_regs_content.empty ())
-    erase_data_content (_("[ Register Values Unavailable ]"));
+    {
+      if (toplevel && has_stack_frames ())
+	{
+	  frame_info_ptr fi = get_selected_frame (NULL);
+	  check_register_values (fi);
+	}
+      else
+	erase_data_content (_("[ Register Values Unavailable ]"));
+    }
   else
     {
       erase_data_content (NULL);
diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h
index 5adff6300aa..1abd22cd382 100644
--- a/gdb/tui/tui-regs.h
+++ b/gdb/tui/tui-regs.h
@@ -75,7 +75,11 @@ struct tui_data_window : public tui_win_info
   {
   }
 
-  void rerender () override;
+  void rerender (bool toplevel);
+  void rerender () override
+  {
+    rerender (true);
+  }
 
 private:
 

base-commit: 1340072a5412877d9d98f5b010cd8e6e9e418905
-- 
2.35.3