From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id abxyNi1el2lDvwEAWB0awg (envelope-from ) for ; Thu, 19 Feb 2026 14:02:05 -0500 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=labware.com header.i=@labware.com header.a=rsa-sha256 header.s=mimecast20220511 header.b=Brp1AYtD; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id D7EAE1E0BA; Thu, 19 Feb 2026 14:02:05 -0500 (EST) 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 38EA51E08D for ; Thu, 19 Feb 2026 14:02:05 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 3758D4B9DB78 for ; Thu, 19 Feb 2026 19:02:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3758D4B9DB78 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=labware.com header.i=@labware.com header.a=rsa-sha256 header.s=mimecast20220511 header.b=Brp1AYtD Received: from us-smtp-delivery-114.mimecast.com (us-smtp-delivery-114.mimecast.com [170.10.129.114]) by sourceware.org (Postfix) with ESMTP id BB1B84BAD143 for ; Thu, 19 Feb 2026 18:58:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BB1B84BAD143 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=labware.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=labware.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org BB1B84BAD143 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.114 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1771527495; cv=none; b=Mz3+lAF92+EQ0bpprNS0gT2/HK8DFajle/Jzhk2v7aBXAV6OVCZoa+iyg2XVjyj/7zavIQz7Ah9Q72eEdVtiJhLEBr3PzNF6kcWyQ85JC8iw9wEwdY4gXWiMQeUuEfwbNTuZQgH1Lu+ts8phnkpH/BynQCIeCqgcghgedW/1YFY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1771527495; c=relaxed/simple; bh=4cCzdFp+zEvi+7HtGkSwHbVlsJ+Dbl3zmpidAL8sq0M=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=ZLpvYcnune72wSulsu5Zw04KcbtvNy99KBTVvRGJ1I8BKYLPi/RUXGAShKypsVCYFkSumjT2FxRgbzmvo18k7A4wpT5eHJLgGWjP+GwBHBGJTVvaS30vuCXkkowm5qDlkfihLJFSY2W4XDtyzozLeKCgVbR8iqCwoW+VyYu52Sk= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BB1B84BAD143 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=labware.com; s=mimecast20220511; t=1771527495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9KS4yP+x7Epgq6bSLSRB2kDWAEL7gMpBpy3OtLHcV8Q=; b=Brp1AYtDVxVHk0Va0OoNTglv+94c0i69Rkptojtqv9m1Gl6YpsjUOB6srveGT1KLY7aLnY DrsL8TvzFGgFzr/LxNgXSHq1WAJiESIB37Gj9JBxS6HM4rZ0MPdUQckpGX6Zd19+zG+rMq 6G8/zE9RoHbr7l0GrMqYcN0+WW4HHSI= Received: from BYAPR05CU005.outbound.protection.outlook.com (mail-westusazon11020135.outbound.protection.outlook.com [52.101.85.135]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-39-WPDyjiTbOdmId088q7oROg-1; Thu, 19 Feb 2026 13:58:12 -0500 X-MC-Unique: WPDyjiTbOdmId088q7oROg-1 X-Mimecast-MFC-AGG-ID: WPDyjiTbOdmId088q7oROg_1771527491 Received: from SA1PR17MB5365.namprd17.prod.outlook.com (2603:10b6:806:1d8::11) by CH3PR17MB7196.namprd17.prod.outlook.com (2603:10b6:610:198::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9632.16; Thu, 19 Feb 2026 18:58:09 +0000 Received: from SA1PR17MB5365.namprd17.prod.outlook.com ([fe80::9a:538a:fa42:730e]) by SA1PR17MB5365.namprd17.prod.outlook.com ([fe80::9a:538a:fa42:730e%7]) with mapi id 15.20.9632.010; Thu, 19 Feb 2026 18:58:09 +0000 From: Jan Vrany To: gdb-patches@sourceware.org CC: Jan Vrany Subject: [PATCH 5/7] gdb: update blockvector::lookup to handle non-contiguous blocks Date: Thu, 19 Feb 2026 18:56:36 +0000 Message-ID: <20260219185638.360694-6-jan.vrany@labware.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260219185638.360694-1-jan.vrany@labware.com> References: <20260219185638.360694-1-jan.vrany@labware.com> X-ClientProxiedBy: LO2P265CA0192.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a::36) To SA1PR17MB5365.namprd17.prod.outlook.com (2603:10b6:806:1d8::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA1PR17MB5365:EE_|CH3PR17MB7196:EE_ X-MS-Office365-Filtering-Correlation-Id: 3acfdb64-4aa0-49ef-f7eb-08de6fe8d302 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024 X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?8N6RD6s3nk45otvn4MGKeRYfYc1ZaxWnLS3U9/dZVhw3FrVFCzNnYL9OTMg6?= =?us-ascii?Q?GDi6P2haPdU8jexrMVb6EMmwqCna2UR+UtKV8/s/e+VxcMR9n5hGyf11UDFu?= =?us-ascii?Q?Mjsgg136PwkpRr05WuzBJQtx+midArhvpJxv2kXFK8uX3ebm8/1l4NgcJsvP?= =?us-ascii?Q?8Hup3NIOl6kypcTjYIvqdMMNzZdU0Cux/ikvJqD+cVdiHpslc9aH6uzeM73o?= =?us-ascii?Q?8zkem2rBb+UDBdJY3rflAWRkFbIb/dg2YgFqnizmquJEatSUxu9q/MLSeQaf?= =?us-ascii?Q?+Lir3KbdKBbrftq161Gsae6mw1Eetuc5yyQs7FnTmsFKle6DOkZ++GCfZX5O?= =?us-ascii?Q?YDKNPBiBnD9h/vsL7ukUcSCj9uKitzyMNeXxvzzn+ztTjQQy9PjamY+jaQLU?= =?us-ascii?Q?zIRGA1ZdaCx94ZDe8+O5ovC2Lw0qZbiV9AXa66ancnuPtVTmeqISDGk2cap5?= =?us-ascii?Q?oQXnoxJG6ds719mQBOiugSmSCeVfbuYQw3ijsQHdSBa4sdJmO3OL2eeSt+pC?= =?us-ascii?Q?noDx0oZEtXPGNxaKuhaaKN/VKSdU7v2vyZzwfM0GVqPMYG7RAsQSOlolfY5d?= =?us-ascii?Q?CHxFgLk+NC88HzH4RBUZ3XQknzXkyDWjVtRRhDkemtFZ+VuAKgv8ofKmyQvg?= =?us-ascii?Q?RhmtS0rvIzSOPUxbfZUsoeBb8rfd3jLnyM2JFQvmFgqcAMvHjNBQt+q1bqTp?= =?us-ascii?Q?3yuiZdRJDEjQjtGqn94D1VEKHHU6byDObOs8taIVcunMJDv5wx5i+N5Rkgrs?= =?us-ascii?Q?qYsdfBPQBIz3pR5cXz7DKV/W7gvOsirg3U6k5u7sHvoTvtti94lVzPqwNVSC?= =?us-ascii?Q?3C9XQD22jroxGs02AHEmltcsf3+uy927vC0tz7rY6FnVhuzDtBpZlcmiBypA?= =?us-ascii?Q?Y4brj9FW6npQfhkdNRr4d+FEN/SPgNm0p67xBQJ9yayxklv44rbJmhJJtREo?= =?us-ascii?Q?k1eOsTuvZWWaKQlaTW8fpHz1vbW5kNzM+bC7WOIIaxQkaM9q6ZIkFB4VZ2a2?= =?us-ascii?Q?tlPCGAieHr06NUqCSoG6rNv/9Lx844uzwUBlHFpFq6dyBaHWDjurh314gpB4?= =?us-ascii?Q?VlNOHaBMpgIS0KzUfFeZXNor8juB5gmiTrHEixy+UxW0NZP/21tgSlggJh5f?= =?us-ascii?Q?DAzk9HCqlC2gZfgKAqxsNVs5+ReVo90SXTFnFpPtny8Vy/HwFvc9t7r1icnr?= =?us-ascii?Q?tCSQG+85IQta48rQB9HTTqj7r+rF2TgqCoO9eGbFtxJG1TPPOBRik8aN583q?= =?us-ascii?Q?APn2aDcSN0iWrH5ok1MQdFZ689YkstBDIUce7Fomg8m+TR6tdBW3gwS7LwVs?= =?us-ascii?Q?0qs6q7+jEtcjNSPz5jzoCKGgNju8F/IR7SKPgGSEHjdprorblSNA/E1Osf9z?= =?us-ascii?Q?1HJkQ0LLlRzz/Y3Eq47NKUFKEatsd+NBly5n0LRggo07i+B0qX+yEZ68tGuc?= =?us-ascii?Q?yvb+pS22qKtTF2XhnSAtvgPRZfdau3RRLToL5+wqCMMvzzF6ZBsgt6ZIL7c3?= =?us-ascii?Q?MZ5TTxLMgemvbakXa7Bo7ZSXsWYOx61pDmL0QNLWq1lnsRznpUpAA8+TTrAP?= =?us-ascii?Q?HZ67va6kXyHbzCYzXz8=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SA1PR17MB5365.namprd17.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(1800799024); DIR:OUT; SFP:1102 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lErUeM0ay4XzrlfIUczZSt25rnq690O8ShZ2HUEYYkwSEyahhq74TBo6/+yA?= =?us-ascii?Q?PxYpmFE/UdIGDz8oKQ+4vFowMh/KRvAROR3cgIqPotXLpgc084VuuedXaXUJ?= =?us-ascii?Q?SRYqntbZHjwIjLJOgu8o+HIaDvd7t1zyHxbln2h9fVPmvwCIUEJA44vM0Chb?= =?us-ascii?Q?52Eyebp/4AgHMKHwpiuetxfcG+Ncc0dx+yJaCCOz+ABS6uSCjhP3G7BDLsdr?= =?us-ascii?Q?8hxn9b81L77QKgPbxgMuDkgm1DM5PTq3EVvCSaLgPKC5K+pSBCX+tai42b61?= =?us-ascii?Q?OCY0E5s7UTfGFMy8s/+JMOhgiVIFh8BehltPQPQbcRvnM8NdNr62pQJyz2EX?= =?us-ascii?Q?GsH2UC8KAufEv2Z+3MAJ4leLQ0+65RX1YQYh1eNt1w54iw4fRYiuublTNVc7?= =?us-ascii?Q?90YzoA3M0xYSjPSOyBgVDoNcdRJGFca0amicJEM5kog42OSfls/VWqnylXBx?= =?us-ascii?Q?bYjhr/MtthSGk05ZwAFfANP/I42La3Qsf6THgK4AGrNjwV3gqYXVZFqgCFfV?= =?us-ascii?Q?Qri6dINhuqvGOhq3ZDj0BEcWb1SXJIh4sx8x5f3l0/XSfn9Sk9F/M5noHk6I?= =?us-ascii?Q?SFgy1XfjZgDodR6ug3oWgcZr9G3E363dETTu+cjnLXdGBamUssffwEz25ERc?= =?us-ascii?Q?Lr6XeTnH7Nc3EVhZ5CRVMl0w7Czw70dg/lpvcv7wqsQ7G2Zl8f+azUnU/qzO?= =?us-ascii?Q?tqFABa8W4eA3/NMPMN9H+YAxWjwNQV86e4F97BVYMKck82SB9adFTRNr+tTk?= =?us-ascii?Q?Ysu46lFOWgfL5ycUqCjKO4B90W2Dgep5A9z5fkx1yU3bELrVmZvOM2Ks4Phm?= =?us-ascii?Q?+JO4C0+0ekYaVBWF8aS0zMKZmG/ny4AP/LxWbmPFiY4640uK5xGGnv5B18hG?= =?us-ascii?Q?IXvuCD0kz9w3XwVb2ML/pL7MnEb/c7ixS0xu0zvXvGBvI3JHb51jShp3GoGI?= =?us-ascii?Q?QHvHkXuapZ93dM4jqzYEAFJGxHgQaALWWTRsdRdgafSDjedklsmbik7cVCcV?= =?us-ascii?Q?VGelvXSGAKbuzT/USXTxPkJHZKPH9CkuW4Fq4VAn/cgUNg4q9xSO1xYiRlC6?= =?us-ascii?Q?hilFc4UGylmOS4mcYqyVWs0W+5tLRyLFjrdzEW9MEnMI9mO0gM8IvreChap2?= =?us-ascii?Q?/UUxc6q1sQ7ymuHtL2A3ZnNyOCUF9z5aohjDlsfmi6XZPqAO1Y4PNujMCH/s?= =?us-ascii?Q?VSOwbvqdhE/GLO3k3Ke4+0jdVFhwJ4PWLEPHs1eMgzoOgQ07XrDnuUeoz98S?= =?us-ascii?Q?2TM3okg8HG7SLQBP0v5WRWttbsRf7/nQBxc0TWT1PUhC2bG95vWR4ulTvkkV?= =?us-ascii?Q?iwyYgMEoPqt40MeqlK+y0/xJT/+U+5fWGUrFW2RNeZ30w5n/SgiRV96cheVP?= =?us-ascii?Q?8KGUG/EkdgomQ+pWlH8+OmLOtc9alE4Mv0EWEDCbYFc+WRXLXbGGrLp+WPiU?= =?us-ascii?Q?rLd6jPKI5yDX+gNTGzWO+Y1Pw8kuiW6mcuUf1mM28avwFJQE1sQxKF9dlqAQ?= =?us-ascii?Q?3fv+MObtSWvp1pgWQH1asVvn98SDtCxEs7iR1DbjeTVS88x9xGzUg8zRnkvk?= =?us-ascii?Q?RwEmEzVNOu4LBv06MKbSvpEVBH+9oQO9Lv2CsasaKlfnNhNPjlyk+iiybsIT?= =?us-ascii?Q?pdHcWsrsBopz8NIMd2+2nD1tqfZZEfwu0iYQbP1iQzFPItVnK876YWVFHm76?= =?us-ascii?Q?AHUsHjvYVVm+ECPLA6i7v7MiKd8ND5Ys2sEywNVTsX3YljWDDWb8AR2S1fya?= =?us-ascii?Q?cyOiukanXg=3D=3D?= X-OriginatorOrg: labware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3acfdb64-4aa0-49ef-f7eb-08de6fe8d302 X-MS-Exchange-CrossTenant-AuthSource: SA1PR17MB5365.namprd17.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2026 18:58:09.7510 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b5db0322-1aa0-4c0a-859c-ad0f96966f4c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: aMlej4xCIQpttj6kGZ6Bo7NLxfgw3XF7RmuTcveRxiMS1zzi9FO7duJsnY2JPilqBEU8yY+8/qRYuzIlEw1AMw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR17MB7196 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: KtUm1eAzYuSKuvAgnuwxhWSH4VCVa0KvPbDxfJJ2mCo_1771527491 X-Mimecast-Originator: labware.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=WINDOWS-1252 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 This commit updates blockvector::lookup to handle non-contiguous without help of addrmap. It introduces a new method, block::contains(CORE_ADDR), to check whether given block contains given address. This new method is then used in blockvector::lookup instead of simply using block's start and end addresses. A unit test for non-contiguous blocks will come later in this series. On Debian x86_64 I see no regressions except FAIL: gdb.dwarf2/debug-names.exp: print _start This is caused by discrepancy between the debug info and the debug names and will be eventually fixed in a separate patch. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=3D33829 --- gdb/block.c | 24 +++++++++++++++++++++++- gdb/block.h | 4 ++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/gdb/block.c b/gdb/block.c index 730e4580a5b..b964674865b 100644 --- a/gdb/block.c +++ b/gdb/block.c @@ -85,6 +85,25 @@ block::contains (const struct block *a, bool allow_neste= d) const =20 /* See block.h. */ =20 +bool +block::contains (const CORE_ADDR addr) const +{ + if (addr >=3D start () && addr < end ()) + { + if (is_contiguous ()) +=09return true; + + for (auto range : ranges ()) +=09{ +=09 if (range.start () <=3D addr && addr < range.end ()) +=09 return true; +=09} + } + return false; +} + +/* See block.h. */ + struct symbol * block::linkage_function () const { @@ -857,7 +876,10 @@ blockvector::lookup (CORE_ADDR addr) const if (b->start () > addr) =09return nullptr; if (b->end () > addr) -=09return b; +=09{ +=09 if (b->contains (addr)) +=09 return b; +=09} bot--; } =20 diff --git a/gdb/block.h b/gdb/block.h index b84ca12c35a..f65546792ca 100644 --- a/gdb/block.h +++ b/gdb/block.h @@ -315,6 +315,10 @@ struct block : public allocate_on_obstack =20 bool contains (const struct block *a, bool allow_nested =3D false) const= ; =20 + /* FIXME!!! */ + + bool contains (const CORE_ADDR addr) const; + /* Relocate this block and all contained blocks. OBJFILE is the objfile holding this block, and OFFSETS is the relocation offsets to use. */ --=20 2.51.0