From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id AWNnNakgp2jPpggAWB0awg (envelope-from ) for ; Thu, 21 Aug 2025 09:35:37 -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=vhrnfSdN; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=KeEMTJqT; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=vhrnfSdN; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=KeEMTJqT; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id D49001E0B3; Thu, 21 Aug 2025 09:35:37 -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 server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (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 360F81E047 for ; Thu, 21 Aug 2025 09:35:37 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C1E05385E027 for ; Thu, 21 Aug 2025 13:35:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C1E05385E027 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=vhrnfSdN; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=KeEMTJqT; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=vhrnfSdN; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=KeEMTJqT Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id F1EF03854829 for ; Thu, 21 Aug 2025 13:31:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F1EF03854829 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 F1EF03854829 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=1755783092; cv=none; b=rADZpwHYoIPXfZMaerQo5R3DzmrgbcTo+eLSGv5ATe5JWddA0MmOSnvsjkzSVu3NYR9Kb2L8w0Lxk5T2sx6iFXxzMUwiV/xs1Hat8XA1MBVJg+RKyVsL8/mdCCeUZn9eSv1pkWoylpJR4EN4ibQ9BvRQl9aFPzD93SqSxD2FLsw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1755783092; c=relaxed/simple; bh=FV5vNAzuG81ByCvltVUgthoIYLweSqf2jQ+bWZKfq4k=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=fELFoG4X+PjbYctoyZhKd0PBvn2sZkFVbFmoiR3oZic+7lDkBHJQD760tChWoING3vI/prbaYLnS5xBFl8NOBtm6SJRsfqqrqZqNQDoa7xLDU0/bBonoT/v9fbjQh7nvczUufRRLfx+1/k8xV/QpJOEWzesMoRsdq3Kd00Kv1ko= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F1EF03854829 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 746151F7C7 for ; Thu, 21 Aug 2025 13:31:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1755783075; 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=Qr2hVjy5txP4Rp33e67AODnV+3h9KnmF7HOIaMH79ls=; b=vhrnfSdN0NinU1DoaxMWweXQnTtEBhRsqhf/F6+DPg4JPTp8pEwpVvEIxE2Rg2AFW83Ti4 2hujgtwSv4oFERhz1Y56+GixWC6zq9QcrOVIjMS4URo5O0o38ZCrgpdCNse7JB3DSMAMy+ TKeI0+P0nBHulPgGg+a8NeoDlO6JlgY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1755783075; 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=Qr2hVjy5txP4Rp33e67AODnV+3h9KnmF7HOIaMH79ls=; b=KeEMTJqTu8kpdsW+yfSWcMZN84mffPnGtgErf/ifcywMb8u/1bYqpX4K4JxO/B3dBBlHxw pA5SvQh7TCNZC4BQ== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=vhrnfSdN; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=KeEMTJqT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1755783075; 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=Qr2hVjy5txP4Rp33e67AODnV+3h9KnmF7HOIaMH79ls=; b=vhrnfSdN0NinU1DoaxMWweXQnTtEBhRsqhf/F6+DPg4JPTp8pEwpVvEIxE2Rg2AFW83Ti4 2hujgtwSv4oFERhz1Y56+GixWC6zq9QcrOVIjMS4URo5O0o38ZCrgpdCNse7JB3DSMAMy+ TKeI0+P0nBHulPgGg+a8NeoDlO6JlgY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1755783075; 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=Qr2hVjy5txP4Rp33e67AODnV+3h9KnmF7HOIaMH79ls=; b=KeEMTJqTu8kpdsW+yfSWcMZN84mffPnGtgErf/ifcywMb8u/1bYqpX4K4JxO/B3dBBlHxw pA5SvQh7TCNZC4BQ== 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 5F8F8139A8 for ; Thu, 21 Aug 2025 13:31:15 +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 qDEHFaMfp2g/bQAAD6G6ig (envelope-from ) for ; Thu, 21 Aug 2025 13:31:15 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2 2/5] [gdb] Make addrmap_mutable::insert_empty return bool Date: Thu, 21 Aug 2025 15:31:11 +0200 Message-ID: <20250821133114.24091-3-tdevries@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250821133114.24091-1-tdevries@suse.de> References: <20250821133114.24091-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 746151F7C7 X-Rspamd-Action: no action X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; 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)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:mid]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCVD_TLS_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_TRACE(0.00)[suse.de:+] 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 Function addrmap_mutable::set_empty has the follow behavior (shortened comment): ... /* In the mutable address map MAP, associate the addresses from START to END_INCLUSIVE that are currently associated with NULL with OBJ instead. Addresses mapped to an object other than NULL are left unchanged. */ void set_empty (CORE_ADDR start, CORE_ADDR end_inclusive, void *obj); ... Change the return type to bool, and return true if the full range [START, END_INCLUSIVE] is mapped to OBJ. Tested on x86_64-linux. --- gdb/addrmap.c | 23 ++++++++++++++++++----- gdb/addrmap.h | 4 ++-- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/gdb/addrmap.c b/gdb/addrmap.c index 45493509f21..5fddc3c32b7 100644 --- a/gdb/addrmap.c +++ b/gdb/addrmap.c @@ -201,10 +201,11 @@ xfree_wrapper (splay_tree_key key) xfree ((void *) key); } -void +bool addrmap_mutable::set_empty (CORE_ADDR start, CORE_ADDR end_inclusive, void *obj) { + bool full_range = true; splay_tree_node n, next; void *prior_value; @@ -234,8 +235,14 @@ addrmap_mutable::set_empty (CORE_ADDR start, CORE_ADDR end_inclusive, n && addrmap_node_key (n) <= end_inclusive; n = splay_tree_successor (addrmap_node_key (n))) { - if (! addrmap_node_value (n)) - addrmap_node_set_value (n, obj); + if (addrmap_node_value (n)) + { + /* Already mapped. */ + full_range = false; + continue; + } + + addrmap_node_set_value (n, obj); } /* Walk the area again, removing transitions from any value to @@ -254,6 +261,8 @@ addrmap_mutable::set_empty (CORE_ADDR start, CORE_ADDR end_inclusive, else prior_value = addrmap_node_value (n); } + + return full_range; } @@ -433,7 +442,9 @@ test_addrmap () check_addrmap_find (map, array, 0, 19, nullptr); /* Insert address range into mutable addrmap. */ - map.set_empty (core_addr (&array[10]), core_addr (&array[12]), val1); + bool full_range_p + = map.set_empty (core_addr (&array[10]), core_addr (&array[12]), val1); + SELF_CHECK (full_range_p); check_addrmap_find (map, array, 0, 9, nullptr); check_addrmap_find (map, array, 10, 12, val1); check_addrmap_find (map, array, 13, 19, nullptr); @@ -469,7 +480,9 @@ test_addrmap () check_addrmap_find (*map2, array, 14, 19, nullptr); /* Insert partially overlapping address range into mutable addrmap. */ - map.set_empty (core_addr (&array[11]), core_addr (&array[13]), val2); + full_range_p + = map.set_empty (core_addr (&array[11]), core_addr (&array[13]), val2); + SELF_CHECK (!full_range_p); check_addrmap_find (map, array, 0, 9, nullptr); check_addrmap_find (map, array, 10, 12, val1); check_addrmap_find (map, array, 13, 13, val2); diff --git a/gdb/addrmap.h b/gdb/addrmap.h index 179e1f86668..398bdd84215 100644 --- a/gdb/addrmap.h +++ b/gdb/addrmap.h @@ -152,7 +152,7 @@ struct addrmap_mutable final : public addrmap /* In the mutable address map MAP, associate the addresses from START to END_INCLUSIVE that are currently associated with NULL with OBJ instead. Addresses mapped to an object other than NULL are left - unchanged. + unchanged. Return true if the full range is mapped to OBJ. As the name suggests, END_INCLUSIVE is also mapped to OBJ. This convention is unusual, but it allows callers to accurately specify @@ -186,7 +186,7 @@ struct addrmap_mutable final : public addrmap semantics than to provide an interface which allows it to be implemented efficiently, but doesn't reveal too much of the representation. */ - void set_empty (CORE_ADDR start, CORE_ADDR end_inclusive, + bool set_empty (CORE_ADDR start, CORE_ADDR end_inclusive, void *obj); /* Clear this addrmap. */ -- 2.43.0