From patchwork Sun Oct 29 17:35:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 78689 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C41C83865C2A for ; Sun, 29 Oct 2023 17:40:16 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta40.uswest2.a.cloudfilter.net (omta40.uswest2.a.cloudfilter.net [35.89.44.39]) by sourceware.org (Postfix) with ESMTPS id CC9483861878 for ; Sun, 29 Oct 2023 17:38:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CC9483861878 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org CC9483861878 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698601114; cv=none; b=PcApgVNl6HLfsd8+/FRRoPLrEny7gH04epjOoQraJ534iE9TVD7i9b/Uv/qqiTCt8ztOzQfiPnbNQLjCb8tsNaIQhHK1Ch1Zz7WoYhf27nhi2vA+8saEzVLPXZjAfxr5P7Q/ZoQX8h4NhRRaqTj1LPxR1cM6h89jAfW5CzIImEI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698601114; c=relaxed/simple; bh=Gxa1dVg0qwfxDk2N3y+0Gb3KnagZ1wVWlTl0mbD5CEc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=ZEsPJwER77lfq4RTV2kDSOm4kvkKZIZWuhdFbYg2VGT5x2PF/vODr1VkhFprvN679wDbuBN4rP49lNsev4MVTBvQPI3++Ox6VBbI+4lrB1tR4M2aby3F3/l6NpEBDSu3RRCsLutdUwINXTrhsH4EYrdCXPiDs5iGwJWNvApr60w= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-5010a.ext.cloudfilter.net ([10.0.29.199]) by cmsmtp with ESMTPS id x8CpqtEZyL9Agx9k2qcQg2; Sun, 29 Oct 2023 17:38:27 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id x9k2qmhbEoIDwx9k2qqmaz; Sun, 29 Oct 2023 17:38:26 +0000 X-Authority-Analysis: v=2.4 cv=TP1W9npa c=1 sm=1 tr=0 ts=653e9892 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=bhdUkHdE2iEA:10 a=Qbun_eYptAEA:10 a=DZavHcuwyplPiQb90MwA:9 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=C7e+80YUCuIQM+25A4CnoWl3YMPXrsW7IK8Yq3jGtww=; b=hBXQru7xYa6/OHAUdgdTPIiQtF GzK+890CDbZ6NUl17KZDTGuzv6aJc0DLKS3Co4ISLl9BChLsfMHbi33wTR/wLBhnvZh1148c9pxrK jNqwEG9mAQVdfalPvWcYCfCgX; Received: from 97-122-77-73.hlrn.qwest.net ([97.122.77.73]:47464 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1qx9k1-000nk4-2T; Sun, 29 Oct 2023 11:38:25 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 09/15] Simplify the public DWARF API Date: Sun, 29 Oct 2023 11:35:28 -0600 Message-ID: <20231029173839.471514-10-tom@tromey.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231029173839.471514-1-tom@tromey.com> References: <20231029173839.471514-1-tom@tromey.com> MIME-Version: 1.0 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.77.73 X-Source-L: No X-Exim-ID: 1qx9k1-000nk4-2T X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-77-73.hlrn.qwest.net (localhost.localdomain) [97.122.77.73]:47464 X-Source-Auth: tom+tromey.com X-Email-Count: 10 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfDDCghQVDC46kMrvvuTrYmAQ8+6trz/jWKsECdGqR6LLoJtBNtnY8YbyQ2wj42EtBYl5Fs9vqoU1gi3k7EJvxzFk5GyxDU1ENTwr2WY4mDc4QsgZwxlI 0NpdvtRQ8PB1MAqlFAjJby+Byci/UyZNNmmNyCPXWH42YwtVaib57zL5oMF3QuGMAiqs1jDnFpiaBq88L5pBWryPd9ef3qyqhd4= X-Spam-Status: No, score=-3024.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org 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+patchwork=sourceware.org@sourceware.org dwarf2_has_info and dwarf2_initialize_objfile are only separate because the DWARF reader implemented lazy psymtab reading. However, now that this is gone, we can simplify the public DWARF API again. --- gdb/coffread.c | 8 +++----- gdb/dwarf2/public.h | 18 ++++++++++------- gdb/dwarf2/read.c | 49 ++++++++++++++++++++------------------------- gdb/elfread.c | 6 ++++-- gdb/machoread.c | 11 ++-------- gdb/xcoffread.c | 3 +-- 6 files changed, 43 insertions(+), 52 deletions(-) diff --git a/gdb/coffread.c b/gdb/coffread.c index 4a6a83b15ad..b0c9c47f13d 100644 --- a/gdb/coffread.c +++ b/gdb/coffread.c @@ -718,11 +718,9 @@ coff_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags) *info->stabsects, info->stabstrsect->filepos, stabstrsize); } - if (dwarf2_has_info (objfile, NULL)) - { - /* DWARF2 sections. */ - dwarf2_initialize_objfile (objfile); - } + + /* DWARF2 sections. */ + dwarf2_initialize_objfile (objfile); /* Try to add separate debug file if no symbols table found. */ if (!objfile->has_partial_symbols ()) diff --git a/gdb/dwarf2/public.h b/gdb/dwarf2/public.h index 0e74857eb1a..efb754b5fe8 100644 --- a/gdb/dwarf2/public.h +++ b/gdb/dwarf2/public.h @@ -20,10 +20,6 @@ #ifndef DWARF2_PUBLIC_H #define DWARF2_PUBLIC_H -extern bool dwarf2_has_info (struct objfile *, - const struct dwarf2_debug_sections *, - bool = false); - /* A DWARF names index variant. */ enum class dw_index_kind { @@ -34,9 +30,17 @@ enum class dw_index_kind DEBUG_NAMES, }; -/* Initialize for reading DWARF for OBJFILE, and push the appropriate - entry on the objfile's "qf" list. */ -extern void dwarf2_initialize_objfile (struct objfile *objfile); +/* Try to locate the sections we need for DWARF 2 debugging + information. If these are found, begin reading the DWARF and + return true. Otherwise, return false. NAMES points to the dwarf2 + section names, or is NULL if the standard ELF names are used. + CAN_COPY is true for formats where symbol interposition is possible + and so symbol values must follow copy relocation rules. */ + +extern bool dwarf2_initialize_objfile + (struct objfile *, + const struct dwarf2_debug_sections * = nullptr, + bool = false); extern void dwarf2_build_frame_info (struct objfile *); diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 3dbe65432d2..5a32710233d 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -1357,14 +1357,10 @@ dwarf2_per_objfile::set_symtab (const dwarf2_per_cu_data *per_cu, this->m_symtabs[per_cu->index] = symtab; } -/* Try to locate the sections we need for DWARF 2 debugging - information and return true if we have enough to do something. - NAMES points to the dwarf2 section names, or is NULL if the standard - ELF names are used. CAN_COPY is true for formats where symbol - interposition is possible and so symbol values must follow copy - relocation rules. */ +/* Helper function for dwarf2_initialize_objfile that creates the + per-BFD object. */ -bool +static bool dwarf2_has_info (struct objfile *objfile, const struct dwarf2_debug_sections *names, bool can_copy) @@ -3211,9 +3207,14 @@ static quick_symbol_functions_up make_cooked_index_funcs /* See dwarf2/public.h. */ -void -dwarf2_initialize_objfile (struct objfile *objfile) +bool +dwarf2_initialize_objfile (struct objfile *objfile, + const struct dwarf2_debug_sections *names, + bool can_copy) { + if (!dwarf2_has_info (objfile, names, can_copy)) + return false; + dwarf2_per_objfile *per_objfile = get_dwarf2_per_objfile (objfile); dwarf2_per_bfd *per_bfd = per_objfile->per_bfd; @@ -3245,48 +3246,42 @@ dwarf2_initialize_objfile (struct objfile *objfile) = create_quick_file_names_table (per_bfd->all_units.size ()); objfile->qf.emplace_front (new readnow_functions); - return; } - /* Was a GDB index already read when we processed an objfile sharing PER_BFD? */ - if (per_bfd->index_table != nullptr) + else if (per_bfd->index_table != nullptr) { dwarf_read_debug_printf ("re-using symbols"); objfile->qf.push_front (per_bfd->index_table->make_quick_functions ()); - return; } - - if (dwarf2_read_debug_names (per_objfile)) + else if (dwarf2_read_debug_names (per_objfile)) { dwarf_read_debug_printf ("found debug names"); objfile->qf.push_front (per_bfd->index_table->make_quick_functions ()); - return; } - - if (dwarf2_read_gdb_index (per_objfile, - get_gdb_index_contents_from_section, - get_gdb_index_contents_from_section)) + else if (dwarf2_read_gdb_index (per_objfile, + get_gdb_index_contents_from_section, + get_gdb_index_contents_from_section)) { dwarf_read_debug_printf ("found gdb index from file"); objfile->qf.push_front (per_bfd->index_table->make_quick_functions ()); - return; } - /* ... otherwise, try to find the index in the index cache. */ - if (dwarf2_read_gdb_index (per_objfile, + else if (dwarf2_read_gdb_index (per_objfile, get_gdb_index_contents_from_cache, get_gdb_index_contents_from_cache_dwz)) { dwarf_read_debug_printf ("found gdb index from cache"); global_index_cache.hit (); objfile->qf.push_front (per_bfd->index_table->make_quick_functions ()); - return; } - - global_index_cache.miss (); - objfile->qf.push_front (make_cooked_index_funcs (per_objfile)); + else + { + global_index_cache.miss (); + objfile->qf.push_front (make_cooked_index_funcs (per_objfile)); + } + return true; } diff --git a/gdb/elfread.c b/gdb/elfread.c index 7900dfbc388..d12dbc25f7a 100644 --- a/gdb/elfread.c +++ b/gdb/elfread.c @@ -1200,8 +1200,10 @@ elf_symfile_read_dwarf2 (struct objfile *objfile, { bool has_dwarf2 = true; - if (dwarf2_has_info (objfile, NULL, true)) - dwarf2_initialize_objfile (objfile); + if (dwarf2_initialize_objfile (objfile, nullptr, true)) + { + /* Nothing. */ + } /* If the file has its own symbol tables it has no separate debug info. `.dynsym'/`.symtab' go to MSYMBOLS, `.debug_info' goes to SYMTABS/PSYMTABS. `.gnu_debuglink' may no longer be present with diff --git a/gdb/machoread.c b/gdb/machoread.c index 38c252c2861..e701a7366c2 100644 --- a/gdb/machoread.c +++ b/gdb/machoread.c @@ -785,6 +785,8 @@ macho_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags) macho_symfile_read_all_oso at the end of this function. */ gdb::def_vector symbol_table; + dwarf2_initialize_objfile (objfile); + /* Get symbols from the symbol table only if the file is an executable. The symbol table of object files is not relocated and is expected to be in the executable. */ @@ -822,9 +824,6 @@ macho_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags) } /* Try to read .eh_frame / .debug_frame. */ - /* First, locate these sections. We ignore the result status - as it only checks for debug info. */ - dwarf2_has_info (objfile, NULL); dwarf2_build_frame_info (objfile); /* Check for DSYM file. */ @@ -854,12 +853,6 @@ macho_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags) } } - if (dwarf2_has_info (objfile, NULL)) - { - /* DWARF 2 sections */ - dwarf2_initialize_objfile (objfile); - } - /* Then the oso. */ if (!oso_vector.empty ()) macho_symfile_read_all_oso (&oso_vector, objfile, symfile_flags); diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c index e6ecf2a6de5..23fd38c9aa2 100644 --- a/gdb/xcoffread.c +++ b/gdb/xcoffread.c @@ -2871,8 +2871,7 @@ xcoff_initial_scan (struct objfile *objfile, symfile_add_flags symfile_flags) /* DWARF2 sections. */ - if (dwarf2_has_info (objfile, &dwarf2_xcoff_names)) - dwarf2_initialize_objfile (objfile); + dwarf2_initialize_objfile (objfile, &dwarf2_xcoff_names); } static void