From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id MP4OJx19WWgt1hoAWB0awg (envelope-from ) for ; Mon, 23 Jun 2025 12:13:17 -0400 Received: by simark.ca (Postfix, from userid 112) id 9B7251E11C; Mon, 23 Jun 2025 12:13:17 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-9.0 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE 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 110751E0C2 for ; Mon, 23 Jun 2025 12:13:17 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B0385384670E for ; Mon, 23 Jun 2025 16:13:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B0385384670E Received: from us-smtp-delivery-114.mimecast.com (us-smtp-delivery-114.mimecast.com [170.10.133.114]) by sourceware.org (Postfix) with ESMTP id BB4D8384670E for ; Mon, 23 Jun 2025 16:10:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BB4D8384670E Authentication-Results: sourceware.org; dmarc=pass (p=none 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 BB4D8384670E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.114 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1750695038; cv=none; b=A3W6+oiQ3kbrYNLd9Iw6uH2Sutuh9vXKXXVhg3hC6NVDEoeBUJuSToGbfTzV+8Hr7GZhG+xSYs6Z16yt8lD9RCOwQvr2Px51e1f82cqz/XJRCtWsoCoGhgRayOU9vTATaFZqkJ0NTCNsPs4AwDx1guZzyfXryJdEIaGn0yQ5FMY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1750695038; c=relaxed/simple; bh=5I/Gc92beCypLd6wynbjZkORRZ5KhYb4mn0MiWB/iFY=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=g1t/dUpfrcsu1oyfHydNsL5hS7SpxlW7RgTvk5qaDHZKq586JcKYbJh9AfXVguXv9vr/4niwfiLna+5vAG1rOVaiRFPOOzlJhle7akTkVVdSynbiNq3M3AHxDcOd1IVfjqa2NIAJ55smR3OSz8iwFoL7qI+v6AdaPylJyp7lRoY= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BB4D8384670E Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2127.outbound.protection.outlook.com [40.107.237.127]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-654-1wddGXFtPAmtmr9r2yc80Q-1; Mon, 23 Jun 2025 12:10:37 -0400 X-MC-Unique: 1wddGXFtPAmtmr9r2yc80Q-1 X-Mimecast-MFC-AGG-ID: 1wddGXFtPAmtmr9r2yc80Q_1750695036 Received: from SA1PR17MB5365.namprd17.prod.outlook.com (2603:10b6:806:1d8::11) by PH0PR17MB4637.namprd17.prod.outlook.com (2603:10b6:510:81::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.29; Mon, 23 Jun 2025 16:10:35 +0000 Received: from SA1PR17MB5365.namprd17.prod.outlook.com ([fe80::6398:7dc0:7d88:5a4d]) by SA1PR17MB5365.namprd17.prod.outlook.com ([fe80::6398:7dc0:7d88:5a4d%5]) with mapi id 15.20.8857.026; Mon, 23 Jun 2025 16:10:35 +0000 From: Jan Vrany To: gdb-patches@sourceware.org CC: Jan Vrany , Tom Tromey Subject: [RFC v5 02/18] gdb: introduce compunit_symtab::maybe_contains Date: Mon, 23 Jun 2025 17:09:57 +0100 Message-ID: <20250623161013.650814-3-jan.vrany@labware.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250623161013.650814-1-jan.vrany@labware.com> References: <20250623161013.650814-1-jan.vrany@labware.com> X-ClientProxiedBy: LNXP265CA0033.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:5c::21) To SA1PR17MB5365.namprd17.prod.outlook.com (2603:10b6:806:1d8::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA1PR17MB5365:EE_|PH0PR17MB4637:EE_ X-MS-Office365-Filtering-Correlation-Id: 90854b04-b4c2-455a-aef3-08ddb2707c59 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?CCy5R/EHqstroa9VqXw3yK5yP+h2h4YEwaAQweTkjNdRlLFCGkERkbXU/uvP?= =?us-ascii?Q?yPtKV6kKIKWiLfxNdoSm12t8+qVet99oiIASY4o2dvjPNKERS9WEUnU6bl9l?= =?us-ascii?Q?X+kGGQ92+pnRFceI/iNExcQIgxBEPuUnFZ4Uevkst/og/U8gtEl/5273W+jf?= =?us-ascii?Q?5JL93HVbljQD5UDgKXbKX7lRW7KaJCxJP4nkeB4h0RKNwpw2VSil7peGdrCY?= =?us-ascii?Q?z/EFPu5OgG1EoDN74kOLbaT/V5vrbJv4S5j6H4IXSdn046Q9QsrBACW0yoJD?= =?us-ascii?Q?WnxRd1cCFcZV3+CN98JAevxaGK6Hl1/sBkgCRLQbKqODd/xK3t8MTyAT87Qm?= =?us-ascii?Q?9yY7yjEJqf0Uwlqvg0GfAE/5lTu3Hz8z+PdU0jnpMT2ob/cwzIW53xqg/jQ5?= =?us-ascii?Q?wjWLNJt9+qBigNlDkQd8raYZZSqdhLLKdmjyn2sbBO9haOPwV41PAg7L281J?= =?us-ascii?Q?j5FBEZuS83bFiab5mXyQp/k4yE7U8Twaag6COzlCw1LqWbkxvzZqlVtyoIpa?= =?us-ascii?Q?5Y5pDTFYYV/GnNo2Yeq7BXwpSQunUBoQnyb6P579iLqDQd5onDfwD5hwW1VY?= =?us-ascii?Q?b3nxItBh0YH1Ww+5Q7Ur48sbLeUu7xIuTOCXxhvj6BIuHieotLz1jWM4i3Dh?= =?us-ascii?Q?mm5QbWx6oJ2jdSTf3MDAOdocobNQiJ/q1r3173mMTTIIpxJwM/dc1XPfZXAc?= =?us-ascii?Q?/lYP95aDUAAYMyVXDHrl8ACWrsGhN1yTgxkd8QEbQA3OkEnwvchzYJYYiNfq?= =?us-ascii?Q?b+M4EayA4tWIX09rHmDPYT9JKC5y61GWc138LpM8vrVbcNrjPvvJh3d/SXIf?= =?us-ascii?Q?vxDLhcgq0dK7vnYbkpa3CIvHPVvdVaGs5SksCtZ1VKik7myWiPtWgeMlSZaL?= =?us-ascii?Q?oSItO2fy3MBVZ62PYnculcdP1txnbsG+WeTdU6UBqtt1mdTLfUGdr9It/0W5?= =?us-ascii?Q?h90zJug3pyA1W34GGHamSsnifRwMJYRLB4auiowBM2IL0zHM0BjMtJ9hZlAQ?= =?us-ascii?Q?hGu+934ZXeeIPi9PI9BW1Sz7FTMgfpI3QDEQY+edWy8fZqkZP25AbRoj58hC?= =?us-ascii?Q?5aodzjzwFN9c9UIGyxrAmvlQIdvqlYq5zv7Gs1WgPR8Fcb6Q6nWgpMflNJgc?= =?us-ascii?Q?nLBB20RoatGzbdtF/zSzHyU5aHxC0paEDF7213XYXrmrTPE7cEilrab9pSMv?= =?us-ascii?Q?f/R7CgMXw7cxZjpR+rELC7LX4V7mEkfhO2JW5RUxk++Vs6cWdfSxjZoo3XGW?= =?us-ascii?Q?NGqDFVqR9aDKBv0wYrinZc5zKrf0/19rEu9GK0y1fsUJLBQ6beQwJasYDuXD?= =?us-ascii?Q?fQv8BoN/HJxRTZe3cMnYF7YXPsvZK7BsLXz6++7GuN0e6aT/DD4ejAnF64sI?= =?us-ascii?Q?3lzqLxzRff2CGzk/m+SyDtJHM1UHhqonk8wI9X+y1hI5jYiGJTqIICiTqaRQ?= =?us-ascii?Q?hx/sIc+qJZQ=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?V2GxBw55ijbILjEklU5JvGHHip09Li6M36XcrajsgGyGrnS/F9vAN7UXX8h2?= =?us-ascii?Q?OH0woVAzUs/5Hgcv8lwwLfj0Ip6Hn+2d/7tfSb6vS/c5usANfy4N1wuS3KxQ?= =?us-ascii?Q?P/2HC3oeBaxbgw1+WLcTAS4oQC6OZ+xEwQTr3XDYYbAaOxZrXeJavo1qp5QM?= =?us-ascii?Q?MrqZe6TF2JfZR0ZAqdv5aN6/1KPnktKZtRRBUDHAJVt/eEUj0uCbCkFhd4Zp?= =?us-ascii?Q?dt2M6IC4I4RX3MGnrLmV3B7iFh5g0IjfWgjMdCyqaxFObgZqkKBKtJvlGdYo?= =?us-ascii?Q?xadwnHJb0XpUBo/+AcvziY/ke/okO5o2PZJvfjIZn2eyMlb8adQFwtkcb5SA?= =?us-ascii?Q?+9qkKsOIOH0RTOVCZP9eDF7GcA4W51+18HGLk5GCL+yddDJYDasB0qS+1Thk?= =?us-ascii?Q?Qy8M2M63Dxz5dDrvGsQbYfnYjMEosn4yoPpGg/CjKZAXfGTc1yQ8a2WS3Qjf?= =?us-ascii?Q?bPekxV5kQsJyE3EemERPYRICZd7WZEQ07wB0cioy5Pev7kMgxCiqJdAANk+w?= =?us-ascii?Q?LzZme4qSmTw7teywY+QdmBC83vAlukjPVEBewkDenkkv2HjYT+yWjSeFCEgb?= =?us-ascii?Q?yf635ng7z1JFeKzWDHXgXmZtEJxKv4L1CXB6DSCg6VoebeXvCVWDUkFE2qUq?= =?us-ascii?Q?krj6voDj8vMRivhnBuBrB/6tY0CYPTXuCFhg9UuqG/ucI0JNfkBqoc8t/HMw?= =?us-ascii?Q?DWtO3BcaXVzfQ30Vmok/sJ+2G1H4IXqAAfVCNUnPS53uiKDQms8fm8TB+ORW?= =?us-ascii?Q?RMPbKWWZ+0NpFDvMvMf7u5JrlqKnNB8m98hsuPYzPXUkpjhb8I7OeDMZqH+N?= =?us-ascii?Q?pLgnbFljDv7sRjkaocHzMegZ7ZNnRcNLUJbJVw2A1UUTJcpz7az1W3DyR7tE?= =?us-ascii?Q?xOccJorhdh4CsMuvh2rtZGO3C12bXS7T9lsWpCUrtRzIQUekCYX4ANKtZCUo?= =?us-ascii?Q?O+6nNwv+fAM2oesmyVPova647PywjdgqaPlEhpFKhCPZJWOErsKzV2nroHVY?= =?us-ascii?Q?ukDPY731crhnFV1R+xGa9PGIoSh583w0HsIm8qGUf4wIj5Ji6o6bSLQJQWws?= =?us-ascii?Q?+F4m51YLgGFaJh9l3TFTiuWU95GoT6XB7P4cIoPnzs7n102ww05+ZOQaB5J/?= =?us-ascii?Q?zt5Sg5yFuUHF9m32gd+EQOzoj+x5xBROm0AaPbbogM5VCmQfXWdrIUIkaYQE?= =?us-ascii?Q?XOaCGu2Ky7khNomBz2CaejURrGsArzDQptx22rHjXbhcUEtCkaL/LOVAtwzM?= =?us-ascii?Q?SDsJCSJAQ61aMxRJu6GYswVb3FNPH67yAJVqjW3QdoY+rxvrImDWSBAYq1ng?= =?us-ascii?Q?+pj1834ZQr59meWJyIWwjJv+sP8vyq55KjVAb5U47jTpEdQvqrF/l7jyo8C7?= =?us-ascii?Q?mI0EMkIFDkSqmVXQUcplXgPFzEs1UoDnF15Dgib0UYqi+VG6kEPHp/00jGhj?= =?us-ascii?Q?Cu0opCF13J1R44kUN+G5lXrJq38o/OGES/lHFCFuh2Z95jnR7kRzYjxon+Of?= =?us-ascii?Q?UhtWaZfsJsQjbzQe1v0u/YWerhuYf1HRNelMLz12MJgdx7RGYYWA3WSy+BRc?= =?us-ascii?Q?4nbLJdTGlKuYJivsiPRDN8c4ShlXKOktXcIzoPEg?= X-OriginatorOrg: labware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 90854b04-b4c2-455a-aef3-08ddb2707c59 X-MS-Exchange-CrossTenant-AuthSource: SA1PR17MB5365.namprd17.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2025 16:10:35.0903 (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: NZNSh8qBQTqzazl/naMqmrdziDkFITc/xx9iILeaGXNJrp9vLOXggNeKgCrBikZ3SQPharDDfDaieq9iyxOOHQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR17MB4637 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: juvPwd__ANObUmLUYBrbbioAvZUvBynAoTH2ELXGOnw_1750695036 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 introduces new method - compunit_symtab::maybe_contains - returning true if a compunit_symtab may contain given address or false if it definitely cannot. This means, compunit_symtab::maybe_contains may return true even if in fact the compunit does not contain the address. This may happen for native ecoff format, as described in a comment in find_pc_sect_compunit_symtab (symtab.c). The second case described in that command (when objfiles that have their functions reordered) should be handled, in that DWARF reader sets blockvector's map accordingly and maybe_contains consults that map. Approved-By: Tom Tromey --- gdb/block.c | 23 +++++++++++++++++++++++ gdb/block.h | 4 ++++ gdb/symtab.c | 26 ++++++++++++-------------- gdb/symtab.h | 4 ++++ 4 files changed, 43 insertions(+), 14 deletions(-) diff --git a/gdb/block.c b/gdb/block.c index fdf209c86a2..54d768d7255 100644 --- a/gdb/block.c +++ b/gdb/block.c @@ -821,6 +821,29 @@ make_blockranges (struct objfile *objfile, return blr; } =20 +/* See block.h. */ + +bool blockvector::maybe_contains (CORE_ADDR addr) const +{ + const CORE_ADDR start =3D global_block ()->start (); + const CORE_ADDR end =3D global_block ()->end (); + + /* Check if given address falls into global block. If not, this compuni= t + definitely does not contain ADDR. */ + if (addr < start || end <=3D addr) + return false; + + /* A compunit may span over multiple disjoint regions (see comment in + find_pc_sect_compunit_symtab). DWARF reader sets address map mapping + addresses to blocks. So if the map is set and there is no block + mapped at ADDR, this compunit definitely does not contain ADDR. */ + if (map () !=3D nullptr && map ()->find (addr) =3D=3D nullptr) + return false; + + /* Otherwise, this compunit may or may not contain ADDR. */ + return true; +} + /* Implement 'maint info blocks' command. If passed an argument then print a list of all blocks at the given address. With no arguments then list all blocks at the current address of the current inferior. *= / diff --git a/gdb/block.h b/gdb/block.h index 76fa203697c..4a962eff30e 100644 --- a/gdb/block.h +++ b/gdb/block.h @@ -483,6 +483,10 @@ struct blockvector void set_map (addrmap_fixed *map) { m_map =3D map; } =20 + /* True if this blockvector contains block at ADDR, false if + it definitely does not. */ + bool maybe_contains (CORE_ADDR addr) const; + private: /* An address map mapping addresses to blocks in this blockvector. This pointer is zero if the blocks' start and end addresses are diff --git a/gdb/symtab.c b/gdb/symtab.c index b2de990143d..506e21eeac4 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -529,6 +529,14 @@ compunit_symtab::forget_cached_source_info () =20 /* See symtab.h. */ =20 +bool +compunit_symtab::maybe_contains (CORE_ADDR addr) const +{ + return this->blockvector ()->maybe_contains (addr); +} + +/* See symtab.h. */ + void compunit_symtab::finalize () { @@ -2931,23 +2939,13 @@ find_pc_sect_compunit_symtab (CORE_ADDR pc, struct = obj_section *section) { for (compunit_symtab *cust : obj_file->compunits ()) =09{ -=09 const struct blockvector *bv =3D cust->blockvector (); -=09 const struct block *global_block =3D bv->global_block (); -=09 CORE_ADDR start =3D global_block->start (); -=09 CORE_ADDR end =3D global_block->end (); -=09 bool in_range_p =3D start <=3D pc && pc < end; -=09 if (!in_range_p) +=09 if (!cust->maybe_contains (pc)) =09 continue; =20 -=09 if (bv->map () !=3D nullptr) -=09 { -=09 if (bv->map ()->find (pc) =3D=3D nullptr) -=09=09continue; - -=09 return cust; -=09 } +=09 const struct blockvector *bv =3D cust->blockvector (); +=09 CORE_ADDR range =3D +=09 bv->global_block ()->end () - bv->global_block ()->start (); =20 -=09 CORE_ADDR range =3D end - start; =09 if (best_cust !=3D nullptr =09 && range >=3D best_cust_range) =09 /* Cust doesn't have a smaller range than best_cust, skip it. */ diff --git a/gdb/symtab.h b/gdb/symtab.h index 0a57be5ed80..7f084cef691 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -1963,6 +1963,10 @@ struct compunit_symtab compunit_symtab objects are allocated on an obstack. */ void finalize (); =20 + /* True if ADDR may be in this compunit_symtab, false if + definitely is not. */ + bool maybe_contains (CORE_ADDR addr) const; + /* Unordered chain of all compunit symtabs of this objfile. */ struct compunit_symtab *next; =20 --=20 2.47.2