espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-08-06 14:49:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change how some psymbol readers access the psymtab storage

Browse Source 
Currently, all psymbol readers access the psymtab storage via the
objfile.  This is done directly at any spot requiring the storage.

In order to move psymbols out of the objfile, the psymtab_storage must
be passed in explicitly.  This patch consolidates the access of the
storage in a single place in these readers, updating various functions
to pass the storage object around.  "Hidden" uses, like
"objfile->psymtabs ()", are also updated.

The DWARF reader is not yet touched.  That requires more complicated
changes.

gdb/ChangeLog
2021-03-20  Tom Tromey  <tom@tromey.com>

	* xcoffread.c (xcoff_end_psymtab): Add partial_symtabs parameter.
	(xcoff_end_psymtab): Update.
	(scan_xcoff_symtab): Add partial_symtabs parameter.
	(xcoff_initial_scan): Update.
	* stabsread.h (dbx_end_psymtab): Add partial_symtabs parameter.
	* mdebugread.c (mdebug_build_psymtabs): Update.
	(parse_partial_symbols): Add partial_symtabs parameter.
	* dbxread.c (dbx_symfile_read): Update.
	(read_dbx_symtab): Add partial_symtabs parameter.
	(read_dbx_symtab): Update.
	(dbx_end_psymtab): Add partial_symtabs parameter.
This commit is contained in:
Tom Tromey
2021-03-20 17:23:40 -06:00
parent 75336a5a2a
commit 7e9c0476a7
5 changed files with 59 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gdb/mdebugread.c
View File

@ -222,6 +222,7 @@ static int upgrade_type (int, struct type **, int, union aux_ext *,
int, const char *);
static void parse_partial_symbols (minimal_symbol_reader &,
psymtab_storage *,
struct objfile *);
static int has_opaque_xref (FDR *, SYMR *);
@ -357,7 +358,8 @@ mdebug_build_psymtabs (minimal_symbol_reader &reader,
(*swap->swap_fdr_in) (objfile->obfd, fdr_src, fdr_ptr);
}
parse_partial_symbols (reader, objfile);
psymtab_storage *partial_symtabs = objfile->partial_symtabs.get ();
parse_partial_symbols (reader, partial_symtabs, objfile);
#if 0
/* Check to make sure file was compiled with -g. If not, warn the
@ -2281,6 +2283,7 @@ record_minimal_symbol (minimal_symbol_reader &reader,
static void
parse_partial_symbols (minimal_symbol_reader &reader,
psymtab_storage *partial_symtabs,
struct objfile *objfile)
{
struct gdbarch *gdbarch = objfile->arch ();
@ -3642,7 +3645,7 @@ parse_partial_symbols (minimal_symbol_reader &reader,
/* Link pst to FDR. dbx_end_psymtab returns NULL if the psymtab was
empty and put on the free list. */
fdr_to_pst[f_idx].pst
= dbx_end_psymtab (objfile, save_pst,
= dbx_end_psymtab (objfile, partial_symtabs, save_pst,
psymtab_include_list, includes_used,
-1, save_pst->raw_text_high (),
dependency_list, dependencies_used,
@ -3666,7 +3669,7 @@ parse_partial_symbols (minimal_symbol_reader &reader,
&& save_pst->text_low_valid
&& !(objfile->flags & OBJF_REORDERED))
{
for (partial_symtab *iter : objfile->psymtabs ())
for (partial_symtab *iter : partial_symtabs->range ())
{
if (save_pst != iter
&& save_pst->raw_text_low () >= iter->raw_text_low ()
@ -3697,7 +3700,7 @@ parse_partial_symbols (minimal_symbol_reader &reader,
source files or a reverse .h -> .c dependency for header files. */
pst->number_of_dependencies = 0;
pst->dependencies
= objfile->partial_symtabs->allocate_dependencies (fh->crfd - 1);
= partial_symtabs->allocate_dependencies (fh->crfd - 1);
for (s_idx = 1; s_idx < fh->crfd; s_idx++)
{
RFDT rh;
@ -3726,11 +3729,11 @@ parse_partial_symbols (minimal_symbol_reader &reader,
/* Remove the dummy psymtab created for -O3 images above, if it is
still empty, to enable the detection of stripped executables. */
partial_symtab *pst_del = objfile->partial_symtabs->psymtabs;
partial_symtab *pst_del = partial_symtabs->psymtabs;
if (pst_del->next == NULL
&& pst_del->number_of_dependencies == 0
&& pst_del->empty ())
objfile->partial_symtabs->discard_psymtab (pst_del);
partial_symtabs->discard_psymtab (pst_del);
}
/* If the current psymbol has an enumerated type, we need to add