Patchwork [14/19] Move code to tui-winsource.h

login
register
mail settings
Submitter Tom Tromey
Date Aug. 3, 2019, 1:29 p.m.
Message ID <20190803132925.25074-15-tom@tromey.com>
Download mbox | patch
Permalink /patch/33944/
State New
Headers show

Comments

Tom Tromey - Aug. 3, 2019, 1:29 p.m.
This moves code related to the execution info window from tui-data.h
to tui-winsource.h.  It fits better here because the execution info is
conceptually part of the source and disassembly windows, and
tui-winsource.h is where this common class lives.

gdb/ChangeLog
2019-08-03  Tom Tromey  <tom@tromey.com>

	* tui/tui-data.h (enum tui_bp_flag, tui_bp_flags, struct tui_source_element)
	(TUI_BP_HIT_POS, TUI_BP_BREAK_POS, TUI_EXEC_POS)
	(TUI_EXECINFO_SIZE, tui_exec_info_content): Move ...
	* tui/tui-winsource.h (enum tui_bp_flag, tui_bp_flags, struct
	tui_source_element, TUI_BP_HIT_POS, TUI_BP_BREAK_POS)
	(TUI_EXEC_POS, TUI_EXECINFO_SIZE, tui_exec_info_content):
	... here.
---
 gdb/ChangeLog           | 10 ++++++++++
 gdb/tui/tui-data.h      | 41 -----------------------------------------
 gdb/tui/tui-winsource.h | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 41 deletions(-)

Patch

diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index 6683848bc18..08178e49ea8 100644
--- a/gdb/tui/tui-data.h
+++ b/gdb/tui/tui-data.h
@@ -151,53 +151,12 @@  struct tui_line_or_address
     } u;
 };
 
-/* Flags to tell what kind of breakpoint is at current line.  */
-enum tui_bp_flag
-{
-  TUI_BP_ENABLED = 0x01,
-  TUI_BP_DISABLED = 0x02,
-  TUI_BP_HIT = 0x04,
-  TUI_BP_CONDITIONAL = 0x08,
-  TUI_BP_HARDWARE = 0x10
-};
-
-DEF_ENUM_FLAGS_TYPE (enum tui_bp_flag, tui_bp_flags);
-
-/* Elements in the Source/Disassembly Window.  */
-struct tui_source_element
-{
-  tui_source_element ()
-  {
-    line_or_addr.loa = LOA_LINE;
-    line_or_addr.u.line_no = 0;
-  }
-
-  ~tui_source_element ()
-  {
-    xfree (line);
-  }
-
-  char *line = nullptr;
-  struct tui_line_or_address line_or_addr;
-  bool is_exec_point = false;
-  tui_bp_flags break_mode = 0;
-};
-
-
 #ifdef PATH_MAX
 # define MAX_LOCATOR_ELEMENT_LEN        PATH_MAX
 #else
 # define MAX_LOCATOR_ELEMENT_LEN        1024
 #endif
 
-/* Position of breakpoint markers in the exec info string.  */
-#define TUI_BP_HIT_POS      0
-#define TUI_BP_BREAK_POS    1
-#define TUI_EXEC_POS        2
-#define TUI_EXECINFO_SIZE   4
-
-typedef char tui_exec_info_content[TUI_EXECINFO_SIZE];
-
 /* Locator window class.  */
 
 struct tui_locator_window : public tui_gen_win_info
diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h
index bce889d5abe..71201e51d89 100644
--- a/gdb/tui/tui-winsource.h
+++ b/gdb/tui/tui-winsource.h
@@ -24,6 +24,26 @@ 
 
 #include "tui/tui-data.h"
 
+/* Flags to tell what kind of breakpoint is at current line.  */
+enum tui_bp_flag
+{
+  TUI_BP_ENABLED = 0x01,
+  TUI_BP_DISABLED = 0x02,
+  TUI_BP_HIT = 0x04,
+  TUI_BP_CONDITIONAL = 0x08,
+  TUI_BP_HARDWARE = 0x10
+};
+
+DEF_ENUM_FLAGS_TYPE (enum tui_bp_flag, tui_bp_flags);
+
+/* Position of breakpoint markers in the exec info string.  */
+#define TUI_BP_HIT_POS      0
+#define TUI_BP_BREAK_POS    1
+#define TUI_EXEC_POS        2
+#define TUI_EXECINFO_SIZE   4
+
+typedef char tui_exec_info_content[TUI_EXECINFO_SIZE];
+
 /* Execution info window class.  */
 
 struct tui_exec_info_window : public tui_gen_win_info
@@ -52,6 +72,27 @@  private:
   tui_exec_info_content *m_content = nullptr;
 };
 
+/* Elements in the Source/Disassembly Window.  */
+struct tui_source_element
+{
+  tui_source_element ()
+  {
+    line_or_addr.loa = LOA_LINE;
+    line_or_addr.u.line_no = 0;
+  }
+
+  ~tui_source_element ()
+  {
+    xfree (line);
+  }
+
+  char *line = nullptr;
+  struct tui_line_or_address line_or_addr;
+  bool is_exec_point = false;
+  tui_bp_flags break_mode = 0;
+};
+
+
 /* The base class for all source-like windows, namely the source and
    disassembly windows.  */