This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 55/61] Move TUI data item window to tui-regs.h
- From: Tom Tromey <tom at tromey dot com>
- To: gdb-patches at sourceware dot org
- Cc: Tom Tromey <tom at tromey dot com>
- Date: Thu, 4 Jul 2019 11:03:05 -0600
- Subject: [PATCH 55/61] Move TUI data item window to tui-regs.h
- References: <20190704170311.15982-1-tom@tromey.com>
The TUI data item window is only used by the TUI register window. So,
this patch moves the relevant code to tui-regs.[ch].
2019-07-04 Tom Tromey <tom@tromey.com>
* tui/tui-regs.h (struct tui_data_item_window): Move from
tui-data.h.
* tui/tui-regs.c (tui_data_item_window): Move from tui-data.c.
* tui/tui-data.h (struct tui_data_item_window): Move to
tui-regs.h.
* tui/tui-data.c (~tui_data_item_window): Move to tui-regs.c.
---
gdb/ChangeLog | 9 +++++++++
gdb/tui/tui-data.c | 11 -----------
gdb/tui/tui-data.h | 19 -------------------
gdb/tui/tui-regs.c | 9 +++++++++
gdb/tui/tui-regs.h | 19 +++++++++++++++++++
5 files changed, 37 insertions(+), 30 deletions(-)
diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c
index 5e755168827..8977e8fd592 100644
--- a/gdb/tui/tui-data.c
+++ b/gdb/tui/tui-data.c
@@ -333,14 +333,3 @@ tui_source_window_base::~tui_source_window_base ()
xfree (fullname);
delete execution_info;
}
-
-/**********************************
-** LOCAL STATIC FUNCTIONS **
-**********************************/
-
-
-tui_data_item_window::~tui_data_item_window ()
-{
- xfree (value);
- xfree (content);
-}
diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index ed5d291f354..2f2f2a0ab91 100644
--- a/gdb/tui/tui-data.h
+++ b/gdb/tui/tui-data.h
@@ -249,25 +249,6 @@ struct tui_locator_window : public tui_gen_win_info
struct gdbarch *gdbarch = nullptr;
};
-/* A data item window. */
-
-struct tui_data_item_window : public tui_gen_win_info
-{
- tui_data_item_window ()
- : tui_gen_win_info (DATA_ITEM_WIN)
- {
- }
-
- ~tui_data_item_window () override;
-
- const char *name = nullptr;
- /* The register number, or data display number. */
- int item_no = -1;
- void *value = nullptr;
- bool highlight = false;
- char *content = nullptr;
-};
-
/* This defines information about each logical window. */
struct tui_win_info : public tui_gen_win_info
{
diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index 264f916aaa1..26f9a0c4a01 100644
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -53,6 +53,15 @@ static void tui_get_register (struct frame_info *frame,
struct tui_data_item_window *data,
int regnum, bool *changedp);
+
+/* See tui-regs.h. */
+
+tui_data_item_window::~tui_data_item_window ()
+{
+ xfree (value);
+ xfree (content);
+}
+
/* See tui-regs.h. */
int
diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h
index ad8d01e445f..208c215d0ed 100644
--- a/gdb/tui/tui-regs.h
+++ b/gdb/tui/tui-regs.h
@@ -24,6 +24,25 @@
#include "tui/tui-data.h"
+/* A data item window. */
+
+struct tui_data_item_window : public tui_gen_win_info
+{
+ tui_data_item_window ()
+ : tui_gen_win_info (DATA_ITEM_WIN)
+ {
+ }
+
+ ~tui_data_item_window () override;
+
+ const char *name = nullptr;
+ /* The register number, or data display number. */
+ int item_no = -1;
+ void *value = nullptr;
+ bool highlight = false;
+ char *content = nullptr;
+};
+
/* The TUI registers window. */
struct tui_data_window : public tui_win_info
{
--
2.17.2