gdb: rename partial symtab expand functions of debug info readers using legacy_psymtab

As I am trying to understand the dynamic of partial_symtab::read_symtab
and partial_symtab::expand_psymtab, I think that renaming these
functions helps make it clear that they are effectively implementations
of the partial_symtab::expand_psymtab method.

gdb/ChangeLog:

	* dbxread.c (dbx_psymtab_to_symtab_1): Rename to...
	(dbx_expand_psymtab): ... this.
	(start_psymtab): Update.
	* mdebugread.c (psymtab_to_symtab_1): Rename to...
	(mdebug_expand_psymtab): ... this.
	(parse_partial_symbols): Update.
	(new_psymtab): Update.
	* xcoffread.c (xcoff_psymtab_to_symtab_1): Rename to...
	(xcoff_expand_psymtab): ... this.
	(xcoff_start_psymtab): Update.
This commit is contained in:
Simon Marchi
2020-03-29 15:24:48 -04:00
parent 48993951ce
commit 69b037c30c
4 changed files with 23 additions and 10 deletions

View File

@ -1,3 +1,16 @@
2020-03-29 Simon Marchi <simon.marchi@polymtl.ca>
* dbxread.c (dbx_psymtab_to_symtab_1): Rename to...
(dbx_expand_psymtab): ... this.
(start_psymtab): Update.
* mdebugread.c (psymtab_to_symtab_1): Rename to...
(mdebug_expand_psymtab): ... this.
(parse_partial_symbols): Update.
(new_psymtab): Update.
* xcoffread.c (xcoff_psymtab_to_symtab_1): Rename to...
(xcoff_expand_psymtab): ... this.
(xcoff_start_psymtab): Update.
2020-03-29 Simon Marchi <simon.marchi@polymtl.ca> 2020-03-29 Simon Marchi <simon.marchi@polymtl.ca>
* psympriv.h (partial_symtab) <read_dependencies>: Rename to... * psympriv.h (partial_symtab) <read_dependencies>: Rename to...

View File

@ -268,7 +268,7 @@ static void read_ofile_symtab (struct objfile *, legacy_psymtab *);
static void dbx_read_symtab (legacy_psymtab *self, static void dbx_read_symtab (legacy_psymtab *self,
struct objfile *objfile); struct objfile *objfile);
static void dbx_psymtab_to_symtab_1 (legacy_psymtab *, struct objfile *); static void dbx_expand_psymtab (legacy_psymtab *, struct objfile *);
static void read_dbx_symtab (minimal_symbol_reader &, struct objfile *); static void read_dbx_symtab (minimal_symbol_reader &, struct objfile *);
@ -1909,7 +1909,7 @@ start_psymtab (struct objfile *objfile, const char *filename, CORE_ADDR textlow,
XOBNEW (&objfile->objfile_obstack, struct symloc); XOBNEW (&objfile->objfile_obstack, struct symloc);
LDSYMOFF (result) = ldsymoff; LDSYMOFF (result) = ldsymoff;
result->legacy_read_symtab = dbx_read_symtab; result->legacy_read_symtab = dbx_read_symtab;
result->legacy_expand_psymtab = dbx_psymtab_to_symtab_1; result->legacy_expand_psymtab = dbx_expand_psymtab;
SYMBOL_SIZE (result) = symbol_size; SYMBOL_SIZE (result) = symbol_size;
SYMBOL_OFFSET (result) = symbol_table_offset; SYMBOL_OFFSET (result) = symbol_table_offset;
STRING_OFFSET (result) = string_table_offset; STRING_OFFSET (result) = string_table_offset;
@ -2066,7 +2066,7 @@ dbx_end_psymtab (struct objfile *objfile, legacy_psymtab *pst,
} }
static void static void
dbx_psymtab_to_symtab_1 (legacy_psymtab *pst, struct objfile *objfile) dbx_expand_psymtab (legacy_psymtab *pst, struct objfile *objfile)
{ {
gdb_assert (!pst->readin); gdb_assert (!pst->readin);

View File

@ -253,8 +253,8 @@ static void sort_blocks (struct symtab *);
static legacy_psymtab *new_psymtab (const char *, struct objfile *); static legacy_psymtab *new_psymtab (const char *, struct objfile *);
static void psymtab_to_symtab_1 (legacy_psymtab *pst, static void mdebug_expand_psymtab (legacy_psymtab *pst,
struct objfile *objfile); struct objfile *objfile);
static void add_block (struct block *, struct symtab *); static void add_block (struct block *, struct symtab *);
@ -2613,7 +2613,7 @@ parse_partial_symbols (minimal_symbol_reader &reader,
/* The way to turn this into a symtab is to call... */ /* The way to turn this into a symtab is to call... */
pst->legacy_read_symtab = mdebug_read_symtab; pst->legacy_read_symtab = mdebug_read_symtab;
pst->legacy_expand_psymtab = psymtab_to_symtab_1; pst->legacy_expand_psymtab = mdebug_expand_psymtab;
/* Set up language for the pst. /* Set up language for the pst.
The language from the FDR is used if it is unambigious (e.g. cfront The language from the FDR is used if it is unambigious (e.g. cfront
@ -3835,7 +3835,7 @@ mdebug_next_symbol_text (struct objfile *objfile)
The flow of control and even the memory allocation differs. FIXME. */ The flow of control and even the memory allocation differs. FIXME. */
static void static void
psymtab_to_symtab_1 (legacy_psymtab *pst, struct objfile *objfile) mdebug_expand_psymtab (legacy_psymtab *pst, struct objfile *objfile)
{ {
bfd_size_type external_sym_size; bfd_size_type external_sym_size;
bfd_size_type external_pdr_size; bfd_size_type external_pdr_size;
@ -4645,7 +4645,7 @@ new_psymtab (const char *name, struct objfile *objfile)
/* The way to turn this into a symtab is to call... */ /* The way to turn this into a symtab is to call... */
psymtab->legacy_read_symtab = mdebug_read_symtab; psymtab->legacy_read_symtab = mdebug_read_symtab;
psymtab->legacy_expand_psymtab = psymtab_to_symtab_1; psymtab->legacy_expand_psymtab = mdebug_expand_psymtab;
return (psymtab); return (psymtab);
} }

View File

@ -1821,7 +1821,7 @@ find_linenos (struct bfd *abfd, struct bfd_section *asect, void *vpinfo)
} }
static void static void
xcoff_psymtab_to_symtab_1 (legacy_psymtab *pst, struct objfile *objfile) xcoff_expand_psymtab (legacy_psymtab *pst, struct objfile *objfile)
{ {
gdb_assert (!pst->readin); gdb_assert (!pst->readin);
@ -1974,7 +1974,7 @@ xcoff_start_psymtab (struct objfile *objfile,
XOBNEW (&objfile->objfile_obstack, struct symloc); XOBNEW (&objfile->objfile_obstack, struct symloc);
((struct symloc *) result->read_symtab_private)->first_symnum = first_symnum; ((struct symloc *) result->read_symtab_private)->first_symnum = first_symnum;
result->legacy_read_symtab = xcoff_read_symtab; result->legacy_read_symtab = xcoff_read_symtab;
result->legacy_expand_psymtab = xcoff_psymtab_to_symtab_1; result->legacy_expand_psymtab = xcoff_expand_psymtab;
/* Deduce the source language from the filename for this psymtab. */ /* Deduce the source language from the filename for this psymtab. */
psymtab_language = deduce_language_from_filename (filename); psymtab_language = deduce_language_from_filename (filename);