From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id iaR4I8wTxmo0NA0AWB0awg (envelope-from ) for ; Wed, 07 Oct 2026 05:41:32 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=HEriO4W5; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=RlVr9jMg; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=HEriO4W5; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=RlVr9jMg; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 8CE1D1E04E; Wed, 07 Oct 2026 05:41:32 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id B508A1E04E for ; Wed, 07 Oct 2026 05:41:30 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5BCC44BA2E33 for ; Wed, 7 Oct 2026 09:41:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5BCC44BA2E33 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=HEriO4W5; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=RlVr9jMg; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=HEriO4W5; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=RlVr9jMg Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id 402B04BA2E09 for ; Wed, 7 Oct 2026 09:41:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 402B04BA2E09 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 402B04BA2E09 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1791366060; cv=none; b=ZlEFqnlhFW5YHMt2JoIHvkUIM9lqhdbvCrTopuFXpWMkbisDzfjKC+YFK0xXHIfEuqJV3e0DP4J1gXYbDtsdJMw/y5qdPc9zM/QWgP3DXVwmriQcBag/7KK0DkK8A2G0hKqi/H7GjDUGIOqTrEPspAHyJmuQCEnuHQ8prkpQ0Os= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1791366060; c=relaxed/simple; bh=EYRRCveMTYkHLEdHqnUHBPD/Z4gZtADBlgsB7YyG/CA=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=mWhxJEw15QCfBN2ThbKlixdjlwFn+/X4o8UHi7mGp66mItJYqIbcKFJfB2zccT6i8mUUMheSKp3+fEg/jAzyniCKVvAOHSS+lOJV9riyKzIgG73ngFeHcoA2OlYT5lMMW9w+nMQ5Bwn3R1lcC6wMsQ0YFgA4mCLbkxf9V9+OSNg= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=HEriO4W5; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=RlVr9jMg; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=HEriO4W5; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=RlVr9jMg DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 402B04BA2E09 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104: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 0FB361F788 for ; Wed, 7 Oct 2026 09:40:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1791366059; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9RUwgq5MEttIunEydGB/fR120ZIJMcjOSFtCpWqPqnw=; b=HEriO4W501MhkjwPy5Xe1sPgOcGugq+B0jS0g8dMoiGbnp3BqSU0J/RejUbWymhbUpMMoW su4iwYsD4UJEsyYuthLIejLHkp6Xo89lg/jJqIsomJUq5Lzppz6LcusCYngjg1Fy+PDi7o Ej5oeOO94sSjGONbrV8ZIlhMvAAbt9s= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1791366059; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9RUwgq5MEttIunEydGB/fR120ZIJMcjOSFtCpWqPqnw=; b=RlVr9jMgCuheIuxJjbqCMbGmXuX9hU5Lnd8pJDM9cQhvfMDbbKn7O8LVBfH+bS+hFrVM7E BOmHfl7LHzx9LCBQ== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=HEriO4W5; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=RlVr9jMg DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1791366059; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9RUwgq5MEttIunEydGB/fR120ZIJMcjOSFtCpWqPqnw=; b=HEriO4W501MhkjwPy5Xe1sPgOcGugq+B0jS0g8dMoiGbnp3BqSU0J/RejUbWymhbUpMMoW su4iwYsD4UJEsyYuthLIejLHkp6Xo89lg/jJqIsomJUq5Lzppz6LcusCYngjg1Fy+PDi7o Ej5oeOO94sSjGONbrV8ZIlhMvAAbt9s= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1791366059; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9RUwgq5MEttIunEydGB/fR120ZIJMcjOSFtCpWqPqnw=; b=RlVr9jMgCuheIuxJjbqCMbGmXuX9hU5Lnd8pJDM9cQhvfMDbbKn7O8LVBfH+bS+hFrVM7E BOmHfl7LHzx9LCBQ== 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 CDA5913B97 for ; Wed, 7 Oct 2026 09:40:58 +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 JEXHFKoTxmo3EwAAD6G6ig:T4 (envelope-from ) for ; Wed, 07 Oct 2026 09:40:58 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v4 03/11] [gdb/tui] Disassemble less often in tui_find_disassembly_address Date: Wed, 7 Oct 2026 11:40:49 +0200 Message-ID: <20261007094057.1811886-4-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20261007094057.1811886-1-tdevries@suse.de> References: <20261007094057.1811886-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.de:dkim]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Action: no action X-Rspamd-Queue-Id: 0FB361F788 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~public-inbox=simark.ca@sourceware.org In tui_find_disassembly_address we have the following code: ... CORE_ADDR new_low = pc; do { /* The previous value of NEW_LOW so we know if the new value is different or not. */ CORE_ADDR prev_low = new_low; /* Find an address from which we can start disassembling. */ new_low = tui_find_backward_disassembly_start_address (new_low); /* Disassemble forward. */ next_addr = tui_disassemble (gdbarch, asm_lines, new_low, max_lines); if (asm_lines.empty ()) break; last_addr = asm_lines.back ().addr; if (new_low == prev_low) break; ... Say we enter this code with some pc, and have pc == prev_low == new_low before the call to tui_find_backward_disassembly_start_address. If tui_find_backward_disassembly_start_address also returns pc, there's no point in trying to disassemble starting from pc. Fix this by moving this check to just after tui_find_backward_disassembly_start_address: ... new_low = tui_find_backward_disassembly_start_address (new_low); if (new_low == prev_low) break; ... At the point of the break, asm_lines either is: - empty because it hasn't been set yet, or - the result of disassembling starting at prev_low, which also happens to be new_low. While I think that's fine, I think it's clearer if we don't carry over asm_lines from a previous iteration, and do asm_lines.clear () at the start of the loop. --- gdb/tui/tui-disasm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c index 18439580ffb..a6cf12ba9c2 100644 --- a/gdb/tui/tui-disasm.c +++ b/gdb/tui/tui-disasm.c @@ -237,12 +237,16 @@ tui_find_disassembly_address (struct gdbarch *gdbarch, CORE_ADDR pc, int from) CORE_ADDR new_low = pc; do { + asm_lines.clear (); + /* The previous value of NEW_LOW so we know if the new value is different or not. */ CORE_ADDR prev_low = new_low; /* Find an address from which we can start disassembling. */ new_low = tui_find_backward_disassembly_start_address (new_low); + if (new_low == prev_low) + break; /* Disassemble forward. */ next_addr = tui_disassemble (gdbarch, asm_lines, new_low, max_lines); @@ -250,9 +254,6 @@ tui_find_disassembly_address (struct gdbarch *gdbarch, CORE_ADDR pc, int from) break; last_addr = asm_lines.back ().addr; - if (new_low == prev_low) - break; - /* If disassembling from the current value of NEW_LOW reached PC (or went past it) then this would do as a starting point if we can't find anything better, so remember it. */ -- 2.51.0