From patchwork Sun Oct 29 23:23:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 78706 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 493DE3875454 for ; Sun, 29 Oct 2023 23:24:06 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta34.uswest2.a.cloudfilter.net (omta34.uswest2.a.cloudfilter.net [35.89.44.33]) by sourceware.org (Postfix) with ESMTPS id A375F38618EC for ; Sun, 29 Oct 2023 23:23:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A375F38618EC 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 A375F38618EC Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.33 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698621792; cv=none; b=hk4nm+yhcHv0Ww9CaGXHnF70KTA0a4+2JC/skusdlxhbBWzLV/c/jukmIIS8mTwGy1t0Hq6ThfrjKPoweTki95A1qqaDu0/CIwLpsXvRToYCRhfAVKPr1jdOjn/0YJe+0V+vI/6btUVZAPwjDPXOc2b8dAXHzjVNgJazqzlwC5w= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698621792; c=relaxed/simple; bh=gtuuR3Gy7ywivAk4vPt0eTYBodC82LVmwXI0KSyFhM0=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=cg9RgZnrsipL3CxD4MMHpGldhkt0NkQaTrMsdrC2LXRBS3yHFgRd/rNi2vF13Zfc2lb7r9kbE8uviswhX82T1Z7Pk7CwmLfyZ97k3qdKTFODdAhn9a91C6djnGOQCJccVUGV6Krx01yB0slWK4ciAmNCmIk/D8pSt+FZQ3lDC88= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6010a.ext.cloudfilter.net ([10.0.30.248]) by cmsmtp with ESMTPS id x5gFqnO1V8HtexF7bqEXdx; Sun, 29 Oct 2023 23:23:07 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id xF7aqjzfZruMPxF7bqQyRE; Sun, 29 Oct 2023 23:23:07 +0000 X-Authority-Analysis: v=2.4 cv=ZNHEJF3b 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=ls6l4_V7LcGA53ig-DIA: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=25FQ5g9qGdiRIlSLmTIWHJZFv/gJQODLjvDRaU4S5uI=; b=ViMynI9Pbcubp7/0QXITHuutLh Xgizn7wb2OAyXHB7NetRPoVIb3UAMdCumLTZY3HTMhlX5z2M6f6K8lbh+iOGah02WH1gA2g97Wf0u Mwt2Vob0DbUh9HeZlkNnXfCxP; 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 1qxF7a-0042zY-2S for gdb-patches@sourceware.org; Sun, 29 Oct 2023 17:23:06 -0600 From: Tom Tromey Date: Sun, 29 Oct 2023 17:23:29 -0600 Subject: [PATCH 08/30] Use block_symbol::address in ax-gdb.c MIME-Version: 1.0 Message-Id: <20231029-split-objfile-2023-bound-sym-october-v1-8-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: 1qxF7a-0042zY-2S 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: 9 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfBHSTXfTsd2GaKpmYu70E/jZm2rrDmobw4ojOMkRCNjx3r+fPQB9jlCvY3TWG+WGN+b0O1Cz73xqnSaHxwrhDEPUEz0iHPSPHqDJ0MxcCJGnGeNXKfHK oBEYmYVdOOlMtlYsu+cbH3ay9gv7ifXF3ASqkIIQ6K0qpKyxIGk+31a+z/yZWxhvdgEBPerocdFnDjP1wiFXd9H1sEWORWLArts= 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 ax-gdb.c to use block_symbol::address. --- gdb/ax-gdb.c | 28 +++++++++++++++------------- gdb/ax-gdb.h | 2 +- gdb/tracepoint.c | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c index a679c864915..dc3ac14078f 100644 --- a/gdb/ax-gdb.c +++ b/gdb/ax-gdb.c @@ -86,7 +86,7 @@ static void gen_frame_locals_address (struct agent_expr *); static void gen_offset (struct agent_expr *ax, int offset); static void gen_sym_offset (struct agent_expr *, struct symbol *); static void gen_var_ref (struct agent_expr *ax, struct axs_value *value, - struct symbol *var); + block_symbol var); static void gen_int_literal (struct agent_expr *ax, @@ -515,8 +515,10 @@ gen_sym_offset (struct agent_expr *ax, struct symbol *var) symbol VAR. Set VALUE to describe the result. */ static void -gen_var_ref (struct agent_expr *ax, struct axs_value *value, struct symbol *var) +gen_var_ref (struct agent_expr *ax, struct axs_value *value, block_symbol bvar) { + symbol *var = bvar.symbol; + /* Dereference any typedefs. */ value->type = check_typedef (var->type ()); value->optimized_out = 0; @@ -536,7 +538,7 @@ gen_var_ref (struct agent_expr *ax, struct axs_value *value, struct symbol *var) break; case LOC_LABEL: /* A goto label, being used as a value. */ - ax_const_l (ax, (LONGEST) var->value_address ()); + ax_const_l (ax, (LONGEST) bvar.address ()); value->kind = axs_rvalue; break; @@ -547,7 +549,7 @@ gen_var_ref (struct agent_expr *ax, struct axs_value *value, struct symbol *var) /* Variable at a fixed location in memory. Easy. */ case LOC_STATIC: /* Push the address of the variable. */ - ax_const_l (ax, var->value_address ()); + ax_const_l (ax, bvar.address ()); value->kind = axs_lvalue_memory; break; @@ -1457,9 +1459,9 @@ gen_static_field (struct agent_expr *ax, struct axs_value *value, else { const char *phys_name = type->field (fieldno).loc_physname (); - struct symbol *sym = lookup_symbol (phys_name, 0, VAR_DOMAIN, 0).symbol; + block_symbol sym = lookup_symbol (phys_name, 0, VAR_DOMAIN, 0); - if (sym) + if (sym.symbol != nullptr) { gen_var_ref (ax, value, sym); @@ -1553,7 +1555,7 @@ gen_maybe_namespace_elt (struct agent_expr *ax, struct axs_value *value, if (sym.symbol == NULL) return 0; - gen_var_ref (ax, value, sym.symbol); + gen_var_ref (ax, value, sym); if (value->optimized_out) error (_("`%s' has been optimized out, cannot use"), @@ -1896,7 +1898,7 @@ op_this_operation::do_generate_ax (struct expression *exp, struct axs_value *value, struct type *cast_type) { - struct symbol *sym, *func; + struct symbol *func; const struct block *b; const struct language_defn *lang; @@ -1904,15 +1906,15 @@ op_this_operation::do_generate_ax (struct expression *exp, func = b->linkage_function (); lang = language_def (func->language ()); - sym = lookup_language_this (lang, b).symbol; - if (!sym) + block_symbol sym = lookup_language_this (lang, b); + if (sym.symbol == nullptr) error (_("no `%s' found"), lang->name_of_this ()); gen_var_ref (ax, value, sym); if (value->optimized_out) error (_("`%s' has been optimized out, cannot use"), - sym->print_name ()); + sym.symbol->print_name ()); } void @@ -2003,7 +2005,7 @@ var_value_operation::do_generate_ax (struct expression *exp, struct axs_value *value, struct type *cast_type) { - gen_var_ref (ax, value, std::get<0> (m_storage).symbol); + gen_var_ref (ax, value, std::get<0> (m_storage)); if (value->optimized_out) error (_("`%s' has been optimized out, cannot use"), @@ -2330,7 +2332,7 @@ gen_expr_unop (struct expression *exp, agent_expr_up gen_trace_for_var (CORE_ADDR scope, struct gdbarch *gdbarch, - struct symbol *var, int trace_string) + block_symbol var, int trace_string) { agent_expr_up ax (new agent_expr (gdbarch, scope)); struct axs_value value; diff --git a/gdb/ax-gdb.h b/gdb/ax-gdb.h index 4f73385208c..8376d7ee29e 100644 --- a/gdb/ax-gdb.h +++ b/gdb/ax-gdb.h @@ -106,7 +106,7 @@ extern agent_expr_up gen_trace_for_expr (CORE_ADDR, struct expression *, int); extern agent_expr_up gen_trace_for_var (CORE_ADDR, struct gdbarch *, - struct symbol *, int); + block_symbol, int); extern agent_expr_up gen_trace_for_return_address (CORE_ADDR, struct gdbarch *, diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index 6d017179283..80239200984 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -1010,7 +1010,7 @@ collection_list::collect_symbol (block_symbol bsym, if (treat_as_expr) { agent_expr_up aexpr = gen_trace_for_var (scope, gdbarch, - sym, trace_string); + bsym, trace_string); /* It can happen that the symbol is recorded as a computed location, but it's been optimized away and doesn't actually