From patchwork Sun Nov 12 20:25:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 79670 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 CC7293856DD5 for ; Sun, 12 Nov 2023 20:27:04 +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 ED4AC3858C52 for ; Sun, 12 Nov 2023 20:25:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ED4AC3858C52 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 ED4AC3858C52 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=1699820738; cv=none; b=r+s22A6temy5j+G9gyocP/TPlV806NbhtyGU/8m5VIVqtl68tI9WTR5KsLa8ypbzji5IiJ+u8AMMDRGvPLX4VGNWFpkQogD8ho2XNj72J0bS8SA30mRxQRs6aFOpRRAA1LSVJihPpZ6KT1E2P72Cjqfrb+ilPu94SBYW7i0FVsU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699820738; c=relaxed/simple; bh=mVFFzrgbYbzGOKTrmJP8V6ViOpWgJnrReDgeKxZyQV0=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=F/0IEyR2GbY0mPvl7E3ldfKV/LOaQ3plE4Wd4otvJqVF7WGpaqI2gYyfXjdQmgHsds5yIJ880VWrshqTxq3K+qUjKnx9Ulg9ItSQeCNQG9qW83ojfcSRjvP8NtC246BAVu5t7zYcTH9hU4f/Z05DyPxSbYjojq/1DSRgQaEohqg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6006a.ext.cloudfilter.net ([10.0.30.182]) by cmsmtp with ESMTPS id 27AIrtoXsL9Ag2H1SrVwdS; Sun, 12 Nov 2023 20:25:34 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id 2H1Qr4hhUGKIc2H1Qr5MTV; Sun, 12 Nov 2023 20:25:33 +0000 X-Authority-Analysis: v=2.4 cv=E+beGIRl c=1 sm=1 tr=0 ts=655134bd a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10 a=BNY50KLci1gA:10 a=Qbun_eYptAEA:10 a=NCcGvFC-7IuRexjrVQYA:9 a=QEXdDO2ut3YA:10 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Cc: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=kA7cNFg8KE+thoRb2phnW+/zVQ5WC1lZaloCKR+RC4U=; b=yfbCTh61Di03cRA4GHvOKRiUi5 r2LkK/BsQKx+NHdhjqUPhBt3knuestqA1qHrRpI+PHFid76/KTFfG6VA1pKi2CYudql3SIdjLmO3e 4VWnN/dwSQjbt4PZ3LOoU7+do; Received: from 97-122-77-73.hlrn.qwest.net ([97.122.77.73]:34540 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1r2H1Q-000cUU-1Z for gdb-patches@sourceware.org; Sun, 12 Nov 2023 13:25:32 -0700 From: Tom Tromey Date: Sun, 12 Nov 2023 13:25:43 -0700 Subject: [PATCH v2 06/18] Add quick_symbol_functions::compute_main_name MIME-Version: 1.0 Message-Id: <20231112-t-bg-dwarf-reading-v2-6-70fb170012ba@tromey.com> References: <20231112-t-bg-dwarf-reading-v2-0-70fb170012ba@tromey.com> In-Reply-To: <20231112-t-bg-dwarf-reading-v2-0-70fb170012ba@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 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: 1r2H1Q-000cUU-1Z X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-77-73.hlrn.qwest.net ([192.168.0.21]) [97.122.77.73]:34540 X-Source-Auth: tom+tromey.com X-Email-Count: 7 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfFHx6kXTWzsXaQ0/vhyXKBb3DFZArjnaoYeFmFXnTD3HaKmTjwS2dPFJc2VJFC6oXfixa0r7+/VLmnRXQ3naZlUu0XfRH2y+f48Iz9+b0bO3r+ZE8KW5 jTOfi6jO0wqAI+BG6L1clHo/2YOH7Kwakb8+IiYODLna83TaybiJP1U4KqotdbzoPp4kIRi61VCeNF5sZsqIsM0Qtx03PYzcM1c= X-Spam-Status: No, score=-3024.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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 This adds a new compute_main_name method to quick_symbol_functions. Currently there are no implementations of this, but a subsequent patch will add one. --- gdb/objfiles.h | 3 +++ gdb/quick-symbol.h | 9 +++++++++ gdb/symfile-debug.c | 12 ++++++++++++ gdb/symtab.c | 2 ++ 4 files changed, 26 insertions(+) diff --git a/gdb/objfiles.h b/gdb/objfiles.h index 4b8aa9bfcec..c0ca9de6874 100644 --- a/gdb/objfiles.h +++ b/gdb/objfiles.h @@ -601,6 +601,9 @@ struct objfile void map_symbol_filenames (gdb::function_view fun, bool need_fullname); + /* See quick_symbol_functions. */ + void compute_main_name (); + /* See quick_symbol_functions. */ struct compunit_symtab *find_compunit_symtab_by_address (CORE_ADDR address); diff --git a/gdb/quick-symbol.h b/gdb/quick-symbol.h index a7fea2ccb49..49505aef64a 100644 --- a/gdb/quick-symbol.h +++ b/gdb/quick-symbol.h @@ -212,6 +212,15 @@ struct quick_symbol_functions gdb::function_view fun, bool need_fullname) = 0; + /* Compute the name and language of the main function for the given + objfile. Normally this is done during symbol reading, but this + method exists in case this work is done in a worker thread and + must be waited for. The implementation can call + set_objfile_main_name if results are found. */ + virtual void compute_main_name (struct objfile *objfile) + { + } + /* Return true if this class can lazily read the symbols. This may only return true if there are in fact symbols to be read, because this is used in the implementation of 'has_partial_symbols'. */ diff --git a/gdb/symfile-debug.c b/gdb/symfile-debug.c index 850da4147a3..4b27d9eb406 100644 --- a/gdb/symfile-debug.c +++ b/gdb/symfile-debug.c @@ -483,6 +483,18 @@ objfile::map_symbol_filenames (gdb::function_view fun, iter->map_symbol_filenames (this, fun, need_fullname); } +void +objfile::compute_main_name () +{ + if (debug_symfile) + gdb_printf (gdb_stdlog, + "qf->compute_main_name (%s)\n", + objfile_debug_name (this)); + + for (const auto &iter : qf_require_partial_symbols ()) + iter->compute_main_name (this); +} + struct compunit_symtab * objfile::find_compunit_symtab_by_address (CORE_ADDR address) { diff --git a/gdb/symtab.c b/gdb/symtab.c index 5ec56f4f2af..ea003a4d4c9 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -6237,6 +6237,8 @@ find_main_name (void) accurate. */ for (objfile *objfile : current_program_space->objfiles ()) { + objfile->compute_main_name (); + if (objfile->per_bfd->name_of_main != NULL) { set_main_name (pspace,