From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 8UfRI/8Txmo0NA0AWB0awg (envelope-from ) for ; Wed, 07 Oct 2026 05:42:23 -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=lI5R4lSo; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=XsjL6YbA; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=lI5R4lSo; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=XsjL6YbA; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 8D98A1E051; Wed, 07 Oct 2026 05:42:23 -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 BD5031E04E for ; Wed, 07 Oct 2026 05:42:22 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 60ECA4BA2E14 for ; Wed, 7 Oct 2026 09:42:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 60ECA4BA2E14 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=lI5R4lSo; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=XsjL6YbA; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=lI5R4lSo; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=XsjL6YbA Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id 75ADB4BA2E12 for ; Wed, 7 Oct 2026 09:41:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 75ADB4BA2E12 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 75ADB4BA2E12 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1791366065; cv=none; b=IS6yadldbJJfkaqsz8jTaEpxZPT6IGQFN6wUPxSxuyqFJh7BHmUs3TBYbNU/yqsQKPxJwaavnL1aJSSsxRax0UEgLBbM+Tdm37MtKa5V3VohO8ygE7hhvQaPQd6URKNByMBSua3ON1x85qGfz/knrr32PsCNUO+HEip/6aL6lsE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1791366065; c=relaxed/simple; bh=lQK2GaVXoHel6JXfGlKYtYkBVJMRDbrcmC2VmTmjCUk=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=xZfySBfK3jlAP2cg6DVKcFa7RuzcouypQJbENwIN+sYWuLkdJwsZhFxwY2fhJZV3dl2JiSo8rKkKscts7tU7JiFBych0dLqO4yHB26etlK9YVRGJGesbRU5lxaCbJe457YzJJq18vuSUvCX3UbP1fhh9vIJRSVd0zblNr1DljKU= 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=lI5R4lSo; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=XsjL6YbA; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=lI5R4lSo; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=XsjL6YbA DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 75ADB4BA2E12 Received: from imap1.dmz-prg2.suse.org (unknown [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-out1.suse.de (Postfix) with ESMTPS id 8B89821C18 for ; Wed, 7 Oct 2026 09:41:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1791366060; 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=TovVME+Eopwrjj57TFe7CnO+XiWtBgalILgA1uw+FG4=; b=lI5R4lSoBTEEIQx4je4tmUXsRRfr/OfNwoeD+sIFVbeilTrUSgBIaoqMSw96TSWOVpLbhg bJvEDABv7fdrOSG+UbrZsCW2mf6AmlvEAR2rsSf3zkg3hl6UmlpKSc52bDnPOqlpF9L1pM kr6NIBzFW+BpKENED/WcuoAEAarNHWw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1791366060; 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=TovVME+Eopwrjj57TFe7CnO+XiWtBgalILgA1uw+FG4=; b=XsjL6YbAkvo6kuaASwUFSfzvobn12U5tCLQHnWKRb7T+RDnkML2O5n7JZrnCv3rakSb6oP 3ey8kr9MoC93xJAA== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1791366060; 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=TovVME+Eopwrjj57TFe7CnO+XiWtBgalILgA1uw+FG4=; b=lI5R4lSoBTEEIQx4je4tmUXsRRfr/OfNwoeD+sIFVbeilTrUSgBIaoqMSw96TSWOVpLbhg bJvEDABv7fdrOSG+UbrZsCW2mf6AmlvEAR2rsSf3zkg3hl6UmlpKSc52bDnPOqlpF9L1pM kr6NIBzFW+BpKENED/WcuoAEAarNHWw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1791366060; 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=TovVME+Eopwrjj57TFe7CnO+XiWtBgalILgA1uw+FG4=; b=XsjL6YbAkvo6kuaASwUFSfzvobn12U5tCLQHnWKRb7T+RDnkML2O5n7JZrnCv3rakSb6oP 3ey8kr9MoC93xJAA== 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 6FA1D13B9A for ; Wed, 7 Oct 2026 09:40:59 +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:T9 (envelope-from ) for ; Wed, 07 Oct 2026 09:40:59 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v4 08/11] [gdb] Make gdb_disassembly return number of insns Date: Wed, 7 Oct 2026 11:40:54 +0200 Message-ID: <20261007094057.1811886-9-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-Spamd-Result: default: False [-2.80 / 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)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[] 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 Currently the function gdb_disassembly returns void. Make it return the number of disassembled instructions. --- gdb/disasm.c | 32 ++++++++++++++++++++++---------- gdb/disasm.h | 10 +++++++--- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/gdb/disasm.c b/gdb/disasm.c index 01361fe4323..ec922fbd323 100644 --- a/gdb/disasm.c +++ b/gdb/disasm.c @@ -524,7 +524,7 @@ dump_insns (struct gdbarch *gdbarch, N.B. This view is deprecated. */ -static void +static int do_mixed_source_and_assembly_deprecated (struct gdbarch *gdbarch, struct ui_out *uiout, struct symtab *symtab, @@ -669,6 +669,8 @@ do_mixed_source_and_assembly_deprecated if (how_many >= 0 && num_displayed >= how_many) break; } + + return num_displayed; } /* The idea here is to present a source-O-centric view of a @@ -676,7 +678,7 @@ do_mixed_source_and_assembly_deprecated in source order, with (possibly) out of order assembly immediately following. */ -static void +static int do_mixed_source_and_assembly (struct gdbarch *gdbarch, struct ui_out *uiout, struct symtab *main_symtab, @@ -906,16 +908,18 @@ do_mixed_source_and_assembly (struct gdbarch *gdbarch, last_symtab = sal.symtab; last_line = sal.line; } + + return num_displayed; } -static void +static int do_assembly_only (struct gdbarch *gdbarch, struct ui_out *uiout, CORE_ADDR low, CORE_ADDR high, int how_many, gdb_disassembly_flags flags) { ui_out_emit_list list_emitter (uiout, "asm_insns"); - dump_insns (gdbarch, uiout, low, high, how_many, flags, NULL); + return dump_insns (gdbarch, uiout, low, high, how_many, flags, NULL); } /* Combine implicit and user disassembler options and return them @@ -1141,13 +1145,16 @@ gdb_disassembler::print_insn (CORE_ADDR memaddr, return length; } -void +/* See disasm.h. */ + +int gdb_disassembly (struct gdbarch *gdbarch, struct ui_out *uiout, gdb_disassembly_flags flags, int how_many, CORE_ADDR low, CORE_ADDR high) { struct symtab *symtab; int nlines = -1; + int num_displayed = 0; /* Assume symtab is valid for whole PC range. */ symtab = find_symtab_for_pc (low); @@ -1157,17 +1164,22 @@ gdb_disassembly (struct gdbarch *gdbarch, struct ui_out *uiout, if (!(flags & (DISASSEMBLY_SOURCE_DEPRECATED | DISASSEMBLY_SOURCE)) || nlines <= 0) - do_assembly_only (gdbarch, uiout, low, high, how_many, flags); + num_displayed + = do_assembly_only (gdbarch, uiout, low, high, how_many, flags); else if (flags & DISASSEMBLY_SOURCE) - do_mixed_source_and_assembly (gdbarch, uiout, symtab, low, high, - how_many, flags); + num_displayed + = do_mixed_source_and_assembly (gdbarch, uiout, symtab, low, high, + how_many, flags); else if (flags & DISASSEMBLY_SOURCE_DEPRECATED) - do_mixed_source_and_assembly_deprecated (gdbarch, uiout, symtab, - low, high, how_many, flags); + num_displayed + = do_mixed_source_and_assembly_deprecated (gdbarch, uiout, symtab, + low, high, how_many, flags); gdb_flush (gdb_stdout); + + return num_displayed; } /* Print the instruction at address MEMADDR in debugged memory, diff --git a/gdb/disasm.h b/gdb/disasm.h index 57195564ca8..9109dbf0a79 100644 --- a/gdb/disasm.h +++ b/gdb/disasm.h @@ -323,9 +323,13 @@ struct disasm_insn unsigned int is_speculative:1; }; -extern void gdb_disassembly (struct gdbarch *gdbarch, struct ui_out *uiout, - gdb_disassembly_flags flags, int how_many, - CORE_ADDR low, CORE_ADDR high); +/* Print at most HOW_MANY instructions of the instruction stream at + [LOW, HIGH) on UIOUT using FLAGS. Return the number of the instructions + printed. */ + +extern int gdb_disassembly (struct gdbarch *gdbarch, struct ui_out *uiout, + gdb_disassembly_flags flags, int how_many, + CORE_ADDR low, CORE_ADDR high); /* Print the instruction at address MEMADDR in debugged memory, on STREAM. Returns the length of the instruction, in bytes, -- 2.51.0