From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 83DF138582B6 for ; Mon, 18 Dec 2023 19:54:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 83DF138582B6 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 83DF138582B6 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702929256; cv=none; b=w6xQCQYcG6GJ09Q8Il9YbmD21KR7uGNFCNTLSpKUsWubMUm9/HjjrsmDzIHHajqa/5g9C/j8hG1WNCWRAc25Rq2aeQ6bxR+Tf3mQgciefBxGodie1TF3W0B9TqeH0cpmaNIfyfhhI25cmzlud7YjD0kodyph8l33PC3GpPwS0NY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702929256; c=relaxed/simple; bh=QEr5o2lA4bFe2m9NFxJmv3DKQVQ0bwHlWgndCcxm44I=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=vhMiX9uG6YplN1a1kVvaq+zIiYGoujziP60jdCY9W+ucl0JNgXZyw5NxNW/9Iw5x6neE1mJsxEFWoPldC/tEfCKK+K0MascbzYOSHTe5Kp5nG8vzElCvxmjAaBLYXsQoYKNR7mtlQywSKh7SUNDr5LEpJG12TzYg+nn8xjcCbpg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702929255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=8w9N175IJnpMPNJ2yGkexPJgQKFmtDFuYaULTvehOac=; b=NCSc0aHzQ/zJ8vlf4dS/DhLQ1XNDV20EQBxoWF6KxZr+Uf02MmBrstnJApuaUDQbhSUt5i 5fSysk+CAU55jRimIF6sx7z61mEutHPrBXBJfpi9iDs9CoFrSgeATrsL78mYmyjmBQAJtx IupCqyq/JVzCiZkJUJHoVrSC0PSVWl4= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-261-YhTcQxBOPaqPjueuriOOhA-1; Mon, 18 Dec 2023 14:54:13 -0500 X-MC-Unique: YhTcQxBOPaqPjueuriOOhA-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-40c62d9bd43so16357745e9.0 for ; Mon, 18 Dec 2023 11:54:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702929251; x=1703534051; h=mime-version:message-id:date:references:in-reply-to:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=8w9N175IJnpMPNJ2yGkexPJgQKFmtDFuYaULTvehOac=; b=Opk1lg+aKX25Sci6wV7viB/Q0LOAwC5l/Qqz+tDCt2siBqTjEjuJXLvR3q1hnupHR/ Q9haCy2G3A+y1tHrf3ApCoG3HvFCb6zD/8qVtT6IoWr69flXvATVvEz2fvV/pD7GbsLT EHIvkstUv2onh3kNYALMmERq5cQmnMmdLOPqZTHed2naYDR9KCSmUdgVB3xBn0Ou9tNL 3L3Ghu7TJKWrRL4S3OloyMfjL4/VxtLXrJIB7RKKcIMKtIYZ10+FQ6YAdQu9YwBzyeWs iCJHhEz3K1u9vGXEeXGAYCRYZ13UehDvVyWrYOFjbwA8KX5VYo4oaCzVqiAlo00lNVmc 0O4g== X-Gm-Message-State: AOJu0YwU+AkbHt1rsBUnKWom1PXt26z+cJJbaeyOHGsKagnjyPydP7JW fKNF0vPL1ABrSe/4/xBllbPSL2VnvuxRZU7TZT4qFt2ZaUm/7M3Uq5fnCk8DVDqUL3Mw/eRqWD9 Z1VNSh5wXQNtIQhv5s/3xEfa6O1o1rg== X-Received: by 2002:a05:600c:5386:b0:40c:6557:7331 with SMTP id hg6-20020a05600c538600b0040c65577331mr3370690wmb.20.1702929251742; Mon, 18 Dec 2023 11:54:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IHWafADlHR0YrQ4/Iu2iXNRzp4wBNTbpMV40ofCnHA5e76a0OavaF3j8hxZfY6GMzBE5y63pg== X-Received: by 2002:a05:600c:5386:b0:40c:6557:7331 with SMTP id hg6-20020a05600c538600b0040c65577331mr3370687wmb.20.1702929251394; Mon, 18 Dec 2023 11:54:11 -0800 (PST) Received: from localhost (92.40.184.41.threembb.co.uk. [92.40.184.41]) by smtp.gmail.com with ESMTPSA id m1-20020adfa3c1000000b0033667f42ef8sm3833700wrb.63.2023.12.18.11.54.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 11:54:11 -0800 (PST) From: Andrew Burgess To: Tom Tromey , gdb-patches@sourceware.org Subject: Re: [PATCH 08/14] Remove the TUI register window rerender overload In-Reply-To: <20231217-tui-regs-cleanup-v1-8-67bd0ea1e8be@tromey.com> References: <20231217-tui-regs-cleanup-v1-0-67bd0ea1e8be@tromey.com> <20231217-tui-regs-cleanup-v1-8-67bd0ea1e8be@tromey.com> Date: Mon, 18 Dec 2023 19:54:10 +0000 Message-ID: <87wmtbz3q5.fsf@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-10.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_NONE,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 List-Id: Tom Tromey writes: > 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. > --- > gdb/tui/tui-regs.c | 55 ++++++++++++++++++++++++------------------------------ > gdb/tui/tui-regs.h | 14 ++++++-------- > 2 files changed, 30 insertions(+), 39 deletions(-) > > diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c > index 7b6b669fe51..5726dc3fea8 100644 > --- a/gdb/tui/tui-regs.c > +++ b/gdb/tui/tui-regs.c > @@ -165,31 +165,33 @@ 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. Values are refreshed only when > + refresh_values_only is true. */ > + > +void > +tui_data_window::update_register_data (const reggroup *group) Function comment is not correct. > { > 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")); > + set_title (""); This is the title change I pointed out in the previous commit. I actually like the 'Registers' string as it means the window always has a title, rather than the title appearing / disappearing. Thanks, Andrew > m_current_group = nullptr; > m_regs_content.clear (); > + return; > } > > - rerender (false); > -} > - > - > -/* Set the data window to display the registers of the register group > - using the given frame. Values are refreshed only when > - refresh_values_only is true. */ > + frame_info_ptr frame = get_selected_frame (nullptr); > > -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. */ > @@ -222,6 +224,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); > @@ -358,29 +363,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 ()); > } > > > @@ -402,7 +396,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 701b8707947..b31a5a3e5b8 100644 > --- a/gdb/tui/tui-regs.h > +++ b/gdb/tui/tui-regs.h > @@ -56,7 +56,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); > > @@ -81,11 +84,7 @@ struct tui_data_window : public tui_win_info > { > } > > - void rerender (bool toplevel); > - void rerender () override > - { > - rerender (true); > - } > + void rerender () override; > > private: > > @@ -110,8 +109,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. */ > > -- > 2.43.0