From 8566b89b737eef50f67bf23329b4606cf7973de1 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 23 Oct 2019 09:40:54 -0600 Subject: Introduce partial_symtab::expand_psymtab method The symbol readers generally used two functions to expand a partial symtab: an outer function (now the "read_symtab" method), and an inner function, typically named something like "psymtab_to_symtab". This patch changes this second step to be a method on partial_symtab, and updates all the callers. For legacy_psymtab, a new function pointer member is introduced. This patch enables a subsequent cleanup. gdb/ChangeLog 2020-01-26 Tom Tromey * xcoffread.c (xcoff_psymtab_to_symtab_1): Change argument order. Call expand_psymtab. (xcoff_read_symtab): Call expand_psymtab. (xcoff_start_psymtab, xcoff_end_psymtab): Set legacy_expand_psymtab. * psympriv.h (struct partial_symtab) : New method. (struct legacy_psymtab) : Implement. : New member. * mdebugread.c (mdebug_read_symtab): Call expand_psymtab. (parse_partial_symbols): Set legacy_expand_psymtab. (psymtab_to_symtab_1): Change argument order. Call expand_psymtab. (new_psymtab): Set legacy_expand_psymtab. * dwarf2read.h (struct dwarf2_psymtab) : Declare. * dwarf2read.c (dwarf2_psymtab::read_symtab): Call expand_psymtab. (dwarf2_psymtab::expand_psymtab): Rename from psymtab_to_symtab_1. Call expand_psymtab. * dbxread.c (start_psymtab): Set legacy_expand_psymtab. (dbx_end_psymtab): Likewise. (dbx_psymtab_to_symtab_1): Change argument order. Call expand_psymtab. (dbx_read_symtab): Call expand_psymtab. * ctfread.c (struct ctf_psymtab) : Declare. (ctf_psymtab::expand_psymtab): Rename from psymtab_to_symtab. (ctf_psymtab::read_symtab): Call expand_psymtab. Change-Id: Ic39a2d7aa7b424088d910b59dbd21271fa1c3430 --- gdb/mdebugread.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gdb/mdebugread.c') diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c index 4b32a5a..1d0a0fc 100644 --- a/gdb/mdebugread.c +++ b/gdb/mdebugread.c @@ -253,8 +253,8 @@ static void sort_blocks (struct symtab *); static legacy_psymtab *new_psymtab (const char *, struct objfile *); -static void psymtab_to_symtab_1 (struct objfile *objfile, - legacy_psymtab *, const char *); +static void psymtab_to_symtab_1 (legacy_psymtab *pst, + struct objfile *objfile); static void add_block (struct block *, struct symtab *); @@ -279,7 +279,7 @@ mdebug_read_symtab (legacy_psymtab *self, struct objfile *objfile) { next_symbol_text_func = mdebug_next_symbol_text; - psymtab_to_symtab_1 (objfile, self, self->filename); + self->expand_psymtab (objfile); /* Match with global symbols. This only needs to be done once, after all of the symtabs and dependencies have been read in. */ @@ -2613,6 +2613,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, /* The way to turn this into a symtab is to call... */ pst->legacy_read_symtab = mdebug_read_symtab; + pst->legacy_expand_psymtab = psymtab_to_symtab_1; /* Set up language for the pst. The language from the FDR is used if it is unambigious (e.g. cfront @@ -3834,8 +3835,7 @@ mdebug_next_symbol_text (struct objfile *objfile) The flow of control and even the memory allocation differs. FIXME. */ static void -psymtab_to_symtab_1 (struct objfile *objfile, - legacy_psymtab *pst, const char *filename) +psymtab_to_symtab_1 (legacy_psymtab *pst, struct objfile *objfile) { bfd_size_type external_sym_size; bfd_size_type external_pdr_size; @@ -3872,9 +3872,7 @@ psymtab_to_symtab_1 (struct objfile *objfile, wrap_here (""); /* Flush output */ gdb_flush (gdb_stdout); } - /* We only pass the filename for debug purposes. */ - psymtab_to_symtab_1 (objfile, (legacy_psymtab *) pst->dependencies[i], - pst->dependencies[i]->filename); + pst->dependencies[i]->expand_psymtab (objfile); } /* Do nothing if this is a dummy psymtab. */ @@ -4664,6 +4662,7 @@ new_psymtab (const char *name, struct objfile *objfile) /* The way to turn this into a symtab is to call... */ psymtab->legacy_read_symtab = mdebug_read_symtab; + psymtab->legacy_expand_psymtab = psymtab_to_symtab_1; return (psymtab); } -- cgit v1.1