diff mbox series

[07/30] More use of block_symbol::address in tracepoint.c

Message ID	20231029-split-objfile-2023-bound-sym-october-v1-7-612531df2734@tromey.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A0C1A38618EA From: Tom Tromey <tom@tromey.com> Date: Sun, 29 Oct 2023 17:23:28 -0600 Subject: [PATCH 07/30] More use of block_symbol::address in tracepoint.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-7-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 the remaining spots in tracepoint.c to use
block_symbol::address.
---
 gdb/expop.h      |  5 +++++
 gdb/tracepoint.c | 12 +++++++-----
 gdb/tracepoint.h |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff mbox series

Patch

diff --git a/gdb/expop.h b/gdb/expop.h
index 25769d5b810..433c92c9a00 100644
--- a/gdb/expop.h
+++ b/gdb/expop.h
@@ -667,6 +667,11 @@  class var_value_operation
     return std::get<0> (m_storage).symbol;
   }
 
+  block_symbol get_block_symbol () const
+  {
+    return std::get<0> (m_storage);
+  }
+
 protected:
 
   void do_generate_ax (struct expression *exp,
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 89611114c9b..6d017179283 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -905,7 +905,7 @@  collection_list::add_memrange (struct gdbarch *gdbarch,
 /* Add a symbol to a collection list.  */
 
 void
-collection_list::collect_symbol (struct symbol *sym,
+collection_list::collect_symbol (block_symbol bsym,
 				 struct gdbarch *gdbarch,
 				 long frame_regno, long frame_offset,
 				 CORE_ADDR scope,
@@ -916,6 +916,7 @@  collection_list::collect_symbol (struct symbol *sym,
   bfd_signed_vma offset;
   int treat_as_expr = 0;
 
+  symbol *sym = bsym.symbol;
   len = check_typedef (sym->type ())->length ();
   switch (sym->aclass ())
     {
@@ -928,7 +929,7 @@  collection_list::collect_symbol (struct symbol *sym,
 		  sym->print_name (), plongest (sym->value_longest ()));
       break;
     case LOC_STATIC:
-      offset = sym->value_address ();
+      offset = bsym.address ();
       if (info_verbose)
 	{
 	  gdb_printf ("LOC_STATIC %s: collect %ld bytes at %s.\n",
@@ -1049,7 +1050,8 @@  collection_list::add_local_symbols (struct gdbarch *gdbarch, CORE_ADDR pc,
   auto do_collect_symbol = [&] (const char *print_name,
 				struct symbol *sym)
     {
-      collect_symbol (sym, gdbarch, frame_regno,
+      block_symbol bsym { sym, block };
+      collect_symbol (bsym, gdbarch, frame_regno,
 		      frame_offset, pc, trace_string);
       count++;
       add_wholly_collected (print_name);
@@ -1392,8 +1394,8 @@  encode_actions_1 (struct command_line *action,
 			expr::var_value_operation *vvo
 			  = (gdb::checked_static_cast<expr::var_value_operation *>
 			     (exp->op.get ()));
-			struct symbol *sym = vvo->get_symbol ();
-			const char *name = sym->natural_name ();
+			block_symbol sym = vvo->get_block_symbol ();
+			const char *name = sym.symbol->natural_name ();
 
 			collect->collect_symbol (sym,
 						 arch,
diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h
index b9ff31fa0f6..8c94f1d9fc2 100644
--- a/gdb/tracepoint.h
+++ b/gdb/tracepoint.h
@@ -270,7 +270,7 @@  class collection_list
   void add_memrange (struct gdbarch *gdbarch,
 		     int type, bfd_signed_vma base,
 		     unsigned long len, CORE_ADDR scope);
-  void collect_symbol (struct symbol *sym,
+  void collect_symbol (block_symbol sym,
 		       struct gdbarch *gdbarch,
 		       long frame_regno, long frame_offset,
 		       CORE_ADDR scope,