From 8dddcb8f005e8470312bf33041bb6ddaa5084e32 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 22 Sep 2016 14:25:08 -0600 Subject: Record minimal symbols directly in reader. This patch changes minimal symbol creation in two ways. First, it removes global variables in favor of members of minimal_symbol_reader. Second, it changes functions like prim_record_minimal_symbol to be member functions of minimal_symbol_reader. 2016-10-21 Tom Tromey * xcoffread.c (record_minimal_symbol, scan_xcoff_symtab): Add "reader" argument. Update. (xcoff_initial_scan): Update. * symfile.h (mdebug_build_psymtabs): Add "reader" argument. * mipsread.c (mipscoff_symfile_read): Update. (read_alphacoff_dynamic_symtab): Add "reader" argument. Update. * minsyms.h (minimal_symbol_reader) : Declare. : New members. : New function, renamed from prim_record_minimal_symbol_and_info. * minsyms.c (msym_bunch, msym_bunch_index, msym_count): Remove globals. (minimal_symbol_reader): Initialize new members. (minimal_symbol_reader::record): Renamed from prim_record_minimal_symbol. (minimal_symbol_reader::record_full): Renamed from prim_record_minimal_symbol_full. (prim_record_minimal_symbol_and_info): Move to minsyms.h; rename. * mdebugread.c (mdebug_build_psymtabs, parse_partial_symbols) (record_minimal_symbol): Add "reader" argument. Update. (elfmdebug_build_psymtabs): Update. * machoread.c (macho_symtab_add_minsym, macho_symtab_read): Add "reader" argument. Update. (macho_symfile_read): Update. * elfread.c (record_minimal_symbol, elf_symtab_read) (elf_rel_plt_read): Add "reader" argument. Update. (elf_read_minimal_symbols): Update. * dbxread.c (record_minimal_symbol, read_dbx_dynamic_symtab) (read_dbx_symtab): Add "reader" argument. Update. (dbx_symfile_read): Update. * coffread.c (record_minimal_symbol, coff_symtab_read): Add "reader" argument. Update. (coff_symfile_read): Update. * coff-pe-read.h (read_pe_exported_syms): Add "reader" argument. * coff-pe-read.c (add_pe_exported_sym, add_pe_forwarded_sym) (read_pe_exported_syms): Add "reader" argument. Update. --- gdb/mipsread.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gdb/mipsread.c') diff --git a/gdb/mipsread.c b/gdb/mipsread.c index 256b262..39af0d3 100644 --- a/gdb/mipsread.c +++ b/gdb/mipsread.c @@ -42,7 +42,8 @@ #include "psymtab.h" static void -read_alphacoff_dynamic_symtab (struct section_offsets *, +read_alphacoff_dynamic_symtab (minimal_symbol_reader &, + struct section_offsets *, struct objfile *objfile); /* Initialize anything that needs initializing when a completely new @@ -79,12 +80,12 @@ mipscoff_symfile_read (struct objfile *objfile, int symfile_flags) (abfd, (asection *) NULL, &ecoff_data (abfd)->debug_info))) error (_("Error reading symbol table: %s"), bfd_errmsg (bfd_get_error ())); - mdebug_build_psymtabs (objfile, &ecoff_backend (abfd)->debug_swap, + mdebug_build_psymtabs (reader, objfile, &ecoff_backend (abfd)->debug_swap, &ecoff_data (abfd)->debug_info); /* Add alpha coff dynamic symbols. */ - read_alphacoff_dynamic_symtab (objfile->section_offsets, objfile); + read_alphacoff_dynamic_symtab (reader, objfile->section_offsets, objfile); /* Install any minimal symbols that have been collected as the current minimal symbols for this objfile. */ @@ -173,7 +174,8 @@ alphacoff_locate_sections (bfd *ignore_abfd, asection *sectp, void *sip) them to the minimal symbol table. */ static void -read_alphacoff_dynamic_symtab (struct section_offsets *section_offsets, +read_alphacoff_dynamic_symtab (minimal_symbol_reader &reader, + struct section_offsets *section_offsets, struct objfile *objfile) { bfd *abfd = objfile->obfd; @@ -388,7 +390,7 @@ read_alphacoff_dynamic_symtab (struct section_offsets *section_offsets, } } - prim_record_minimal_symbol (name, sym_value, ms_type, objfile); + reader.record (name, sym_value, ms_type); } do_cleanups (cleanups); -- cgit v1.1