From patchwork Sun Oct 29 23:23:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 78704 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 AB4A038768A2 for ; Sun, 29 Oct 2023 23:24:03 +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 033DC38618F4 for ; Sun, 29 Oct 2023 23:23:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 033DC38618F4 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 033DC38618F4 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=1698621793; cv=none; b=WrmHZM2U7DY+tUexwNYD3VH+RLPwmIhNauS2W3IyC7GJw+2Ga66JM+GTdFk7M6APUEIwngM5AT9IBipCN39UX8hhX3D8eqgN/VY5KIMMN0ZCy9tQLQGMw4YulG3Y0AEuV5GZrCpp89i9GaOHChGsAosuzcNdREtqJEbn1LVmLIg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698621793; c=relaxed/simple; bh=DPvThK9Hi8lJ3cDNv8l1mdVMIC/SwfsF7LcMAIBkbkQ=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=vmhqDGE2APpWxFmZ69JYZyIfu3n0uBIFnYkVkgcyYEStdrOBVrzoD6gZVGDZTLUcIfsFVyjt1EJwyRl6Y8Dv6e1qexLaY6GcOsibMSPH3b7FvcOyKdlb9K5Tol1t9h2w+CyuKRtaIxuuLiyGNUcHxqqGjNy3qI63lKdNZU0vUvc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-5001a.ext.cloudfilter.net ([10.0.29.139]) by cmsmtp with ESMTPS id wu9rqrZtsL9AgxF7cqdPr5; Sun, 29 Oct 2023 23:23:08 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id xF7bqy0HOkmEdxF7bqWc8P; Sun, 29 Oct 2023 23:23:07 +0000 X-Authority-Analysis: v=2.4 cv=AsL9YcxP c=1 sm=1 tr=0 ts=653ee95b a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10 a=bhdUkHdE2iEA:10 a=Qbun_eYptAEA:10 a=vdn_P9uBLAvIqKZbNcQA: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=q2Vlx3e2jSIOMCiEsZm7xt3crHc7RzpftVTxddlFXrE=; b=WXFajf3cw0dN3QT+c/3xnaSK3q QOtAQ8NfWUa6maRPse/QfYm/iAHtDEqzVHLw2cSYw1eSWznjet7HmI4WzSHvIyKouPxgo2jLnBcLC 11qj6++KK/EIL837gXI2l0dun; Received: from 97-122-77-73.hlrn.qwest.net ([97.122.77.73]:56344 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 1qxF7b-0042zY-0S for gdb-patches@sourceware.org; Sun, 29 Oct 2023 17:23:07 -0600 From: Tom Tromey Date: Sun, 29 Oct 2023 17:23:30 -0600 Subject: [PATCH 09/30] Use block_symbol::address in linespec.c MIME-Version: 1.0 Message-Id: <20231029-split-objfile-2023-bound-sym-october-v1-9-612531df2734@tromey.com> References: <20231029-split-objfile-2023-bound-sym-october-v1-0-612531df2734@tromey.com> In-Reply-To: <20231029-split-objfile-2023-bound-sym-october-v1-0-612531df2734@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: 1qxF7b-0042zY-0S 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]:56344 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: MS4xfL9u36EW75ZmyDAhqsm5X6zkh/S0akrfQOl8+RIVquHJGCE8EOqVrkZjxU96+/Dbky/FpIypVTcJicGe7EhTMpIBP+Mzsbn9QuG/87tfQ7aZtCO1nTdo m4jHYXg1O9TKYHTN2fE4WyyWm3hmfC4Q0xpP1nGVDKVYUWXMWh5cBRsTXhC2xXtP0hYs6Ng3Ty5Dfw/Hn3I84AQ3o0dvp2wGAkk= X-Spam-Status: No, score=-3024.5 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 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 changes linespec.c to use block_symbol::address. --- gdb/linespec.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gdb/linespec.c b/gdb/linespec.c index fa733d880e3..a118a20cade 100644 --- a/gdb/linespec.c +++ b/gdb/linespec.c @@ -383,7 +383,7 @@ static struct line_offset const char *variable); static int symbol_to_sal (struct symtab_and_line *result, - int funfirstline, struct symbol *sym); + int funfirstline, block_symbol sym); static void add_matching_symbols_to_info (const char *name, symbol_name_match_type name_match_type, @@ -2187,7 +2187,7 @@ convert_linespec_to_sals (struct linespec_state *state, linespec *ls) struct program_space *pspace = sym.symbol->symtab ()->compunit ()->objfile ()->pspace; - if (symbol_to_sal (&sal, state->funfirstline, sym.symbol) + if (symbol_to_sal (&sal, state->funfirstline, sym) && maybe_add_address (state->addr_set, pspace, sal.pc)) add_sal_to_sals (state, &sals, &sal, sym.symbol->natural_name (), 0); @@ -2252,7 +2252,7 @@ convert_linespec_to_sals (struct linespec_state *state, linespec *ls) if (!found_ifunc) { symtab_and_line sal; - if (symbol_to_sal (&sal, state->funfirstline, sym.symbol) + if (symbol_to_sal (&sal, state->funfirstline, sym) && maybe_add_address (state->addr_set, pspace, sal.pc)) add_sal_to_sals (state, &sals, &sal, sym.symbol->natural_name (), 0); @@ -4358,8 +4358,9 @@ add_matching_symbols_to_info (const char *name, static int symbol_to_sal (struct symtab_and_line *result, - int funfirstline, struct symbol *sym) + int funfirstline, block_symbol bsym) { + symbol *sym = bsym.symbol; if (sym->aclass () == LOC_BLOCK) { *result = find_function_start_sal (sym, funfirstline); @@ -4367,13 +4368,13 @@ symbol_to_sal (struct symtab_and_line *result, } else { - if (sym->aclass () == LOC_LABEL && sym->value_address () != 0) + if (sym->aclass () == LOC_LABEL && bsym.address () != 0) { *result = {}; result->symtab = sym->symtab (); result->symbol = sym; result->line = sym->line (); - result->pc = sym->value_address (); + result->pc = bsym.address (); result->pspace = result->symtab->compunit ()->objfile ()->pspace; result->explicit_pc = 1; return 1; @@ -4389,7 +4390,7 @@ symbol_to_sal (struct symtab_and_line *result, result->symtab = sym->symtab (); result->symbol = sym; result->line = sym->line (); - result->pc = sym->value_address (); + result->pc = bsym.address (); result->pspace = result->symtab->compunit ()->objfile ()->pspace; return 1; }