From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id eb6rMbQUxmo0NA0AWB0awg (envelope-from ) for ; Wed, 07 Oct 2026 05:45:24 -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=NyzC0XuA; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=3NvsOl81; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=VH9FbZjr; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=1FDPcgWe; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id BC9181E051; Wed, 07 Oct 2026 05:45:24 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.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 autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [IPv6:2620:52:6:3111::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 8D5D81E04E for ; Wed, 07 Oct 2026 05:45:23 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 62BBF4BA2E0A for ; Wed, 7 Oct 2026 09:45:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 62BBF4BA2E0A 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=NyzC0XuA; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=3NvsOl81; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=VH9FbZjr; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=1FDPcgWe Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id 610584BA2E3A for ; Wed, 7 Oct 2026 09:41:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 610584BA2E3A 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 610584BA2E3A Authentication-Results: sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1791366068; cv=none; b=GxV6CjmEruY/u9aWBY8Wb6L/2bJf2hTwgcOZHoJ9iy3TeQgvytrAarrL0GOLJ6C0Ydrqk2ZCsUg2+f6BFCmw/QqsWvhzFtG72jodIlMiTRoWSjL2VZKNnzWlbVXZPvgpS8yeatKt5nMFTj2OGXl4D7MMW829tQHmsztzHSkP+2E= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1791366068; c=relaxed/simple; bh=9oZwMvdeuXL34V8IGhBQI8RfgBXHsuSS4I1vsMQcM2o=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=Yg7O1JNz5faQdro5fwsP8OuJfKV1WePPxUh1DCtbkTSQfxNtIXOxKuOid988TWk0j0Ucj4JPRYDH2NyoYUKjmxD8r+D1kROF+CZc58fnRmI2aod4pTspmCPCmCpSefkonJBffWbxqq25ld8eH42Uunmjw3ZxNmP83N+rJILylzc= 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=NyzC0XuA; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=3NvsOl81; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=VH9FbZjr; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=1FDPcgWe DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 610584BA2E3A 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 8435321F3B 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=1791366063; 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=8HxO5f1Xdn7X2ky/FSf6Ng3+c1nmAZf12PRt6CqN3lo=; b=NyzC0XuANrx0r5SxVLEJVgZj2JTgI8kNxu+EaJAqd1AMxb+dtjmdLdVhHwTkMhuSNHsD2B syaVJoEBab+G8SO1sKP28FLoH9XZhtUNET6/k/vpUt2AVRaswI0ccW0/6MDOODdfoyykqM NozO3Az/7f8CaU+ZCfaBRHbxSdSLcxU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1791366063; 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=8HxO5f1Xdn7X2ky/FSf6Ng3+c1nmAZf12PRt6CqN3lo=; b=3NvsOl81uLKlfsyHLKyHEo2ujPB4wtZe3zeJQNIp9aYOWFDJDH09ZWCP5ImOy3GEdvdN0Z OP/CuMt+dmGRKsCg== Authentication-Results: smtp-out1.suse.de; none 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=8HxO5f1Xdn7X2ky/FSf6Ng3+c1nmAZf12PRt6CqN3lo=; b=VH9FbZjrhszMweXnR4T1lvKnGwc/dG8/4fPW3ItZ2vvdxlefhS3uehvAgoPr1BdBm3XCGR EBuBKTjTN16S1EUEJpH9+cqc5e0g66BUiT+6y3T1kwdZyz5yahB/8xd1q0QnpVZ5BHANiJ GLz3nJMhX9wbB8/U/7ZU9CmsvkPKOzY= 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=8HxO5f1Xdn7X2ky/FSf6Ng3+c1nmAZf12PRt6CqN3lo=; b=1FDPcgWeeSLNA4+A060uqIEg/TahtQFW0WF++rWnK0l7nGUzXe3uLkIHlUZN9ScOjVGVTK IH9dLORIbpfNa6CQ== 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 50FF213B97 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:T8 (envelope-from ) for ; Wed, 07 Oct 2026 09:40:59 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v4 07/11] [gdb] Extend addrmap::find with low/high results Date: Wed, 7 Oct 2026 11:40:53 +0200 Message-ID: <20261007094057.1811886-8-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 An addrmap contains a mapping from CORE_ADDR to void *. The function addrmap::find: ... void *find (CORE_ADDR addr) ... returns a void * for a given addr, but doesn't give us an answer about the range of addresses containing addr for which it would return the same value. Add a alternative using parameters low/high: ... void *find (CORE_ADDR addr, CORE_ADDR *low, CORE_ADDR *high) ... --- gdb/addrmap.c | 78 +++++++++++++++++++++++++++++++++++++++++++++------ gdb/addrmap.h | 23 ++++++++++----- 2 files changed, 86 insertions(+), 15 deletions(-) diff --git a/gdb/addrmap.c b/gdb/addrmap.c index a311592c3bb..ce7f8afccf4 100644 --- a/gdb/addrmap.c +++ b/gdb/addrmap.c @@ -31,7 +31,7 @@ static_assert (sizeof (splay_tree_value) >= sizeof (void *)); /* Fixed address maps. */ void * -addrmap_fixed::do_find (CORE_ADDR addr) const +addrmap_fixed::do_find (CORE_ADDR addr, CORE_ADDR *low, CORE_ADDR *high) const { const struct addrmap_transition *bottom = &transitions[0]; const struct addrmap_transition *top = &transitions[num_transitions - 1]; @@ -58,6 +58,12 @@ addrmap_fixed::do_find (CORE_ADDR addr) const top = mid - 1; } + if (low != nullptr) + *low = bottom->addr; + if (high != nullptr) + *high = (bottom == &transitions[num_transitions - 1] + ? (CORE_ADDR)-1 + : (bottom + 1)->addr - 1); return bottom->value; } @@ -119,7 +125,7 @@ addrmap_mutable::splay_tree_predecessor (CORE_ADDR addr) const splay_tree_node -addrmap_mutable::splay_tree_successor (CORE_ADDR addr) +addrmap_mutable::splay_tree_successor (CORE_ADDR addr) const { return ::splay_tree_successor (tree, (splay_tree_key) &addr); } @@ -266,25 +272,54 @@ addrmap_mutable::set_empty (CORE_ADDR start, CORE_ADDR end_inclusive, void * -addrmap_mutable::do_find (CORE_ADDR addr) const +addrmap_mutable::do_find (CORE_ADDR addr, CORE_ADDR *low, CORE_ADDR *high) const { if (tree == nullptr) - return nullptr; + { + if (low != nullptr) + *low = 0; + if (high != nullptr) + *high = (CORE_ADDR)-1; + return nullptr; + } + + auto return_value = [this, &low, &high] (splay_tree_node &n) + { + if (low != nullptr) + *low = addrmap_node_key (n); + if (high != nullptr) + { + splay_tree_node succ = splay_tree_successor (addrmap_node_key (n)); + if (succ != nullptr) + *high = addrmap_node_key (succ) - 1; + else + *high = (CORE_ADDR)-1; + } + return addrmap_node_value (n); + }; splay_tree_node n = splay_tree_lookup (addr); if (n != nullptr) { gdb_assert (addrmap_node_key (n) == addr); - return addrmap_node_value (n); + return return_value (n); } n = splay_tree_predecessor (addr); if (n != nullptr) { gdb_assert (addrmap_node_key (n) < addr); - return addrmap_node_value (n); + return return_value (n); } + if (low != nullptr) + *low = 0; + if (high != nullptr) + { + splay_tree_node succ = splay_tree_successor (addr); + gdb_assert (succ != nullptr); + *high = addrmap_node_key (succ) - 1; + } return nullptr; } @@ -436,10 +471,22 @@ test_addrmap () /* Create mutable addrmap. */ auto_obstack temp_obstack; addrmap_mutable map; + addrmap_fixed *map2; /* Check initial state. */ check_addrmap_find (map, array, 0, 19, nullptr); + CORE_ADDR low, high; + { + map2 = new (&temp_obstack) addrmap_fixed (&temp_obstack, &map); + for (addrmap *m : {(addrmap *)&map, (addrmap *)map2}) + { + SELF_CHECK (m->find (core_addr (&array[0]), &low, &high) == nullptr); + SELF_CHECK (low == 0 && high == (CORE_ADDR)-1); + } + map2 = nullptr; + } + /* Insert address range into mutable addrmap. */ bool full_range_p = map.set_empty (core_addr (&array[10]), core_addr (&array[12]), val1); @@ -449,8 +496,7 @@ test_addrmap () check_addrmap_find (map, array, 13, 19, nullptr); /* Create corresponding fixed addrmap. */ - addrmap_fixed *map2 - = new (&temp_obstack) addrmap_fixed (&temp_obstack, &map); + map2 = new (&temp_obstack) addrmap_fixed (&temp_obstack, &map); SELF_CHECK (map2 != nullptr); check_addrmap_find (*map2, array, 0, 9, nullptr); check_addrmap_find (*map2, array, 10, 12, val1); @@ -472,6 +518,22 @@ test_addrmap () SELF_CHECK (map.foreach (callback) == 0); SELF_CHECK (map2->foreach (callback) == 0); + for (addrmap *m : {(addrmap *)&map, (addrmap *)map2}) + { + SELF_CHECK (m->find (core_addr (&array[0]), &low, &high) == nullptr); + SELF_CHECK (low == 0 && high == core_addr (&array[9])); + + for (int i = 10; i <= 12; i++) + { + m->find (core_addr (&array[i]), &low, &high); + SELF_CHECK (low == core_addr (&array[10]) + && high == core_addr (&array[12])); + } + + SELF_CHECK (m->find (core_addr (&array[19]), &low, &high) == nullptr); + SELF_CHECK (low == core_addr (&array[13]) && high == (CORE_ADDR)-1); + } + /* Relocate fixed addrmap. */ map2->relocate (1); check_addrmap_find (*map2, array, 0, 10, nullptr); diff --git a/gdb/addrmap.h b/gdb/addrmap.h index a702341ef8f..029f58133c3 100644 --- a/gdb/addrmap.h +++ b/gdb/addrmap.h @@ -45,12 +45,18 @@ using addrmap_foreach_const_fn /* The base class for addrmaps. */ struct addrmap { - /* Return the object associated with ADDR in MAP. */ + /* Return the object associated with ADDR in MAP. If LOW and HIGH are + non-nullptr, use them to return the range associated with ADDR. */ + const void *find (CORE_ADDR addr, CORE_ADDR *low, + CORE_ADDR *high) const + { return this->do_find (addr, low, high); } const void *find (CORE_ADDR addr) const - { return this->do_find (addr); } + { return this->do_find (addr, nullptr, nullptr); } + void *find (CORE_ADDR addr, CORE_ADDR *low, CORE_ADDR *high) + { return this->do_find (addr, low, high); } void *find (CORE_ADDR addr) - { return this->do_find (addr); } + { return this->do_find (addr, nullptr, nullptr); } /* Call FN for every address in MAP, following an in-order traversal. If FN ever returns a non-zero value, the iteration ceases @@ -68,7 +74,8 @@ struct addrmap private: /* Worker for find, implemented by sub-classes. */ - virtual void *do_find (CORE_ADDR addr) const = 0; + virtual void *do_find (CORE_ADDR addr, CORE_ADDR *low, + CORE_ADDR *high) const = 0; /* Worker for foreach, implemented by sub-classes. */ virtual int do_foreach (addrmap_foreach_fn fn) const = 0; @@ -94,7 +101,8 @@ struct addrmap_fixed final : public addrmap, void relocate (CORE_ADDR offset); private: - void *do_find (CORE_ADDR addr) const override; + void *do_find (CORE_ADDR addr, CORE_ADDR *low, + CORE_ADDR *high) const override; int do_foreach (addrmap_foreach_fn fn) const override; /* A transition: a point in an address map where the value changes. @@ -193,7 +201,8 @@ struct addrmap_mutable final : public addrmap void clear (); private: - void *do_find (CORE_ADDR addr) const override; + void *do_find (CORE_ADDR addr, CORE_ADDR *low, + CORE_ADDR *high) const override; int do_foreach (addrmap_foreach_fn fn) const override; /* A splay tree, with a node for each transition; there is a @@ -220,7 +229,7 @@ struct addrmap_mutable final : public addrmap void force_transition (CORE_ADDR addr); splay_tree_node splay_tree_lookup (CORE_ADDR addr) const; splay_tree_node splay_tree_predecessor (CORE_ADDR addr) const; - splay_tree_node splay_tree_successor (CORE_ADDR addr); + splay_tree_node splay_tree_successor (CORE_ADDR addr) const; void splay_tree_remove (CORE_ADDR addr); void splay_tree_insert (CORE_ADDR key, void *value); }; -- 2.51.0