From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id ELAJExKDTWLSMAAAWB0awg (envelope-from ) for ; Wed, 06 Apr 2022 08:09:54 -0400 Received: by simark.ca (Postfix, from userid 112) id 4BADD1F344; Wed, 6 Apr 2022 08:09:54 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id B7D0B1E787 for ; Wed, 6 Apr 2022 08:09:53 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 67D773858427 for ; Wed, 6 Apr 2022 12:09:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 67D773858427 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1649246993; bh=tfYI/vqtnYQOoaBFIwSLb9jN3JRsBE1CF5dO7WYHSqE=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=MWsD6stonecKj2z9Y5HmK+bXJwwqq0efErlp9kGJmcYCQkji9ODdsw2a4YQETIbEV B+nGuKGxwm+2605p8+P8V4gfafBJx9nSUB80bwsH8oLMpB0KVRVRps24MS9fZBIa/W Y8jeyUntTNghkQq3bRxNz0gbDazjYaoKm9gTCsIw= 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 55A0F3857836 for ; Wed, 6 Apr 2022 12:05:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 55A0F3857836 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-437-EdHJJ8lxM9OclMGRh6-K0Q-1; Wed, 06 Apr 2022 08:05:09 -0400 X-MC-Unique: EdHJJ8lxM9OclMGRh6-K0Q-1 Received: by mail-wm1-f70.google.com with SMTP id r6-20020a05600c35c600b0038e6db5da9cso609112wmq.9 for ; Wed, 06 Apr 2022 05:05:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tfYI/vqtnYQOoaBFIwSLb9jN3JRsBE1CF5dO7WYHSqE=; b=XiscdlCYHA56Z5tXNQx+dyKqAPWJ2GcqRltQI8LvAjCYhQDOx5t/5HJtqzNzLTS0al ifctIEUQI2hFNmI+RCA4Qxeqxa/mIWYj+IC0DKqIXv4QWIkccNgJp2mUk52Kun+kfXHi PkOWWmM6131pJd+VzpF1bEAJWuewlKSyg2OFY5ROy9bULeTfuC3DexSFSBdBuXqhOIy5 f4ebfNSLoouYfqZzzU3MFgx+o9BX25YBAxemDW5m0HenZpKH/iSpyIUFkxsfcC+jtKE6 AF2cwFg7h1szc/iJzZIDfU6Vmfqout4oTXr0LFJlgB757hptvSUZ+vJhCfO2RZ0INaUX HTHg== X-Gm-Message-State: AOAM530RgiyI/v8I1+I45N7m/GUy34dAAzEWOhjuRRdGjquHD9mjy92v dmUOGlVYzqkKlJDmXl/NonLQYZghQb+6kZs0s0Xx4Btsd7VGgf9LrvUf1THILywM2bBKiasCJT5 i8y4IAgBgirw9p7A5K+smwWqn/pakLhRYZP68PytN4rGpNtds+8ItqhBJ+mxIqCXurTRStJRuUw == X-Received: by 2002:a05:600c:35cc:b0:38c:6d25:f4ad with SMTP id r12-20020a05600c35cc00b0038c6d25f4admr7133295wmq.127.1649246707655; Wed, 06 Apr 2022 05:05:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzW0Hr1j09VLj6QNCE8mqtcJanh+FNGvwuQNtLTVcq5YN/OyI3Mo351N+H3w02IRzoWUdGd9A== X-Received: by 2002:a05:600c:35cc:b0:38c:6d25:f4ad with SMTP id r12-20020a05600c35cc00b0038c6d25f4admr7133271wmq.127.1649246707375; Wed, 06 Apr 2022 05:05:07 -0700 (PDT) Received: from localhost (host86-169-131-113.range86-169.btcentralplus.com. [86.169.131.113]) by smtp.gmail.com with ESMTPSA id f8-20020a5d50c8000000b002061622ec88sm6668725wrt.105.2022.04.06.05.05.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 05:05:06 -0700 (PDT) To: gdb-patches@sourceware.org Subject: [PATCHv2 08/16] gdb/tui: fix 'tui reg next/prev' command when data window is hidden Date: Wed, 6 Apr 2022 13:04:41 +0100 Message-Id: X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Andrew Burgess via Gdb-patches Reply-To: Andrew Burgess Cc: Andrew Burgess Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" Start GDB like: $ gdb -q executable (gdb) start (gdb) layout src ... tui windows are now displayed ... (gdb) tui reg next At this point the data (register) window should be displayed, but will contain the message 'Register Values Unavailable', and at the console you'll see the message "unknown register group 'next'". The same happens with 'tui reg prev' (but the error message is slightly different). At this point you can continue to use 'tui reg next' and/or 'tui reg prev' and you'll keep getting the error message. The problem is that when the data (register) window is first displayed, it's current register group is nullptr. As a consequence tui_reg_next and tui_reg_prev (tui/tui-regs.c) will always just return nullptr, which triggers an error in tui_reg_command. In this commit I change tui_reg_next and tui_reg_prev so that they instead return the first and last register group respectively if the current register group is nullptr. So, after this, using 'tui reg next' will (in the above case) show the first register group, while 'tui reg prev' will display the last register group. --- gdb/testsuite/gdb.tui/regs.exp | 26 ++++++++++++++++++++++++++ gdb/tui/tui-regs.c | 34 ++++++++++++++-------------------- 2 files changed, 40 insertions(+), 20 deletions(-) diff --git a/gdb/testsuite/gdb.tui/regs.exp b/gdb/testsuite/gdb.tui/regs.exp index 2f3482f5d38..4f34ced990c 100644 --- a/gdb/testsuite/gdb.tui/regs.exp +++ b/gdb/testsuite/gdb.tui/regs.exp @@ -44,3 +44,29 @@ Term::check_box "source box in regs layout" 0 7 80 8 set text [Term::get_line 1] # Just check for any register window content at all. Term::check_contents "any register contents" "\\|.*\[^ \].*\\|" + + +# Check that we can successfully cause the register window to appear +# using the 'tui reg next' and 'tui reg prev' commands. +foreach_with_prefix cmd { next prev } { + Term::clean_restart 24 80 $testfile + + if {![runto_main]} { + perror "test suppressed" + return + } + + if {![Term::enter_tui]} { + unsupported "TUI not supported" + return + } + + Term::command "tui reg ${cmd}" + Term::check_box "register box" 0 0 80 8 + Term::check_box "source box in regs layout" 0 7 80 8 + Term::check_region_contents "check register group title" \ + 0 0 80 1 "Register group: " + set contents [Term::get_region 0 15 80 8 "\r\n"] + gdb_assert {![regexp -- "unknown register group '${cmd}'" $contents]} \ + "check register group is known" +} diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c index 75ffa9babbf..b968947fa1c 100644 --- a/gdb/tui/tui-regs.c +++ b/gdb/tui/tui-regs.c @@ -515,38 +515,32 @@ tui_data_item_window::rerender (WINDOW *handle, int field_width) } /* Helper for "tui reg next", wraps a call to REGGROUP_NEXT, but adds wrap - around behaviour. Returns the next register group, or NULL if the - register window is not currently being displayed. */ + around behaviour. Will never return nullptr. If CURRENT_GROUP is + nullptr (e.g. if the tui register window has only just been displayed + and has no current group selected), then the first register group will + be returned. */ static const reggroup * tui_reg_next (const reggroup *current_group, struct gdbarch *gdbarch) { - const reggroup *group = NULL; - - if (current_group != NULL) - { - group = reggroup_next (gdbarch, current_group); - if (group == NULL) - group = reggroup_next (gdbarch, NULL); - } + const reggroup *group = reggroup_next (gdbarch, current_group); + if (group == NULL) + group = reggroup_next (gdbarch, NULL); return group; } /* Helper for "tui reg prev", wraps a call to REGGROUP_PREV, but adds wrap - around behaviour. Returns the previous register group, or NULL if the - register window is not currently being displayed. */ + around behaviour. Will never return nullptr. If CURRENT_GROUP is + nullptr (e.g. if the tui register window has only just been displayed + and has no current group selected), then the last register group will + be returned. */ static const reggroup * tui_reg_prev (const reggroup *current_group, struct gdbarch *gdbarch) { - const reggroup *group = NULL; - - if (current_group != NULL) - { - group = reggroup_prev (gdbarch, current_group); - if (group == NULL) - group = reggroup_prev (gdbarch, NULL); - } + const reggroup *group = reggroup_prev (gdbarch, current_group); + if (group == NULL) + group = reggroup_prev (gdbarch, NULL); return group; } -- 2.25.4