Replace symbol_arch with symbol::arch

This turns symbol_arch into a method on symbol.
This commit is contained in:
Tom Tromey 2022-04-17 19:47:22 -06:00
parent e19b2d9465
commit bcd6845e2b
7 changed files with 13 additions and 13 deletions

View file

@ -60,7 +60,7 @@ struct gdbarch *
block_gdbarch (const struct block *block)
{
if (BLOCK_FUNCTION (block) != NULL)
return symbol_arch (BLOCK_FUNCTION (block));
return BLOCK_FUNCTION (block)->arch ();
return block_objfile (block)->arch ();
}

View file

@ -753,7 +753,7 @@ language_defn::read_var_value (struct symbol *var,
lookup_data.name = var->linkage_name ();
gdbarch_iterate_over_objfiles_in_search_order
(symbol_arch (var),
(var->arch (),
minsym_lookup_iterator_cb, &lookup_data,
var->objfile ());
msym = lookup_data.result.minsym;

View file

@ -115,7 +115,7 @@ syscm_get_symbol_map (struct symbol *symbol)
}
else
{
struct gdbarch *gdbarch = symbol_arch (symbol);
struct gdbarch *gdbarch = symbol->arch ();
struct syscm_gdbarch_data *data
= (struct syscm_gdbarch_data *) gdbarch_data (gdbarch,
syscm_gdbarch_data_key);

View file

@ -1684,7 +1684,7 @@ info_address_command (const char *exp, int from_tty)
section = sym->obj_section (sym->objfile ());
else
section = NULL;
gdbarch = symbol_arch (sym);
gdbarch = sym->arch ();
if (SYMBOL_COMPUTED_OPS (sym) != NULL)
{

View file

@ -6602,11 +6602,11 @@ symbol::objfile () const
/* See symtab.h. */
struct gdbarch *
symbol_arch (const struct symbol *symbol)
symbol::arch () const
{
if (!symbol->is_objfile_owned ())
return symbol->owner.arch;
return symbol->owner.symtab->compunit ()->objfile ()->arch ();
if (!is_objfile_owned ())
return owner.arch;
return owner.symtab->compunit ()->objfile ()->arch ();
}
/* See symtab.h. */

View file

@ -1382,6 +1382,10 @@ struct symbol : public general_symbol_info, public allocate_on_obstack
struct objfile *objfile () const;
/* Return the ARCH of this symbol. */
struct gdbarch *arch () const;
/* Data type of value */
struct type *m_type = nullptr;
@ -1498,10 +1502,6 @@ extern int register_symbol_block_impl (enum address_class aclass,
extern int register_symbol_register_impl (enum address_class,
const struct symbol_register_ops *);
/* Return the ARCH of SYMBOL. */
extern struct gdbarch *symbol_arch (const struct symbol *symbol);
/* Return the SYMTAB of SYMBOL.
It is an error to call this if symbol.is_objfile_owned is false, which
only happens for architecture-provided types. */

View file

@ -2506,7 +2506,7 @@ info_scope_command (const char *args_in, int from_tty)
if (symname == NULL || *symname == '\0')
continue; /* Probably botched, certainly useless. */
gdbarch = symbol_arch (sym);
gdbarch = sym->arch ();
gdb_printf ("Symbol %s is ", symname);