FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gdb: remove COMPUNIT_MACRO_TABLE macro, add getter/setter

Browse source 
Add a getter and a setter for a compunit_symtab's macro table.  Remove the
corresponding macro and adjust all callers.

Change-Id: I00615ea72d5ac43d9a865e941cb2de0a979c173a
This commit is contained in:
Simon Marchi 2021-11-19 22:43:56 -05:00 • committed by Simon Marchi
parent 3908b699f8
commit 10cc645b6a
5 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gdb/buildsym.c
View file

@ -1024,7 +1024,7 @@ buildsym_compunit::end_symtab_with_blockvector (struct block *static_block,
cu->set_block_line_section (section); cu->set_block_line_section (section);
COMPUNIT_MACRO_TABLE (cu) = release_macros (); cu->set_macro_table (release_macros ());
/* Default any symbols without a specified symtab to the primary symtab. */ /* Default any symbols without a specified symtab to the primary symtab. */
{ {

4
gdb/macroscope.c
View file

@ -44,12 +44,12 @@ sal_macro_scope (struct symtab_and_line sal)
if (sal.symtab == NULL) if (sal.symtab == NULL)
return NULL; return NULL;
cust = SYMTAB_COMPUNIT (sal.symtab); cust = SYMTAB_COMPUNIT (sal.symtab);
if (COMPUNIT_MACRO_TABLE (cust) == NULL) if (cust->macro_table () == NULL)
return NULL; return NULL;
gdb::unique_xmalloc_ptr<struct macro_scope> ms (XNEW (struct macro_scope)); gdb::unique_xmalloc_ptr<struct macro_scope> ms (XNEW (struct macro_scope));
main_file = macro_main (COMPUNIT_MACRO_TABLE (cust)); main_file = macro_main (cust->macro_table ());
inclusion = macro_lookup_inclusion (main_file, sal.symtab->filename); inclusion = macro_lookup_inclusion (main_file, sal.symtab->filename);
if (inclusion) if (inclusion)

2
gdb/mi/mi-cmd-file.c
View file

@ -59,7 +59,7 @@ mi_cmd_file_list_exec_source_file (const char *command, char **argv, int argc)
uiout->field_string ("fullname", symtab_to_fullname (st.symtab)); uiout->field_string ("fullname", symtab_to_fullname (st.symtab));
uiout->field_signed ("macro-info", uiout->field_signed ("macro-info",
COMPUNIT_MACRO_TABLE (SYMTAB_COMPUNIT (st.symtab)) != NULL); SYMTAB_COMPUNIT (st.symtab)->macro_table () != NULL);
} }
/* Implement -file-list-exec-source-files command. */ /* Implement -file-list-exec-source-files command. */

4
gdb/source.c
View file

@ -729,8 +729,8 @@ info_source_command (const char *ignore, int from_tty)
printf_filtered (_("Compiled with %s debugging format.\n"), printf_filtered (_("Compiled with %s debugging format.\n"),
cust->debugformat ()); cust->debugformat ());
printf_filtered (_("%s preprocessor macro info.\n"), printf_filtered (_("%s preprocessor macro info.\n"),
COMPUNIT_MACRO_TABLE (cust) != NULL (cust->macro_table () != nullptr
? "Includes" : "Does not include"); ? "Includes" : "Does not include"));
} }

14
gdb/symtab.h
View file

@ -1551,6 +1551,16 @@ struct compunit_symtab
m_epilogue_unwind_valid = epilogue_unwind_valid; m_epilogue_unwind_valid = epilogue_unwind_valid;
} }
struct macro_table *macro_table () const
{
return m_macro_table;
}
void set_macro_table (struct macro_table *macro_table)
{
m_macro_table = macro_table;
}
/* Make PRIMARY_FILETAB the primary filetab of this compunit symtab. /* Make PRIMARY_FILETAB the primary filetab of this compunit symtab.
PRIMARY_FILETAB must already be a filetab of this compunit symtab. */ PRIMARY_FILETAB must already be a filetab of this compunit symtab. */
@ -1626,7 +1636,7 @@ struct compunit_symtab
is shared between different symtabs in a given compilation unit. is shared between different symtabs in a given compilation unit.
It's debatable whether it *should* be shared among all the symtabs in It's debatable whether it *should* be shared among all the symtabs in
the given compilation unit, but it currently is. */ the given compilation unit, but it currently is. */
struct macro_table *macro_table; struct macro_table *m_macro_table;
/* If non-NULL, then this points to a NULL-terminated vector of /* If non-NULL, then this points to a NULL-terminated vector of
included compunits. When searching the static or global included compunits. When searching the static or global
@ -1646,8 +1656,6 @@ struct compunit_symtab
using compunit_symtab_range = next_range<compunit_symtab>; using compunit_symtab_range = next_range<compunit_symtab>;
#define COMPUNIT_MACRO_TABLE(cust) ((cust)->macro_table)
/* 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);