From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from omta040.useast.a.cloudfilter.net (omta040.useast.a.cloudfilter.net [44.202.169.39]) by sourceware.org (Postfix) with ESMTPS id 0A0B73858422 for ; Sun, 5 Nov 2023 18:11:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0A0B73858422 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 0A0B73858422 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699207892; cv=none; b=SW6/dDnOZgz+ScYdCmGPBpoD0qDGpTSDsFlB+KY+VPoVsK9bH/vnqq2BGFWFNfoH9q6uS3Rdg72MboZK4jVVsmHZdPdKFihwuKfV5D4Zfn7LjWHECwyahui1DiMac6pJxdxSGtC8b3HVhnS4QlK3s3yW25e4VVpRDySzQwtFNNQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699207892; c=relaxed/simple; bh=lWlDZU5iDzR/te3jk9ahDtCjp8Uz0sS+3hhnmvO8/CI=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=XmSMxXUgHQs6xQRWnKtnVNsnIT7c/ZuhzMUS9FvX3JZguUpNiU1m0/JlVWxc+k3rj+zMaDCxWyy2RGNaGoHjtjJTHL8mF1xC30WtFPYHHZxLfFa5UAmU5iOPQHFy4Syw4QIJn+ruzq/I4yFYxhBCA7mghd7piMLqG0BJq3gV6NY= 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 zetLqe8vE6nOZzhasqqvtL; Sun, 05 Nov 2023 18:11:30 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id zhasqkEku5OjYzhasqSHqy; Sun, 05 Nov 2023 18:11:30 +0000 X-Authority-Analysis: v=2.4 cv=ep/Mc6lX 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=gNE060aIARCBDlep2ecA: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=xpNYTko0TvMAefNOluBftcHRqnECxBuD0nsy9BvwmGk=; b=CojkYOzrEe5/YGEfVpCosz6CnG ROsC5VadIqcPApyxiGKykm9G+x3xlQtjGM1+kowdND+3AswcSwt4rAHtd55/03qGvj1mhgLXBJ2UP 1scJkpHmytd3ZD7JfRnkFjMr7; 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 1qzhar-003Y66-2m for gdb-patches@sourceware.org; Sun, 05 Nov 2023 11:11:29 -0700 From: Tom Tromey Date: Sun, 05 Nov 2023 11:11:44 -0700 Subject: [PATCH v2 06/31] Use block_symbol::address in printcmd.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-6-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: 1qzhar-003Y66-2m 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: 7 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfGSqJ2ZBzNr7gYnzPhEgL+gKAM5dQyb25RD6367HBDjXAynFDYW5ddZJmMHSoVMk6U0dPnGujS1Mv89im6HZc2AsfWEwhgS6nFYKDmb0Mmm/izCnNkTN e1tBxhseIj6Qay08p1oLrqS8pkHlVdku6odUu6p1cCLKa3ODCmxBG2B5rngGzkFav4hP5NfLwd+NuuVZ1ezUgENowBMa3pNLCic= 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 printcmd.c to use block_symbol::address. --- gdb/printcmd.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gdb/printcmd.c b/gdb/printcmd.c index 06cc5316eec..2dbaaf0fffe 100644 --- a/gdb/printcmd.c +++ b/gdb/printcmd.c @@ -1637,7 +1637,6 @@ info_address_command (const char *exp, int from_tty) { struct gdbarch *gdbarch; int regno; - struct symbol *sym; struct bound_minimal_symbol msymbol; long val; struct obj_section *section; @@ -1647,8 +1646,10 @@ info_address_command (const char *exp, int from_tty) if (exp == 0) error (_("Argument required.")); - sym = lookup_symbol (exp, get_selected_block (&context_pc), VAR_DOMAIN, - &is_a_field_of_this).symbol; + block_symbol bsym = lookup_symbol (exp, get_selected_block (&context_pc), + VAR_DOMAIN, + &is_a_field_of_this); + symbol *sym = bsym.symbol; if (sym == NULL) { if (is_a_field_of_this.type != NULL) @@ -1725,7 +1726,7 @@ info_address_command (const char *exp, int from_tty) case LOC_LABEL: gdb_printf ("a label at address "); - load_addr = sym->value_address (); + load_addr = bsym.address (); fputs_styled (paddress (gdbarch, load_addr), address_style.style (), gdb_stdout); if (section_is_overlay (section)) @@ -1761,7 +1762,7 @@ info_address_command (const char *exp, int from_tty) case LOC_STATIC: gdb_printf (_("static storage at address ")); - load_addr = sym->value_address (); + load_addr = bsym.address (); fputs_styled (paddress (gdbarch, load_addr), address_style.style (), gdb_stdout); if (section_is_overlay (section)) -- 2.41.0