diff mbox series

[v2,07/31] Use bound_symbol::address in tracepoint.c

Message ID	20231105-split-objfile-2023-bound-sym-october-v2-7-dbd2d158bbc3@tromey.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 095F33857BA4 From: Tom Tromey <tom@tromey.com> 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 Precedence: list Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org
Series	Baby step for objfile splitting \| [v2,00/31] Baby step for objfile splitting [v2,01/31] Introduce block-symbol.h [v2,02/31] Add block_symbol::address [v2,03/31] Add bound_symbol [v2,04/31] Easy conversions to use block_symbol::address [v2,05/31] Use block_symbol::address in ada-tasks.c [v2,06/31] Use block_symbol::address in printcmd.c [v2,07/31] Use bound_symbol::address in tracepoint.c [v2,08/31] Use block_symbol::address in tracepoint.c [v2,09/31] Use block_symbol::address in ax-gdb.c [v2,10/31] Use block_symbol::address in linespec.c [v2,11/31] Use block_symbol::address in ada-lang.c [v2,12/31] Use bound_symbol::address in symmisc.c [v2,13/31] Introduce read_var_value overload [v2,14/31] Use read_var_value in gdb/compile [v2,15/31] Return a block_symbol from find_pc_sect_function [v2,16/31] Use read_var_value overload in finish_command_fsm [v2,17/31] Use block_symbol in overload-handling code [v2,18/31] Change evaluate_var_value to accept a block_symbol [v2,19/31] Change value_of_variable to take a block_symbol [v2,20/31] Return a block_symbol from get_frame_function [v2,21/31] Use read_var_value overload in return_command [v2,22/31] Use read_var_value overload in py-finishbreakpoint.c [v2,23/31] Use read_var_value overload in py-framefilter.c [v2,24/31] Use read_var_value overload in Guile [v2,25/31] Use read_var_value in read_frame_arg and read_frame_local [v2,26/31] Change print_variable_and_value to take a block_symbol [v2,27/31] Change find_frame_funname to return a block_symbol [v2,28/31] Change btrace_function::sym to a block_symbol [v2,29/31] Use read_var_value overload in Python [v2,30/31] Remove the old read_var_value [v2,31/31] Change language_defn::read_var_value to accept block_symbol

Commit Message

Tom Tromey Nov. 5, 2023, 6:11 p.m. UTC

  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 mbox series

Patch

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 ");