From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway33.websitewelcome.com (gateway33.websitewelcome.com [192.185.145.87]) by sourceware.org (Postfix) with ESMTPS id 58398385800C for ; Sat, 4 Dec 2021 20:38:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 58398385800C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=tromey.com Received: from cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway33.websitewelcome.com (Postfix) with ESMTP id A1E5E40F0073 for ; Sat, 4 Dec 2021 14:38:47 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id tbnzmwWjOIQaEtbnzmrdzC; Sat, 04 Dec 2021 14:38:47 -0600 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=FIXNHYvKtI4QZPNfyA8RGGST7LRMYyvh+Enw1FClrPA=; b=KcbyLPiT/kelJ12b6KEuSdJMtF +yGAxXGcoMQu6F0rWnPavtEeE84TroSZ9DsPIe5BlsS+nThoY3Z2k/GmYpIcfhEtAKWsekQvKOKdO taL45jgWPW3yKZ9haeG175do8; Received: from 97-122-84-67.hlrn.qwest.net ([97.122.84.67]:51986 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mtbnz-000epk-IU; Sat, 04 Dec 2021 13:38:47 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v3 04/33] Refactor dwarf2_get_pc_bounds Date: Sat, 4 Dec 2021 13:38:15 -0700 Message-Id: <20211204203844.1188999-5-tom@tromey.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211204203844.1188999-1-tom@tromey.com> References: <20211204203844.1188999-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.84.67 X-Source-L: No X-Exim-ID: 1mtbnz-000epk-IU X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-84-67.hlrn.qwest.net (localhost.localdomain) [97.122.84.67]:51986 X-Source-Auth: tom+tromey.com X-Email-Count: 5 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3031.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Dec 2021 20:38:58 -0000 This changes dwarf2_get_pc_bounds so that it does not directly access a psymtab or psymtabs_addrmap. Instead, both the addrmap and the desired payload are passed as parameters. This makes it suitable to be used by the new indexer. --- gdb/dwarf2/read.c | 49 ++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 23b4fdf3cad..fcfad3e3361 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -1297,7 +1297,8 @@ enum pc_bounds_kind static enum pc_bounds_kind dwarf2_get_pc_bounds (struct die_info *, CORE_ADDR *, CORE_ADDR *, struct dwarf2_cu *, - dwarf2_psymtab *); + addrmap *, + void *); static void get_scope_pc_bounds (struct die_info *, CORE_ADDR *, CORE_ADDR *, @@ -7026,8 +7027,11 @@ process_psymtab_comp_unit_reader (const struct die_reader_specs *reader, /* Possibly set the default values of LOWPC and HIGHPC from `DW_AT_ranges'. */ - cu_bounds_kind = dwarf2_get_pc_bounds (comp_unit_die, &best_lowpc, - &best_highpc, cu, pst); + cu_bounds_kind + = dwarf2_get_pc_bounds (comp_unit_die, &best_lowpc, + &best_highpc, cu, + per_bfd->partial_symtabs->psymtabs_addrmap, + pst); if (cu_bounds_kind == PC_BOUNDS_HIGH_LOW && best_lowpc < best_highpc) { CORE_ADDR low @@ -8145,9 +8149,9 @@ add_partial_module (struct partial_die_info *pdi, CORE_ADDR *lowpc, scan_partial_symbols (pdi->die_child, lowpc, highpc, set_addrmap, cu); } -static int -dwarf2_ranges_read (unsigned, CORE_ADDR *, CORE_ADDR *, struct dwarf2_cu *, - dwarf2_psymtab *, dwarf_tag); +static int dwarf2_ranges_read (unsigned offset, CORE_ADDR *low_return, + CORE_ADDR *high_return, struct dwarf2_cu *cu, + addrmap *map, void *datum, dwarf_tag tag); /* Read a partial die corresponding to a subprogram or an inlined subprogram and create a partial symbol for that subprogram. @@ -8201,6 +8205,9 @@ add_partial_subprogram (struct partial_die_info *pdi, if (pdi->has_range_info && dwarf2_ranges_read (pdi->ranges_offset, &pdi->lowpc, &pdi->highpc, cu, + (set_addrmap + ? cu->per_objfile->per_bfd->partial_symtabs->psymtabs_addrmap + : nullptr), set_addrmap ? cu->per_cu->v.psymtab : nullptr, pdi->tag)) { @@ -13088,7 +13095,7 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu) } /* Ignore functions with missing or invalid low and high pc attributes. */ - if (dwarf2_get_pc_bounds (die, &lowpc, &highpc, cu, NULL) + if (dwarf2_get_pc_bounds (die, &lowpc, &highpc, cu, nullptr, nullptr) <= PC_BOUNDS_INVALID) { attr = dwarf2_attr (die, DW_AT_external, cu); @@ -13261,7 +13268,7 @@ read_lexical_block_scope (struct die_info *die, struct dwarf2_cu *cu) as multiple lexical blocks? Handling children in a sane way would be nasty. Might be easier to properly extend generic blocks to describe ranges. */ - switch (dwarf2_get_pc_bounds (die, &lowpc, &highpc, cu, NULL)) + switch (dwarf2_get_pc_bounds (die, &lowpc, &highpc, cu, nullptr, nullptr)) { case PC_BOUNDS_NOT_PRESENT: /* DW_TAG_lexical_block has no attributes, process its children as if @@ -13506,7 +13513,8 @@ read_call_site_scope (struct die_info *die, struct dwarf2_cu *cu) CORE_ADDR lowpc; /* DW_AT_entry_pc should be preferred. */ - if (dwarf2_get_pc_bounds (target_die, &lowpc, NULL, target_cu, NULL) + if (dwarf2_get_pc_bounds (target_die, &lowpc, NULL, target_cu, + nullptr, nullptr) <= PC_BOUNDS_INVALID) complaint (_("DW_AT_call_target target DIE has invalid " "low pc, for referencing DIE %s [in module %s]"), @@ -14007,15 +14015,15 @@ dwarf2_ranges_process (unsigned offset, struct dwarf2_cu *cu, dwarf_tag tag, /* Get low and high pc attributes from DW_AT_ranges attribute value OFFSET. Return 1 if the attributes are present and valid, otherwise, return 0. - If RANGES_PST is not NULL we should set up the `psymtabs_addrmap'. */ + TAG is passed to dwarf2_ranges_process. If MAP is not NULL, then + ranges in MAP are set, using DATUM as the value. */ static int dwarf2_ranges_read (unsigned offset, CORE_ADDR *low_return, CORE_ADDR *high_return, struct dwarf2_cu *cu, - dwarf2_psymtab *ranges_pst, dwarf_tag tag) + addrmap *map, void *datum, dwarf_tag tag) { struct objfile *objfile = cu->per_objfile->objfile; - dwarf2_per_bfd *per_bfd = cu->per_objfile->per_bfd; struct gdbarch *gdbarch = objfile->arch (); const CORE_ADDR baseaddr = objfile->text_section_offset (); int low_set = 0; @@ -14026,7 +14034,7 @@ dwarf2_ranges_read (unsigned offset, CORE_ADDR *low_return, retval = dwarf2_ranges_process (offset, cu, tag, [&] (CORE_ADDR range_beginning, CORE_ADDR range_end) { - if (ranges_pst != NULL) + if (map != nullptr) { CORE_ADDR lowpc; CORE_ADDR highpc; @@ -14037,8 +14045,7 @@ dwarf2_ranges_read (unsigned offset, CORE_ADDR *low_return, highpc = (gdbarch_adjust_dwarf2_addr (gdbarch, range_end + baseaddr) - baseaddr); - addrmap_set_empty (per_bfd->partial_symtabs->psymtabs_addrmap, - lowpc, highpc - 1, ranges_pst); + addrmap_set_empty (map, lowpc, highpc - 1, datum); } /* FIXME: This is recording everything as a low-high @@ -14081,7 +14088,7 @@ dwarf2_ranges_read (unsigned offset, CORE_ADDR *low_return, static enum pc_bounds_kind dwarf2_get_pc_bounds (struct die_info *die, CORE_ADDR *lowpc, CORE_ADDR *highpc, struct dwarf2_cu *cu, - dwarf2_psymtab *pst) + addrmap *map, void *datum) { dwarf2_per_objfile *per_objfile = cu->per_objfile; struct attribute *attr; @@ -14124,8 +14131,8 @@ dwarf2_get_pc_bounds (struct die_info *die, CORE_ADDR *lowpc, /* Value of the DW_AT_ranges attribute is the offset in the .debug_ranges section. */ - if (!dwarf2_ranges_read (ranges_offset, &low, &high, cu, pst, - die->tag)) + if (!dwarf2_ranges_read (ranges_offset, &low, &high, cu, + map, datum, die->tag)) return PC_BOUNDS_INVALID; /* Found discontinuous range of addresses. */ ret = PC_BOUNDS_RANGES; @@ -14168,7 +14175,8 @@ dwarf2_get_subprogram_pc_bounds (struct die_info *die, CORE_ADDR low, high; struct die_info *child = die->child; - if (dwarf2_get_pc_bounds (die, &low, &high, cu, NULL) >= PC_BOUNDS_RANGES) + if (dwarf2_get_pc_bounds (die, &low, &high, cu, nullptr, nullptr) + >= PC_BOUNDS_RANGES) { *lowpc = std::min (*lowpc, low); *highpc = std::max (*highpc, high); @@ -14205,7 +14213,8 @@ get_scope_pc_bounds (struct die_info *die, CORE_ADDR best_high = (CORE_ADDR) 0; CORE_ADDR current_low, current_high; - if (dwarf2_get_pc_bounds (die, ¤t_low, ¤t_high, cu, NULL) + if (dwarf2_get_pc_bounds (die, ¤t_low, ¤t_high, cu, + nullptr, nullptr) >= PC_BOUNDS_RANGES) { best_low = current_low; -- 2.31.1