From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from omta036.useast.a.cloudfilter.net (omta036.useast.a.cloudfilter.net [44.202.169.35]) by sourceware.org (Postfix) with ESMTPS id B25863857B93 for ; Sun, 5 Nov 2023 18:11:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B25863857B93 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 B25863857B93 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.35 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699207893; cv=none; b=GasVPvLRXpTt6ZngB5z7RqdwKJkN3mpTMyxl/IM4ZUiTYujLmnzP4QrFryCQK076fINdqJPcNdeLWYtQ6dTx+7DWcNY5Y9Ep0UwPOkNaKqrBiAhRlvNWlDjLjmKRPWGiIkL/Msfv+hCmnolhOjTt6iAkuYQQdXbZpt/zzrlRJnc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699207893; c=relaxed/simple; bh=Or0zeG5wKOpsy+JzP08lBmUJ1AP+X8hzzin41rhkcs8=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=en7U/RuohgadcNgbtcrFat8jxK39zO+xpT+uGEOfe5l7zjdzrYXipmmCWv0YTLBn10ONRfcr45YOQ4RIsu/CTG6tmB1plSewL9Q8t4uifUa5PfDYrwxxfauFoQ1tjiVNx7DiBSydKYQvweEzyfJDsmLWO6GR4VpbhqyeKGqeUvU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6009a.ext.cloudfilter.net ([10.0.30.184]) by cmsmtp with ESMTPS id zENoq6okOgpyEzhatq8ILi; Sun, 05 Nov 2023 18:11:31 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id zhasqaKQlOk5Szhasquvxv; Sun, 05 Nov 2023 18:11:30 +0000 X-Authority-Analysis: v=2.4 cv=E+DeGIRl c=1 sm=1 tr=0 ts=6547dad2 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=TmwTfRWsdxCQHMdIpFMA: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=KWfJW6pv7UaUlG/VsbFIMa/ATDqwjfHDArx10GUT0wA=; b=DfoHoYz5csRxC8jH33wRwMvM4G 5NFQvBWVWrNQdLwQF0XOVQ0hcLX0B5VxyqtkxQWnvL1aq81prpxDXGkAsTWQ4fUFMt4SYSqvUDLhi gm4qY6WGEkqstxJxxLkIXoArl; Received: from 97-122-77-73.hlrn.qwest.net ([97.122.77.73]:51014 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 1qzhas-003Y66-14 for gdb-patches@sourceware.org; Sun, 05 Nov 2023 11:11:30 -0700 From: Tom Tromey Date: Sun, 05 Nov 2023 11:11:46 -0700 Subject: [PATCH v2 08/31] Use block_symbol::address in tracepoint.c MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20231105-split-objfile-2023-bound-sym-october-v2-8-dbd2d158bbc3@tromey.com> References: <20231105-split-objfile-2023-bound-sym-october-v2-0-dbd2d158bbc3@tromey.com> In-Reply-To: <20231105-split-objfile-2023-bound-sym-october-v2-0-dbd2d158bbc3@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: 1qzhas-003Y66-14 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]:51014 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: MS4xfDrouv+Mf0MWQ6Tb+3QFO3ngSTFSsMMlGjvxs6qhPMgzc1mAi7sUnLKc+sw7b9BFroMI+3n7DF6FlOPnkeKVxd4tcf92vOEfeLYyBT6Kue/cO0Kd/fq8 IqGa0LvaA1GTXprwjouu3NaTUHkJRYN/IP/3DZ7KTYt0hsdd1e/8hRlLgUW0wJV0Yf1Qt/8Snd6/4TqMFuUni3Tu61ao2BsXokk= 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_DNSWL_NONE,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 List-Id: This changes some spots in tracepoint.c to use block_symbol::address. --- gdb/expop.h | 5 +++++ gdb/tracepoint.c | 12 +++++++----- gdb/tracepoint.h | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/gdb/expop.h b/gdb/expop.h index 25769d5b810..433c92c9a00 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -667,6 +667,11 @@ class var_value_operation return std::get<0> (m_storage).symbol; } + block_symbol get_block_symbol () const + { + return std::get<0> (m_storage); + } + protected: void do_generate_ax (struct expression *exp, diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index 6eb40153e24..a273ea0a328 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -905,7 +905,7 @@ collection_list::add_memrange (struct gdbarch *gdbarch, /* Add a symbol to a collection list. */ void -collection_list::collect_symbol (struct symbol *sym, +collection_list::collect_symbol (block_symbol bsym, struct gdbarch *gdbarch, long frame_regno, long frame_offset, CORE_ADDR scope, @@ -916,6 +916,7 @@ collection_list::collect_symbol (struct symbol *sym, bfd_signed_vma offset; int treat_as_expr = 0; + symbol *sym = bsym.symbol; len = check_typedef (sym->type ())->length (); switch (sym->aclass ()) { @@ -928,7 +929,7 @@ collection_list::collect_symbol (struct symbol *sym, sym->print_name (), plongest (sym->value_longest ())); break; case LOC_STATIC: - offset = sym->value_address (); + offset = bsym.address (); if (info_verbose) { gdb_printf ("LOC_STATIC %s: collect %ld bytes at %s.\n", @@ -1049,7 +1050,8 @@ collection_list::add_local_symbols (struct gdbarch *gdbarch, CORE_ADDR pc, auto do_collect_symbol = [&] (const char *print_name, struct symbol *sym) { - collect_symbol (sym, gdbarch, frame_regno, + block_symbol bsym { sym, block }; + collect_symbol (bsym, gdbarch, frame_regno, frame_offset, pc, trace_string); count++; add_wholly_collected (print_name); @@ -1392,8 +1394,8 @@ encode_actions_1 (struct command_line *action, expr::var_value_operation *vvo = (gdb::checked_static_cast (exp->op.get ())); - struct symbol *sym = vvo->get_symbol (); - const char *name = sym->natural_name (); + block_symbol sym = vvo->get_block_symbol (); + const char *name = sym.symbol->natural_name (); collect->collect_symbol (sym, arch, diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h index b9ff31fa0f6..8c94f1d9fc2 100644 --- a/gdb/tracepoint.h +++ b/gdb/tracepoint.h @@ -270,7 +270,7 @@ class collection_list void add_memrange (struct gdbarch *gdbarch, int type, bfd_signed_vma base, unsigned long len, CORE_ADDR scope); - void collect_symbol (struct symbol *sym, + void collect_symbol (block_symbol sym, struct gdbarch *gdbarch, long frame_regno, long frame_offset, CORE_ADDR scope, -- 2.41.0