diff mbox series

[05/30] Use block_symbol::address in printcmd.c

Message ID	20231029-split-objfile-2023-bound-sym-october-v1-5-612531df2734@tromey.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A72D538618EE From: Tom Tromey <tom@tromey.com> Date: Sun, 29 Oct 2023 17:23:26 -0600 Subject: [PATCH 05/30] Use block_symbol::address in printcmd.c MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20231029-split-objfile-2023-bound-sym-october-v1-5-612531df2734@tromey.com> References: <20231029-split-objfile-2023-bound-sym-october-v1-0-612531df2734@tromey.com> In-Reply-To: <20231029-split-objfile-2023-bound-sym-october-v1-0-612531df2734@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 \| [00/30] Baby step for objfile splitting [01/30] Introduce block-symbol.h [02/30] Add block_symbol::address [03/30] Easy conversions to use block_symbol::address [04/30] Use block_symbol::address in ada-tasks.c [05/30] Use block_symbol::address in printcmd.c [06/30] Use block_symbol::address in tracepoint.c [07/30] More use of block_symbol::address in tracepoint.c [08/30] Use block_symbol::address in ax-gdb.c [09/30] Use block_symbol::address in linespec.c [10/30] Use block_symbol::address in ada-lang.c [11/30] Use block_symbol::address in symmisc.c [12/30] Introduce read_var_value overload [13/30] Use read_var_value in gdb/compile [14/30] Return a block_symbol from find_pc_sect_function [15/30] Use read_var_value overload in finish_command_fsm [16/30] Use block_symbol in overload-handling code [17/30] Change evaluate_var_value to accept a block_symbol [18/30] Change value_of_variable to take a block_symbol [19/30] Return a block_symbol from get_frame_function [20/30] Use read_var_value overload in return_command [21/30] Use read_var_value overload in py-finishbreakpoint.c [22/30] Use read_var_value overload in py-framefilter.c [23/30] Use read_var_value overload in Guile [24/30] Use read_var_value in read_frame_arg and read_frame_local [25/30] Change print_variable_and_value to take a block_symbol [26/30] Change find_frame_funname to return a block_symbol [27/30] Change btrace_function::sym to a block_symbol [28/30] Use read_var_value overload in Python [29/30] Remove the old read_var_value [30/30] Change language_defn::read_var_value to accept block_symbol

Commit Message

Tom Tromey Oct. 29, 2023, 11:23 p.m. UTC

  This changes printcmd.c to use block_symbol::address.
---
 gdb/printcmd.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Comments

Simon Marchi Nov. 3, 2023, 3:42 a.m. UTC | #1

On 2023-10-29 19:23, Tom Tromey wrote:
> This changes printcmd.c to use block_symbol::address.
> ---
>  gdb/printcmd.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/gdb/printcmd.c b/gdb/printcmd.c
> index b9b6a3b8648..94ce5113e06 100644
> --- a/gdb/printcmd.c
> +++ b/gdb/printcmd.c
> @@ -1647,8 +1647,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);
> +  sym = bsym.symbol;

I would suggest moving the declaration of sym there.

Simon

Tom Tromey Nov. 5, 2023, 4:35 p.m. UTC | #2

>>>>> "Simon" == Simon Marchi <simark@simark.ca> writes:

>> -  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);
>> +  sym = bsym.symbol;

Simon> I would suggest moving the declaration of sym there.

I did this.

Tom

diff mbox series

Patch

diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index b9b6a3b8648..94ce5113e06 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -1647,8 +1647,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);
+  sym = bsym.symbol;
   if (sym == NULL)
     {
       if (is_a_field_of_this.type != NULL)
@@ -1725,7 +1727,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 +1763,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))