[PATCH 04/16] gdb: switch to using 'const reggroup *' in tui-regs.{c, h}

Andrew Burgess via Gdb-patches
2022-03-31T21:06:49Z

Make uses of 'reggroup *' const throughout tui-regs.{c,h}.

There should be no user visible changes after this commit.
---
gdb/tui/tui-regs.c | 22 +++++++++++-----------
gdb/tui/tui-regs.h | 9 +++++----
2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index 190985321eb..5c6189a59b1 100644
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -177,7 +177,7 @@ tui_data_window::first_reg_element_no_inline (int line_no) const
/* Show the registers of the given group in the data window
and refresh the window. */
void
-tui_data_window::show_registers (struct reggroup *group)
+tui_data_window::show_registers (const reggroup *group)
{
if (group == 0)
group = general_reggroup;
@@ -207,7 +207,7 @@ tui_data_window::show_registers (struct reggroup *group)
refresh_values_only is true. */

void
-tui_data_window::show_register_group (struct reggroup *group,
+tui_data_window::show_register_group (const reggroup *group,
struct frame_info *frame,
bool refresh_values_only)
{
@@ -518,10 +518,10 @@ tui_data_item_window::rerender (WINDOW *handle, int field_width)
around behaviour. Returns the next register group, or NULL if the
register window is not currently being displayed. */

-static struct reggroup *
-tui_reg_next (struct reggroup *current_group, struct gdbarch *gdbarch)
+static const reggroup *
+tui_reg_next (const reggroup *current_group, struct gdbarch *gdbarch)
{
- struct reggroup *group = NULL;
+ const reggroup *group = NULL;

if (current_group != NULL)
{
@@ -536,10 +536,10 @@ tui_reg_next (struct reggroup *current_group, struct gdbarch *gdbarch)
around behaviour. Returns the previous register group, or NULL if the
register window is not currently being displayed. */

-static struct reggroup *
-tui_reg_prev (struct reggroup *current_group, struct gdbarch *gdbarch)
+static const reggroup *
+tui_reg_prev (const reggroup *current_group, struct gdbarch *gdbarch)
{
- struct reggroup *group = NULL;
+ const reggroup *group = NULL;

if (current_group != NULL)
{
@@ -561,7 +561,7 @@ tui_reg_command (const char *args, int from_tty)

if (args != NULL)
{
- struct reggroup *group, *match = NULL;
+ const reggroup *group, *match = NULL;
size_t len = strlen (args);

/* Make sure the curses mode is enabled. */
@@ -575,7 +575,7 @@ tui_reg_command (const char *args, int from_tty)
if (TUI_DATA_WIN == NULL || !TUI_DATA_WIN->is_visible ())
tui_regs_layout ();

- struct reggroup *current_group = TUI_DATA_WIN->get_current_group ();
+ const reggroup *current_group = TUI_DATA_WIN->get_current_group ();
if (strncmp (args, "next", len) == 0)
match = tui_reg_next (current_group, gdbarch);
else if (strncmp (args, "prev", len) == 0)
@@ -603,7 +603,7 @@ tui_reg_command (const char *args, int from_tty)
}
else
{
- struct reggroup *group;
+ const reggroup *group;
int first;

gdb_printf (_("\"tui reg\" must be followed by the name of "
diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h
index 9192a73b177..5289d3a892d 100644
--- a/gdb/tui/tui-regs.h
+++ b/gdb/tui/tui-regs.h
@@ -23,6 +23,7 @@
#define TUI_TUI_REGS_H

#include "tui/tui-data.h"
+#include "reggroups.h"

/* A data item window. */

@@ -60,9 +61,9 @@ struct tui_data_window : public tui_win_info

void check_register_values (struct frame_info *frame);

- void show_registers (struct reggroup *group);
+ void show_registers (const reggroup *group);

- struct reggroup *get_current_group () const
+ const reggroup *get_current_group () const
{
return m_current_group;
}
@@ -99,7 +100,7 @@ struct tui_data_window : public tui_win_info
display off the end of the register display. */
void display_reg_element_at_line (int start_element_no, int start_line_no);

- void show_register_group (struct reggroup *group,
+ void show_register_group (const reggroup *group,
struct frame_info *frame,
bool refresh_values_only);

@@ -125,7 +126,7 @@ struct tui_data_window : public tui_win_info
/* Windows that are used to display registers. */
std::vector<tui_data_item_window> m_regs_content;
int m_regs_column_count = 0;
- struct reggroup *m_current_group = nullptr;
+ const reggroup *m_current_group = nullptr;

/* Width of each register's display area. */
int m_item_width = 0;
--
2.25.4