diff options
author | Tom Tromey <tromey@redhat.com> | 2010-03-10 18:20:08 +0000 |
---|---|---|
committer | Tom Tromey <tromey@redhat.com> | 2010-03-10 18:20:08 +0000 |
commit | ccefe4c44c4b2d1bc88757fba90ff59eb017a074 (patch) | |
tree | 829f5399a69d6926d7ff1708b43ff81fb4faf453 /gdb/symmisc.c | |
parent | a2a5469e7999a8e4e713e11bfd191c11a422e1e8 (diff) | |
download | gdb-ccefe4c44c4b2d1bc88757fba90ff59eb017a074.zip gdb-ccefe4c44c4b2d1bc88757fba90ff59eb017a074.tar.gz gdb-ccefe4c44c4b2d1bc88757fba90ff59eb017a074.tar.bz2 |
gdb
* xcoffread.c: Include psymtab.h.
(xcoff_sym_fns): Update.
* symtab.h (struct partial_symbol): Remove.
(PSYMBOL_DOMAIN, PSYMBOL_CLASS): Remove.
(struct partial_symtab): Remove.
(PSYMTAB_TO_SYMTAB): Remove.
(lookup_partial_symbol, lookup_partial_symtab, find_pc_psymtab)
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): Declare.
(find_pc_psymtab, find_pc_sect_psymbol, psymtab_to_symtab)
(find_main_psymtab): Remove.
(find_main_filename): Declare.
(fixup_psymbol_section): Remove.
(fixup_section): Declare.
* symtab.c: Include psymtab.h.
(lookup_symtab): Use lookup_symtab method.
(lookup_partial_symtab): Remove.
(find_pc_sect_psymtab_closer): Remove.
(find_pc_sect_psymtab): Remove.
(find_pc_sect_symtab_via_partial): New function.
(find_pc_psymtab, find_pc_sect_psymbol, find_pc_psymbol): Remove.
(fixup_section): No longer static.
(fixup_psymbol_section): Remove.
(lookup_symbol_aux): Use lookup_symbol_aux_quick.
(lookup_global_symbol_from_objfile): Likewise.
(lookup_symbol_aux_psymtabs): Remove.
(lookup_symbol_aux_quick): New function.
(lookup_symbol_global): Use lookup_symbol_aux_quick.
(lookup_partial_symbol): Remove.
(basic_lookup_transparent_type_quick): New function.
(basic_lookup_transparent_type): Use it.
(find_main_psymtab): Remove.
(find_main_filename): New function.
(find_pc_sect_symtab): Use find_pc_sect_symtab method.
(find_line_symtab): Use expand_symtabs_with_filename method.
(output_partial_symbol_filename): New function.
(sources_info): Use map_partial_symbol_filenames.
(struct search_symbols_data): New type.
(search_symbols_file_matches): New function.
(search_symbols_name_matches): Likewise.
(search_symbols): Use expand_symtabs_matching method.
(struct add_name_data): Rename from add_macro_name_data.
(add_macro_name): Update.
(add_partial_symbol_name): New function.
(default_make_symbol_completion_list): Use
map_partial_symbol_names.
(struct add_partial_symbol_name): New type.
(maybe_add_partial_symtab_filename): New function.
(make_source_files_completion_list): Use
map_partial_symbol_filenames.
(expand_line_sal): Use expand_symtabs_with_filename method.
* symmisc.c: Include psymtab.h.
(print_objfile_statistics): Use print_stats method.
(dump_objfile): Use dump method.
(dump_psymtab, maintenance_print_psymbols)
(maintenance_info_psymtabs, maintenance_check_symtabs)
(extend_psymbol_list): Remove.
* symfile.h (struct quick_symbol_functions): New struct.
(struct sym_fns) <qf>: New field.
(sort_pst_symbols): Remove.
(increment_reading_symtab): Declare.
* symfile.c: Include psymtab.h.
(compare_psymbols, sort_pst_symbols): Remove.
(psymtab_to_symtab): Remove.
(increment_reading_symtab): New function.
(symbol_file_add_with_addrs_or_offsets): Use expand_all_symtabs
method.
(set_initial_language): Use find_main_filename.
(allocate_psymtab, discard_psymtab, cashier_psymtab): Remove.
(free_named_symtabs): Remove unused code.
(start_psymtab_common, add_psymbol_to_bcache)
(append_psymbol_to_list, add_psymbol_to_list, init_psymbol_list):
Remove.
* stack.c: Include psymtab.h, symfile.h.
(backtrace_command_1): Use find_pc_sect_symtab_via_partial.
* source.h (psymtab_to_fullname): Don't declare.
* source.c: Include psymtab.h.
(select_source_symtab): Use find_last_source_symtab method.
(forget_cached_source_info): Use forget_cached_source_info
method.
(find_and_open_source): No longer static.
(psymtab_to_fullname): Remove.
* somread.c: Include psymtab.h.
(som_sym_fns): Update.
* psympriv.h: New file.
* psymtab.h: New file.
* psymtab.c: New file.
* objfiles.h: (ALL_OBJFILE_PSYMTABS): Remove.
(ALL_PSYMTABS, ALL_PSPACE_PSYMTABS): Likewise.
* objfiles.c: Include psymtab.h.
(objfile_relocate1): Use relocate method.
(objfile_has_partial_symbols): Use has_symbols method.
* mipsread.c: Include psymtab.h.
(ecoff_sym_fns): Update.
* mi/mi-cmd-file.c: Include psymtab.h.
(print_partial_file_name): New function.
(mi_cmd_file_list_exec_source_files): Use
map_partial_symbol_filenames.
* mdebugread.c: Include psympriv.h.
* machoread.c: Include psympriv.h.
(macho_sym_fns): Update.
* m2-exp.y (yylex): Use lookup_symtab.
* elfread.c: Include psympriv.h.
(elf_sym_fns): Update.
* dwarf2read.c: Include psympriv.h.
* dbxread.c: Include psympriv.h.
(aout_sym_fns): Update.
* cp-support.c: Include psymtab.h.
(read_in_psymtabs): Remove.
(make_symbol_overload_list_qualified): Use
expand_symtabs_for_function method.
* coffread.c: Include psympriv.h.
(coff_sym_fns): Update.
* blockframe.c: Include psymtab.h.
(find_pc_partial_function): Use find_pc_sect_symtab method.
* ada-lang.h (ada_update_initial_language): Update.
* ada-lang.c: Include psymtab.h.
(ada_update_initial_language): Remove 'main_pst' argument.
(ada_lookup_partial_symbol): Remove.
(struct ada_psym_data): New type.
(ada_add_psyms): New function.
(ada_add_non_local_symbols): Use map_ada_symtabs method.
(struct add_partial_datum): New type.
(ada_add_partial_symbol_completions): New function.
(ada_make_symbol_completion_list): Use map_partial_symbol_names.
(ada_exception_support_info_sniffer): Update.
* Makefile.in (SFILES): Add psymtab.c.
(COMMON_OBS): Add psymtab.o.
(HFILES_NO_SRCDIR): Add psymtab.h, psympriv.h.
gdb/doc
* gdbint.texinfo (Symbol Handling): Update.
Diffstat (limited to 'gdb/symmisc.c')
-rw-r--r-- | gdb/symmisc.c | 464 |
1 files changed, 6 insertions, 458 deletions
diff --git a/gdb/symmisc.c b/gdb/symmisc.c index d096d5c..8d3e1a6 100644 --- a/gdb/symmisc.c +++ b/gdb/symmisc.c @@ -39,6 +39,8 @@ #include "gdb_string.h" #include "readline/readline.h" +#include "psymtab.h" + #ifndef DEV_TTY #define DEV_TTY "/dev/tty" #endif @@ -58,19 +60,12 @@ FILE *std_err; static void dump_symtab (struct objfile *, struct symtab *, struct ui_file *); -static void dump_psymtab (struct objfile *, struct partial_symtab *, - struct ui_file *); - static void dump_msymbols (struct objfile *, struct ui_file *); static void dump_objfile (struct objfile *); static int block_depth (struct block *); -static void print_partial_symbols (struct gdbarch *, - struct partial_symbol **, int, - char *, struct ui_file *); - void _initialize_symmisc (void); struct print_symbol_args @@ -151,7 +146,6 @@ print_objfile_statistics (void) struct program_space *pspace; struct objfile *objfile; struct symtab *s; - struct partial_symtab *ps; int i, linetables, blockvectors; immediate_quit++; @@ -174,13 +168,8 @@ print_objfile_statistics (void) if (OBJSTAT (objfile, n_types) > 0) printf_filtered (_(" Number of \"types\" defined: %d\n"), OBJSTAT (objfile, n_types)); - i = 0; - ALL_OBJFILE_PSYMTABS (objfile, ps) - { - if (ps->readin == 0) - i++; - } - printf_filtered (_(" Number of psym tables (not yet expanded): %d\n"), i); + if (objfile->sf) + objfile->sf->qf->print_stats (objfile); i = linetables = blockvectors = 0; ALL_OBJFILE_SYMTABS (objfile, s) { @@ -215,7 +204,6 @@ static void dump_objfile (struct objfile *objfile) { struct symtab *symtab; - struct partial_symtab *psymtab; printf_filtered ("\nObject file %s: ", objfile->name); printf_filtered ("Objfile at "); @@ -225,25 +213,8 @@ dump_objfile (struct objfile *objfile) printf_filtered (", %d minsyms\n\n", objfile->minimal_symbol_count); - if (objfile->psymtabs) - { - printf_filtered ("Psymtabs:\n"); - for (psymtab = objfile->psymtabs; - psymtab != NULL; - psymtab = psymtab->next) - { - printf_filtered ("%s at ", - psymtab->filename); - gdb_print_host_address (psymtab, gdb_stdout); - printf_filtered (", "); - if (psymtab->objfile != objfile) - { - printf_filtered ("NOT ON CHAIN! "); - } - wrap_here (" "); - } - printf_filtered ("\n\n"); - } + if (objfile->sf) + objfile->sf->qf->dump (objfile); if (objfile->symtabs) { @@ -345,76 +316,6 @@ dump_msymbols (struct objfile *objfile, struct ui_file *outfile) } static void -dump_psymtab (struct objfile *objfile, struct partial_symtab *psymtab, - struct ui_file *outfile) -{ - struct gdbarch *gdbarch = get_objfile_arch (objfile); - int i; - - fprintf_filtered (outfile, "\nPartial symtab for source file %s ", - psymtab->filename); - fprintf_filtered (outfile, "(object "); - gdb_print_host_address (psymtab, outfile); - fprintf_filtered (outfile, ")\n\n"); - fprintf_unfiltered (outfile, " Read from object file %s (", - objfile->name); - gdb_print_host_address (objfile, outfile); - fprintf_unfiltered (outfile, ")\n"); - - if (psymtab->readin) - { - fprintf_filtered (outfile, - " Full symtab was read (at "); - gdb_print_host_address (psymtab->symtab, outfile); - fprintf_filtered (outfile, " by function at "); - gdb_print_host_address (psymtab->read_symtab, outfile); - fprintf_filtered (outfile, ")\n"); - } - - fprintf_filtered (outfile, " Relocate symbols by "); - for (i = 0; i < psymtab->objfile->num_sections; ++i) - { - if (i != 0) - fprintf_filtered (outfile, ", "); - wrap_here (" "); - fputs_filtered (paddress (gdbarch, - ANOFFSET (psymtab->section_offsets, i)), - outfile); - } - fprintf_filtered (outfile, "\n"); - - fprintf_filtered (outfile, " Symbols cover text addresses "); - fputs_filtered (paddress (gdbarch, psymtab->textlow), outfile); - fprintf_filtered (outfile, "-"); - fputs_filtered (paddress (gdbarch, psymtab->texthigh), outfile); - fprintf_filtered (outfile, "\n"); - fprintf_filtered (outfile, " Depends on %d other partial symtabs.\n", - psymtab->number_of_dependencies); - for (i = 0; i < psymtab->number_of_dependencies; i++) - { - fprintf_filtered (outfile, " %d ", i); - gdb_print_host_address (psymtab->dependencies[i], outfile); - fprintf_filtered (outfile, " %s\n", - psymtab->dependencies[i]->filename); - } - if (psymtab->n_global_syms > 0) - { - print_partial_symbols (gdbarch, - objfile->global_psymbols.list - + psymtab->globals_offset, - psymtab->n_global_syms, "Global", outfile); - } - if (psymtab->n_static_syms > 0) - { - print_partial_symbols (gdbarch, - objfile->static_psymbols.list - + psymtab->statics_offset, - psymtab->n_static_syms, "Static", outfile); - } - fprintf_filtered (outfile, "\n"); -} - -static void dump_symtab_1 (struct objfile *objfile, struct symtab *symtab, struct ui_file *outfile) { @@ -750,142 +651,6 @@ print_symbol (void *args) } void -maintenance_print_psymbols (char *args, int from_tty) -{ - char **argv; - struct ui_file *outfile; - struct cleanup *cleanups; - char *symname = NULL; - char *filename = DEV_TTY; - struct objfile *objfile; - struct partial_symtab *ps; - - dont_repeat (); - - if (args == NULL) - { - error (_("print-psymbols takes an output file name and optional symbol file name")); - } - argv = gdb_buildargv (args); - cleanups = make_cleanup_freeargv (argv); - - if (argv[0] != NULL) - { - filename = argv[0]; - /* If a second arg is supplied, it is a source file name to match on */ - if (argv[1] != NULL) - { - symname = argv[1]; - } - } - - filename = tilde_expand (filename); - make_cleanup (xfree, filename); - - outfile = gdb_fopen (filename, FOPEN_WT); - if (outfile == 0) - perror_with_name (filename); - make_cleanup_ui_file_delete (outfile); - - immediate_quit++; - ALL_PSYMTABS (objfile, ps) - if (symname == NULL || strcmp (symname, ps->filename) == 0) - dump_psymtab (objfile, ps, outfile); - immediate_quit--; - do_cleanups (cleanups); -} - -static void -print_partial_symbols (struct gdbarch *gdbarch, - struct partial_symbol **p, int count, char *what, - struct ui_file *outfile) -{ - fprintf_filtered (outfile, " %s partial symbols:\n", what); - while (count-- > 0) - { - fprintf_filtered (outfile, " `%s'", SYMBOL_LINKAGE_NAME (*p)); - if (SYMBOL_DEMANGLED_NAME (*p) != NULL) - { - fprintf_filtered (outfile, " `%s'", SYMBOL_DEMANGLED_NAME (*p)); - } - fputs_filtered (", ", outfile); - switch (SYMBOL_DOMAIN (*p)) - { - case UNDEF_DOMAIN: - fputs_filtered ("undefined domain, ", outfile); - break; - case VAR_DOMAIN: - /* This is the usual thing -- don't print it */ - break; - case STRUCT_DOMAIN: - fputs_filtered ("struct domain, ", outfile); - break; - case LABEL_DOMAIN: - fputs_filtered ("label domain, ", outfile); - break; - default: - fputs_filtered ("<invalid domain>, ", outfile); - break; - } - switch (SYMBOL_CLASS (*p)) - { - case LOC_UNDEF: - fputs_filtered ("undefined", outfile); - break; - case LOC_CONST: - fputs_filtered ("constant int", outfile); - break; - case LOC_STATIC: - fputs_filtered ("static", outfile); - break; - case LOC_REGISTER: - fputs_filtered ("register", outfile); - break; - case LOC_ARG: - fputs_filtered ("pass by value", outfile); - break; - case LOC_REF_ARG: - fputs_filtered ("pass by reference", outfile); - break; - case LOC_REGPARM_ADDR: - fputs_filtered ("register address parameter", outfile); - break; - case LOC_LOCAL: - fputs_filtered ("stack parameter", outfile); - break; - case LOC_TYPEDEF: - fputs_filtered ("type", outfile); - break; - case LOC_LABEL: - fputs_filtered ("label", outfile); - break; - case LOC_BLOCK: - fputs_filtered ("function", outfile); - break; - case LOC_CONST_BYTES: - fputs_filtered ("constant bytes", outfile); - break; - case LOC_UNRESOLVED: - fputs_filtered ("unresolved", outfile); - break; - case LOC_OPTIMIZED_OUT: - fputs_filtered ("optimized out", outfile); - break; - case LOC_COMPUTED: - fputs_filtered ("computed at runtime", outfile); - break; - default: - fputs_filtered ("<invalid location>", outfile); - break; - } - fputs_filtered (", ", outfile); - fputs_filtered (paddress (gdbarch, SYMBOL_VALUE_ADDRESS (*p)), outfile); - fprintf_filtered (outfile, "\n"); - p++; - } -} - -void maintenance_print_msymbols (char *args, int from_tty) { char **argv; @@ -1012,194 +777,6 @@ maintenance_info_symtabs (char *regexp, int from_tty) printf_filtered ("}\n"); } } - - -/* List all the partial symbol tables whose names match REGEXP (optional). */ -void -maintenance_info_psymtabs (char *regexp, int from_tty) -{ - struct program_space *pspace; - struct objfile *objfile; - - if (regexp) - re_comp (regexp); - - ALL_PSPACES (pspace) - ALL_PSPACE_OBJFILES (pspace, objfile) - { - struct gdbarch *gdbarch = get_objfile_arch (objfile); - struct partial_symtab *psymtab; - - /* We don't want to print anything for this objfile until we - actually find a symtab whose name matches. */ - int printed_objfile_start = 0; - - ALL_OBJFILE_PSYMTABS (objfile, psymtab) - { - QUIT; - - if (! regexp - || re_exec (psymtab->filename)) - { - if (! printed_objfile_start) - { - printf_filtered ("{ objfile %s ", objfile->name); - wrap_here (" "); - printf_filtered ("((struct objfile *) %s)\n", - host_address_to_string (objfile)); - printed_objfile_start = 1; - } - - printf_filtered (" { psymtab %s ", psymtab->filename); - wrap_here (" "); - printf_filtered ("((struct partial_symtab *) %s)\n", - host_address_to_string (psymtab)); - - printf_filtered (" readin %s\n", - psymtab->readin ? "yes" : "no"); - printf_filtered (" fullname %s\n", - psymtab->fullname ? psymtab->fullname : "(null)"); - printf_filtered (" text addresses "); - fputs_filtered (paddress (gdbarch, psymtab->textlow), - gdb_stdout); - printf_filtered (" -- "); - fputs_filtered (paddress (gdbarch, psymtab->texthigh), - gdb_stdout); - printf_filtered ("\n"); - printf_filtered (" globals "); - if (psymtab->n_global_syms) - { - printf_filtered ("(* (struct partial_symbol **) %s @ %d)\n", - host_address_to_string (psymtab->objfile->global_psymbols.list - + psymtab->globals_offset), - psymtab->n_global_syms); - } - else - printf_filtered ("(none)\n"); - printf_filtered (" statics "); - if (psymtab->n_static_syms) - { - printf_filtered ("(* (struct partial_symbol **) %s @ %d)\n", - host_address_to_string (psymtab->objfile->static_psymbols.list - + psymtab->statics_offset), - psymtab->n_static_syms); - } - else - printf_filtered ("(none)\n"); - printf_filtered (" dependencies "); - if (psymtab->number_of_dependencies) - { - int i; - - printf_filtered ("{\n"); - for (i = 0; i < psymtab->number_of_dependencies; i++) - { - struct partial_symtab *dep = psymtab->dependencies[i]; - - /* Note the string concatenation there --- no comma. */ - printf_filtered (" psymtab %s " - "((struct partial_symtab *) %s)\n", - dep->filename, - host_address_to_string (dep)); - } - printf_filtered (" }\n"); - } - else - printf_filtered ("(none)\n"); - printf_filtered (" }\n"); - } - } - - if (printed_objfile_start) - printf_filtered ("}\n"); - } -} - - -/* Check consistency of psymtabs and symtabs. */ - -void -maintenance_check_symtabs (char *ignore, int from_tty) -{ - struct symbol *sym; - struct partial_symbol **psym; - struct symtab *s = NULL; - struct partial_symtab *ps; - struct blockvector *bv; - struct objfile *objfile; - struct block *b; - int length; - - ALL_PSYMTABS (objfile, ps) - { - struct gdbarch *gdbarch = get_objfile_arch (objfile); - s = PSYMTAB_TO_SYMTAB (ps); - if (s == NULL) - continue; - bv = BLOCKVECTOR (s); - b = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK); - psym = ps->objfile->static_psymbols.list + ps->statics_offset; - length = ps->n_static_syms; - while (length--) - { - sym = lookup_block_symbol (b, SYMBOL_LINKAGE_NAME (*psym), - SYMBOL_DOMAIN (*psym)); - if (!sym) - { - printf_filtered ("Static symbol `"); - puts_filtered (SYMBOL_LINKAGE_NAME (*psym)); - printf_filtered ("' only found in "); - puts_filtered (ps->filename); - printf_filtered (" psymtab\n"); - } - psym++; - } - b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK); - psym = ps->objfile->global_psymbols.list + ps->globals_offset; - length = ps->n_global_syms; - while (length--) - { - sym = lookup_block_symbol (b, SYMBOL_LINKAGE_NAME (*psym), - SYMBOL_DOMAIN (*psym)); - if (!sym) - { - printf_filtered ("Global symbol `"); - puts_filtered (SYMBOL_LINKAGE_NAME (*psym)); - printf_filtered ("' only found in "); - puts_filtered (ps->filename); - printf_filtered (" psymtab\n"); - } - psym++; - } - if (ps->texthigh < ps->textlow) - { - printf_filtered ("Psymtab "); - puts_filtered (ps->filename); - printf_filtered (" covers bad range "); - fputs_filtered (paddress (gdbarch, ps->textlow), gdb_stdout); - printf_filtered (" - "); - fputs_filtered (paddress (gdbarch, ps->texthigh), gdb_stdout); - printf_filtered ("\n"); - continue; - } - if (ps->texthigh == 0) - continue; - if (ps->textlow < BLOCK_START (b) || ps->texthigh > BLOCK_END (b)) - { - printf_filtered ("Psymtab "); - puts_filtered (ps->filename); - printf_filtered (" covers "); - fputs_filtered (paddress (gdbarch, ps->textlow), gdb_stdout); - printf_filtered (" - "); - fputs_filtered (paddress (gdbarch, ps->texthigh), gdb_stdout); - printf_filtered (" but symtab covers only "); - fputs_filtered (paddress (gdbarch, BLOCK_START (b)), gdb_stdout); - printf_filtered (" - "); - fputs_filtered (paddress (gdbarch, BLOCK_END (b)), gdb_stdout); - printf_filtered ("\n"); - } - } -} /* Return the nexting depth of a block within other blocks in its symtab. */ @@ -1216,35 +793,6 @@ block_depth (struct block *block) } -/* Increase the space allocated for LISTP, which is probably - global_psymbols or static_psymbols. This space will eventually - be freed in free_objfile(). */ - -void -extend_psymbol_list (struct psymbol_allocation_list *listp, - struct objfile *objfile) -{ - int new_size; - if (listp->size == 0) - { - new_size = 255; - listp->list = (struct partial_symbol **) - xmalloc (new_size * sizeof (struct partial_symbol *)); - } - else - { - new_size = listp->size * 2; - listp->list = (struct partial_symbol **) - xrealloc ((char *) listp->list, - new_size * sizeof (struct partial_symbol *)); - } - /* Next assumes we only went one over. Should be good if - program works correctly */ - listp->next = listp->list + listp->size; - listp->size = new_size; -} - - /* Do early runtime initializations. */ void _initialize_symmisc (void) |