From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from omta34.uswest2.a.cloudfilter.net (omta34.uswest2.a.cloudfilter.net [35.89.44.33]) by sourceware.org (Postfix) with ESMTPS id 960E73857355 for ; Sun, 5 Nov 2023 18:11:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 960E73857355 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 960E73857355 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=1699207895; cv=none; b=nsNyqe45jLFaJodj5/LtpqA6LNoJphDb1uGaK8QRKSXuuNn7m/S3cvjO4EHCwK1b6+LqMN333kf6TUU3uiLp7G4ZSVdJAqVP1VVCvkSJEP76kYySj9tQOxnlpIxXykd/MJygmxzwAqCnPwl9ejbSrxVZfb78eA4T6ykq6cCoZxk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699207895; c=relaxed/simple; bh=wknFCN30dSGT7KRKccQ2kBFI+jyGK4Kwst2cJiFUZ20=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=VTEL1BjKmyGeROf+auYksRWv/BRTfexR4XOPiPu7KH8sCIpkD+y0OfAUyz9KHtw/ZlUmWgnBYcdSXxolnRXcpKpeIr3Xmh58UPCkp7U/P5ApcF2m9pKQfsHtjMTA4IQ7JLnNwQ5hCK/g5IFOsgeev+kSlqrJBMfPUPSFINC9uM0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6001a.ext.cloudfilter.net ([10.0.30.140]) by cmsmtp with ESMTPS id zgfTqHWgx8Htezhauq8aBU; Sun, 05 Nov 2023 18:11:32 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id zhatqJ1pwNUwRzhauqng4x; Sun, 05 Nov 2023 18:11:32 +0000 X-Authority-Analysis: v=2.4 cv=I852+fsg c=1 sm=1 tr=0 ts=6547dad4 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=INqLYPXPp5oCZDKoHgwA: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=HylTIHBeEYoZfRM5qxoXUMxO9l+IqcmNRS++prCMWuc=; b=dW6nbtxoRebAlVotXLl+J3jH9y BT/YbmmCBtW4tnmQVTCbPPPsFjkXbvMgaZUBV5SommZ7R417KzLHQiYip/dIhxWl0wALAAaJPkkLp e0cqiC3LDZKB9dkNfWZZifkkm; 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 1qzhat-003Y66-1k for gdb-patches@sourceware.org; Sun, 05 Nov 2023 11:11:31 -0700 From: Tom Tromey Date: Sun, 05 Nov 2023 11:11:50 -0700 Subject: [PATCH v2 12/31] Use bound_symbol::address in symmisc.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-12-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: 1qzhat-003Y66-1k 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: 13 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfH4aX97Kp2t2jUZaRt6rp1eXRgRYWI3Zopr7DpcrBIY11zXA3XiApaXqykDpjBSj43eqgK0qHUoJWdCa/XxtuxAh3wTvKKriKtoSOw0t/16LvhXRiPwd 0FMshZ86RblRatLX/GICdnKwi5QMoySnLoigZLgIYSMiaW+L6CdfRv3rKFK6CPCkA4nkM4lZi7Jscf3Ur1Th8+FHOatj7aaG6x4= 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_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 symmisc.c to use bound_symbol::address. --- gdb/symmisc.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gdb/symmisc.c b/gdb/symmisc.c index c1a6ab5cd7d..e84dd2ce049 100644 --- a/gdb/symmisc.c +++ b/gdb/symmisc.c @@ -44,7 +44,7 @@ static int block_depth (const struct block *); -static void print_symbol (struct gdbarch *gdbarch, struct symbol *symbol, +static void print_symbol (struct gdbarch *gdbarch, bound_symbol symbol, int depth, ui_file *outfile); @@ -309,7 +309,8 @@ dump_symtab_1 (struct symtab *symtab, struct ui_file *outfile) { try { - print_symbol (gdbarch, sym, depth + 1, outfile); + bound_symbol bsym { sym, objfile }; + print_symbol (gdbarch, bsym, depth + 1, outfile); } catch (const gdb_exception_error &ex) { @@ -489,11 +490,13 @@ maintenance_print_symbols (const char *args, int from_tty) /* Print symbol SYMBOL on OUTFILE. DEPTH says how far to indent. */ static void -print_symbol (struct gdbarch *gdbarch, struct symbol *symbol, +print_symbol (struct gdbarch *gdbarch, bound_symbol bsymbol, int depth, ui_file *outfile) { struct obj_section *section; + symbol *symbol = bsymbol.symbol; + if (symbol->is_objfile_owned ()) section = symbol->obj_section (symbol->objfile ()); else @@ -503,7 +506,7 @@ print_symbol (struct gdbarch *gdbarch, struct symbol *symbol, if (symbol->domain () == LABEL_DOMAIN) { gdb_printf (outfile, "label %s at ", symbol->print_name ()); - gdb_puts (paddress (gdbarch, symbol->value_address ()), + gdb_puts (paddress (gdbarch, bsymbol.address ()), outfile); if (section) gdb_printf (outfile, " section %s\n", @@ -573,7 +576,7 @@ print_symbol (struct gdbarch *gdbarch, struct symbol *symbol, case LOC_STATIC: gdb_printf (outfile, "static at "); - gdb_puts (paddress (gdbarch, symbol->value_address ()), outfile); + gdb_puts (paddress (gdbarch, bsymbol.address ()), outfile); if (section) gdb_printf (outfile, " section %s", bfd_section_name (section->the_bfd_section)); @@ -613,7 +616,7 @@ print_symbol (struct gdbarch *gdbarch, struct symbol *symbol, case LOC_LABEL: gdb_printf (outfile, "label at "); - gdb_puts (paddress (gdbarch, symbol->value_address ()), outfile); + gdb_puts (paddress (gdbarch, bsymbol.address ()), outfile); if (section) gdb_printf (outfile, " section %s", bfd_section_name (section->the_bfd_section)); -- 2.41.0