From patchwork Thu Jul 4 17:03:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33590 Received: (qmail 113763 invoked by alias); 4 Jul 2019 17:04:22 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 108041 invoked by uid 89); 4 Jul 2019 17:03:45 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=H*RU:esmtpa, H*r:esmtpa X-HELO: gateway22.websitewelcome.com Received: from gateway22.websitewelcome.com (HELO gateway22.websitewelcome.com) (192.185.46.194) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 04 Jul 2019 17:03:38 +0000 Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway22.websitewelcome.com (Postfix) with ESMTP id 86AA1266B2 for ; Thu, 4 Jul 2019 12:03:35 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id j58xhxM5R4FKpj58xhBufz; Thu, 04 Jul 2019 12:03:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=DDFF8OSo4HMCyVYrnSdk3GZiCs0VepUC+xkKKY/1frQ=; b=S20Akt82fFfDNNo7+PdK1XQ0uk pCJtRgTEC8BGsQL6o5l1j92O41PR7FCeITy4eJZPr78fVfdS6RtDZUZueE1hJLA2jmFdEhh2iPr+X nJhH9a2bmexQHbbJAPN3TwQRP; Received: from 174-29-58-150.hlrn.qwest.net ([174.29.58.150]:34704 helo=bapiya.Home) by box5379.bluehost.com with esmtpa (Exim 4.92) (envelope-from ) id 1hj58x-002sNV-9O; Thu, 04 Jul 2019 12:03:35 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 56/61] Move tui_disasm_window to tui-disasm.h Date: Thu, 4 Jul 2019 11:03:06 -0600 Message-Id: <20190704170311.15982-57-tom@tromey.com> In-Reply-To: <20190704170311.15982-1-tom@tromey.com> References: <20190704170311.15982-1-tom@tromey.com> This moves tui_disasm_window to tui-disasm.h. In this case there were no method definitions to be moved. 2019-07-04 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. --- 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/tui/tui-data.h b/gdb/tui/tui-data.h index 2f2f2a0ab91..3446d51b8dc 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -412,29 +412,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 59822c70c5c..cc00d0018fa 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);