From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from omta38.uswest2.a.cloudfilter.net (omta38.uswest2.a.cloudfilter.net [35.89.44.37]) by sourceware.org (Postfix) with ESMTPS id 095F33857BA4 for ; Sun, 5 Nov 2023 18:11:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 095F33857BA4 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 095F33857BA4 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=1699207894; cv=none; b=hQdHkeLpPlW7O72/yMiMJKyV0IH2M+F7rY4uYYZqtC4OMzZ7TxmujtgIfCP9ntbjMolUiQNh4+aqOK4bOchxW8UaSMhmQ+YVa/2RYkSqAEeJv+Qj64WU1hRBu7AqTQCDdDekW3pOvNxAR4ON0qzC6/7zccWQIXxGgGPcZ+ctVtE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699207894; c=relaxed/simple; bh=IICmlIFIxxs2dJhS+otQ/0lbzYvyt+o9idfRGagnuC8=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=aEeYoPlI9Re7yo6YnpUFR+c+1dZ9gGsgmiddE+PNq0Ihno+EeHv4BsDwbYJ9M3CUNy8TQaGaj3Cq8DrfBtPIQvEumk/bpLzES/JtjADI3hVxvfmEIwuzKqs+HjZge9IzZE35KsnIagN47TShNLACd+cite4O9Pmq0kIT5tWIwvY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-5010a.ext.cloudfilter.net ([10.0.29.199]) by cmsmtp with ESMTPS id zGFxqrrn1KOkLzhatqKH4n; Sun, 05 Nov 2023 18:11:31 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id zhasqpsIxoIDwzhasqXuPJ; Sun, 05 Nov 2023 18:11:30 +0000 X-Authority-Analysis: v=2.4 cv=TP1W9npa 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=SYnpTgJ_xSHc7HjGPwsA: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=GxSF8SVoBfQMBMEvOdXMlSivkI87NGNdLmQ1Go/iAno=; b=Oa/WCF3yom3QnDPVu7Iu2cZLnj wCsD2gMfod2neNNa4BzBlHoV9sTDyCFOgDqVU+Wjj/QpfT5txffnNfIIUyQJnNIg9TUj7NfS/JPcy Pezwzk58o97lSFZSdv23jAvSH; 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-0F for gdb-patches@sourceware.org; Sun, 05 Nov 2023 11:11:30 -0700 From: Tom Tromey Date: Sun, 05 Nov 2023 11:11:45 -0700 Subject: [PATCH v2 07/31] Use bound_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-7-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-0F 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: 8 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfEAa3eUzkpfjeJEtTBXjXLnM4X3pUA5yhQfJDvZ6FoiOplhDgqnwplDbOWK/zIEWLyMR3k0um4Jjd2Udo+OEp9Zxs/MjeuJM0A5B/20mIVIVKqcg+hk+ OahzxL7+Ztw3cZlkrz5EpgY8NMBdNY50NLroLOVvCza28bdDWIKd8UeMxw4QaOjMon//kLzyyxINFxRVWz3JEQRN5BUYxSA8GyY= 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 the easy spots in tracepoint.c to use bound_symbol::address. --- gdb/tracepoint.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index 2c548688570..6eb40153e24 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -2484,11 +2484,15 @@ info_scope_command (const char *args_in, int from_tty) resolve_sal_pc (&sals[0]); block = block_for_pc (sals[0].pc); + struct objfile *objfile = block->objfile (); + while (block != 0) { QUIT; /* Allow user to bail out with ^C. */ for (struct symbol *sym : block_iterator_range (block)) { + bound_symbol bsym { sym, objfile }; + QUIT; /* Allow user to bail out with ^C. */ if (count == 0) gdb_printf ("Scope for %s:\n", save_args); @@ -2529,7 +2533,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 +2577,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 "); -- 2.41.0