X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fsymmisc.c;h=02021e5e98c0afcfbdf6d6b98947f8e31b7fe8b0;hb=2bd7c093f663139ad9e57ddc748ade12f6bfbe01;hp=21bc3d413972747613c062b42036f36b92a1a540;hpb=fba45db2faf619e71856ee38ec63949c0ef6903e;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index 21bc3d4139..02021e5e98 100644
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -1,11 +1,14 @@
/* Do various things to symbol tables (other than lookup), for GDB.
- Copyright 1986, 1987, 1989, 1991-1996, 1998, 2000 Free Software Foundation, Inc.
+
+ 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.
This file is part of GDB.
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
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -14,9 +17,7 @@
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, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
#include "defs.h"
#include "symtab.h"
@@ -26,11 +27,17 @@
#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 "gdb_string.h"
+#include "readline/readline.h"
#ifndef DEV_TTY
#define DEV_TTY "/dev/tty"
@@ -63,8 +70,6 @@ static int block_depth (struct block *);
static void print_partial_symbols (struct partial_symbol **, int,
char *, struct ui_file *);
-static void free_symtab_block (struct objfile *, struct block *);
-
void _initialize_symmisc (void);
struct print_symbol_args
@@ -74,39 +79,20 @@ struct print_symbol_args
struct ui_file *outfile;
};
-static int print_symbol (PTR);
-
-static void free_symtab_block (struct objfile *, struct block *);
+static int print_symbol (void *);
-
-/* Free a struct block <- B and all the symbols defined in that block. */
-
-static void
-free_symtab_block (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).
+ Note that some symtabs 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 (register struct symtab *s)
+free_symtab (struct symtab *s)
{
- register int i, n;
- register struct blockvector *bv;
+ int i, n;
+ struct blockvector *bv;
switch (s->free_code)
{
@@ -116,39 +102,27 @@ free_symtab (register struct symtab *s)
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'
+ /* Everything will be freed either by our `free_func'
or by some other symtab, except for our linetable.
Free that now. */
if (LINETABLE (s))
- mfree (s->objfile->md, (PTR) LINETABLE (s));
+ xfree (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);
+ if (s->free_func != NULL)
+ s->free_func (s);
/* Free source-related stuff */
if (s->line_charpos != NULL)
- mfree (s->objfile->md, (PTR) s->line_charpos);
+ xfree (s->line_charpos);
if (s->fullname != NULL)
- mfree (s->objfile->md, s->fullname);
+ xfree (s->fullname);
if (s->debugformat != NULL)
- mfree (s->objfile->md, s->debugformat);
- mfree (s->objfile->md, (PTR) s);
+ xfree (s->debugformat);
+ xfree (s);
}
void
@@ -159,8 +133,9 @@ print_symbol_bcache_statistics (void)
immediate_quit++;
ALL_OBJFILES (objfile)
{
- printf_filtered ("Byte cache statistics for '%s':\n", objfile->name);
- print_bcache_statistics (&objfile->psymbol_cache, "partial symbol cache");
+ printf_filtered (_("Byte cache statistics for '%s':\n"), objfile->name);
+ print_bcache_statistics (objfile->psymbol_cache, "partial symbol cache");
+ print_bcache_statistics (objfile->macro_cache, "preprocessor macro cache");
}
immediate_quit--;
}
@@ -169,37 +144,60 @@ void
print_objfile_statistics (void)
{
struct objfile *objfile;
+ struct symtab *s;
+ struct partial_symtab *ps;
+ int i, linetables, blockvectors;
immediate_quit++;
ALL_OBJFILES (objfile)
{
- printf_filtered ("Statistics for '%s':\n", objfile->name);
+ printf_filtered (_("Statistics for '%s':\n"), objfile->name);
if (OBJSTAT (objfile, n_stabs) > 0)
- printf_filtered (" Number of \"stab\" symbols read: %d\n",
+ 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",
+ 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",
+ 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",
+ 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",
+ 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);
+ 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",
+ 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));
+ 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));
+ printf_filtered (_(" Total memory used for macro cache: %d\n"),
+ bcache_memory_used (objfile->macro_cache));
}
immediate_quit--;
}
@@ -273,10 +271,12 @@ dump_msymbols (struct objfile *objfile, struct ui_file *outfile)
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 (msymbol);
+
+ switch (MSYMBOL_TYPE (msymbol))
{
case mst_unknown:
ms_type = 'u';
@@ -310,25 +310,24 @@ dump_msymbols (struct objfile *objfile, struct ui_file *outfile)
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))
+ fputs_filtered (paddress (SYMBOL_VALUE_ADDRESS (msymbol)), outfile);
+ fprintf_filtered (outfile, " %s", SYMBOL_LINKAGE_NAME (msymbol));
+ if (section)
fprintf_filtered (outfile, " section %s",
bfd_section_name (objfile->obfd,
- SYMBOL_BFD_SECTION (msymbol)));
+ section->the_bfd_section));
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)
{
- warning ("internal error: minimal symbol count %d != %d",
+ warning (_("internal error: minimal symbol count %d != %d"),
objfile->minimal_symbol_count, index);
}
fprintf_filtered (outfile, "\n");
@@ -356,7 +355,7 @@ dump_psymtab (struct objfile *objfile, struct partial_symtab *psymtab,
" Full symtab was read (at ");
gdb_print_host_address (psymtab->symtab, outfile);
fprintf_filtered (outfile, " by function at ");
- gdb_print_host_address ((PTR) psymtab->read_symtab, outfile);
+ gdb_print_host_address (psymtab->read_symtab, outfile);
fprintf_filtered (outfile, ")\n");
}
@@ -366,16 +365,15 @@ dump_psymtab (struct objfile *objfile, struct partial_symtab *psymtab,
if (i != 0)
fprintf_filtered (outfile, ", ");
wrap_here (" ");
- print_address_numeric (ANOFFSET (psymtab->section_offsets, i),
- 1,
- outfile);
+ fputs_filtered (paddress (ANOFFSET (psymtab->section_offsets, i)),
+ outfile);
}
fprintf_filtered (outfile, "\n");
fprintf_filtered (outfile, " Symbols cover text addresses ");
- print_address_numeric (psymtab->textlow, 1, outfile);
+ fputs_filtered (paddress (psymtab->textlow), outfile);
fprintf_filtered (outfile, "-");
- print_address_numeric (psymtab->texthigh, 1, 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);
@@ -402,14 +400,16 @@ dump_psymtab (struct objfile *objfile, struct partial_symtab *psymtab,
}
static void
-dump_symtab (struct objfile *objfile, struct symtab *symtab,
- struct ui_file *outfile)
+dump_symtab_1 (struct objfile *objfile, struct symtab *symtab,
+ struct ui_file *outfile)
{
- register int i, j;
+ int i;
+ struct dict_iterator iter;
int len, blen;
- register struct linetable *l;
+ 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);
@@ -430,7 +430,7 @@ dump_symtab (struct objfile *objfile, struct symtab *symtab,
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 (l->item[i].pc), outfile);
fprintf_filtered (outfile, "\n");
}
}
@@ -453,32 +453,35 @@ dump_symtab (struct objfile *objfile, struct symtab *symtab,
fprintf_filtered (outfile, " under ");
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 (BLOCK_START (b)), outfile);
fprintf_filtered (outfile, "..");
- print_address_numeric (BLOCK_END (b), 1, outfile);
+ fputs_filtered (paddress (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)));
}
}
- 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). */
+ ALL_BLOCK_SYMBOLS (b, iter, sym)
{
struct print_symbol_args s;
- s.symbol = BLOCK_SYM (b, j);
+ 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");
@@ -489,6 +492,22 @@ dump_symtab (struct objfile *objfile, struct symtab *symtab,
}
}
+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);
+
+ dump_symtab_1 (objfile, symtab, outfile);
+
+ set_language (saved_lang);
+}
+
void
maintenance_print_symbols (char *args, int from_tty)
{
@@ -504,13 +523,10 @@ maintenance_print_symbols (char *args, int 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)
@@ -524,7 +540,7 @@ 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)
@@ -533,7 +549,7 @@ Arguments missing: an output file name and an optional symbol file name");
immediate_quit++;
ALL_SYMTABS (objfile, s)
- if (symname == NULL || (STREQ (symname, s->filename)))
+ if (symname == NULL || strcmp (symname, s->filename) == 0)
dump_symtab (objfile, s, outfile);
immediate_quit--;
do_cleanups (cleanups);
@@ -545,26 +561,27 @@ Arguments missing: an output file name and an optional symbol file name");
1 for success. */
static int
-print_symbol (PTR args)
+print_symbol (void *args)
{
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);
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 (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)))
{
@@ -577,7 +594,7 @@ print_symbol (PTR args)
? "enum"
: (TYPE_CODE (SYMBOL_TYPE (symbol)) == TYPE_CODE_STRUCT
? "struct" : "union")),
- SYMBOL_NAME (symbol));
+ SYMBOL_LINKAGE_NAME (symbol));
LA_PRINT_TYPE (SYMBOL_TYPE (symbol), "", outfile, 1, depth);
}
fprintf_filtered (outfile, ";\n");
@@ -589,14 +606,14 @@ print_symbol (PTR 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);
fprintf_filtered (outfile, "; ");
}
else
- fprintf_filtered (outfile, "%s ", SYMBOL_SOURCE_NAME (symbol));
+ fprintf_filtered (outfile, "%s ", SYMBOL_PRINT_NAME (symbol));
switch (SYMBOL_CLASS (symbol))
{
@@ -620,22 +637,19 @@ print_symbol (PTR args)
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 (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 %ld",
+ SYMBOL_VALUE (symbol));
+ else
+ fprintf_filtered (outfile, "register %ld", SYMBOL_VALUE (symbol));
break;
case LOC_ARG:
@@ -643,19 +657,10 @@ print_symbol (PTR args)
SYMBOL_VALUE (symbol));
break;
- case LOC_LOCAL_ARG:
- fprintf_filtered (outfile, "arg at offset 0x%lx from fp",
- 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));
- break;
-
case LOC_REGPARM_ADDR:
fprintf_filtered (outfile, "address parameter register %ld", SYMBOL_VALUE (symbol));
break;
@@ -665,45 +670,35 @@ print_symbol (PTR args)
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));
- break;
-
case LOC_TYPEDEF:
break;
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 (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_host_address (SYMBOL_BLOCK_VALUE (symbol), outfile);
fprintf_filtered (outfile, ", ");
- print_address_numeric (BLOCK_START (SYMBOL_BLOCK_VALUE (symbol)),
- 1,
- outfile);
+ fputs_filtered (paddress (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 (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:
@@ -739,12 +734,9 @@ maintenance_print_psymbols (char *args, int from_tty)
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-psymbols takes an output file name and optional symbol file name"));
}
+ argv = gdb_buildargv (args);
cleanups = make_cleanup_freeargv (argv);
if (argv[0] != NULL)
@@ -758,7 +750,7 @@ maintenance_print_psymbols (char *args, int from_tty)
}
filename = tilde_expand (filename);
- make_cleanup (free, filename);
+ make_cleanup (xfree, filename);
outfile = gdb_fopen (filename, FOPEN_WT);
if (outfile == 0)
@@ -767,7 +759,7 @@ maintenance_print_psymbols (char *args, int from_tty)
immediate_quit++;
ALL_PSYMTABS (objfile, ps)
- if (symname == NULL || (STREQ (symname, ps->filename)))
+ if (symname == NULL || strcmp (symname, ps->filename) == 0)
dump_psymtab (objfile, ps, outfile);
immediate_quit--;
do_cleanups (cleanups);
@@ -780,28 +772,28 @@ print_partial_symbols (struct partial_symbol **p, int count, char *what,
fprintf_filtered (outfile, " %s partial symbols:\n", what);
while (count-- > 0)
{
- fprintf_filtered (outfile, " `%s'", SYMBOL_NAME (*p));
+ 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_NAMESPACE (*p))
+ switch (SYMBOL_DOMAIN (*p))
{
- case UNDEF_NAMESPACE:
- fputs_filtered ("undefined namespace, ", outfile);
+ case UNDEF_DOMAIN:
+ fputs_filtered ("undefined domain, ", outfile);
break;
- case VAR_NAMESPACE:
+ case VAR_DOMAIN:
/* This is the usual thing -- don't print it */
break;
- case STRUCT_NAMESPACE:
- fputs_filtered ("struct namespace, ", outfile);
+ case STRUCT_DOMAIN:
+ fputs_filtered ("struct domain, ", outfile);
break;
- case LABEL_NAMESPACE:
- fputs_filtered ("label namespace, ", outfile);
+ case LABEL_DOMAIN:
+ fputs_filtered ("label domain, ", outfile);
break;
default:
- fputs_filtered (", ", outfile);
+ fputs_filtered (", ", outfile);
break;
}
switch (SYMBOL_CLASS (*p))
@@ -815,9 +807,6 @@ print_partial_symbols (struct partial_symbol **p, int count, char *what,
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;
@@ -827,9 +816,6 @@ print_partial_symbols (struct partial_symbol **p, int count, char *what,
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;
@@ -848,21 +834,21 @@ print_partial_symbols (struct partial_symbol **p, int count, char *what,
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;
+ case LOC_COMPUTED:
+ fputs_filtered ("computed at runtime", outfile);
+ break;
default:
fputs_filtered ("", outfile);
break;
}
fputs_filtered (", ", outfile);
- print_address_numeric (SYMBOL_VALUE_ADDRESS (*p), 1, outfile);
+ fputs_filtered (paddress (SYMBOL_VALUE_ADDRESS (*p)), outfile);
fprintf_filtered (outfile, "\n");
p++;
}
@@ -878,16 +864,15 @@ maintenance_print_msymbols (char *args, int from_tty)
char *symname = NULL;
struct objfile *objfile;
+ struct stat sym_st, obj_st;
+
dont_repeat ();
if (args == NULL)
{
- error ("print-msymbols 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)
@@ -896,12 +881,15 @@ maintenance_print_msymbols (char *args, int from_tty)
/* If a second arg is supplied, it is a source file name to match on */
if (argv[1] != NULL)
{
- symname = argv[1];
+ symname = xfullpath (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)
@@ -910,8 +898,9 @@ maintenance_print_msymbols (char *args, int from_tty)
immediate_quit++;
ALL_OBJFILES (objfile)
- if (symname == NULL || (STREQ (symname, objfile->name)))
- dump_msymbols (objfile, outfile);
+ 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);
@@ -930,18 +919,167 @@ maintenance_print_objfiles (char *ignore, int from_tty)
immediate_quit--;
}
+
+/* List all the symbol tables whose names match REGEXP (optional). */
+void
+maintenance_info_symtabs (char *regexp, int from_tty)
+{
+ struct objfile *objfile;
+
+ if (regexp)
+ re_comp (regexp);
+
+ ALL_OBJFILES (objfile)
+ {
+ 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->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 (" { symtab %s ", symtab->filename);
+ wrap_here (" ");
+ printf_filtered ("((struct symtab *) %p)\n", 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,
+ symtab->primary ? " (primary)" : "");
+ printf_filtered (" linetable ((struct linetable *) %p)\n",
+ symtab->linetable);
+ printf_filtered (" debugformat %s\n", symtab->debugformat);
+ printf_filtered (" }\n");
+ }
+ }
+
+ if (printed_objfile_start)
+ 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)
{
- register struct symbol *sym;
- register struct partial_symbol **psym;
- register struct symtab *s = NULL;
- register struct partial_symtab *ps;
+ struct symbol *sym;
+ struct partial_symbol **psym;
+ struct symtab *s = NULL;
+ struct partial_symtab *ps;
struct blockvector *bv;
- register struct objfile *objfile;
- register struct block *b;
+ struct objfile *objfile;
+ struct block *b;
int length;
ALL_PSYMTABS (objfile, ps)
@@ -955,12 +1093,12 @@ maintenance_check_symtabs (char *ignore, int from_tty)
length = ps->n_static_syms;
while (length--)
{
- sym = lookup_block_symbol (b, SYMBOL_NAME (*psym),
- SYMBOL_NAMESPACE (*psym));
+ sym = lookup_block_symbol (b, SYMBOL_LINKAGE_NAME (*psym),
+ NULL, SYMBOL_DOMAIN (*psym));
if (!sym)
{
printf_filtered ("Static symbol `");
- puts_filtered (SYMBOL_NAME (*psym));
+ puts_filtered (SYMBOL_LINKAGE_NAME (*psym));
printf_filtered ("' only found in ");
puts_filtered (ps->filename);
printf_filtered (" psymtab\n");
@@ -972,12 +1110,12 @@ maintenance_check_symtabs (char *ignore, int from_tty)
length = ps->n_global_syms;
while (length--)
{
- sym = lookup_block_symbol (b, SYMBOL_NAME (*psym),
- SYMBOL_NAMESPACE (*psym));
+ sym = lookup_block_symbol (b, SYMBOL_LINKAGE_NAME (*psym),
+ NULL, SYMBOL_DOMAIN (*psym));
if (!sym)
{
printf_filtered ("Global symbol `");
- puts_filtered (SYMBOL_NAME (*psym));
+ puts_filtered (SYMBOL_LINKAGE_NAME (*psym));
printf_filtered ("' only found in ");
puts_filtered (ps->filename);
printf_filtered (" psymtab\n");
@@ -989,9 +1127,9 @@ maintenance_check_symtabs (char *ignore, int from_tty)
printf_filtered ("Psymtab ");
puts_filtered (ps->filename);
printf_filtered (" covers bad range ");
- print_address_numeric (ps->textlow, 1, gdb_stdout);
+ fputs_filtered (paddress (ps->textlow), gdb_stdout);
printf_filtered (" - ");
- print_address_numeric (ps->texthigh, 1, gdb_stdout);
+ fputs_filtered (paddress (ps->texthigh), gdb_stdout);
printf_filtered ("\n");
continue;
}
@@ -1002,13 +1140,13 @@ maintenance_check_symtabs (char *ignore, int from_tty)
printf_filtered ("Psymtab ");
puts_filtered (ps->filename);
printf_filtered (" covers ");
- print_address_numeric (ps->textlow, 1, gdb_stdout);
+ fputs_filtered (paddress (ps->textlow), gdb_stdout);
printf_filtered (" - ");
- print_address_numeric (ps->texthigh, 1, gdb_stdout);
+ fputs_filtered (paddress (ps->texthigh), gdb_stdout);
printf_filtered (" but symtab covers only ");
- print_address_numeric (BLOCK_START (b), 1, gdb_stdout);
+ fputs_filtered (paddress (BLOCK_START (b)), gdb_stdout);
printf_filtered (" - ");
- print_address_numeric (BLOCK_END (b), 1, gdb_stdout);
+ fputs_filtered (paddress (BLOCK_END (b)), gdb_stdout);
printf_filtered ("\n");
}
}
@@ -1020,7 +1158,7 @@ maintenance_check_symtabs (char *ignore, int from_tty)
static int
block_depth (struct block *block)
{
- register int i = 0;
+ int i = 0;
while ((block = BLOCK_SUPERBLOCK (block)) != NULL)
{
i++;
@@ -1034,7 +1172,7 @@ block_depth (struct block *block)
be freed in free_objfile(). */
void
-extend_psymbol_list (register struct psymbol_allocation_list *listp,
+extend_psymbol_list (struct psymbol_allocation_list *listp,
struct objfile *objfile)
{
int new_size;
@@ -1042,14 +1180,14 @@ extend_psymbol_list (register struct psymbol_allocation_list *listp,
{
new_size = 255;
listp->list = (struct partial_symbol **)
- xmmalloc (objfile->md, new_size * sizeof (struct partial_symbol *));
+ xmalloc (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 *));
+ xrealloc ((char *) listp->list,
+ new_size * sizeof (struct partial_symbol *));
}
/* Next assumes we only went one over. Should be good if
program works correctly */