X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fsymmisc.c;h=f4c3fc51af0a9171ea2d788745b63977e2923d9d;hb=4ff70b847ca222dcd9e7fc33ef2be300f75be68a;hp=c615bfcdea27d89f65917f17eacf8b1449f203fa;hpb=8b0b198558d0fc981f129e2e3dcbe00a0f308449;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index c615bfcdea..f4c3fc51af 100644
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -1,36 +1,47 @@
/* Do various things to symbol tables (other than lookup), for GDB.
- Copyright 1986, 87, 89, 91, 92, 93, 94, 95, 96, 1998
- Free Software Foundation, Inc.
-This file is part of GDB.
+ Copyright (C) 1986-2013 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+ This file is part of GDB.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
#include "defs.h"
#include "symtab.h"
#include "gdbtypes.h"
#include "bfd.h"
+#include "filenames.h"
#include "symfile.h"
#include "objfiles.h"
#include "breakpoint.h"
#include "command.h"
-#include "obstack.h"
+#include "gdb_obstack.h"
+#include "exceptions.h"
#include "language.h"
#include "bcache.h"
+#include "block.h"
+#include "gdb_regex.h"
+#include "gdb_stat.h"
+#include "dictionary.h"
+#include "typeprint.h"
+#include "gdbcmd.h"
+#include "source.h"
+
+#include
+#include "readline/readline.h"
-#include "gdb_string.h"
+#include "psymtab.h"
#ifndef DEV_TTY
#define DEV_TTY "/dev/tty"
@@ -48,211 +59,131 @@ FILE *std_err;
/* Prototypes for local functions */
-static void dump_symtab PARAMS ((struct objfile *, struct symtab *,
- GDB_FILE *));
-
-static void dump_psymtab PARAMS ((struct objfile *, struct partial_symtab *,
- GDB_FILE *));
-
-static void dump_msymbols PARAMS ((struct objfile *, GDB_FILE *));
-
-static void dump_objfile PARAMS ((struct objfile *));
-
-static int block_depth PARAMS ((struct block *));
-
-static void print_partial_symbols PARAMS ((struct partial_symbol **, int,
- char *, GDB_FILE *));
-
-static void free_symtab_block PARAMS ((struct objfile *, struct block *));
-
-void _initialize_symmisc PARAMS ((void));
+static int block_depth (struct block *);
-struct print_symbol_args {
- struct symbol *symbol;
- int depth;
- GDB_FILE *outfile;
-};
-
-static int print_symbol PARAMS ((PTR));
+void _initialize_symmisc (void);
-static void
-free_symtab_block PARAMS ((struct objfile *, struct block *));
+struct print_symbol_args
+ {
+ struct gdbarch *gdbarch;
+ struct symbol *symbol;
+ int depth;
+ struct ui_file *outfile;
+ };
+static int print_symbol (void *);
-/* Free a struct block <- B and all the symbols defined in that block. */
-
-static void
-free_symtab_block (objfile, b)
- struct objfile *objfile;
- struct block *b;
-{
- register int i, n;
- n = BLOCK_NSYMS (b);
- for (i = 0; i < n; i++)
- {
- mfree (objfile -> md, SYMBOL_NAME (BLOCK_SYM (b, i)));
- mfree (objfile -> md, (PTR) BLOCK_SYM (b, i));
- }
- mfree (objfile -> md, (PTR) b);
-}
-
-/* Free all the storage associated with the struct symtab <- S.
- Note that some symtabs have contents malloc'ed structure by structure,
- while some have contents that all live inside one big block of memory,
- and some share the contents of another symbol table and so you should
- not free the contents on their behalf (except sometimes the linetable,
- which maybe per symtab even when the rest is not).
- It is s->free_code that says which alternative to use. */
void
-free_symtab (s)
- register struct symtab *s;
-{
- register int i, n;
- register struct blockvector *bv;
-
- switch (s->free_code)
- {
- case free_nothing:
- /* All the contents are part of a big block of memory (an obstack),
- and some other symtab is in charge of freeing that block.
- Therefore, do nothing. */
- break;
-
- case free_contents:
- /* Here all the contents were malloc'ed structure by structure
- and must be freed that way. */
- /* First free the blocks (and their symbols. */
- bv = BLOCKVECTOR (s);
- n = BLOCKVECTOR_NBLOCKS (bv);
- for (i = 0; i < n; i++)
- free_symtab_block (s -> objfile, BLOCKVECTOR_BLOCK (bv, i));
- /* Free the blockvector itself. */
- mfree (s -> objfile -> md, (PTR) bv);
- /* Also free the linetable. */
-
- case free_linetable:
- /* Everything will be freed either by our `free_ptr'
- or by some other symtab, except for our linetable.
- Free that now. */
- if (LINETABLE (s))
- mfree (s -> objfile -> md, (PTR) LINETABLE (s));
- break;
- }
-
- /* If there is a single block of memory to free, free it. */
- if (s -> free_ptr != NULL)
- mfree (s -> objfile -> md, s -> free_ptr);
-
- /* Free source-related stuff */
- if (s -> line_charpos != NULL)
- mfree (s -> objfile -> md, (PTR) s -> line_charpos);
- if (s -> fullname != NULL)
- mfree (s -> objfile -> md, s -> fullname);
- if (s -> debugformat != NULL)
- mfree (s -> objfile -> md, s -> debugformat);
- mfree (s -> objfile -> md, (PTR) s);
-}
-
-void
-print_symbol_bcache_statistics ()
+print_symbol_bcache_statistics (void)
{
+ struct program_space *pspace;
struct objfile *objfile;
- immediate_quit++;
- ALL_OBJFILES (objfile)
- {
- printf_filtered ("Byte cache statistics for '%s':\n", objfile -> name);
- print_bcache_statistics (&objfile -> psymbol_cache, "partial symbol cache");
- }
- immediate_quit--;
+ ALL_PSPACES (pspace)
+ ALL_PSPACE_OBJFILES (pspace, objfile)
+ {
+ QUIT;
+ printf_filtered (_("Byte cache statistics for '%s':\n"),
+ objfile_name (objfile));
+ print_bcache_statistics (psymbol_bcache_get_bcache (objfile->psymbol_cache),
+ "partial symbol cache");
+ print_bcache_statistics (objfile->per_bfd->macro_cache,
+ "preprocessor macro cache");
+ print_bcache_statistics (objfile->per_bfd->filename_cache,
+ "file name cache");
+ }
}
void
-print_objfile_statistics ()
+print_objfile_statistics (void)
{
+ struct program_space *pspace;
struct objfile *objfile;
-
- immediate_quit++;
- ALL_OBJFILES (objfile)
- {
- printf_filtered ("Statistics for '%s':\n", objfile -> name);
- if (OBJSTAT (objfile, n_stabs) > 0)
- printf_filtered (" Number of \"stab\" symbols read: %d\n",
- OBJSTAT (objfile, n_stabs));
- if (OBJSTAT (objfile, n_minsyms) > 0)
- printf_filtered (" Number of \"minimal\" symbols read: %d\n",
- OBJSTAT (objfile, n_minsyms));
- if (OBJSTAT (objfile, n_psyms) > 0)
- printf_filtered (" Number of \"partial\" symbols read: %d\n",
- OBJSTAT (objfile, n_psyms));
- if (OBJSTAT (objfile, n_syms) > 0)
- printf_filtered (" Number of \"full\" symbols read: %d\n",
- OBJSTAT (objfile, n_syms));
- if (OBJSTAT (objfile, n_types) > 0)
- printf_filtered (" Number of \"types\" defined: %d\n",
- OBJSTAT (objfile, n_types));
- if (OBJSTAT (objfile, sz_strtab) > 0)
- printf_filtered (" Space used by a.out string tables: %d\n",
- OBJSTAT (objfile, sz_strtab));
- printf_filtered (" Total memory used for psymbol obstack: %d\n",
- obstack_memory_used (&objfile -> psymbol_obstack));
- printf_filtered (" Total memory used for psymbol cache: %d\n",
- obstack_memory_used (&objfile -> psymbol_cache.cache));
- printf_filtered (" Total memory used for symbol obstack: %d\n",
- obstack_memory_used (&objfile -> symbol_obstack));
- printf_filtered (" Total memory used for type obstack: %d\n",
- obstack_memory_used (&objfile -> type_obstack));
- }
- immediate_quit--;
+ struct symtab *s;
+ int i, linetables, blockvectors;
+
+ ALL_PSPACES (pspace)
+ ALL_PSPACE_OBJFILES (pspace, objfile)
+ {
+ QUIT;
+ printf_filtered (_("Statistics for '%s':\n"), objfile_name (objfile));
+ if (OBJSTAT (objfile, n_stabs) > 0)
+ printf_filtered (_(" Number of \"stab\" symbols read: %d\n"),
+ OBJSTAT (objfile, n_stabs));
+ if (OBJSTAT (objfile, n_minsyms) > 0)
+ printf_filtered (_(" Number of \"minimal\" symbols read: %d\n"),
+ OBJSTAT (objfile, n_minsyms));
+ if (OBJSTAT (objfile, n_psyms) > 0)
+ printf_filtered (_(" Number of \"partial\" symbols read: %d\n"),
+ OBJSTAT (objfile, n_psyms));
+ if (OBJSTAT (objfile, n_syms) > 0)
+ printf_filtered (_(" Number of \"full\" symbols read: %d\n"),
+ OBJSTAT (objfile, n_syms));
+ if (OBJSTAT (objfile, n_types) > 0)
+ printf_filtered (_(" Number of \"types\" defined: %d\n"),
+ OBJSTAT (objfile, n_types));
+ if (objfile->sf)
+ objfile->sf->qf->print_stats (objfile);
+ i = linetables = blockvectors = 0;
+ ALL_OBJFILE_SYMTABS (objfile, s)
+ {
+ i++;
+ if (s->linetable != NULL)
+ linetables++;
+ if (s->primary == 1)
+ blockvectors++;
+ }
+ printf_filtered (_(" Number of symbol tables: %d\n"), i);
+ printf_filtered (_(" Number of symbol tables with line tables: %d\n"),
+ linetables);
+ printf_filtered (_(" Number of symbol tables with blockvectors: %d\n"),
+ blockvectors);
+
+ if (OBJSTAT (objfile, sz_strtab) > 0)
+ printf_filtered (_(" Space used by a.out string tables: %d\n"),
+ OBJSTAT (objfile, sz_strtab));
+ printf_filtered (_(" Total memory used for objfile obstack: %d\n"),
+ obstack_memory_used (&objfile->objfile_obstack));
+ printf_filtered (_(" Total memory used for BFD obstack: %d\n"),
+ obstack_memory_used (&objfile->per_bfd->storage_obstack));
+ printf_filtered (_(" Total memory used for psymbol cache: %d\n"),
+ bcache_memory_used (psymbol_bcache_get_bcache
+ (objfile->psymbol_cache)));
+ printf_filtered (_(" Total memory used for macro cache: %d\n"),
+ bcache_memory_used (objfile->per_bfd->macro_cache));
+ printf_filtered (_(" Total memory used for file name cache: %d\n"),
+ bcache_memory_used (objfile->per_bfd->filename_cache));
+ }
}
-static void
-dump_objfile (objfile)
- struct objfile *objfile;
+static void
+dump_objfile (struct objfile *objfile)
{
struct symtab *symtab;
- struct partial_symtab *psymtab;
- printf_filtered ("\nObject file %s: ", objfile -> name);
+ printf_filtered ("\nObject file %s: ", objfile_name (objfile));
printf_filtered ("Objfile at ");
- gdb_print_address (objfile, gdb_stdout);
+ gdb_print_host_address (objfile, gdb_stdout);
printf_filtered (", bfd at ");
- gdb_print_address (objfile->obfd, gdb_stdout);
+ gdb_print_host_address (objfile->obfd, gdb_stdout);
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_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)
+ if (objfile->symtabs)
{
printf_filtered ("Symtabs:\n");
- for (symtab = objfile -> symtabs;
+ for (symtab = objfile->symtabs;
symtab != NULL;
symtab = symtab->next)
{
- printf_filtered ("%s at ", symtab -> filename);
- gdb_print_address (symtab, gdb_stdout);
+ printf_filtered ("%s at ", symtab_to_filename_for_display (symtab));
+ gdb_print_host_address (symtab, gdb_stdout);
printf_filtered (", ");
- if (symtab -> objfile != objfile)
+ if (symtab->objfile != objfile)
{
printf_filtered ("NOT ON CHAIN! ");
}
@@ -263,173 +194,118 @@ dump_objfile (objfile)
}
/* Print minimal symbols from this objfile. */
-
-static void
-dump_msymbols (objfile, outfile)
- struct objfile *objfile;
- GDB_FILE *outfile;
+
+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;
-
- fprintf_filtered (outfile, "\nObject file %s:\n\n", objfile -> name);
- if (objfile -> minimal_symbol_count == 0)
+
+ fprintf_filtered (outfile, "\nObject file %s:\n\n", objfile_name (objfile));
+ if (objfile->minimal_symbol_count == 0)
{
fprintf_filtered (outfile, "No minimal symbols found.\n");
return;
}
- for (index = 0, msymbol = objfile -> msymbols;
- SYMBOL_NAME (msymbol) != NULL; msymbol++, index++)
+ index = 0;
+ ALL_OBJFILE_MSYMBOLS (objfile, msymbol)
{
- switch (msymbol -> type)
+ struct obj_section *section = SYMBOL_OBJ_SECTION (objfile, msymbol);
+
+ switch (MSYMBOL_TYPE (msymbol))
{
- case mst_unknown:
- ms_type = 'u';
- break;
- case mst_text:
- ms_type = 'T';
- break;
- case mst_solib_trampoline:
- ms_type = 'S';
- break;
- case mst_data:
- ms_type = 'D';
- break;
- case mst_bss:
- ms_type = 'B';
- break;
- case mst_abs:
- ms_type = 'A';
- break;
- case mst_file_text:
- ms_type = 't';
- break;
- case mst_file_data:
- ms_type = 'd';
- break;
- case mst_file_bss:
- ms_type = 'b';
- break;
- default:
- ms_type = '?';
- break;
+ case mst_unknown:
+ ms_type = 'u';
+ break;
+ case mst_text:
+ ms_type = 'T';
+ break;
+ case mst_text_gnu_ifunc:
+ ms_type = 'i';
+ break;
+ case mst_solib_trampoline:
+ ms_type = 'S';
+ break;
+ case mst_data:
+ ms_type = 'D';
+ break;
+ case mst_bss:
+ ms_type = 'B';
+ break;
+ case mst_abs:
+ ms_type = 'A';
+ break;
+ case mst_file_text:
+ ms_type = 't';
+ break;
+ case mst_file_data:
+ ms_type = 'd';
+ break;
+ case mst_file_bss:
+ ms_type = 'b';
+ break;
+ default:
+ ms_type = '?';
+ break;
}
fprintf_filtered (outfile, "[%2d] %c ", index, ms_type);
- print_address_numeric (SYMBOL_VALUE_ADDRESS (msymbol), 1, outfile);
- fprintf_filtered (outfile, " %s", SYMBOL_NAME (msymbol));
- if (SYMBOL_BFD_SECTION (msymbol))
- fprintf_filtered (outfile, " section %s",
- bfd_section_name (objfile->obfd,
- SYMBOL_BFD_SECTION (msymbol)));
+ fputs_filtered (paddress (gdbarch, SYMBOL_VALUE_ADDRESS (msymbol)),
+ outfile);
+ fprintf_filtered (outfile, " %s", SYMBOL_LINKAGE_NAME (msymbol));
+ if (section)
+ {
+ if (section->the_bfd_section != NULL)
+ fprintf_filtered (outfile, " section %s",
+ bfd_section_name (objfile->obfd,
+ section->the_bfd_section));
+ else
+ fprintf_filtered (outfile, " spurious section %ld",
+ (long) (section - objfile->sections));
+ }
if (SYMBOL_DEMANGLED_NAME (msymbol) != NULL)
{
fprintf_filtered (outfile, " %s", SYMBOL_DEMANGLED_NAME (msymbol));
}
-#ifdef SOFUN_ADDRESS_MAYBE_MISSING
if (msymbol->filename)
fprintf_filtered (outfile, " %s", msymbol->filename);
-#endif
fputs_filtered ("\n", outfile);
+ index++;
}
- if (objfile -> minimal_symbol_count != index)
+ if (objfile->minimal_symbol_count != index)
{
- warning ("internal error: minimal symbol count %d != %d",
- objfile -> minimal_symbol_count, index);
+ warning (_("internal error: minimal symbol count %d != %d"),
+ objfile->minimal_symbol_count, index);
}
fprintf_filtered (outfile, "\n");
}
static void
-dump_psymtab (objfile, psymtab, outfile)
- struct objfile *objfile;
- struct partial_symtab *psymtab;
- GDB_FILE *outfile;
+dump_symtab_1 (struct objfile *objfile, struct symtab *symtab,
+ 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_address (psymtab, outfile);
- fprintf_filtered (outfile, ")\n\n");
- fprintf_unfiltered (outfile, " Read from object file %s (",
- objfile -> name);
- gdb_print_address (objfile, outfile);
- fprintf_unfiltered (outfile, ")\n");
-
- if (psymtab -> readin)
- {
- fprintf_filtered (outfile,
- " Full symtab was read (at ");
- gdb_print_address (psymtab->symtab, outfile);
- fprintf_filtered (outfile, " by function at ");
- gdb_print_address ((PTR)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 (" ");
- print_address_numeric (ANOFFSET (psymtab->section_offsets, i),
- 1,
- outfile);
- }
- fprintf_filtered (outfile, "\n");
-
- fprintf_filtered (outfile, " Symbols cover text addresses ");
- print_address_numeric (psymtab->textlow, 1, outfile);
- fprintf_filtered (outfile, "-");
- print_address_numeric (psymtab->texthigh, 1, 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_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 (objfile, symtab, outfile)
- struct objfile *objfile;
- struct symtab *symtab;
- GDB_FILE *outfile;
-{
- register int i, j;
- int len, blen;
- register struct linetable *l;
+ struct dict_iterator iter;
+ int len;
+ struct linetable *l;
struct blockvector *bv;
- register struct block *b;
+ struct symbol *sym;
+ struct block *b;
int depth;
- fprintf_filtered (outfile, "\nSymtab for file %s\n", symtab->filename);
+ fprintf_filtered (outfile, "\nSymtab for file %s\n",
+ symtab_to_filename_for_display (symtab));
if (symtab->dirname)
fprintf_filtered (outfile, "Compilation directory is %s\n",
symtab->dirname);
- fprintf_filtered (outfile, "Read from object file %s (", objfile->name);
- gdb_print_address (objfile, outfile);
+ fprintf_filtered (outfile, "Read from object file %s (",
+ objfile_name (objfile));
+ 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);
@@ -440,13 +316,13 @@ dump_symtab (objfile, symtab, outfile)
for (i = 0; i < len; i++)
{
fprintf_filtered (outfile, " line %d at ", l->item[i].line);
- print_address_numeric (l->item[i].pc, 1, 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. */
- if (symtab -> primary)
+ print lots of duplicate info otherwise. */
+ if (symtab->primary)
{
fprintf_filtered (outfile, "\nBlockvector:\n\n");
bv = BLOCKVECTOR (symtab);
@@ -457,38 +333,44 @@ dump_symtab (objfile, symtab, outfile)
depth = block_depth (b) * 2;
print_spaces (depth, outfile);
fprintf_filtered (outfile, "block #%03d, object at ", i);
- gdb_print_address (b, outfile);
+ gdb_print_host_address (b, outfile);
if (BLOCK_SUPERBLOCK (b))
{
fprintf_filtered (outfile, " under ");
- gdb_print_address (BLOCK_SUPERBLOCK (b), outfile);
+ gdb_print_host_address (BLOCK_SUPERBLOCK (b), outfile);
}
- blen = BLOCK_NSYMS (b);
- fprintf_filtered (outfile, ", %d syms in ", blen);
- print_address_numeric (BLOCK_START (b), 1, outfile);
+ /* drow/2002-07-10: We could save the total symbols count
+ even if we're using a hashtable, but nothing else but this message
+ wants it. */
+ fprintf_filtered (outfile, ", %d syms/buckets in ",
+ dict_size (BLOCK_DICT (b)));
+ fputs_filtered (paddress (gdbarch, BLOCK_START (b)), outfile);
fprintf_filtered (outfile, "..");
- print_address_numeric (BLOCK_END (b), 1, outfile);
+ fputs_filtered (paddress (gdbarch, BLOCK_END (b)), outfile);
if (BLOCK_FUNCTION (b))
{
- fprintf_filtered (outfile, ", function %s", SYMBOL_NAME (BLOCK_FUNCTION (b)));
+ fprintf_filtered (outfile, ", function %s",
+ SYMBOL_LINKAGE_NAME (BLOCK_FUNCTION (b)));
if (SYMBOL_DEMANGLED_NAME (BLOCK_FUNCTION (b)) != NULL)
{
fprintf_filtered (outfile, ", %s",
- SYMBOL_DEMANGLED_NAME (BLOCK_FUNCTION (b)));
+ SYMBOL_DEMANGLED_NAME (BLOCK_FUNCTION (b)));
}
}
- if (BLOCK_GCC_COMPILED(b))
- fprintf_filtered (outfile, ", compiled with gcc%d", BLOCK_GCC_COMPILED(b));
fprintf_filtered (outfile, "\n");
- /* Now print each symbol in this block */
- for (j = 0; j < blen; j++)
+ /* Now print each symbol in this block (in no particular order, if
+ we're using a hashtable). Note that we only want this
+ block, not any blocks from included symtabs. */
+ ALL_DICT_SYMBOLS (BLOCK_DICT (b), iter, sym)
{
struct print_symbol_args s;
- s.symbol = BLOCK_SYM (b, j);
+
+ s.gdbarch = gdbarch;
+ s.symbol = sym;
s.depth = depth + 1;
s.outfile = outfile;
catch_errors (print_symbol, &s, "Error printing symbol:\n",
- RETURN_MASK_ALL);
+ RETURN_MASK_ERROR);
}
}
fprintf_filtered (outfile, "\n");
@@ -499,13 +381,34 @@ dump_symtab (objfile, symtab, outfile)
}
}
-void
-maintenance_print_symbols (args, from_tty)
- char *args;
- int from_tty;
+static void
+dump_symtab (struct objfile *objfile, struct symtab *symtab,
+ struct ui_file *outfile)
+{
+ /* 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.
+ 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);
+
+ set_language (saved_lang);
+ }
+ else
+ dump_symtab_1 (objfile, symtab, outfile);
+}
+
+static void
+maintenance_print_symbols (char *args, int from_tty)
{
char **argv;
- GDB_FILE *outfile;
+ struct ui_file *outfile;
struct cleanup *cleanups;
char *symname = NULL;
char *filename = DEV_TTY;
@@ -516,19 +419,16 @@ maintenance_print_symbols (args, from_tty)
if (args == NULL)
{
- error ("\
-Arguments missing: an output file name and an optional symbol file name");
- }
- else if ((argv = buildargv (args)) == NULL)
- {
- nomem (0);
+ error (_("Arguments missing: an output file name "
+ "and an 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 a second arg is supplied, it is a source file name to match on. */
if (argv[1] != NULL)
{
symname = argv[1];
@@ -536,18 +436,20 @@ Arguments missing: an output file name and an optional symbol file name");
}
filename = tilde_expand (filename);
- make_cleanup (free, filename);
-
+ make_cleanup (xfree, filename);
+
outfile = gdb_fopen (filename, FOPEN_WT);
if (outfile == 0)
perror_with_name (filename);
- make_cleanup ((make_cleanup_func) gdb_fclose, (char *) &outfile);
+ make_cleanup_ui_file_delete (outfile);
- immediate_quit++;
ALL_SYMTABS (objfile, s)
- if (symname == NULL || (STREQ (symname, s -> filename)))
- dump_symtab (objfile, s, outfile);
- immediate_quit--;
+ {
+ QUIT;
+ if (symname == NULL
+ || filename_cmp (symname, symtab_to_filename_for_display (s)) == 0)
+ dump_symtab (objfile, s, outfile);
+ }
do_cleanups (cleanups);
}
@@ -557,41 +459,46 @@ Arguments missing: an output file name and an optional symbol file name");
1 for success. */
static int
-print_symbol (args)
- PTR args;
+print_symbol (void *args)
{
- struct symbol *symbol = ((struct print_symbol_args *)args)->symbol;
- int depth = ((struct print_symbol_args *)args)->depth;
- GDB_FILE *outfile = ((struct print_symbol_args *)args)->outfile;
+ 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;
+ struct obj_section *section = SYMBOL_OBJ_SECTION (SYMBOL_OBJFILE (symbol),
+ symbol);
print_spaces (depth, outfile);
- if (SYMBOL_NAMESPACE (symbol) == LABEL_NAMESPACE)
+ if (SYMBOL_DOMAIN (symbol) == LABEL_DOMAIN)
{
- fprintf_filtered (outfile, "label %s at ", SYMBOL_SOURCE_NAME (symbol));
- print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1, outfile);
- if (SYMBOL_BFD_SECTION (symbol))
+ fprintf_filtered (outfile, "label %s at ", SYMBOL_PRINT_NAME (symbol));
+ fputs_filtered (paddress (gdbarch, SYMBOL_VALUE_ADDRESS (symbol)),
+ outfile);
+ if (section)
fprintf_filtered (outfile, " section %s\n",
- bfd_section_name (SYMBOL_BFD_SECTION (symbol)->owner,
- SYMBOL_BFD_SECTION (symbol)));
+ bfd_section_name (section->the_bfd_section->owner,
+ section->the_bfd_section));
else
fprintf_filtered (outfile, "\n");
return 1;
}
- if (SYMBOL_NAMESPACE (symbol) == STRUCT_NAMESPACE)
+ if (SYMBOL_DOMAIN (symbol) == STRUCT_DOMAIN)
{
if (TYPE_TAG_NAME (SYMBOL_TYPE (symbol)))
{
- LA_PRINT_TYPE (SYMBOL_TYPE (symbol), "", outfile, 1, depth);
+ LA_PRINT_TYPE (SYMBOL_TYPE (symbol), "", outfile, 1, depth,
+ &type_print_raw_options);
}
else
{
fprintf_filtered (outfile, "%s %s = ",
- (TYPE_CODE (SYMBOL_TYPE (symbol)) == TYPE_CODE_ENUM
- ? "enum"
- : (TYPE_CODE (SYMBOL_TYPE (symbol)) == TYPE_CODE_STRUCT
- ? "struct" : "union")),
- SYMBOL_NAME (symbol));
- LA_PRINT_TYPE (SYMBOL_TYPE (symbol), "", outfile, 1, depth);
+ (TYPE_CODE (SYMBOL_TYPE (symbol)) == TYPE_CODE_ENUM
+ ? "enum"
+ : (TYPE_CODE (SYMBOL_TYPE (symbol)) == TYPE_CODE_STRUCT
+ ? "struct" : "union")),
+ SYMBOL_LINKAGE_NAME (symbol));
+ LA_PRINT_TYPE (SYMBOL_TYPE (symbol), "", outfile, 1, depth,
+ &type_print_raw_options);
}
fprintf_filtered (outfile, ";\n");
}
@@ -602,90 +509,74 @@ print_symbol (args)
if (SYMBOL_TYPE (symbol))
{
/* Print details of types, except for enums where it's clutter. */
- LA_PRINT_TYPE (SYMBOL_TYPE (symbol), SYMBOL_SOURCE_NAME (symbol),
+ LA_PRINT_TYPE (SYMBOL_TYPE (symbol), SYMBOL_PRINT_NAME (symbol),
outfile,
TYPE_CODE (SYMBOL_TYPE (symbol)) != TYPE_CODE_ENUM,
- depth);
+ depth,
+ &type_print_raw_options);
fprintf_filtered (outfile, "; ");
}
else
- fprintf_filtered (outfile, "%s ", SYMBOL_SOURCE_NAME (symbol));
+ fprintf_filtered (outfile, "%s ", SYMBOL_PRINT_NAME (symbol));
switch (SYMBOL_CLASS (symbol))
{
case LOC_CONST:
- fprintf_filtered (outfile, "const %ld (0x%lx)",
- SYMBOL_VALUE (symbol),
- SYMBOL_VALUE (symbol));
+ fprintf_filtered (outfile, "const %s (%s)",
+ plongest (SYMBOL_VALUE (symbol)),
+ hex_string (SYMBOL_VALUE (symbol)));
break;
case LOC_CONST_BYTES:
{
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++)
fprintf_filtered (outfile, " %02x",
- (unsigned)SYMBOL_VALUE_BYTES (symbol) [i]);
+ (unsigned) SYMBOL_VALUE_BYTES (symbol)[i]);
}
break;
case LOC_STATIC:
fprintf_filtered (outfile, "static at ");
- print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1,outfile);
- if (SYMBOL_BFD_SECTION (symbol))
+ fputs_filtered (paddress (gdbarch, SYMBOL_VALUE_ADDRESS (symbol)),
+ outfile);
+ if (section)
fprintf_filtered (outfile, " section %s",
- bfd_section_name
- (SYMBOL_BFD_SECTION (symbol)->owner,
- SYMBOL_BFD_SECTION (symbol)));
- break;
-
- case LOC_INDIRECT:
- fprintf_filtered (outfile, "extern global at *(");
- print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1,outfile);
- fprintf_filtered (outfile, "),");
+ bfd_section_name (section->the_bfd_section->owner,
+ section->the_bfd_section));
break;
case LOC_REGISTER:
- fprintf_filtered (outfile, "register %ld", SYMBOL_VALUE (symbol));
+ if (SYMBOL_IS_ARGUMENT (symbol))
+ fprintf_filtered (outfile, "parameter register %s",
+ plongest (SYMBOL_VALUE (symbol)));
+ else
+ fprintf_filtered (outfile, "register %s",
+ plongest (SYMBOL_VALUE (symbol)));
break;
case LOC_ARG:
- fprintf_filtered (outfile, "arg at offset 0x%lx",
- SYMBOL_VALUE (symbol));
- break;
-
- case LOC_LOCAL_ARG:
- fprintf_filtered (outfile, "arg at offset 0x%lx from fp",
- SYMBOL_VALUE (symbol));
+ fprintf_filtered (outfile, "arg at offset %s",
+ hex_string (SYMBOL_VALUE (symbol)));
break;
case LOC_REF_ARG:
- fprintf_filtered (outfile, "reference arg at 0x%lx", SYMBOL_VALUE (symbol));
- break;
-
- case LOC_REGPARM:
- fprintf_filtered (outfile, "parameter register %ld", SYMBOL_VALUE (symbol));
+ fprintf_filtered (outfile, "reference arg at %s",
+ hex_string (SYMBOL_VALUE (symbol)));
break;
case LOC_REGPARM_ADDR:
- fprintf_filtered (outfile, "address parameter register %ld", SYMBOL_VALUE (symbol));
+ fprintf_filtered (outfile, "address parameter register %s",
+ plongest (SYMBOL_VALUE (symbol)));
break;
case LOC_LOCAL:
- fprintf_filtered (outfile, "local at offset 0x%lx",
- SYMBOL_VALUE (symbol));
- break;
-
- case LOC_BASEREG:
- fprintf_filtered (outfile, "local at 0x%lx from register %d",
- SYMBOL_VALUE (symbol), SYMBOL_BASEREG (symbol));
- break;
-
- case LOC_BASEREG_ARG:
- fprintf_filtered (outfile, "arg at 0x%lx from register %d",
- SYMBOL_VALUE (symbol), SYMBOL_BASEREG (symbol));
+ fprintf_filtered (outfile, "local at offset %s",
+ hex_string (SYMBOL_VALUE (symbol)));
break;
case LOC_TYPEDEF:
@@ -693,30 +584,33 @@ print_symbol (args)
case LOC_LABEL:
fprintf_filtered (outfile, "label at ");
- print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1, outfile);
- if (SYMBOL_BFD_SECTION (symbol))
+ fputs_filtered (paddress (gdbarch, SYMBOL_VALUE_ADDRESS (symbol)),
+ outfile);
+ if (section)
fprintf_filtered (outfile, " section %s",
- bfd_section_name
- (SYMBOL_BFD_SECTION (symbol)->owner,
- SYMBOL_BFD_SECTION (symbol)));
+ bfd_section_name (section->the_bfd_section->owner,
+ section->the_bfd_section));
break;
case LOC_BLOCK:
fprintf_filtered (outfile, "block object ");
- gdb_print_address (SYMBOL_BLOCK_VALUE (symbol), outfile);
+ gdb_print_host_address (SYMBOL_BLOCK_VALUE (symbol), outfile);
fprintf_filtered (outfile, ", ");
- print_address_numeric (BLOCK_START (SYMBOL_BLOCK_VALUE (symbol)),
- 1,
- outfile);
+ fputs_filtered (paddress (gdbarch,
+ BLOCK_START (SYMBOL_BLOCK_VALUE (symbol))),
+ outfile);
fprintf_filtered (outfile, "..");
- print_address_numeric (BLOCK_END (SYMBOL_BLOCK_VALUE (symbol)),
- 1,
- outfile);
- if (SYMBOL_BFD_SECTION (symbol))
+ fputs_filtered (paddress (gdbarch,
+ BLOCK_END (SYMBOL_BLOCK_VALUE (symbol))),
+ outfile);
+ if (section)
fprintf_filtered (outfile, " section %s",
- bfd_section_name
- (SYMBOL_BFD_SECTION (symbol)->owner,
- SYMBOL_BFD_SECTION (symbol)));
+ bfd_section_name (section->the_bfd_section->owner,
+ section->the_bfd_section));
+ break;
+
+ case LOC_COMPUTED:
+ fprintf_filtered (outfile, "computed at runtime");
break;
case LOC_UNRESOLVED:
@@ -727,7 +621,7 @@ print_symbol (args)
fprintf_filtered (outfile, "optimized out");
break;
- default:
+ default:
fprintf_filtered (outfile, "botched symbol class %x",
SYMBOL_CLASS (symbol));
break;
@@ -737,358 +631,335 @@ print_symbol (args)
return 1;
}
-void
-maintenance_print_psymbols (args, from_tty)
- char *args;
- int from_tty;
+static void
+maintenance_print_msymbols (char *args, int from_tty)
{
char **argv;
- GDB_FILE *outfile;
+ struct ui_file *outfile;
struct cleanup *cleanups;
- char *symname = NULL;
char *filename = DEV_TTY;
+ char *symname = NULL;
+ struct program_space *pspace;
struct objfile *objfile;
- struct partial_symtab *ps;
+
+ struct stat sym_st, obj_st;
dont_repeat ();
if (args == NULL)
{
- error ("print-psymbols takes an output file name and optional symbol file name");
- }
- else if ((argv = buildargv (args)) == NULL)
- {
- nomem (0);
+ error (_("print-msymbols 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 a second arg is supplied, it is a source file name to match on. */
if (argv[1] != NULL)
{
- symname = argv[1];
+ symname = gdb_realpath (argv[1]);
+ make_cleanup (xfree, symname);
+ if (symname && stat (symname, &sym_st))
+ perror_with_name (symname);
}
}
filename = tilde_expand (filename);
- make_cleanup (free, filename);
-
+ make_cleanup (xfree, filename);
+
outfile = gdb_fopen (filename, FOPEN_WT);
if (outfile == 0)
perror_with_name (filename);
- make_cleanup ((make_cleanup_func) gdb_fclose, &outfile);
-
- immediate_quit++;
- ALL_PSYMTABS (objfile, ps)
- if (symname == NULL || (STREQ (symname, ps -> filename)))
- dump_psymtab (objfile, ps, outfile);
- immediate_quit--;
+ make_cleanup_ui_file_delete (outfile);
+
+ ALL_PSPACES (pspace)
+ ALL_PSPACE_OBJFILES (pspace, objfile)
+ {
+ QUIT;
+ if (symname == NULL || (!stat (objfile_name (objfile), &obj_st)
+ && sym_st.st_dev == obj_st.st_dev
+ && sym_st.st_ino == obj_st.st_ino))
+ dump_msymbols (objfile, outfile);
+ }
+ fprintf_filtered (outfile, "\n\n");
do_cleanups (cleanups);
}
static void
-print_partial_symbols (p, count, what, outfile)
- struct partial_symbol **p;
- int count;
- char *what;
- GDB_FILE *outfile;
+maintenance_print_objfiles (char *regexp, int from_tty)
{
- fprintf_filtered (outfile, " %s partial symbols:\n", what);
- while (count-- > 0)
- {
- fprintf_filtered (outfile, " `%s'", SYMBOL_NAME(*p));
- if (SYMBOL_DEMANGLED_NAME (*p) != NULL)
- {
- fprintf_filtered (outfile, " `%s'", SYMBOL_DEMANGLED_NAME (*p));
- }
- fputs_filtered (", ", outfile);
- switch (SYMBOL_NAMESPACE (*p))
- {
- case UNDEF_NAMESPACE:
- fputs_filtered ("undefined namespace, ", outfile);
- break;
- case VAR_NAMESPACE:
- /* This is the usual thing -- don't print it */
- break;
- case STRUCT_NAMESPACE:
- fputs_filtered ("struct namespace, ", outfile);
- break;
- case LABEL_NAMESPACE:
- fputs_filtered ("label namespace, ", 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_INDIRECT:
- fputs_filtered ("extern global", 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:
- fputs_filtered ("register parameter", 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_LOCAL_ARG:
- fputs_filtered ("shuffled arg", outfile);
- break;
- case LOC_UNRESOLVED:
- fputs_filtered ("unresolved", outfile);
- break;
- case LOC_OPTIMIZED_OUT:
- fputs_filtered ("optimized out", outfile);
- break;
- default:
- fputs_filtered ("", outfile);
- break;
- }
- fputs_filtered (", ", outfile);
- print_address_numeric (SYMBOL_VALUE_ADDRESS (*p), 1, outfile);
- fprintf_filtered (outfile, "\n");
- p++;
- }
+ struct program_space *pspace;
+ struct objfile *objfile;
+
+ dont_repeat ();
+
+ if (regexp)
+ re_comp (regexp);
+
+ ALL_PSPACES (pspace)
+ ALL_PSPACE_OBJFILES (pspace, objfile)
+ {
+ QUIT;
+ if (! regexp
+ || re_exec (objfile_name (objfile)))
+ dump_objfile (objfile);
+ }
}
-void
-maintenance_print_msymbols (args, from_tty)
- char *args;
- int from_tty;
+/* List all the symbol tables whose names match REGEXP (optional). */
+
+static void
+maintenance_info_symtabs (char *regexp, int from_tty)
{
- char **argv;
- GDB_FILE *outfile;
- struct cleanup *cleanups;
- char *filename = DEV_TTY;
- char *symname = NULL;
+ struct program_space *pspace;
struct objfile *objfile;
dont_repeat ();
- if (args == NULL)
- {
- error ("print-msymbols takes an output file name and optional symbol file name");
- }
- else if ((argv = buildargv (args)) == NULL)
+ if (regexp)
+ re_comp (regexp);
+
+ ALL_PSPACES (pspace)
+ ALL_PSPACE_OBJFILES (pspace, objfile)
{
- nomem (0);
+ struct symtab *symtab;
+
+ /* 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_SYMTABS (objfile, symtab)
+ {
+ QUIT;
+
+ if (! regexp
+ || re_exec (symtab_to_filename_for_display (symtab)))
+ {
+ if (! printed_objfile_start)
+ {
+ printf_filtered ("{ objfile %s ", objfile_name (objfile));
+ wrap_here (" ");
+ printf_filtered ("((struct objfile *) %s)\n",
+ host_address_to_string (objfile));
+ printed_objfile_start = 1;
+ }
+
+ printf_filtered (" { symtab %s ",
+ symtab_to_filename_for_display (symtab));
+ wrap_here (" ");
+ 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 *) %s)%s\n",
+ host_address_to_string (symtab->blockvector),
+ symtab->primary ? " (primary)" : "");
+ printf_filtered (" "
+ "linetable ((struct linetable *) %s)\n",
+ host_address_to_string (symtab->linetable));
+ printf_filtered (" debugformat %s\n",
+ symtab->debugformat);
+ printf_filtered (" }\n");
+ }
+ }
+
+ if (printed_objfile_start)
+ printf_filtered ("}\n");
}
- cleanups = make_cleanup_freeargv (argv);
+}
- if (argv[0] != NULL)
+/* Check consistency of symtabs.
+ An example of what this checks for is NULL blockvectors.
+ They can happen if there's a bug during debug info reading.
+ GDB assumes they are always non-NULL.
+
+ Note: This does not check for psymtab vs symtab consistency.
+ Use "maint check-psymtabs" for that. */
+
+static void
+maintenance_check_symtabs (char *ignore, int from_tty)
+{
+ struct program_space *pspace;
+ struct objfile *objfile;
+
+ ALL_PSPACES (pspace)
+ ALL_PSPACE_OBJFILES (pspace, objfile)
{
- filename = argv[0];
- /* If a second arg is supplied, it is a source file name to match on */
- if (argv[1] != NULL)
+ struct symtab *symtab;
+
+ /* We don't want to print anything for this objfile until we
+ actually find something worth printing. */
+ int printed_objfile_start = 0;
+
+ ALL_OBJFILE_SYMTABS (objfile, symtab)
{
- symname = argv[1];
+ int found_something = 0;
+
+ QUIT;
+
+ if (symtab->blockvector == NULL)
+ found_something = 1;
+ /* Add more checks here. */
+
+ if (found_something)
+ {
+ if (! printed_objfile_start)
+ {
+ printf_filtered ("{ objfile %s ", objfile_name (objfile));
+ wrap_here (" ");
+ printf_filtered ("((struct objfile *) %s)\n",
+ host_address_to_string (objfile));
+ printed_objfile_start = 1;
+ }
+ printf_filtered (" { symtab %s\n",
+ symtab_to_filename_for_display (symtab));
+ if (symtab->blockvector == NULL)
+ printf_filtered (" NULL blockvector\n");
+ printf_filtered (" }\n");
+ }
}
+
+ if (printed_objfile_start)
+ printf_filtered ("}\n");
}
+}
- filename = tilde_expand (filename);
- make_cleanup (free, filename);
-
- outfile = gdb_fopen (filename, FOPEN_WT);
- if (outfile == 0)
- perror_with_name (filename);
- make_cleanup ((make_cleanup_func) gdb_fclose, &outfile);
+/* Helper function for maintenance_expand_symtabs.
+ This is the name_matcher function for expand_symtabs_matching. */
- immediate_quit++;
- ALL_OBJFILES (objfile)
- if (symname == NULL || (STREQ (symname, objfile -> name)))
- dump_msymbols (objfile, outfile);
- immediate_quit--;
- fprintf_filtered (outfile, "\n\n");
- do_cleanups (cleanups);
+static int
+maintenance_expand_name_matcher (const char *symname, void *data)
+{
+ /* Since we're not searching on symbols, just return TRUE. */
+ return 1;
}
-void
-maintenance_print_objfiles (ignore, from_tty)
- char *ignore;
- int from_tty;
+/* Helper function for maintenance_expand_symtabs.
+ This is the file_matcher function for expand_symtabs_matching. */
+
+static int
+maintenance_expand_file_matcher (const char *filename, void *data,
+ int basenames)
{
- struct objfile *objfile;
+ const char *regexp = data;
- dont_repeat ();
+ QUIT;
- immediate_quit++;
- ALL_OBJFILES (objfile)
- dump_objfile (objfile);
- immediate_quit--;
+ /* KISS: Only apply the regexp to the complete file name. */
+ if (basenames)
+ return 0;
+
+ if (regexp == NULL || re_exec (filename))
+ return 1;
+
+ return 0;
}
-/* Check consistency of psymtabs and symtabs. */
+/* Expand all symbol tables whose name matches an optional regexp. */
-void
-maintenance_check_symtabs (ignore, from_tty)
- char *ignore;
- int from_tty;
+static void
+maintenance_expand_symtabs (char *args, int from_tty)
{
- register struct symbol *sym;
- register struct partial_symbol **psym;
- register struct symtab *s = NULL;
- register struct partial_symtab *ps;
- struct blockvector *bv;
- register struct objfile *objfile;
- register struct block *b;
- int length;
+ struct program_space *pspace;
+ struct objfile *objfile;
+ struct cleanup *cleanups;
+ char **argv;
+ char *regexp = NULL;
- ALL_PSYMTABS (objfile, ps)
+ /* We use buildargv here so that we handle spaces in the regexp
+ in a way that allows adding more arguments later. */
+ argv = gdb_buildargv (args);
+ cleanups = make_cleanup_freeargv (argv);
+
+ if (argv != NULL)
{
- 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--)
+ if (argv[0] != NULL)
{
- sym = lookup_block_symbol (b, SYMBOL_NAME (*psym),
- SYMBOL_NAMESPACE (*psym));
- if (!sym)
- {
- printf_filtered ("Static symbol `");
- puts_filtered (SYMBOL_NAME (*psym));
- printf_filtered ("' only found in ");
- puts_filtered (ps->filename);
- printf_filtered (" psymtab\n");
- }
- psym++;
+ regexp = argv[0];
+ if (argv[1] != NULL)
+ error (_("Extra arguments after regexp."));
}
- 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_NAME (*psym),
- SYMBOL_NAMESPACE (*psym));
- if (!sym)
- {
- printf_filtered ("Global symbol `");
- puts_filtered (SYMBOL_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 ");
- print_address_numeric (ps->textlow, 1, gdb_stdout);
- printf_filtered (" - ");
- print_address_numeric (ps->texthigh, 1, gdb_stdout);
- printf_filtered ("\n");
- continue;
- }
- if (ps->texthigh == 0)
- continue;
- if (ps->textlow < BLOCK_START (b) || ps->texthigh > BLOCK_END (b))
+ }
+
+ if (regexp)
+ re_comp (regexp);
+
+ ALL_PSPACES (pspace)
+ ALL_PSPACE_OBJFILES (pspace, objfile)
+ {
+ if (objfile->sf)
{
- printf_filtered ("Psymtab ");
- puts_filtered (ps->filename);
- printf_filtered (" covers ");
- print_address_numeric (ps->textlow, 1, gdb_stdout);
- printf_filtered (" - ");
- print_address_numeric (ps->texthigh, 1, gdb_stdout);
- printf_filtered (" but symtab covers only ");
- print_address_numeric (BLOCK_START (b), 1, gdb_stdout);
- printf_filtered (" - ");
- print_address_numeric (BLOCK_END (b), 1, gdb_stdout);
- printf_filtered ("\n");
+ objfile->sf->qf->expand_symtabs_matching
+ (objfile, maintenance_expand_file_matcher,
+ maintenance_expand_name_matcher, ALL_DOMAIN, regexp);
}
}
-}
+ do_cleanups (cleanups);
+}
+
/* Return the nexting depth of a block within other blocks in its symtab. */
static int
-block_depth (block)
- struct block *block;
+block_depth (struct block *block)
{
- register int i = 0;
- while ((block = BLOCK_SUPERBLOCK (block)) != NULL)
+ int i = 0;
+
+ while ((block = BLOCK_SUPERBLOCK (block)) != NULL)
{
i++;
}
return i;
}
-
-/* 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 (listp, objfile)
- register struct psymbol_allocation_list *listp;
- struct objfile *objfile;
-{
- int new_size;
- if (listp->size == 0)
- {
- new_size = 255;
- listp->list = (struct partial_symbol **)
- xmmalloc (objfile -> md, new_size * sizeof (struct partial_symbol *));
- }
- else
- {
- new_size = listp->size * 2;
- listp->list = (struct partial_symbol **)
- xmrealloc (objfile -> md, (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 ()
+_initialize_symmisc (void)
{
- std_in = stdin;
+ std_in = stdin;
std_out = stdout;
std_err = stderr;
+
+ add_cmd ("symbols", class_maintenance, maintenance_print_symbols, _("\
+Print dump of current symbol definitions.\n\
+Entries in the full symbol table are dumped to file OUTFILE.\n\
+If a SOURCE file is specified, dump only that file's symbols."),
+ &maintenanceprintlist);
+
+ add_cmd ("msymbols", class_maintenance, maintenance_print_msymbols, _("\
+Print dump of current minimal symbol definitions.\n\
+Entries in the minimal symbol table are dumped to file OUTFILE.\n\
+If a SOURCE file is specified, dump only that file's minimal symbols."),
+ &maintenanceprintlist);
+
+ add_cmd ("objfiles", class_maintenance, maintenance_print_objfiles,
+ _("Print dump of current object file definitions.\n\
+With an argument REGEXP, list the object files with matching names."),
+ &maintenanceprintlist);
+
+ add_cmd ("symtabs", class_maintenance, maintenance_info_symtabs, _("\
+List the full symbol tables for all object files.\n\
+This does not include information about individual symbols, blocks, or\n\
+linetables --- just the symbol table structures themselves.\n\
+With an argument REGEXP, list the symbol tables with matching names."),
+ &maintenanceinfolist);
+
+ add_cmd ("check-symtabs", class_maintenance, maintenance_check_symtabs,
+ _("\
+Check consistency of currently expanded symtabs."),
+ &maintenancelist);
+
+ add_cmd ("expand-symtabs", class_maintenance, maintenance_expand_symtabs,
+ _("Expand symbol tables.\n\
+With an argument REGEXP, only expand the symbol tables with matching names."),
+ &maintenancelist);
}