Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Move some code out of tui-data.h

Browse Source 
This moves some code out of tui-data.h, to more closely related
places.  Some unused forward declarations are also removed.

gdb/ChangeLog
2020-07-01  Tom Tromey  <tom@tromey.com>

	* tui/tui-stack.c (SINGLE_KEY): Move from tui-data.h
	* tui/tui-winsource.h (enum tui_line_or_address_kind)
	(struct tui_line_or_address): Move from tui-data.h.
	* tui/tui-win.c (DEFAULT_TAB_LEN): Move from tui-data.h.
	* tui/tui-data.h (DEFAULT_TAB_LEN): Move to tui-win.c.
	(tui_cmd_window, tui_source_window_base, tui_source_window)
	(tui_disasm_window): Don't declare.
	(enum tui_line_or_address_kind, struct tui_line_or_address): Move
	to tui-winsource.h.
	(SINGLE_KEY): Move to tui-stack.c.
This commit is contained in:
Tom Tromey
2020-07-01 21:21:12 -06:00
parent 7a02bab704
commit e555083f95
5 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gdb/ChangeLog
View File

@@ -1,3 +1,16 @@
2020-07-01 Tom Tromey <tom@tromey.com>
* tui/tui-stack.c (SINGLE_KEY): Move from tui-data.h
* tui/tui-winsource.h (enum tui_line_or_address_kind)
(struct tui_line_or_address): Move from tui-data.h.
* tui/tui-win.c (DEFAULT_TAB_LEN): Move from tui-data.h.
* tui/tui-data.h (DEFAULT_TAB_LEN): Move to tui-win.c.
(tui_cmd_window, tui_source_window_base, tui_source_window)
(tui_disasm_window): Don't declare.
(enum tui_line_or_address_kind, struct tui_line_or_address): Move
to tui-winsource.h.
(SINGLE_KEY): Move to tui-stack.c.
2020-07-01 Tom Tromey <tom@tromey.com>
* tui/tui-regs.h (struct tui_data_item_window) <content>: Now a

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

@@ -26,11 +26,6 @@
#include "gdb_curses.h" /* For WINDOW. */
#include "observable.h"
struct tui_cmd_window;
struct tui_source_window_base;
struct tui_source_window;
struct tui_disasm_window;
/* A deleter that calls delwin. */
struct curses_deleter
{
@@ -125,7 +120,6 @@ public:
};
/* Constant definitions. */
#define DEFAULT_TAB_LEN 8
#define SRC_NAME "src"
#define CMD_NAME "cmd"
#define DATA_NAME "regs"
@@ -133,26 +127,6 @@ public:
#define STATUS_NAME "status"
#define MIN_WIN_HEIGHT 3
/* Strings to display in the TUI status line. */
#define SINGLE_KEY "(SingleKey)"
enum tui_line_or_address_kind
{
LOA_LINE,
LOA_ADDRESS
};
/* Structure describing source line or line address. */
struct tui_line_or_address
{
enum tui_line_or_address_kind loa;
union
{
int line_no;
CORE_ADDR addr;
} u;
};
/* This defines information about each logical window. */
struct tui_win_info : public tui_gen_win_info
{

3
gdb/tui/tui-stack.c
View File

@@ -43,6 +43,9 @@
#define LINE_PREFIX "L"
#define PC_PREFIX "PC: "
/* Strings to display in the TUI status line. */
#define SINGLE_KEY "(SingleKey)"
/* Minimum/Maximum length of some fields displayed in the TUI status
line. */
#define MIN_LINE_WIDTH 4 /* Use at least 4 digits for line

2
gdb/tui/tui-win.c
View File

@@ -753,6 +753,8 @@ tui_refresh_all_command (const char *arg, int from_tty)
tui_refresh_all_win ();
}
#define DEFAULT_TAB_LEN 8
/* The tab width that should be used by the TUI. */
unsigned int tui_tab_width = DEFAULT_TAB_LEN;

17
gdb/tui/tui-winsource.h
View File

@@ -25,6 +25,23 @@
#include "tui/tui-data.h"
#include "symtab.h"
enum tui_line_or_address_kind
{
LOA_LINE,
LOA_ADDRESS
};
/* Structure describing source line or line address. */
struct tui_line_or_address
{
enum tui_line_or_address_kind loa;
union
{
int line_no;
CORE_ADDR addr;
} u;
};
/* Flags to tell what kind of breakpoint is at current line. */
enum tui_bp_flag
{