From patchwork Sun Jun 23 22:42:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33291 Received: (qmail 48237 invoked by alias); 23 Jun 2019 22:43:46 -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 47994 invoked by uid 89); 23 Jun 2019 22:43:45 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.9 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=shares, derive, 6197 X-HELO: gateway24.websitewelcome.com Received: from gateway24.websitewelcome.com (HELO gateway24.websitewelcome.com) (192.185.51.31) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 23 Jun 2019 22:43:41 +0000 Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway24.websitewelcome.com (Postfix) with ESMTP id 89D8FAC44 for ; Sun, 23 Jun 2019 17:43:40 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id fBD2htSpUYTGMfBD2hoHBI; Sun, 23 Jun 2019 17:43:40 -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=9rBRqGG+J66KuLy5LjUvmZVqugdJxne+HPMcjMGzSGc=; b=h1BW/EC2JOamP5F7vnGjgWSnTk m/bvA5aZoqrs7xmbWMOaU6BPecipAOEJUHsoVAJ6DkrZg8EVWke92YhYyNGemAn099+5D8an2aNbo 53gHvzG3OWeVqJtL+tTqiP3jb; Received: from 75-166-12-78.hlrn.qwest.net ([75.166.12.78]:54396 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1hfBD2-000vDQ-B7; Sun, 23 Jun 2019 17:43:40 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 10/66] Create tui_disasm_window Date: Sun, 23 Jun 2019 16:42:33 -0600 Message-Id: <20190623224329.16060-11-tom@tromey.com> In-Reply-To: <20190623224329.16060-1-tom@tromey.com> References: <20190623224329.16060-1-tom@tromey.com> This introduces the new tui_disasm_window class, which represents a disassembly window. It shares a lot of behavior with the source window, so a new tui_source_window_base class is also created. gdb/ChangeLog 2019-06-23 Tom Tromey * tui/tui-data.h (struct tui_source_window_base): New struct. (struct tui_source_window): Derive from tui_source_window_base. (struct tui_disasm_window): New struct. * tui/tui-data.c (tui_source_window_base::clear_detail): Rename from tui_source_window::clear_detail. (tui_source_window_base): Rename from tui_source_window. (~tui_source_window_base): Rename from ~tui_source_window. (tui_alloc_win_info): Create a tui_disasm_window. --- gdb/ChangeLog | 11 +++++++++++ gdb/tui/tui-data.c | 10 ++++++---- gdb/tui/tui-data.h | 38 ++++++++++++++++++++++++++++++++++---- 3 files changed, 51 insertions(+), 8 deletions(-) diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c index 8993bfe5d47..b3d68df8f3c 100644 --- a/gdb/tui/tui-data.c +++ b/gdb/tui/tui-data.c @@ -176,7 +176,7 @@ tui_add_to_source_windows (struct tui_win_info *win_info) /* See tui-data.h. */ void -tui_source_window::clear_detail () +tui_source_window_base::clear_detail () { detail.source_info.gdbarch = NULL; detail.source_info.start_line_or_addr.loa = LOA_ADDRESS; @@ -503,7 +503,7 @@ tui_win_info::tui_win_info (enum tui_win_type type) tui_init_generic_part (&generic); } -tui_source_window::tui_source_window (enum tui_win_type type) +tui_source_window_base::tui_source_window_base (enum tui_win_type type) : tui_win_info (type) { gdb_assert (type == SRC_WIN || type == DISASSEM_WIN); @@ -539,8 +539,10 @@ tui_alloc_win_info (enum tui_win_type type) switch (type) { case SRC_WIN: + return new tui_source_window (); + case DISASSEM_WIN: - return new tui_source_window (type); + return new tui_disasm_window (); case DATA_WIN: return new tui_data_window (); @@ -617,7 +619,7 @@ tui_add_content_elements (struct tui_gen_win_info *win_info, return index_start; } -tui_source_window::~tui_source_window () +tui_source_window_base::~tui_source_window_base () { if (detail.source_info.fullname) { diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 2a775a42be8..fe00d9ed2bd 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -291,15 +291,45 @@ public: int is_highlighted = 0; }; -struct tui_source_window : public tui_win_info +/* The base class for all source-like windows, namely the source and + disassembly windows. */ + +struct tui_source_window_base : public tui_win_info { - tui_source_window (enum tui_win_type type); - ~tui_source_window () override; - DISABLE_COPY_AND_ASSIGN (tui_source_window); +protected: + tui_source_window_base (enum tui_win_type type); + ~tui_source_window_base () override; + DISABLE_COPY_AND_ASSIGN (tui_source_window_base); + +public: void clear_detail () override; }; +/* A TUI source window. */ + +struct tui_source_window : public tui_source_window_base +{ + tui_source_window () + : tui_source_window_base (SRC_WIN) + { + } + + DISABLE_COPY_AND_ASSIGN (tui_source_window); +}; + +/* 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); +}; + struct tui_data_window : public tui_win_info { tui_data_window ();