espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-05-25 11:16:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

gdb: remove SYMTAB_BLOCKVECTOR macro

Browse Source 
Remove the macro, replace with an equivalent method.

Change-Id: Id6fe2a79c04bcd6c69ccaefb7a69bc06a476288c
This commit is contained in:
Simon Marchi
2021-11-20 21:32:41 -05:00
parent 1ee2e9f930
commit 012cfab919
14 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gdb/ada-exp.y
View File

@ -1302,7 +1302,7 @@ block_lookup (const struct block *context, const char *raw_name)
symtab = NULL; symtab = NULL;
if (symtab != NULL) if (symtab != NULL)
result = BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (symtab), STATIC_BLOCK); result = BLOCKVECTOR_BLOCK (symtab->blockvector (), STATIC_BLOCK);
else if (syms.empty () || SYMBOL_CLASS (syms[0].symbol) != LOC_BLOCK) else if (syms.empty () || SYMBOL_CLASS (syms[0].symbol) != LOC_BLOCK)
{ {
if (context == NULL) if (context == NULL)

4
gdb/ada-lang.c
View File

@ -4384,9 +4384,9 @@ cache_symbol (const char *name, domain_enum domain, struct symbol *sym,
the symbol is local or not, we check the block where we found it the symbol is local or not, we check the block where we found it
against the global and static blocks of its associated symtab. */ against the global and static blocks of its associated symtab. */
if (sym if (sym
&& BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (symbol_symtab (sym)), && BLOCKVECTOR_BLOCK (symbol_symtab (sym)->blockvector (),
GLOBAL_BLOCK) != block GLOBAL_BLOCK) != block
&& BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (symbol_symtab (sym)), && BLOCKVECTOR_BLOCK (symbol_symtab (sym)->blockvector (),
STATIC_BLOCK) != block) STATIC_BLOCK) != block)
return; return;

2
gdb/c-exp.y
View File

@ -3109,7 +3109,7 @@ classify_name (struct parser_state *par_state, const struct block *block,
symtab = lookup_symtab (copy.c_str ()); symtab = lookup_symtab (copy.c_str ());
if (symtab) if (symtab)
{ {
yylval.bval = BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (symtab), yylval.bval = BLOCKVECTOR_BLOCK (symtab->blockvector (),
STATIC_BLOCK); STATIC_BLOCK);
return FILENAME; return FILENAME;
} }

2
gdb/coffread.c
View File

@ -1483,7 +1483,7 @@ patch_opaque_types (struct symtab *s)
struct symbol *real_sym; struct symbol *real_sym;
/* Go through the per-file symbols only. */ /* Go through the per-file symbols only. */
b = BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (s), STATIC_BLOCK); b = BLOCKVECTOR_BLOCK (s->blockvector (), STATIC_BLOCK);
ALL_BLOCK_SYMBOLS (b, iter, real_sym) ALL_BLOCK_SYMBOLS (b, iter, real_sym)
{ {
/* Find completed typedefs to use to fix opaque ones. /* Find completed typedefs to use to fix opaque ones.

2
gdb/compile/compile-object-load.c
View File

@ -421,7 +421,7 @@ get_out_value_type (struct symbol *func_sym, struct objfile *objfile,
lookup_name_info func_matcher (GCC_FE_WRAPPER_FUNCTION, lookup_name_info func_matcher (GCC_FE_WRAPPER_FUNCTION,
symbol_name_match_type::SEARCH_NAME); symbol_name_match_type::SEARCH_NAME);
bv = SYMTAB_BLOCKVECTOR (func_sym->owner.symtab); bv = func_sym->owner.symtab->blockvector ();
nblocks = BLOCKVECTOR_NBLOCKS (bv); nblocks = BLOCKVECTOR_NBLOCKS (bv);
gdb_ptr_type_sym = NULL; gdb_ptr_type_sym = NULL;

2
gdb/compile/compile.c
View File

@ -484,7 +484,7 @@ get_expr_block_and_pc (CORE_ADDR *pc)
struct symtab_and_line cursal = get_current_source_symtab_and_line (); struct symtab_and_line cursal = get_current_source_symtab_and_line ();
if (cursal.symtab) if (cursal.symtab)
block = BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (cursal.symtab), block = BLOCKVECTOR_BLOCK (cursal.symtab->blockvector (),
STATIC_BLOCK); STATIC_BLOCK);
if (block != NULL) if (block != NULL)
*pc = BLOCK_ENTRY_PC (block); *pc = BLOCK_ENTRY_PC (block);

4
gdb/guile/scm-symtab.c
View File

@ -363,7 +363,7 @@ gdbscm_symtab_global_block (SCM self)
const struct blockvector *blockvector; const struct blockvector *blockvector;
const struct block *block; const struct block *block;
blockvector = SYMTAB_BLOCKVECTOR (symtab); blockvector = symtab->blockvector ();
block = BLOCKVECTOR_BLOCK (blockvector, GLOBAL_BLOCK); block = BLOCKVECTOR_BLOCK (blockvector, GLOBAL_BLOCK);
return bkscm_scm_from_block (block, SYMTAB_OBJFILE (symtab)); return bkscm_scm_from_block (block, SYMTAB_OBJFILE (symtab));
@ -381,7 +381,7 @@ gdbscm_symtab_static_block (SCM self)
const struct blockvector *blockvector; const struct blockvector *blockvector;
const struct block *block; const struct block *block;
blockvector = SYMTAB_BLOCKVECTOR (symtab); blockvector = symtab->blockvector ();
block = BLOCKVECTOR_BLOCK (blockvector, STATIC_BLOCK); block = BLOCKVECTOR_BLOCK (blockvector, STATIC_BLOCK);
return bkscm_scm_from_block (block, SYMTAB_OBJFILE (symtab)); return bkscm_scm_from_block (block, SYMTAB_OBJFILE (symtab));

6
gdb/linespec.c
View File

@ -1190,10 +1190,10 @@ iterate_over_all_matching_symtabs
int i; int i;
for (i = FIRST_LOCAL_BLOCK; for (i = FIRST_LOCAL_BLOCK;
i < BLOCKVECTOR_NBLOCKS (SYMTAB_BLOCKVECTOR (symtab)); i < BLOCKVECTOR_NBLOCKS (symtab->blockvector ());
i++) i++)
{ {
block = BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (symtab), i); block = BLOCKVECTOR_BLOCK (symtab->blockvector (), i);
state->language->iterate_over_symbols state->language->iterate_over_symbols
(block, lookup_name, name_domain, (block, lookup_name, name_domain,
[&] (block_symbol *bsym) [&] (block_symbol *bsym)
@ -1232,7 +1232,7 @@ iterate_over_file_blocks
{ {
const struct block *block; const struct block *block;
for (block = BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (symtab), STATIC_BLOCK); for (block = BLOCKVECTOR_BLOCK (symtab->blockvector (), STATIC_BLOCK);
block != NULL; block != NULL;
block = BLOCK_SUPERBLOCK (block)) block = BLOCK_SUPERBLOCK (block))
current_language->iterate_over_symbols (block, name, domain, callback); current_language->iterate_over_symbols (block, name, domain, callback);

14
gdb/mdebugread.c
View File

@ -628,7 +628,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
break; break;
case stGlobal: /* External symbol, goes into global block. */ case stGlobal: /* External symbol, goes into global block. */
b = BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (top_stack->cur_st), b = BLOCKVECTOR_BLOCK (top_stack->cur_st->blockvector (),
GLOBAL_BLOCK); GLOBAL_BLOCK);
s = new_symbol (name); s = new_symbol (name);
SET_SYMBOL_VALUE_ADDRESS (s, (CORE_ADDR) sh->value); SET_SYMBOL_VALUE_ADDRESS (s, (CORE_ADDR) sh->value);
@ -771,7 +771,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
if (sh->st == stProc) if (sh->st == stProc)
{ {
const struct blockvector *bv const struct blockvector *bv
= SYMTAB_BLOCKVECTOR (top_stack->cur_st); = top_stack->cur_st->blockvector ();
/* The next test should normally be true, but provides a /* The next test should normally be true, but provides a
hook for nested functions (which we don't want to make hook for nested functions (which we don't want to make
@ -1144,7 +1144,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
{ {
/* Finished with procedure */ /* Finished with procedure */
const struct blockvector *bv const struct blockvector *bv
= SYMTAB_BLOCKVECTOR (top_stack->cur_st); = top_stack->cur_st->blockvector ();
struct mdebug_extra_func_info *e; struct mdebug_extra_func_info *e;
struct block *cblock = top_stack->cur_block; struct block *cblock = top_stack->cur_block;
struct type *ftype = top_stack->cur_type; struct type *ftype = top_stack->cur_type;
@ -4186,7 +4186,7 @@ mdebug_expand_psymtab (legacy_psymtab *pst, struct objfile *objfile)
FIXME, Maybe quit once we have found the right number of ext's? */ FIXME, Maybe quit once we have found the right number of ext's? */
top_stack->cur_st = cust->primary_filetab (); top_stack->cur_st = cust->primary_filetab ();
top_stack->cur_block top_stack->cur_block
= BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (top_stack->cur_st), = BLOCKVECTOR_BLOCK (top_stack->cur_st->blockvector (),
GLOBAL_BLOCK); GLOBAL_BLOCK);
top_stack->blocktype = stFile; top_stack->blocktype = stFile;
@ -4496,13 +4496,13 @@ add_block (struct block *b, struct symtab *s)
{ {
/* Cast away "const", but that's ok because we're building the /* Cast away "const", but that's ok because we're building the
symtab and blockvector here. */ symtab and blockvector here. */
struct blockvector *bv = (struct blockvector *) SYMTAB_BLOCKVECTOR (s); struct blockvector *bv = (struct blockvector *) s->blockvector ();
bv = (struct blockvector *) xrealloc ((void *) bv, bv = (struct blockvector *) xrealloc ((void *) bv,
(sizeof (struct blockvector) (sizeof (struct blockvector)
+ BLOCKVECTOR_NBLOCKS (bv) + BLOCKVECTOR_NBLOCKS (bv)
* sizeof (bv->block))); * sizeof (bv->block)));
if (bv != SYMTAB_BLOCKVECTOR (s)) if (bv != s->blockvector ())
s->compunit ()->set_blockvector (bv); s->compunit ()->set_blockvector (bv);
BLOCKVECTOR_BLOCK (bv, BLOCKVECTOR_NBLOCKS (bv)++) = b; BLOCKVECTOR_BLOCK (bv, BLOCKVECTOR_NBLOCKS (bv)++) = b;
@ -4566,7 +4566,7 @@ sort_blocks (struct symtab *s)
{ {
/* We have to cast away const here, but this is ok because we're /* We have to cast away const here, but this is ok because we're
constructing the blockvector in this code. */ constructing the blockvector in this code. */
struct blockvector *bv = (struct blockvector *) SYMTAB_BLOCKVECTOR (s); struct blockvector *bv = (struct blockvector *) s->blockvector ();
if (BLOCKVECTOR_NBLOCKS (bv) <= FIRST_LOCAL_BLOCK) if (BLOCKVECTOR_NBLOCKS (bv) <= FIRST_LOCAL_BLOCK)
{ {

2
gdb/p-exp.y
View File

@ -619,7 +619,7 @@ block : BLOCKNAME
struct symtab *tem = struct symtab *tem =
lookup_symtab (copy.c_str ()); lookup_symtab (copy.c_str ());
if (tem) if (tem)
$$ = BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (tem), $$ = BLOCKVECTOR_BLOCK (tem->blockvector (),
STATIC_BLOCK); STATIC_BLOCK);
else else
error (_("No file or function \"%s\"."), error (_("No file or function \"%s\"."),

2
gdb/parse.c
View File

@ -462,7 +462,7 @@ parse_exp_in_context (const char **stringptr, CORE_ADDR pc,
struct symtab_and_line cursal = get_current_source_symtab_and_line (); struct symtab_and_line cursal = get_current_source_symtab_and_line ();
if (cursal.symtab) if (cursal.symtab)
expression_context_block expression_context_block
= BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (cursal.symtab), = BLOCKVECTOR_BLOCK (cursal.symtab->blockvector (),
STATIC_BLOCK); STATIC_BLOCK);
if (expression_context_block) if (expression_context_block)
expression_context_pc = BLOCK_ENTRY_PC (expression_context_block); expression_context_pc = BLOCK_ENTRY_PC (expression_context_block);

4
gdb/python/py-symtab.c
View File

@ -181,7 +181,7 @@ stpy_global_block (PyObject *self, PyObject *args)
STPY_REQUIRE_VALID (self, symtab); STPY_REQUIRE_VALID (self, symtab);
blockvector = SYMTAB_BLOCKVECTOR (symtab); blockvector = symtab->blockvector ();
block = BLOCKVECTOR_BLOCK (blockvector, GLOBAL_BLOCK); block = BLOCKVECTOR_BLOCK (blockvector, GLOBAL_BLOCK);
return block_to_block_object (block, SYMTAB_OBJFILE (symtab)); return block_to_block_object (block, SYMTAB_OBJFILE (symtab));
} }
@ -197,7 +197,7 @@ stpy_static_block (PyObject *self, PyObject *args)
STPY_REQUIRE_VALID (self, symtab); STPY_REQUIRE_VALID (self, symtab);
blockvector = SYMTAB_BLOCKVECTOR (symtab); blockvector = symtab->blockvector ();
block = BLOCKVECTOR_BLOCK (blockvector, STATIC_BLOCK); block = BLOCKVECTOR_BLOCK (blockvector, STATIC_BLOCK);
return block_to_block_object (block, SYMTAB_OBJFILE (symtab)); return block_to_block_object (block, SYMTAB_OBJFILE (symtab));
} }

2
gdb/symmisc.c
View File

@ -278,7 +278,7 @@ dump_symtab_1 (struct symtab *symtab, struct ui_file *outfile)
if (is_main_symtab_of_compunit_symtab (symtab)) if (is_main_symtab_of_compunit_symtab (symtab))
{ {
fprintf_filtered (outfile, "\nBlockvector:\n\n"); fprintf_filtered (outfile, "\nBlockvector:\n\n");
bv = SYMTAB_BLOCKVECTOR (symtab); bv = symtab->blockvector ();
len = BLOCKVECTOR_NBLOCKS (bv); len = BLOCKVECTOR_NBLOCKS (bv);
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
{ {

10
gdb/symtab.h
View File

@ -1403,6 +1403,8 @@ struct symtab
m_language = language; m_language = language;
} }
const struct blockvector *blockvector () const;
/* Unordered chain of all filetabs in the compunit, with the exception /* Unordered chain of all filetabs in the compunit, with the exception
that the "main" source file is the first entry in the list. */ that the "main" source file is the first entry in the list. */
@ -1435,8 +1437,6 @@ struct symtab
using symtab_range = next_range<symtab>; using symtab_range = next_range<symtab>;
#define SYMTAB_BLOCKVECTOR(symtab) \
(symtab->compunit ()->blockvector ())
#define SYMTAB_OBJFILE(symtab) \ #define SYMTAB_OBJFILE(symtab) \
(symtab->compunit ()->objfile ()) (symtab->compunit ()->objfile ())
#define SYMTAB_PSPACE(symtab) (SYMTAB_OBJFILE (symtab)->pspace) #define SYMTAB_PSPACE(symtab) (SYMTAB_OBJFILE (symtab)->pspace)
@ -1683,6 +1683,12 @@ struct compunit_symtab
using compunit_symtab_range = next_range<compunit_symtab>; using compunit_symtab_range = next_range<compunit_symtab>;
inline const struct blockvector *
symtab::blockvector () const
{
return this->compunit ()->blockvector ();
}
/* Return the language of CUST. */ /* Return the language of CUST. */
extern enum language compunit_language (const struct compunit_symtab *cust); extern enum language compunit_language (const struct compunit_symtab *cust);