diff mbox series

[v2,06/31] Use block_symbol::address in printcmd.c

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

diff mbox series

Patch

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