From patchwork Sat Jan 20 18:23:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 84491 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B4B3D385843B for ; Sat, 20 Jan 2024 18:24:54 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta040.useast.a.cloudfilter.net (omta040.useast.a.cloudfilter.net [44.202.169.39]) by sourceware.org (Postfix) with ESMTPS id 6EA7A3858417 for ; Sat, 20 Jan 2024 18:23:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6EA7A3858417 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 6EA7A3858417 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705775005; cv=none; b=JUqFOpwqGLzmMhvb7lL538Cxy6tm/OkfHpu/6qBwzGo1CmYNyceYnq/weVs4fa3CO6XTq3pUn7qFAZ20uTWcK/CswviXYI+KjUr5VicQMuO/hh11k3RgevLpYYJZ/+O7rOudrgfb/FFkVN34ZQVgUCtFUPLLFAVb93san0nC8nw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705775005; c=relaxed/simple; bh=ru7llIyspK/3AVUksTJwZc/EwIfRQjvCuVd5Pim8KaM=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=crJHFTimlycir8DvLQF5RyGOjJ6pv+ATcGJVdf8j+WGnZoE8nY1hVjjuVuinodRqjndpG7FUA8vyzExP6JHB14Pasqkdv20AVYT9ksaCsw5/UIcztERzdn2pQiaYbTnSgEju/UHVoX2RYvlISyEo0q6SO4JEw5dR2sS39XED0fM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-5008a.ext.cloudfilter.net ([10.0.29.246]) by cmsmtp with ESMTPS id R8yMrcEfPTHHuRG02rPtvr; Sat, 20 Jan 2024 18:23:22 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id RG01rxDVBL3AmRG01rMHc5; Sat, 20 Jan 2024 18:23:21 +0000 X-Authority-Analysis: v=2.4 cv=Sdrky9du c=1 sm=1 tr=0 ts=65ac0f99 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=dEuoMetlWLkA:10 a=Qbun_eYptAEA:10 a=20KFwNOVAAAA:8 a=S9GyxO0HTDeAskKyipIA:9 a=QEXdDO2ut3YA:10 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender: Reply-To: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=+NvxuJ43KdTt4Q+qQbZsthe8VuJ/0lhGdLyW3dg10Rw=; b=hUWfFYDpPAeZhpv1HcSyRe+hd7 WP8ABXLEDyzCD0ICo17POE/YceL7wfxKWA6mPoeF9W77QVh5Z3MgF62jwdQQaCUeg7Ik1+4qaPqOK VXyesLLafKvZIj2P0sjx89fxM; Received: from 97-122-68-157.hlrn.qwest.net ([97.122.68.157]:47898 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1rRG00-0049D4-2W; Sat, 20 Jan 2024 11:23:20 -0700 From: Tom Tromey Date: Sat, 20 Jan 2024 11:23:19 -0700 Subject: [PATCH v2 08/14] Remove the TUI register window rerender overload MIME-Version: 1.0 Message-Id: <20240120-tui-regs-cleanup-v2-8-a3cccc6a3573@tromey.com> References: <20240120-tui-regs-cleanup-v2-0-a3cccc6a3573@tromey.com> In-Reply-To: <20240120-tui-regs-cleanup-v2-0-a3cccc6a3573@tromey.com> To: gdb-patches@sourceware.org Cc: Tom de Vries , Andrew Burgess X-Mailer: b4 0.12.4 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.68.157 X-Source-L: No X-Exim-ID: 1rRG00-0049D4-2W X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-68-157.hlrn.qwest.net ([192.168.0.21]) [97.122.68.157]:47898 X-Source-Auth: tom+tromey.com X-Email-Count: 26 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfObsdMYqHZEt73Ss298fLMCmgpvcRn4dpBDwy9xiVeZh8UWNS7wPAnrXEed8Dv5yJb/MYFfBpLhtg8bmVxEIDFsSZE/QA9n4+/aEeQVQrXvPiylzb5ni +Lct/dmMvR9MueM55CHaFB0n0U6gOmIMa4+RSStlTER8CZ+q7WYFbQt2oILZF/p8F7EBoTvpEwJbVBckLQ9I2+mzwoKBDMpgN6M= X-Spam-Status: No, score=-3022.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org After these restructurings, it should be clear that the rerender overload can be removed from the TUI register window. This is done by moving a bit more logic from show_registers into update_register_data. After this, update_register_data simply updates the internal state, and rerender will write to the screen. All the actual rendering work is done, ultimately, by display_registers_from. This split between updating the mode and rendering makes it clear that the recursive case can't happen any longer. Tested-By: Tom de Vries Reviewed-By: Andrew Burgess --- gdb/tui/tui-regs.c | 51 ++++++++++++++++++++++----------------------------- gdb/tui/tui-regs.h | 14 ++++++-------- 2 files changed, 28 insertions(+), 37 deletions(-) diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c index 7af572c9da4..52cf6b7efdf 100644 --- a/gdb/tui/tui-regs.c +++ b/gdb/tui/tui-regs.c @@ -165,30 +165,32 @@ tui_data_window::first_reg_element_no_inline (int line_no) const and refresh the window. */ void tui_data_window::show_registers (const reggroup *group) +{ + update_register_data (group); + rerender (); +} + +/* Set the data window to display the registers of the register group + using the given frame. */ + +void +tui_data_window::update_register_data (const reggroup *group) { if (group == nullptr) group = general_reggroup; - if (target_has_registers () && target_has_stack () && target_has_memory ()) - update_register_data (group, get_selected_frame (nullptr)); - else + if (!target_has_registers () + || !target_has_stack () + || !target_has_memory ()) { set_title (_("Registers")); m_current_group = nullptr; m_regs_content.clear (); + return; } - rerender (false); -} - + frame_info_ptr frame = get_selected_frame (nullptr); -/* Set the data window to display the registers of the register group - using the given frame. */ - -void -tui_data_window::update_register_data (const reggroup *group, - frame_info_ptr frame) -{ m_current_group = group; /* Make a new title showing which group we display. */ @@ -221,6 +223,9 @@ tui_data_window::update_register_data (const reggroup *group, void tui_data_window::display_registers_from (int start_element_no) { + werase (handle.get ()); + check_and_display_highlight_if_needed (); + /* In case the regs window is not boxed, we'll write the last char in the last line here, causing a scroll, so prevent that. */ scrollok (handle.get (), FALSE); @@ -357,29 +362,18 @@ tui_data_window::erase_data_content (const char *prompt) x_pos = half_width - strlen (prompt); display_string (height / 2, x_pos, prompt); } - tui_wrefresh (handle.get ()); } /* See tui-regs.h. */ void -tui_data_window::rerender (bool toplevel) +tui_data_window::rerender () { if (m_regs_content.empty ()) - { - if (toplevel && has_stack_frames ()) - { - frame_info_ptr fi = get_selected_frame (NULL); - check_register_values (fi); - } - else - erase_data_content (_("[ Register Values Unavailable ]")); - } + erase_data_content (_("[ Register Values Unavailable ]")); else - { - erase_data_content (NULL); - display_registers_from (0); - } + display_registers_from (0); + tui_wrefresh (handle.get ()); } @@ -401,7 +395,6 @@ tui_data_window::do_scroll_vertical (int num_to_scroll) if (first_line >= 0) { first_line += num_to_scroll; - erase_data_content (NULL); display_registers_from_line (first_line); } } diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h index 1b0eaa2033b..7f1c30ca5d6 100644 --- a/gdb/tui/tui-regs.h +++ b/gdb/tui/tui-regs.h @@ -62,7 +62,10 @@ struct tui_register_info /* The TUI registers window. */ struct tui_data_window : public tui_win_info { - tui_data_window () = default; + tui_data_window () + { + update_register_data (nullptr); + } DISABLE_COPY_AND_ASSIGN (tui_data_window); @@ -87,11 +90,7 @@ struct tui_data_window : public tui_win_info { } - void rerender (bool toplevel); - void rerender () override - { - rerender (true); - } + void rerender () override; private: @@ -116,8 +115,7 @@ struct tui_data_window : public tui_win_info display off the end of the register display. */ void display_reg_element_at_line (int start_element_no, int start_line_no); - void update_register_data (const reggroup *group, - frame_info_ptr frame); + void update_register_data (const reggroup *group); /* Answer the number of the last line in the regs display. If there are no registers (-1) is returned. */