OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move TUI data item window to tui-regs.h 

The TUI data item window is only used by the TUI register window.  So,
this patch moves the relevant code to tui-regs.[ch].

gdb/ChangeLog
2019-07-17  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.
This commit is contained in:
Tom Tromey 2019-07-02 15:51:00 -06:00
parent ce38393b1a
commit 96bd6233af
5 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gdb/ChangeLog
View File

@ -1,3 +1,12 @@
2019-07-17 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.
2019-07-17 Tom Tromey <tom@tromey.com>
* tui/tui.c: Update.

11
gdb/tui/tui-data.c
View File

@ -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);
}

19
gdb/tui/tui-data.h
View File

@ -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
{

9
gdb/tui/tui-regs.c
View File

@ -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

19
gdb/tui/tui-regs.h
View File

@ -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
{