From patchwork Sun Oct 29 23:23:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 78702 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 DA8573831E32 for ; Sun, 29 Oct 2023 23:23:48 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta38.uswest2.a.cloudfilter.net (omta38.uswest2.a.cloudfilter.net [35.89.44.37]) by sourceware.org (Postfix) with ESMTPS id 400C638618D9 for ; Sun, 29 Oct 2023 23:23:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 400C638618D9 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 400C638618D9 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.37 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698621790; cv=none; b=elZe9kM6C805IdQ7r51jC0RXNjOB0oGAMey6rVg8HVW4MjhKGqRpX4xOJDmkjMyazJbmVP3zvYyBDPKkSpMPI/4WIh6GNBrSc/2PF/RF51DxFnMpCPl5cRORhlOxjTxm/qcpHFAiyqFN9P74kIUEx0akYgAnTEBG5ug1rZpMF9k= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698621790; c=relaxed/simple; bh=FpuTR72u0aug03+qddVuVTsWEi5fyQ2zed4/PYqoAco=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=TC80TYiOzXJiHtLm/Puw1+WX3T+7LS1DCDUd3WmUjuzZoGkcrjfzYzkj+N1TIyiR3vNuDFV3o5D+RLy0FjVApawJJCZVCGIswpjcqvmdU/n87yR0VwHMFD63kUg9bQ5cYo/jNm5lCGHZijHyvrEqYY5DH9KLK2iq4uvYJq6ivzE= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-5002a.ext.cloudfilter.net ([10.0.29.215]) by cmsmtp with ESMTPS id wjr9qO05EKOkLxF7bqQEPE; Sun, 29 Oct 2023 23:23:07 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id xF7aqlJnaF1O4xF7bq7aqU; Sun, 29 Oct 2023 23:23:07 +0000 X-Authority-Analysis: v=2.4 cv=CcwbWZnl 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=O4yZiLRku0mW-y6P6AMA: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=60oEbkis+iOKmf4Jkhm28QTqyeYGYMFNVJCKwpz6jYo=; b=GtobL5ao92NckrtYWNEE5sYZHF BSGI85ZQ5xO73kqmwMfxYRk9ZAGWQ8Me9pDeheO6/bTx1DOVXWfCVJoglCmRWbvdD6mEa/+Nsrcil Awa+NiWqkCJj/f+sUHETG3kT4; 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-1X for gdb-patches@sourceware.org; Sun, 29 Oct 2023 17:23:06 -0600 From: Tom Tromey Date: Sun, 29 Oct 2023 17:23:27 -0600 Subject: [PATCH 06/30] Use block_symbol::address in tracepoint.c MIME-Version: 1.0 Message-Id: <20231029-split-objfile-2023-bound-sym-october-v1-6-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-1X 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: 7 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfE8yuh/H3liO7Gpeqq+COIOJlWieu/z+4h7/Ibuz3Otar9sdQXhMeoCbM00xdF/hFPohlU5e6thKp2H7f4XF8VISNFE8kxvtp1PP6W/pelkVssTnox/I 2ZqeXFvDzJx/SOSQJvn0TMO1315nrkAmLaxXFV+2mrkP8YL4FE2Lqyg+iejB6maBdrEt1iZnOrYGJBNPnR3c8ZgpFgBTWx7uEsE= 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 the easy spots in tracepoint.c to use block_symbol::address. --- gdb/tracepoint.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index 2c548688570..89611114c9b 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -2489,6 +2489,8 @@ info_scope_command (const char *args_in, int from_tty) QUIT; /* Allow user to bail out with ^C. */ for (struct symbol *sym : block_iterator_range (block)) { + block_symbol bsym { sym, block }; + QUIT; /* Allow user to bail out with ^C. */ if (count == 0) gdb_printf ("Scope for %s:\n", save_args); @@ -2529,7 +2531,7 @@ info_scope_command (const char *args_in, int from_tty) break; case LOC_STATIC: gdb_printf ("in static storage at address "); - gdb_printf ("%s", paddress (gdbarch, sym->value_address ())); + gdb_printf ("%s", paddress (gdbarch, bsym.address ())); break; case LOC_REGISTER: /* GDBARCH is the architecture associated with the objfile @@ -2573,7 +2575,7 @@ info_scope_command (const char *args_in, int from_tty) continue; case LOC_LABEL: gdb_printf ("a label at address "); - gdb_printf ("%s", paddress (gdbarch, sym->value_address ())); + gdb_printf ("%s", paddress (gdbarch, bsym.address ())); break; case LOC_BLOCK: gdb_printf ("a function at address ");