From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 91946 invoked by alias); 17 Jul 2019 18:41:14 -0000 Mailing-List: contact gdb-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: gdb-cvs-owner@sourceware.org List-Subscribe: Sender: gdb-cvs-owner@sourceware.org Received: (qmail 91928 invoked by uid 306); 17 Jul 2019 18:41:14 -0000 Date: Wed, 17 Jul 2019 18:41:00 -0000 Message-ID: <20190717184114.91927.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Move tui_disasm_window to tui-disasm.h X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 96bd6233af7c01885de4f4de3a4016014d61d859 X-Git-Newrev: 88f7e873362279462c676b26fee62376dba82b5c X-SW-Source: 2019-07/txt/msg00139.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=88f7e873362279462c676b26fee62376dba82b5c commit 88f7e873362279462c676b26fee62376dba82b5c Author: Tom Tromey Date: Tue Jul 2 15:54:08 2019 -0600 Move tui_disasm_window to tui-disasm.h This moves tui_disasm_window to tui-disasm.h. In this case there were no method definitions to be moved. gdb/ChangeLog 2019-07-17 Tom Tromey * 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. Diff: --- gdb/ChangeLog | 7 +++++++ gdb/tui/tui-data.h | 23 ----------------------- 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 + * 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 + * 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);