diff options
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/tui/tui-data.h | 23 | ||||
| -rw-r--r-- | gdb/tui/tui-disasm.h | 27 |
3 files changed, 32 insertions, 25 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5f413c9..3b0aca6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2019-07-17 Tom Tromey <tom@tromey.com> + * tui/tui-disasm.h (struct tui_disasm_window): Move from + tui-data.h. + * tui/tui-data.h (struct tui_disasm_window): Move to + tui-disasm.h. + +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. diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index e66adc1..bb7f0f9 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -414,29 +414,6 @@ private: gdb::observers::token m_observable; }; -/* A TUI disassembly window. */ - -struct tui_disasm_window : public tui_source_window_base -{ - tui_disasm_window () - : tui_source_window_base (DISASSEM_WIN) - { - } - - DISABLE_COPY_AND_ASSIGN (tui_disasm_window); - - const char *name () const override - { - return DISASSEM_NAME; - } - - bool location_matches_p (struct bp_location *loc, int line_no) override; - -protected: - - void do_scroll_vertical (int num_to_scroll) override; -}; - extern int tui_win_is_auxiliary (enum tui_win_type win_type); diff --git a/gdb/tui/tui-disasm.h b/gdb/tui/tui-disasm.h index 59822c7..cc00d00 100644 --- a/gdb/tui/tui-disasm.h +++ b/gdb/tui/tui-disasm.h @@ -22,8 +22,31 @@ #ifndef TUI_TUI_DISASM_H #define TUI_TUI_DISASM_H -#include "tui/tui.h" /* For enum tui_status. */ -#include "tui/tui-data.h" /* For enum tui_scroll_direction. */ +#include "tui/tui.h" +#include "tui/tui-data.h" + +/* A TUI disassembly window. */ + +struct tui_disasm_window : public tui_source_window_base +{ + tui_disasm_window () + : tui_source_window_base (DISASSEM_WIN) + { + } + + DISABLE_COPY_AND_ASSIGN (tui_disasm_window); + + const char *name () const override + { + return DISASSEM_NAME; + } + + bool location_matches_p (struct bp_location *loc, int line_no) override; + +protected: + + void do_scroll_vertical (int num_to_scroll) override; +}; extern enum tui_status tui_set_disassem_content (tui_source_window_base *, struct gdbarch *, CORE_ADDR); |