From patchwork Thu Jul 4 17:03:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33587 Received: (qmail 113305 invoked by alias); 4 Jul 2019 17:04:19 -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 107751 invoked by uid 89); 4 Jul 2019 17:03:43 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=LOCAL X-HELO: gateway21.websitewelcome.com Received: from gateway21.websitewelcome.com (HELO gateway21.websitewelcome.com) (192.185.46.113) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 04 Jul 2019 17:03:36 +0000 Received: from cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway21.websitewelcome.com (Postfix) with ESMTP id 27E1C40118E96 for ; Thu, 4 Jul 2019 12:03:35 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id j58xhkjnliQerj58xhEYr0; 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=cjgtPSUBc9MXgwmB2gwsRAxL4eVHmiz6l0DpEX0LlPI=; b=ttntVWxG2QXnROzWjUDIlZqTFf 0Au8sMe45rY8+QM7nQcMY9eBehwD8+H9/ofmAJH5iAN7qOwDXzDzPFLPV8NNC9YPo93xfexSi7h/p oCT1nTaYpozYnmFomtS934C01; 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 1hj58w-002sNV-S5; Thu, 04 Jul 2019 12:03:35 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 55/61] Move TUI data item window to tui-regs.h Date: Thu, 4 Jul 2019 11:03:05 -0600 Message-Id: <20190704170311.15982-56-tom@tromey.com> In-Reply-To: <20190704170311.15982-1-tom@tromey.com> References: <20190704170311.15982-1-tom@tromey.com> The TUI data item window is only used by the TUI register window. So, this patch moves the relevant code to tui-regs.[ch]. 2019-07-04 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. * tui/tui-data.h (struct tui_data_item_window): Move to tui-regs.h. * tui/tui-data.c (~tui_data_item_window): Move to tui-regs.c. --- gdb/ChangeLog | 9 +++++++++ gdb/tui/tui-data.c | 11 ----------- gdb/tui/tui-data.h | 19 ------------------- gdb/tui/tui-regs.c | 9 +++++++++ gdb/tui/tui-regs.h | 19 +++++++++++++++++++ 5 files changed, 37 insertions(+), 30 deletions(-) diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c index 5e755168827..8977e8fd592 100644 --- a/gdb/tui/tui-data.c +++ b/gdb/tui/tui-data.c @@ -333,14 +333,3 @@ tui_source_window_base::~tui_source_window_base () xfree (fullname); delete execution_info; } - -/********************************** -** LOCAL STATIC FUNCTIONS ** -**********************************/ - - -tui_data_item_window::~tui_data_item_window () -{ - xfree (value); - xfree (content); -} diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index ed5d291f354..2f2f2a0ab91 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -249,25 +249,6 @@ struct tui_locator_window : public tui_gen_win_info struct gdbarch *gdbarch = nullptr; }; -/* A data item window. */ - -struct tui_data_item_window : public tui_gen_win_info -{ - tui_data_item_window () - : tui_gen_win_info (DATA_ITEM_WIN) - { - } - - ~tui_data_item_window () override; - - const char *name = nullptr; - /* The register number, or data display number. */ - int item_no = -1; - void *value = nullptr; - bool highlight = false; - char *content = nullptr; -}; - /* This defines information about each logical window. */ struct tui_win_info : public tui_gen_win_info { diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c index 264f916aaa1..26f9a0c4a01 100644 --- a/gdb/tui/tui-regs.c +++ b/gdb/tui/tui-regs.c @@ -53,6 +53,15 @@ static void tui_get_register (struct frame_info *frame, struct tui_data_item_window *data, int regnum, bool *changedp); + +/* See tui-regs.h. */ + +tui_data_item_window::~tui_data_item_window () +{ + xfree (value); + xfree (content); +} + /* See tui-regs.h. */ int diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h index ad8d01e445f..208c215d0ed 100644 --- a/gdb/tui/tui-regs.h +++ b/gdb/tui/tui-regs.h @@ -24,6 +24,25 @@ #include "tui/tui-data.h" +/* A data item window. */ + +struct tui_data_item_window : public tui_gen_win_info +{ + tui_data_item_window () + : tui_gen_win_info (DATA_ITEM_WIN) + { + } + + ~tui_data_item_window () override; + + const char *name = nullptr; + /* The register number, or data display number. */ + int item_no = -1; + void *value = nullptr; + bool highlight = false; + char *content = nullptr; +}; + /* The TUI registers window. */ struct tui_data_window : public tui_win_info {