X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fsymmisc.c;h=74e49414cbec7b5f144c2ce938fe709e272ab8de;hb=0ba1096ad5c3a2dc64e6f30c122e7d9c205eef90;hp=02021e5e98c0afcfbdf6d6b98947f8e31b7fe8b0;hpb=0fb0cc7590113e9b459dfcc48dc71c9d419d9580;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/symmisc.c b/gdb/symmisc.c index 02021e5e98..74e49414cb 100644 --- a/gdb/symmisc.c +++ b/gdb/symmisc.c @@ -1,8 +1,8 @@ /* Do various things to symbol tables (other than lookup), for GDB. Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, - 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2007, 2008, 2009 - Free Software Foundation, Inc. + 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2007, 2008, 2009, 2010, + 2011 Free Software Foundation, Inc. This file is part of GDB. @@ -23,6 +23,7 @@ #include "symtab.h" #include "gdbtypes.h" #include "bfd.h" +#include "filenames.h" #include "symfile.h" #include "objfiles.h" #include "breakpoint.h" @@ -39,6 +40,8 @@ #include "gdb_string.h" #include "readline/readline.h" +#include "psymtab.h" + #ifndef DEV_TTY #define DEV_TTY "/dev/tty" #endif @@ -58,22 +61,17 @@ 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 partial_symbol **, int, - char *, struct ui_file *); - void _initialize_symmisc (void); struct print_symbol_args { + struct gdbarch *gdbarch; struct symbol *symbol; int depth; struct ui_file *outfile; @@ -91,9 +89,6 @@ static int print_symbol (void *); void free_symtab (struct symtab *s) { - int i, n; - struct blockvector *bv; - switch (s->free_code) { case free_nothing: @@ -115,7 +110,7 @@ free_symtab (struct symtab *s) if (s->free_func != NULL) s->free_func (s); - /* Free source-related stuff */ + /* Free source-related stuff. */ if (s->line_charpos != NULL) xfree (s->line_charpos); if (s->fullname != NULL) @@ -128,14 +123,18 @@ free_symtab (struct symtab *s) void print_symbol_bcache_statistics (void) { + struct program_space *pspace; struct objfile *objfile; immediate_quit++; - ALL_OBJFILES (objfile) + ALL_PSPACES (pspace) + ALL_PSPACE_OBJFILES (pspace, objfile) { printf_filtered (_("Byte cache statistics for '%s':\n"), objfile->name); - print_bcache_statistics (objfile->psymbol_cache, "partial symbol cache"); + print_bcache_statistics (psymbol_bcache_get_bcache (objfile->psymbol_cache), + "partial symbol cache"); print_bcache_statistics (objfile->macro_cache, "preprocessor macro cache"); + print_bcache_statistics (objfile->filename_cache, "file name cache"); } immediate_quit--; } @@ -143,13 +142,14 @@ print_symbol_bcache_statistics (void) void print_objfile_statistics (void) { + struct program_space *pspace; struct objfile *objfile; struct symtab *s; - struct partial_symtab *ps; int i, linetables, blockvectors; immediate_quit++; - ALL_OBJFILES (objfile) + ALL_PSPACES (pspace) + ALL_PSPACE_OBJFILES (pspace, objfile) { printf_filtered (_("Statistics for '%s':\n"), objfile->name); if (OBJSTAT (objfile, n_stabs) > 0) @@ -167,13 +167,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) { @@ -195,9 +190,12 @@ print_objfile_statistics (void) printf_filtered (_(" Total memory used for objfile obstack: %d\n"), obstack_memory_used (&objfile->objfile_obstack)); printf_filtered (_(" Total memory used for psymbol cache: %d\n"), - bcache_memory_used (objfile->psymbol_cache)); + bcache_memory_used (psymbol_bcache_get_bcache + (objfile->psymbol_cache))); printf_filtered (_(" Total memory used for macro cache: %d\n"), bcache_memory_used (objfile->macro_cache)); + printf_filtered (_(" Total memory used for file name cache: %d\n"), + bcache_memory_used (objfile->filename_cache)); } immediate_quit--; } @@ -206,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 "); @@ -216,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) { @@ -261,6 +241,7 @@ dump_objfile (struct objfile *objfile) static void dump_msymbols (struct objfile *objfile, struct ui_file *outfile) { + struct gdbarch *gdbarch = get_objfile_arch (objfile); struct minimal_symbol *msymbol; int index; char ms_type; @@ -310,7 +291,8 @@ dump_msymbols (struct objfile *objfile, struct ui_file *outfile) break; } fprintf_filtered (outfile, "[%2d] %c ", index, ms_type); - fputs_filtered (paddress (SYMBOL_VALUE_ADDRESS (msymbol)), outfile); + fputs_filtered (paddress (gdbarch, SYMBOL_VALUE_ADDRESS (msymbol)), + outfile); fprintf_filtered (outfile, " %s", SYMBOL_LINKAGE_NAME (msymbol)); if (section) fprintf_filtered (outfile, " section %s", @@ -333,79 +315,14 @@ dump_msymbols (struct objfile *objfile, struct ui_file *outfile) fprintf_filtered (outfile, "\n"); } -static void -dump_psymtab (struct objfile *objfile, struct partial_symtab *psymtab, - struct ui_file *outfile) -{ - 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 (ANOFFSET (psymtab->section_offsets, i)), - outfile); - } - fprintf_filtered (outfile, "\n"); - - fprintf_filtered (outfile, " Symbols cover text addresses "); - fputs_filtered (paddress (psymtab->textlow), outfile); - fprintf_filtered (outfile, "-"); - fputs_filtered (paddress (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 (objfile->global_psymbols.list - + psymtab->globals_offset, - psymtab->n_global_syms, "Global", outfile); - } - if (psymtab->n_static_syms > 0) - { - print_partial_symbols (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) { + struct gdbarch *gdbarch = get_objfile_arch (objfile); int i; struct dict_iterator iter; - int len, blen; + int len; struct linetable *l; struct blockvector *bv; struct symbol *sym; @@ -419,7 +336,8 @@ dump_symtab_1 (struct objfile *objfile, struct symtab *symtab, fprintf_filtered (outfile, "Read from object file %s (", objfile->name); gdb_print_host_address (objfile, outfile); fprintf_filtered (outfile, ")\n"); - fprintf_filtered (outfile, "Language: %s\n", language_str (symtab->language)); + fprintf_filtered (outfile, "Language: %s\n", + language_str (symtab->language)); /* First print the line table. */ l = LINETABLE (symtab); @@ -430,12 +348,12 @@ dump_symtab_1 (struct objfile *objfile, struct symtab *symtab, for (i = 0; i < len; i++) { fprintf_filtered (outfile, " line %d at ", l->item[i].line); - fputs_filtered (paddress (l->item[i].pc), outfile); + fputs_filtered (paddress (gdbarch, l->item[i].pc), outfile); fprintf_filtered (outfile, "\n"); } } /* Now print the block info, but only for primary symtabs since we will - print lots of duplicate info otherwise. */ + print lots of duplicate info otherwise. */ if (symtab->primary) { fprintf_filtered (outfile, "\nBlockvector:\n\n"); @@ -458,9 +376,9 @@ dump_symtab_1 (struct objfile *objfile, struct symtab *symtab, wants it. */ fprintf_filtered (outfile, ", %d syms/buckets in ", dict_size (BLOCK_DICT (b))); - fputs_filtered (paddress (BLOCK_START (b)), outfile); + fputs_filtered (paddress (gdbarch, BLOCK_START (b)), outfile); fprintf_filtered (outfile, ".."); - fputs_filtered (paddress (BLOCK_END (b)), outfile); + fputs_filtered (paddress (gdbarch, BLOCK_END (b)), outfile); if (BLOCK_FUNCTION (b)) { fprintf_filtered (outfile, ", function %s", @@ -477,6 +395,8 @@ dump_symtab_1 (struct objfile *objfile, struct symtab *symtab, ALL_BLOCK_SYMBOLS (b, iter, sym) { struct print_symbol_args s; + + s.gdbarch = gdbarch; s.symbol = sym; s.depth = depth + 1; s.outfile = outfile; @@ -496,16 +416,23 @@ static void dump_symtab (struct objfile *objfile, struct symtab *symtab, struct ui_file *outfile) { - enum language saved_lang; - /* Set the current language to the language of the symtab we're dumping because certain routines used during dump_symtab() use the current - language to print an image of the symbol. We'll restore it later. */ - saved_lang = set_language (symtab->language); + language to print an image of the symbol. We'll restore it later. + But use only real languages, not placeholders. */ + if (symtab->language != language_unknown + && symtab->language != language_auto) + { + enum language saved_lang; + + saved_lang = set_language (symtab->language); - dump_symtab_1 (objfile, symtab, outfile); + dump_symtab_1 (objfile, symtab, outfile); - set_language (saved_lang); + set_language (saved_lang); + } + else + dump_symtab_1 (objfile, symtab, outfile); } void @@ -523,8 +450,8 @@ maintenance_print_symbols (char *args, int from_tty) if (args == NULL) { - error (_("\ -Arguments missing: an output file name and an optional symbol file name")); + error (_("Arguments missing: an output file name " + "and an optional symbol file name")); } argv = gdb_buildargv (args); cleanups = make_cleanup_freeargv (argv); @@ -532,7 +459,7 @@ Arguments missing: an output file name and an optional symbol file name")); if (argv[0] != NULL) { filename = argv[0]; - /* If a second arg is supplied, it is a source file name to match on */ + /* If a second arg is supplied, it is a source file name to match on. */ if (argv[1] != NULL) { symname = argv[1]; @@ -549,7 +476,7 @@ Arguments missing: an output file name and an optional symbol file name")); immediate_quit++; ALL_SYMTABS (objfile, s) - if (symname == NULL || strcmp (symname, s->filename) == 0) + if (symname == NULL || filename_cmp (symname, s->filename) == 0) dump_symtab (objfile, s, outfile); immediate_quit--; do_cleanups (cleanups); @@ -563,6 +490,7 @@ Arguments missing: an output file name and an optional symbol file name")); static int print_symbol (void *args) { + struct gdbarch *gdbarch = ((struct print_symbol_args *) args)->gdbarch; struct symbol *symbol = ((struct print_symbol_args *) args)->symbol; int depth = ((struct print_symbol_args *) args)->depth; struct ui_file *outfile = ((struct print_symbol_args *) args)->outfile; @@ -572,7 +500,8 @@ print_symbol (void *args) if (SYMBOL_DOMAIN (symbol) == LABEL_DOMAIN) { fprintf_filtered (outfile, "label %s at ", SYMBOL_PRINT_NAME (symbol)); - fputs_filtered (paddress (SYMBOL_VALUE_ADDRESS (symbol)), outfile); + fputs_filtered (paddress (gdbarch, SYMBOL_VALUE_ADDRESS (symbol)), + outfile); if (section) fprintf_filtered (outfile, " section %s\n", bfd_section_name (section->the_bfd_section->owner, @@ -627,6 +556,7 @@ print_symbol (void *args) { unsigned i; struct type *type = check_typedef (SYMBOL_TYPE (symbol)); + fprintf_filtered (outfile, "const %u hex bytes:", TYPE_LENGTH (type)); for (i = 0; i < TYPE_LENGTH (type); i++) @@ -637,7 +567,8 @@ print_symbol (void *args) case LOC_STATIC: fprintf_filtered (outfile, "static at "); - fputs_filtered (paddress (SYMBOL_VALUE_ADDRESS (symbol)), outfile); + fputs_filtered (paddress (gdbarch, SYMBOL_VALUE_ADDRESS (symbol)), + outfile); if (section) fprintf_filtered (outfile, " section %s", bfd_section_name (section->the_bfd_section->owner, @@ -675,7 +606,8 @@ print_symbol (void *args) case LOC_LABEL: fprintf_filtered (outfile, "label at "); - fputs_filtered (paddress (SYMBOL_VALUE_ADDRESS (symbol)), outfile); + fputs_filtered (paddress (gdbarch, SYMBOL_VALUE_ADDRESS (symbol)), + outfile); if (section) fprintf_filtered (outfile, " section %s", bfd_section_name (section->the_bfd_section->owner, @@ -686,10 +618,12 @@ print_symbol (void *args) fprintf_filtered (outfile, "block object "); gdb_print_host_address (SYMBOL_BLOCK_VALUE (symbol), outfile); fprintf_filtered (outfile, ", "); - fputs_filtered (paddress (BLOCK_START (SYMBOL_BLOCK_VALUE (symbol))), + fputs_filtered (paddress (gdbarch, + BLOCK_START (SYMBOL_BLOCK_VALUE (symbol))), outfile); fprintf_filtered (outfile, ".."); - fputs_filtered (paddress (BLOCK_END (SYMBOL_BLOCK_VALUE (symbol))), + fputs_filtered (paddress (gdbarch, + BLOCK_END (SYMBOL_BLOCK_VALUE (symbol))), outfile); if (section) fprintf_filtered (outfile, " section %s", @@ -719,141 +653,6 @@ print_symbol (void *args) return 1; } -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 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 (", ", 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 ("", outfile); - break; - } - fputs_filtered (", ", outfile); - fputs_filtered (paddress (SYMBOL_VALUE_ADDRESS (*p)), outfile); - fprintf_filtered (outfile, "\n"); - p++; - } -} - void maintenance_print_msymbols (char *args, int from_tty) { @@ -862,6 +661,7 @@ maintenance_print_msymbols (char *args, int from_tty) struct cleanup *cleanups; char *filename = DEV_TTY; char *symname = NULL; + struct program_space *pspace; struct objfile *objfile; struct stat sym_st, obj_st; @@ -870,7 +670,8 @@ maintenance_print_msymbols (char *args, int from_tty) if (args == NULL) { - error (_("print-msymbols takes an output file name and optional symbol file name")); + error (_("print-msymbols takes an output file " + "name and optional symbol file name")); } argv = gdb_buildargv (args); cleanups = make_cleanup_freeargv (argv); @@ -878,7 +679,7 @@ maintenance_print_msymbols (char *args, int from_tty) if (argv[0] != NULL) { filename = argv[0]; - /* If a second arg is supplied, it is a source file name to match on */ + /* If a second arg is supplied, it is a source file name to match on. */ if (argv[1] != NULL) { symname = xfullpath (argv[1]); @@ -897,10 +698,11 @@ maintenance_print_msymbols (char *args, int from_tty) make_cleanup_ui_file_delete (outfile); immediate_quit++; - ALL_OBJFILES (objfile) - if (symname == NULL - || (!stat (objfile->name, &obj_st) && sym_st.st_ino == obj_st.st_ino)) - dump_msymbols (objfile, outfile); + ALL_PSPACES (pspace) + ALL_PSPACE_OBJFILES (pspace, objfile) + if (symname == NULL || (!stat (objfile->name, &obj_st) + && sym_st.st_ino == obj_st.st_ino)) + dump_msymbols (objfile, outfile); immediate_quit--; fprintf_filtered (outfile, "\n\n"); do_cleanups (cleanups); @@ -909,13 +711,15 @@ maintenance_print_msymbols (char *args, int from_tty) void maintenance_print_objfiles (char *ignore, int from_tty) { + struct program_space *pspace; struct objfile *objfile; dont_repeat (); immediate_quit++; - ALL_OBJFILES (objfile) - dump_objfile (objfile); + ALL_PSPACES (pspace) + ALL_PSPACE_OBJFILES (pspace, objfile) + dump_objfile (objfile); immediate_quit--; } @@ -924,12 +728,14 @@ maintenance_print_objfiles (char *ignore, int from_tty) void maintenance_info_symtabs (char *regexp, int from_tty) { + struct program_space *pspace; struct objfile *objfile; if (regexp) re_comp (regexp); - ALL_OBJFILES (objfile) + ALL_PSPACES (pspace) + ALL_PSPACE_OBJFILES (pspace, objfile) { struct symtab *symtab; @@ -948,23 +754,28 @@ maintenance_info_symtabs (char *regexp, int from_tty) { printf_filtered ("{ objfile %s ", objfile->name); wrap_here (" "); - printf_filtered ("((struct objfile *) %p)\n", objfile); + printf_filtered ("((struct objfile *) %s)\n", + host_address_to_string (objfile)); printed_objfile_start = 1; } printf_filtered (" { symtab %s ", symtab->filename); wrap_here (" "); - printf_filtered ("((struct symtab *) %p)\n", symtab); + printf_filtered ("((struct symtab *) %s)\n", + host_address_to_string (symtab)); printf_filtered (" dirname %s\n", symtab->dirname ? symtab->dirname : "(null)"); printf_filtered (" fullname %s\n", symtab->fullname ? symtab->fullname : "(null)"); - printf_filtered (" blockvector ((struct blockvector *) %p)%s\n", - symtab->blockvector, + printf_filtered (" " + "blockvector ((struct blockvector *) %s)%s\n", + host_address_to_string (symtab->blockvector), symtab->primary ? " (primary)" : ""); - printf_filtered (" linetable ((struct linetable *) %p)\n", - symtab->linetable); - printf_filtered (" debugformat %s\n", symtab->debugformat); + printf_filtered (" " + "linetable ((struct linetable *) %s)\n", + host_address_to_string (symtab->linetable)); + printf_filtered (" debugformat %s\n", + symtab->debugformat); printf_filtered (" }\n"); } } @@ -973,184 +784,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 objfile *objfile; - - if (regexp) - re_comp (regexp); - - ALL_OBJFILES (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 *) %p)\n", objfile); - printed_objfile_start = 1; - } - - printf_filtered (" { psymtab %s ", psymtab->filename); - wrap_here (" "); - printf_filtered ("((struct partial_symtab *) %p)\n", 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 (psymtab->textlow), gdb_stdout); - printf_filtered (" -- "); - fputs_filtered (paddress (psymtab->texthigh), gdb_stdout); - printf_filtered ("\n"); - printf_filtered (" globals "); - if (psymtab->n_global_syms) - { - printf_filtered ("(* (struct partial_symbol **) %p @ %d)\n", - (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 **) %p @ %d)\n", - (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 *) %p)\n", - dep->filename, 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) - { - 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), - NULL, 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), - NULL, 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 (ps->textlow), gdb_stdout); - printf_filtered (" - "); - fputs_filtered (paddress (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 (ps->textlow), gdb_stdout); - printf_filtered (" - "); - fputs_filtered (paddress (ps->texthigh), gdb_stdout); - printf_filtered (" but symtab covers only "); - fputs_filtered (paddress (BLOCK_START (b)), gdb_stdout); - printf_filtered (" - "); - fputs_filtered (paddress (BLOCK_END (b)), gdb_stdout); - printf_filtered ("\n"); - } - } -} /* Return the nexting depth of a block within other blocks in its symtab. */ @@ -1159,6 +792,7 @@ static int block_depth (struct block *block) { int i = 0; + while ((block = BLOCK_SUPERBLOCK (block)) != NULL) { i++; @@ -1167,36 +801,7 @@ 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. */ +/* Do early runtime initializations. */ void _initialize_symmisc (void) {