From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id B5EEF3858D39 for ; Fri, 24 Nov 2023 10:27:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B5EEF3858D39 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B5EEF3858D39 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700821632; cv=none; b=ZnJAnaDbcqOgAPgpJRMN5KuHNNbt9Hy1FgjHhFY+HXU3OjSMsrVEWMrGYUwZZFmF240Wgpv71BSkX9bWJEgjjknducjznOMn/LKObd8hdJUzEZwuhy6w84+UV+aHAk+BQVjMcfVsc4AvfBzpi8APXIPCQ0X0nbXFECMZKXfOvvE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700821632; c=relaxed/simple; bh=WZSfCHOzOiNlQlWuhwbjEwU204a51C0hhE1sIp7U2Rk=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-Id: MIME-Version; b=gxV6BgMT3a5LSSAekr7pJCIUyzwJAi/qRpB3WIbjVZ8tdJz2NK1FwCTksBlgxfI4ZG4l+KtTnK0Onf3a/7NP3DXcZzsxfWP6SrRfLEnQIqRjTWnAKXbxrSZtb5xSJIFV237M36/BzsYoVij2TyGpLqrOT32gkuTEbxQ6zKezTV8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 917291FCFD for ; Fri, 24 Nov 2023 10:27:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1700821629; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=uaQMmiH4EvRJwqH5zM06cQUi9GNgz798Wc5w48sp1Kk=; b=MTyqfe0KpXSKOvTcZIuum1uziRu8PfvmjFsJ8NWgJ+ChggvdK3M5qBmQioTO6bAH1uKhZL k4upBSqIn4PL4FJ2+4k/YF11B52o8nuXBvfy/p1JmclZSUcQJM10BR+Q95yfIUpWyYq/K5 EHAEU6xf6IInDvgRGmkt5eM79zXx3N8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1700821629; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=uaQMmiH4EvRJwqH5zM06cQUi9GNgz798Wc5w48sp1Kk=; b=ZiYMoE/0tH3JLXD026I5Vs1+DQMqLp4MBWziheMKbodXxzrY3d37H7n09PxG/37jZN+XVo JpC7i33I+jmguQCQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 7BB2D1340B for ; Fri, 24 Nov 2023 10:27:09 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id dobpHH16YGXLegAAD6G6ig (envelope-from ) for ; Fri, 24 Nov 2023 10:27:09 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb/tui] Show regs when switching to regs layout Date: Fri, 24 Nov 2023 11:27:10 +0100 Message-Id: <20231124102710.7681-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: smtp-out2.suse.de; none X-Spam-Score: 11.39 X-Spamd-Result: default: False [11.39 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_MISSING_CHARSET(2.50)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; BROKEN_CONTENT_TYPE(1.50)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_NONE(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_SPAM_LONG(3.50)[1.000]; MID_CONTAINS_FROM(1.00)[]; NEURAL_SPAM_SHORT(3.00)[1.000]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-0.01)[47.52%] X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,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 List-Id: When starting gdb in CLI mode, running to main and switching into the TUI regs layout: ... $ gdb -q a.out -ex start -ex "layout regs" ... we get: ... +---------------------------------+ | | | [ Register Values Unavailable ] | | | +---------------------------------+ ... Fix this by updating the TUI_DATA_WIN in tui_apply_current_layout. Tested on x86_64-linux. PR tui/28600 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=28600 --- gdb/testsuite/gdb.tui/regs.exp | 10 ++++++---- gdb/tui/tui-layout.c | 6 ++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/gdb.tui/regs.exp b/gdb/testsuite/gdb.tui/regs.exp index 520f6ddba96..0be99625b9f 100644 --- a/gdb/testsuite/gdb.tui/regs.exp +++ b/gdb/testsuite/gdb.tui/regs.exp @@ -41,10 +41,12 @@ Term::command "layout regs" Term::check_box "register box" 0 0 80 8 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" "\\|.*\[^ \].*\\|" - +# The current frame is main, check that registers are available. +set re_reg_vals_unavailable \ + [string_to_regexp {[ Register Values Unavailable ]}] +gdb_assert \ + { ![Term::check_region_contents_p 0 0 80 8 $re_reg_vals_unavailable] } \ + "Register values available" # Check that we can successfully cause the register window to appear # using the 'tui reg next' and 'tui reg prev' commands. diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index 85f4991c769..813f8f93b57 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -112,6 +112,12 @@ tui_apply_current_layout (bool preserve_cmd_win_size_p) if (gdbarch == nullptr && TUI_DISASM_WIN != nullptr) tui_get_begin_asm_address (&gdbarch, &addr); tui_update_source_windows_with_addr (gdbarch, addr); + + if (TUI_DATA_WIN != nullptr && has_stack_frames ()) + { + frame_info_ptr fi = get_selected_frame (NULL); + TUI_DATA_WIN->check_register_values (fi); + } } /* See tui-layout. */ base-commit: 2ec31e54dff83130fbde8d2f674469078ee203d5 -- 2.35.3