diff mbox series

[v2,12/31] Use bound_symbol::address in symmisc.c

Message ID	20231105-split-objfile-2023-bound-sym-october-v2-12-dbd2d158bbc3@tromey.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 960E73857355 From: Tom Tromey <tom@tromey.com> 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 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 symmisc.c to use bound_symbol::address.
---
 gdb/symmisc.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff mbox series

Patch

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