From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Subject: [PATCH v2 24/31] Use read_var_value overload in Guile
Date: Sun, 05 Nov 2023 11:12:02 -0700 [thread overview]
Message-ID: <20231105-split-objfile-2023-bound-sym-october-v2-24-dbd2d158bbc3@tromey.com> (raw)
In-Reply-To: <20231105-split-objfile-2023-bound-sym-october-v2-0-dbd2d158bbc3@tromey.com>
This changes the Guile layer to store a block_symbol in its symbol
wrapper, and then to use the new read_var_value overload.
---
gdb/guile/guile-internal.h | 2 +-
gdb/guile/scm-block.c | 6 ++--
gdb/guile/scm-frame.c | 9 +++---
gdb/guile/scm-symbol.c | 78 ++++++++++++++++++++++------------------------
4 files changed, 46 insertions(+), 49 deletions(-)
diff --git a/gdb/guile/guile-internal.h b/gdb/guile/guile-internal.h
index c0f1410ed7c..e8b59c160cc 100644
--- a/gdb/guile/guile-internal.h
+++ b/gdb/guile/guile-internal.h
@@ -538,7 +538,7 @@ extern SCM gdbscm_scm_from_host_string (const char *string, size_t len);
extern int syscm_is_symbol (SCM scm);
-extern SCM syscm_scm_from_symbol (struct symbol *symbol);
+extern SCM syscm_scm_from_symbol (block_symbol symbol);
extern struct symbol *syscm_get_valid_symbol_arg_unsafe
(SCM self, int arg_pos, const char *func_name);
diff --git a/gdb/guile/scm-block.c b/gdb/guile/scm-block.c
index 02b7a48be37..4293a13b81b 100644
--- a/gdb/guile/scm-block.c
+++ b/gdb/guile/scm-block.c
@@ -406,7 +406,7 @@ gdbscm_block_function (SCM self)
sym = block->function ();
if (sym != NULL)
- return syscm_scm_from_symbol (sym);
+ return syscm_scm_from_symbol ({ sym, block });
return SCM_BOOL_F;
}
@@ -507,7 +507,7 @@ gdbscm_block_symbols (SCM self)
for (struct symbol *sym : block_iterator_range (block))
{
- SCM s_scm = syscm_scm_from_symbol (sym);
+ SCM s_scm = syscm_scm_from_symbol ({ sym, block });
result = scm_cons (s_scm, result);
}
@@ -658,7 +658,7 @@ gdbscm_block_next_symbol_x (SCM self)
if (sym == NULL)
return gdbscm_end_of_iteration ();
- return syscm_scm_from_symbol (sym);
+ return syscm_scm_from_symbol ({ sym, block });
}
\f
/* (lookup-block address) -> <gdb:block>
diff --git a/gdb/guile/scm-frame.c b/gdb/guile/scm-frame.c
index 74012ffea4f..62a28a39bcf 100644
--- a/gdb/guile/scm-frame.c
+++ b/gdb/guile/scm-frame.c
@@ -654,7 +654,7 @@ static SCM
gdbscm_frame_function (SCM self)
{
frame_smob *f_smob;
- struct symbol *sym = NULL;
+ block_symbol sym = {};
bool found = false;
f_smob = frscm_get_frame_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
@@ -666,7 +666,7 @@ gdbscm_frame_function (SCM self)
if (frame != NULL)
{
found = true;
- sym = find_pc_function (get_frame_address_in_block (frame)).symbol;
+ sym = find_pc_function (get_frame_address_in_block (frame));
}
}
catch (const gdb_exception &except)
@@ -681,7 +681,7 @@ gdbscm_frame_function (SCM self)
_("<gdb:frame>"));
}
- if (sym != NULL)
+ if (sym.symbol != nullptr)
return syscm_scm_from_symbol (sym);
return SCM_BOOL_F;
@@ -962,7 +962,8 @@ gdbscm_frame_read_var (SCM self, SCM symbol_scm, SCM rest)
try
{
- value = read_var_value (var, block, frame_info_ptr (frame));
+ // FIXME
+ value = read_var_value ({ var, block }, frame_info_ptr (frame));
}
catch (const gdb_exception &except)
{
diff --git a/gdb/guile/scm-symbol.c b/gdb/guile/scm-symbol.c
index 1619705f065..f7fc3123dcd 100644
--- a/gdb/guile/scm-symbol.c
+++ b/gdb/guile/scm-symbol.c
@@ -36,7 +36,7 @@ struct symbol_smob
eqable_gdb_smob base;
/* The GDB symbol structure this smob is wrapping. */
- struct symbol *symbol;
+ block_symbol symbol;
};
static const char symbol_smob_name[] = "gdb:symbol";
@@ -64,7 +64,7 @@ struct syscm_deleter
{
symbol_smob *s_smob = (symbol_smob *) *slot;
- s_smob->symbol = NULL;
+ s_smob->symbol = {};
return 1;
}
@@ -96,7 +96,7 @@ syscm_hash_symbol_smob (const void *p)
{
const symbol_smob *s_smob = (const symbol_smob *) p;
- return htab_hash_pointer (s_smob->symbol);
+ return htab_hash_pointer (s_smob->symbol.symbol);
}
/* Helper function to compute equality of symbol_smobs. */
@@ -107,8 +107,8 @@ syscm_eq_symbol_smob (const void *ap, const void *bp)
const symbol_smob *a = (const symbol_smob *) ap;
const symbol_smob *b = (const symbol_smob *) bp;
- return (a->symbol == b->symbol
- && a->symbol != NULL);
+ return (a->symbol.symbol == b->symbol.symbol
+ && a->symbol.symbol != nullptr);
}
/* Return the struct symbol pointer -> SCM mapping table.
@@ -156,15 +156,15 @@ syscm_free_symbol_smob (SCM self)
{
symbol_smob *s_smob = (symbol_smob *) SCM_SMOB_DATA (self);
- if (s_smob->symbol != NULL)
+ if (s_smob->symbol.symbol != nullptr)
{
- htab_t htab = syscm_get_symbol_map (s_smob->symbol);
+ htab_t htab = syscm_get_symbol_map (s_smob->symbol.symbol);
gdbscm_clear_eqable_gsmob_ptr_slot (htab, &s_smob->base);
}
/* Not necessary, done to catch bugs. */
- s_smob->symbol = NULL;
+ s_smob->symbol = {};
return 0;
}
@@ -179,8 +179,8 @@ syscm_print_symbol_smob (SCM self, SCM port, scm_print_state *pstate)
if (pstate->writingp)
gdbscm_printf (port, "#<%s ", symbol_smob_name);
gdbscm_printf (port, "%s",
- s_smob->symbol != NULL
- ? s_smob->symbol->print_name ()
+ s_smob->symbol.symbol != nullptr
+ ? s_smob->symbol.symbol->print_name ()
: "<invalid>");
if (pstate->writingp)
scm_puts (">", port);
@@ -200,7 +200,7 @@ syscm_make_symbol_smob (void)
scm_gc_malloc (sizeof (symbol_smob), symbol_smob_name);
SCM s_scm;
- s_smob->symbol = NULL;
+ s_smob->symbol.symbol = {};
s_scm = scm_new_smob (symbol_smob_tag, (scm_t_bits) s_smob);
gdbscm_init_eqable_gsmob (&s_smob->base, s_scm);
@@ -227,7 +227,7 @@ gdbscm_symbol_p (SCM scm)
<gdb:symbol> object. */
SCM
-syscm_scm_from_symbol (struct symbol *symbol)
+syscm_scm_from_symbol (block_symbol symbol)
{
htab_t htab;
eqable_gdb_smob **slot;
@@ -236,7 +236,7 @@ syscm_scm_from_symbol (struct symbol *symbol)
/* If we've already created a gsmob for this symbol, return it.
This makes symbols eq?-able. */
- htab = syscm_get_symbol_map (symbol);
+ htab = syscm_get_symbol_map (symbol.symbol);
s_smob_for_lookup.symbol = symbol;
slot = gdbscm_find_eqable_gsmob_ptr_slot (htab, &s_smob_for_lookup.base);
if (*slot != NULL)
@@ -279,7 +279,7 @@ syscm_get_symbol_smob_arg_unsafe (SCM self, int arg_pos, const char *func_name)
static int
syscm_is_valid (symbol_smob *s_smob)
{
- return s_smob->symbol != NULL;
+ return s_smob->symbol.symbol != nullptr;
}
/* Throw a Scheme error if SELF is not a valid symbol smob.
@@ -311,7 +311,7 @@ syscm_get_valid_symbol_arg_unsafe (SCM self, int arg_pos,
symbol_smob *s_smob = syscm_get_valid_symbol_smob_arg_unsafe (self, arg_pos,
func_name);
- return s_smob->symbol;
+ return s_smob->symbol.symbol;
}
\f
@@ -337,7 +337,7 @@ gdbscm_symbol_type (SCM self)
{
symbol_smob *s_smob
= syscm_get_valid_symbol_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
- const struct symbol *symbol = s_smob->symbol;
+ const struct symbol *symbol = s_smob->symbol.symbol;
if (symbol->type () == NULL)
return SCM_BOOL_F;
@@ -354,7 +354,7 @@ gdbscm_symbol_symtab (SCM self)
{
symbol_smob *s_smob
= syscm_get_valid_symbol_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
- const struct symbol *symbol = s_smob->symbol;
+ const struct symbol *symbol = s_smob->symbol.symbol;
if (!symbol->is_objfile_owned ())
return SCM_BOOL_F;
@@ -368,7 +368,7 @@ gdbscm_symbol_name (SCM self)
{
symbol_smob *s_smob
= syscm_get_valid_symbol_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
- const struct symbol *symbol = s_smob->symbol;
+ const struct symbol *symbol = s_smob->symbol.symbol;
return gdbscm_scm_from_c_string (symbol->natural_name ());
}
@@ -380,7 +380,7 @@ gdbscm_symbol_linkage_name (SCM self)
{
symbol_smob *s_smob
= syscm_get_valid_symbol_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
- const struct symbol *symbol = s_smob->symbol;
+ const struct symbol *symbol = s_smob->symbol.symbol;
return gdbscm_scm_from_c_string (symbol->linkage_name ());
}
@@ -392,7 +392,7 @@ gdbscm_symbol_print_name (SCM self)
{
symbol_smob *s_smob
= syscm_get_valid_symbol_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
- const struct symbol *symbol = s_smob->symbol;
+ const struct symbol *symbol = s_smob->symbol.symbol;
return gdbscm_scm_from_c_string (symbol->print_name ());
}
@@ -404,7 +404,7 @@ gdbscm_symbol_addr_class (SCM self)
{
symbol_smob *s_smob
= syscm_get_valid_symbol_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
- const struct symbol *symbol = s_smob->symbol;
+ const struct symbol *symbol = s_smob->symbol.symbol;
return scm_from_int (symbol->aclass ());
}
@@ -416,7 +416,7 @@ gdbscm_symbol_argument_p (SCM self)
{
symbol_smob *s_smob
= syscm_get_valid_symbol_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
- const struct symbol *symbol = s_smob->symbol;
+ const struct symbol *symbol = s_smob->symbol.symbol;
return scm_from_bool (symbol->is_argument ());
}
@@ -428,7 +428,7 @@ gdbscm_symbol_constant_p (SCM self)
{
symbol_smob *s_smob
= syscm_get_valid_symbol_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
- const struct symbol *symbol = s_smob->symbol;
+ const struct symbol *symbol = s_smob->symbol.symbol;
enum address_class theclass;
theclass = symbol->aclass ();
@@ -443,7 +443,7 @@ gdbscm_symbol_function_p (SCM self)
{
symbol_smob *s_smob
= syscm_get_valid_symbol_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
- const struct symbol *symbol = s_smob->symbol;
+ const struct symbol *symbol = s_smob->symbol.symbol;
enum address_class theclass;
theclass = symbol->aclass ();
@@ -458,7 +458,7 @@ gdbscm_symbol_variable_p (SCM self)
{
symbol_smob *s_smob
= syscm_get_valid_symbol_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
- const struct symbol *symbol = s_smob->symbol;
+ const struct symbol *symbol = s_smob->symbol.symbol;
enum address_class theclass;
theclass = symbol->aclass ();
@@ -477,7 +477,7 @@ gdbscm_symbol_needs_frame_p (SCM self)
{
symbol_smob *s_smob
= syscm_get_valid_symbol_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
- struct symbol *symbol = s_smob->symbol;
+ struct symbol *symbol = s_smob->symbol.symbol;
int result = 0;
gdbscm_gdb_exception exc {};
@@ -502,7 +502,7 @@ gdbscm_symbol_line (SCM self)
{
symbol_smob *s_smob
= syscm_get_valid_symbol_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
- const struct symbol *symbol = s_smob->symbol;
+ const struct symbol *symbol = s_smob->symbol.symbol;
return scm_from_int (symbol->line ());
}
@@ -515,7 +515,7 @@ gdbscm_symbol_value (SCM self, SCM rest)
{
symbol_smob *s_smob
= syscm_get_valid_symbol_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
- struct symbol *symbol = s_smob->symbol;
+ block_symbol symbol = s_smob->symbol;
SCM keywords[] = { frame_keyword, SCM_BOOL_F };
int frame_pos = -1;
SCM frame_scm = SCM_BOOL_F;
@@ -527,7 +527,7 @@ gdbscm_symbol_value (SCM self, SCM rest)
if (!gdbscm_is_false (frame_scm))
f_smob = frscm_get_frame_smob_arg_unsafe (frame_scm, frame_pos, FUNC_NAME);
- if (symbol->aclass () == LOC_TYPEDEF)
+ if (symbol.symbol->aclass () == LOC_TYPEDEF)
{
gdbscm_out_of_range_error (FUNC_NAME, SCM_ARG1, self,
_("cannot get the value of a typedef"));
@@ -545,14 +545,10 @@ gdbscm_symbol_value (SCM self, SCM rest)
error (_("Invalid frame"));
}
- if (symbol_read_needs_frame (symbol) && frame_info == NULL)
+ if (symbol_read_needs_frame (symbol.symbol) && frame_info == nullptr)
error (_("Symbol requires a frame to compute its value"));
- /* TODO: currently, we have no way to recover the block in which SYMBOL
- was found, so we have no block to pass to read_var_value. This will
- yield an incorrect value when symbol is not local to FRAME_INFO (this
- can happen with nested functions). */
- value = read_var_value (symbol, NULL, frame_info);
+ value = read_var_value (symbol, frame_info);
}
catch (const gdb_exception &except)
{
@@ -578,7 +574,7 @@ gdbscm_lookup_symbol (SCM name_scm, SCM rest)
int domain = VAR_DOMAIN;
int block_arg_pos = -1, domain_arg_pos = -1;
struct field_of_this_result is_a_field_of_this;
- struct symbol *symbol = NULL;
+ block_symbol symbol = {};
gdbscm_parse_function_args (FUNC_NAME, SCM_ARG1, keywords, "s#Oi",
name_scm, &name, rest,
@@ -618,7 +614,7 @@ gdbscm_lookup_symbol (SCM name_scm, SCM rest)
try
{
symbol = lookup_symbol (name, block, (domain_enum) domain,
- &is_a_field_of_this).symbol;
+ &is_a_field_of_this);
}
catch (const gdb_exception &ex)
{
@@ -628,7 +624,7 @@ gdbscm_lookup_symbol (SCM name_scm, SCM rest)
xfree (name);
GDBSCM_HANDLE_GDB_EXCEPTION (except);
- if (symbol == NULL)
+ if (symbol.symbol == nullptr)
return SCM_BOOL_F;
return scm_list_2 (syscm_scm_from_symbol (symbol),
@@ -645,7 +641,7 @@ gdbscm_lookup_global_symbol (SCM name_scm, SCM rest)
SCM keywords[] = { domain_keyword, SCM_BOOL_F };
int domain_arg_pos = -1;
int domain = VAR_DOMAIN;
- struct symbol *symbol = NULL;
+ block_symbol symbol = {};
gdbscm_gdb_exception except {};
gdbscm_parse_function_args (FUNC_NAME, SCM_ARG1, keywords, "s#i",
@@ -654,7 +650,7 @@ gdbscm_lookup_global_symbol (SCM name_scm, SCM rest)
try
{
- symbol = lookup_global_symbol (name, NULL, (domain_enum) domain).symbol;
+ symbol = lookup_global_symbol (name, NULL, (domain_enum) domain);
}
catch (const gdb_exception &ex)
{
@@ -664,7 +660,7 @@ gdbscm_lookup_global_symbol (SCM name_scm, SCM rest)
xfree (name);
GDBSCM_HANDLE_GDB_EXCEPTION (except);
- if (symbol == NULL)
+ if (symbol.symbol == nullptr)
return SCM_BOOL_F;
return syscm_scm_from_symbol (symbol);
--
2.41.0
next prev parent reply other threads:[~2023-11-05 18:11 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-05 18:11 [PATCH v2 00/31] Baby step for objfile splitting Tom Tromey
2023-11-05 18:11 ` [PATCH v2 01/31] Introduce block-symbol.h Tom Tromey
2023-11-05 18:11 ` [PATCH v2 02/31] Add block_symbol::address Tom Tromey
2023-11-05 18:11 ` [PATCH v2 03/31] Add bound_symbol Tom Tromey
2023-11-05 18:11 ` [PATCH v2 04/31] Easy conversions to use block_symbol::address Tom Tromey
2023-11-05 18:11 ` [PATCH v2 05/31] Use block_symbol::address in ada-tasks.c Tom Tromey
2023-11-05 18:11 ` [PATCH v2 06/31] Use block_symbol::address in printcmd.c Tom Tromey
2023-11-05 18:11 ` [PATCH v2 07/31] Use bound_symbol::address in tracepoint.c Tom Tromey
2023-11-05 18:11 ` [PATCH v2 08/31] Use block_symbol::address " Tom Tromey
2023-11-05 18:11 ` [PATCH v2 09/31] Use block_symbol::address in ax-gdb.c Tom Tromey
2023-11-05 18:11 ` [PATCH v2 10/31] Use block_symbol::address in linespec.c Tom Tromey
2023-11-05 18:11 ` [PATCH v2 11/31] Use block_symbol::address in ada-lang.c Tom Tromey
2023-11-05 18:11 ` [PATCH v2 12/31] Use bound_symbol::address in symmisc.c Tom Tromey
2023-11-05 18:11 ` [PATCH v2 13/31] Introduce read_var_value overload Tom Tromey
2023-11-05 18:11 ` [PATCH v2 14/31] Use read_var_value in gdb/compile Tom Tromey
2023-11-05 18:11 ` [PATCH v2 15/31] Return a block_symbol from find_pc_sect_function Tom Tromey
2023-11-05 18:11 ` [PATCH v2 16/31] Use read_var_value overload in finish_command_fsm Tom Tromey
2023-11-05 18:11 ` [PATCH v2 17/31] Use block_symbol in overload-handling code Tom Tromey
2023-11-05 18:11 ` [PATCH v2 18/31] Change evaluate_var_value to accept a block_symbol Tom Tromey
2023-11-05 18:11 ` [PATCH v2 19/31] Change value_of_variable to take " Tom Tromey
2023-11-05 18:11 ` [PATCH v2 20/31] Return a block_symbol from get_frame_function Tom Tromey
2023-11-05 18:11 ` [PATCH v2 21/31] Use read_var_value overload in return_command Tom Tromey
2023-11-05 18:12 ` [PATCH v2 22/31] Use read_var_value overload in py-finishbreakpoint.c Tom Tromey
2023-11-05 18:12 ` [PATCH v2 23/31] Use read_var_value overload in py-framefilter.c Tom Tromey
2023-11-05 18:12 ` Tom Tromey [this message]
2023-11-05 18:12 ` [PATCH v2 25/31] Use read_var_value in read_frame_arg and read_frame_local Tom Tromey
2023-11-05 18:12 ` [PATCH v2 26/31] Change print_variable_and_value to take a block_symbol Tom Tromey
2023-11-05 18:12 ` [PATCH v2 27/31] Change find_frame_funname to return " Tom Tromey
2023-11-05 18:12 ` [PATCH v2 28/31] Change btrace_function::sym to " Tom Tromey
2023-11-05 18:12 ` [PATCH v2 29/31] Use read_var_value overload in Python Tom Tromey
2023-11-05 18:12 ` [PATCH v2 30/31] Remove the old read_var_value Tom Tromey
2023-11-05 18:12 ` [PATCH v2 31/31] Change language_defn::read_var_value to accept block_symbol Tom Tromey
2023-11-06 15:16 ` [PATCH v2 00/31] Baby step for objfile splitting Andrew Burgess
2023-11-07 3:36 ` Tom Tromey
2023-11-07 11:06 ` Andrew Burgess
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231105-split-objfile-2023-bound-sym-october-v2-24-dbd2d158bbc3@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).