From patchwork Thu Jul 4 17:02:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33551 Received: (qmail 106384 invoked by alias); 4 Jul 2019 17:03:34 -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 105317 invoked by uid 89); 4 Jul 2019 17:03:26 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-17.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=snprintf, HX-Languages-Length:2936, H*RU:esmtpa, H*r:esmtpa 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:21 +0000 Received: from cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway21.websitewelcome.com (Postfix) with ESMTP id 4BEA94011886C for ; Thu, 4 Jul 2019 12:03:20 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id j58ihYBT1dnCej58ih6HeK; Thu, 04 Jul 2019 12:03:20 -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=eOl7NvUJ2xzlXHy/V+8AHWtBmuq2J53qAUTzQ8hQNdQ=; b=a/xl4igtAIUdHVKuVE9t14UMfJ /AtLnrj7WxR/RBPPcn8p/6Cc+H7Mkn8pCVmHf75u/cmS0LZGmfdwFweHuhzG24uSfjsMPzXuPnYKz Me1O42LMMYnxmlfzXLxs81Lga; Received: from 174-29-58-150.hlrn.qwest.net ([174.29.58.150]:34692 helo=bapiya.Home) by box5379.bluehost.com with esmtpa (Exim 4.92) (envelope-from ) id 1hj58i-002sDI-3I; Thu, 04 Jul 2019 12:03:20 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 17/61] Parameterize tui_show_register_group with window Date: Thu, 4 Jul 2019 11:02:27 -0600 Message-Id: <20190704170311.15982-18-tom@tromey.com> In-Reply-To: <20190704170311.15982-1-tom@tromey.com> References: <20190704170311.15982-1-tom@tromey.com> This changes tui_show_register_group not to reference the TUI_DATA_WIN global, instead leaving that to its caller. 2019-07-04 Tom Tromey * tui/tui-regs.c (tui_show_registers): Update. (tui_show_register_group): Add win_info parameter. --- gdb/ChangeLog | 5 +++++ gdb/tui/tui-regs.c | 24 +++++++++++++----------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c index eea8cf45acf..f99e7c12f7f 100644 --- a/gdb/tui/tui-regs.c +++ b/gdb/tui/tui-regs.c @@ -49,7 +49,8 @@ ******************************************/ static void tui_display_register (struct tui_data_item_window *data); -static void tui_show_register_group (struct reggroup *group, +static void tui_show_register_group (tui_data_window *win_info, + struct reggroup *group, struct frame_info *frame, int refresh_values_only); @@ -139,7 +140,7 @@ tui_show_registers (struct reggroup *group) if (target_has_registers && target_has_stack && target_has_memory) { - tui_show_register_group (group, get_selected_frame (NULL), + tui_show_register_group (TUI_DATA_WIN, group, get_selected_frame (NULL), group == TUI_DATA_WIN->current_group); ret = TUI_SUCCESS; } @@ -167,7 +168,8 @@ tui_show_registers (struct reggroup *group) refresh_values_only is TRUE. */ static void -tui_show_register_group (struct reggroup *group, +tui_show_register_group (tui_data_window *win_info, + struct reggroup *group, struct frame_info *frame, int refresh_values_only) { @@ -179,8 +181,8 @@ tui_show_register_group (struct reggroup *group, /* Make a new title showing which group we display. */ snprintf (title, sizeof (title) - 1, "Register group: %s", reggroup_name (group)); - xfree (TUI_DATA_WIN->title); - TUI_DATA_WIN->title = xstrdup (title); + xfree (win_info->title); + win_info->title = xstrdup (title); /* See how many registers must be displayed. */ nr_regs = 0; @@ -202,14 +204,14 @@ tui_show_register_group (struct reggroup *group, } if (!refresh_values_only) - TUI_DATA_WIN->regs_content.clear (); + win_info->regs_content.clear (); - if (nr_regs < TUI_DATA_WIN->regs_content.size ()) - TUI_DATA_WIN->regs_content.resize (nr_regs); + if (nr_regs < win_info->regs_content.size ()) + win_info->regs_content.resize (nr_regs); else { - for (int i = TUI_DATA_WIN->regs_content.size (); i < nr_regs; ++i) - TUI_DATA_WIN->regs_content.emplace_back (new tui_data_item_window ()); + for (int i = win_info->regs_content.size (); i < nr_regs; ++i) + win_info->regs_content.emplace_back (new tui_data_item_window ()); } /* Now set the register names and values. */ @@ -229,7 +231,7 @@ tui_show_register_group (struct reggroup *group, if (name == 0 || *name == '\0') continue; - data_item_win = TUI_DATA_WIN->regs_content[pos].get (); + data_item_win = win_info->regs_content[pos].get (); if (data_item_win) { if (!refresh_values_only)