From e555083f95748276ab7a229c46aa8d5c0ef9fbc4 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 1 Jul 2020 21:21:12 -0600 Subject: [PATCH] Move some code out of tui-data.h 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 * 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. --- gdb/ChangeLog | 13 +++++++++++++ gdb/tui/tui-data.h | 26 -------------------------- gdb/tui/tui-stack.c | 3 +++ gdb/tui/tui-win.c | 2 ++ gdb/tui/tui-winsource.h | 17 +++++++++++++++++ 5 files changed, 35 insertions(+), 26 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9efd8b6eaa5..95e2b2d2c51 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,16 @@ +2020-07-01 Tom Tromey + + * 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 * tui/tui-regs.h (struct tui_data_item_window) : Now a diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 1accf3683d4..d96384f6ce7 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -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 { diff --git a/gdb/tui/tui-stack.c b/gdb/tui/tui-stack.c index f1e075a3d20..8bd7880f89a 100644 --- a/gdb/tui/tui-stack.c +++ b/gdb/tui/tui-stack.c @@ -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 diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index a78837fe689..5f56eca3b2f 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -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; diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h index 501dd31ccfd..fab1487f637 100644 --- a/gdb/tui/tui-winsource.h +++ b/gdb/tui/tui-winsource.h @@ -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 { -- 2.30.2