/* Do various things to symbol tables (other than lookup), for GDB.
- Copyright (C) 1986-2014 Free Software Foundation, Inc.
+ Copyright (C) 1986-2015 Free Software Foundation, Inc.
This file is part of GDB.
#include "breakpoint.h"
#include "command.h"
#include "gdb_obstack.h"
-#include "exceptions.h"
#include "language.h"
#include "bcache.h"
#include "block.h"
#include "typeprint.h"
#include "gdbcmd.h"
#include "source.h"
-
-#include <string.h>
#include "readline/readline.h"
#include "psymtab.h"
{
struct program_space *pspace;
struct objfile *objfile;
+ struct compunit_symtab *cu;
struct symtab *s;
int i, linetables, blockvectors;
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)
+ if (objfile->per_bfd->n_minsyms > 0)
printf_filtered (_(" Number of \"minimal\" symbols read: %d\n"),
- OBJSTAT (objfile, n_minsyms));
+ objfile->per_bfd->n_minsyms);
if (OBJSTAT (objfile, n_psyms) > 0)
printf_filtered (_(" Number of \"partial\" symbols read: %d\n"),
OBJSTAT (objfile, n_psyms));
if (objfile->sf)
objfile->sf->qf->print_stats (objfile);
i = linetables = blockvectors = 0;
- ALL_OBJFILE_SYMTABS (objfile, s)
+ ALL_OBJFILE_FILETABS (objfile, cu, s)
{
i++;
- if (s->linetable != NULL)
+ if (SYMTAB_LINETABLE (s) != NULL)
linetables++;
- if (s->primary == 1)
- blockvectors++;
}
+ ALL_OBJFILE_COMPUNITS (objfile, cu)
+ blockvectors++;
printf_filtered (_(" Number of symbol tables: %d\n"), i);
- printf_filtered (_(" Number of symbol tables with line tables: %d\n"),
+ printf_filtered (_(" Number of symbol tables with line tables: %d\n"),
linetables);
- printf_filtered (_(" Number of symbol tables with blockvectors: %d\n"),
+ 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 objfile obstack: %s\n"),
+ pulongest (obstack_memory_used (&objfile
+ ->objfile_obstack)));
+ printf_filtered (_(" Total memory used for BFD obstack: %s\n"),
+ pulongest (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)));
static void
dump_objfile (struct objfile *objfile)
{
+ struct compunit_symtab *cust;
struct symtab *symtab;
printf_filtered ("\nObject file %s: ", objfile_name (objfile));
printf_filtered (", bfd at ");
gdb_print_host_address (objfile->obfd, gdb_stdout);
printf_filtered (", %d minsyms\n\n",
- objfile->minimal_symbol_count);
+ objfile->per_bfd->minimal_symbol_count);
if (objfile->sf)
objfile->sf->qf->dump (objfile);
- if (objfile->symtabs)
+ if (objfile->compunit_symtabs != NULL)
{
printf_filtered ("Symtabs:\n");
- for (symtab = objfile->symtabs;
- symtab != NULL;
- symtab = symtab->next)
+ ALL_OBJFILE_FILETABS (objfile, cust, symtab)
{
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 (symtab) != objfile)
{
printf_filtered ("NOT ON CHAIN! ");
}
char ms_type;
fprintf_filtered (outfile, "\nObject file %s:\n\n", objfile_name (objfile));
- if (objfile->minimal_symbol_count == 0)
+ if (objfile->per_bfd->minimal_symbol_count == 0)
{
fprintf_filtered (outfile, "No minimal symbols found.\n");
return;
break;
}
fprintf_filtered (outfile, "[%2d] %c ", index, ms_type);
- fputs_filtered (paddress (gdbarch, MSYMBOL_VALUE_ADDRESS (msymbol)),
+ fputs_filtered (paddress (gdbarch, MSYMBOL_VALUE_ADDRESS (objfile,
+ msymbol)),
outfile);
fprintf_filtered (outfile, " %s", MSYMBOL_LINKAGE_NAME (msymbol));
if (section)
fputs_filtered ("\n", outfile);
index++;
}
- if (objfile->minimal_symbol_count != index)
+ if (objfile->per_bfd->minimal_symbol_count != index)
{
warning (_("internal error: minimal symbol count %d != %d"),
- objfile->minimal_symbol_count, index);
+ objfile->per_bfd->minimal_symbol_count, index);
}
fprintf_filtered (outfile, "\n");
}
struct dict_iterator iter;
int len;
struct linetable *l;
- struct blockvector *bv;
+ const struct blockvector *bv;
struct symbol *sym;
struct block *b;
int depth;
fprintf_filtered (outfile, "\nSymtab for file %s\n",
symtab_to_filename_for_display (symtab));
- if (symtab->dirname)
+ if (SYMTAB_DIRNAME (symtab) != NULL)
fprintf_filtered (outfile, "Compilation directory is %s\n",
- symtab->dirname);
+ SYMTAB_DIRNAME (symtab));
fprintf_filtered (outfile, "Read from object file %s (",
objfile_name (objfile));
gdb_print_host_address (objfile, outfile);
language_str (symtab->language));
/* First print the line table. */
- l = LINETABLE (symtab);
+ l = SYMTAB_LINETABLE (symtab);
if (l)
{
fprintf_filtered (outfile, "\nLine table:\n\n");
fprintf_filtered (outfile, "\n");
}
}
- /* Now print the block info, but only for primary symtabs since we will
+ /* Now print the block info, but only for compunit symtabs since we will
print lots of duplicate info otherwise. */
- if (symtab->primary)
+ if (symtab == COMPUNIT_FILETABS (SYMTAB_COMPUNIT (symtab)))
{
fprintf_filtered (outfile, "\nBlockvector:\n\n");
- bv = BLOCKVECTOR (symtab);
+ bv = SYMTAB_BLOCKVECTOR (symtab);
len = BLOCKVECTOR_NBLOCKS (bv);
for (i = 0; i < len; i++)
{
char *symname = NULL;
char *filename = DEV_TTY;
struct objfile *objfile;
+ struct compunit_symtab *cu;
struct symtab *s;
dont_repeat ();
perror_with_name (filename);
make_cleanup_ui_file_delete (outfile);
- ALL_SYMTABS (objfile, s)
+ ALL_FILETABS (objfile, cu, s)
{
QUIT;
if (symname == NULL
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);
+ struct obj_section *section;
+
+ if (SYMBOL_OBJFILE_OWNED (symbol))
+ section = SYMBOL_OBJ_SECTION (symbol_objfile (symbol), symbol);
+ else
+ section = NULL;
print_spaces (depth, outfile);
if (SYMBOL_DOMAIN (symbol) == LABEL_DOMAIN)
ALL_PSPACES (pspace)
ALL_PSPACE_OBJFILES (pspace, objfile)
{
+ struct compunit_symtab *cust;
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)
+ ALL_OBJFILE_COMPUNITS (objfile, cust)
{
- QUIT;
+ int printed_compunit_symtab_start = 0;
- if (! regexp
- || re_exec (symtab_to_filename_for_display (symtab)))
+ ALL_COMPUNIT_FILETABS (cust, symtab)
{
- if (! printed_objfile_start)
+ QUIT;
+
+ if (! regexp
+ || re_exec (symtab_to_filename_for_display (symtab)))
{
- printf_filtered ("{ objfile %s ", objfile_name (objfile));
- wrap_here (" ");
- printf_filtered ("((struct objfile *) %s)\n",
- host_address_to_string (objfile));
- printed_objfile_start = 1;
+ 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;
+ }
+ if (! printed_compunit_symtab_start)
+ {
+ printf_filtered (" { ((struct compunit_symtab *) %s)\n",
+ host_address_to_string (cust));
+ printf_filtered (" debugformat %s\n",
+ COMPUNIT_DEBUGFORMAT (cust));
+ printf_filtered (" producer %s\n",
+ COMPUNIT_PRODUCER (cust) != NULL
+ ? COMPUNIT_PRODUCER (cust)
+ : "(null)");
+ printf_filtered (" dirname %s\n",
+ COMPUNIT_DIRNAME (cust) != NULL
+ ? COMPUNIT_DIRNAME (cust)
+ : "(null)");
+ printf_filtered (" blockvector"
+ " ((struct blockvector *) %s)\n",
+ host_address_to_string
+ (COMPUNIT_BLOCKVECTOR (cust)));
+ printed_compunit_symtab_start = 1;
+ }
+
+ printf_filtered ("\t{ symtab %s ",
+ symtab_to_filename_for_display (symtab));
+ wrap_here (" ");
+ printf_filtered ("((struct symtab *) %s)\n",
+ host_address_to_string (symtab));
+ printf_filtered ("\t fullname %s\n",
+ symtab->fullname != NULL
+ ? symtab->fullname
+ : "(null)");
+ printf_filtered ("\t "
+ "linetable ((struct linetable *) %s)\n",
+ host_address_to_string (symtab->linetable));
+ printf_filtered ("\t}\n");
}
-
- 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_compunit_symtab_start)
+ printf_filtered (" }\n");
}
if (printed_objfile_start)
ALL_PSPACES (pspace)
ALL_PSPACE_OBJFILES (pspace, objfile)
{
- struct symtab *symtab;
+ struct compunit_symtab *cust;
/* 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)
+ ALL_OBJFILE_COMPUNITS (objfile, cust)
{
int found_something = 0;
+ struct symtab *symtab = compunit_primary_filetab (cust);
QUIT;
- if (symtab->blockvector == NULL)
+ if (COMPUNIT_BLOCKVECTOR (cust) == NULL)
found_something = 1;
/* Add more checks here. */
{
printf_filtered ("{ objfile %s ", objfile_name (objfile));
wrap_here (" ");
- printf_filtered ("((struct objfile *) %s)\n",
+ 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)
+ if (COMPUNIT_BLOCKVECTOR (cust) == NULL)
printf_filtered (" NULL blockvector\n");
printf_filtered (" }\n");
}
{
objfile->sf->qf->expand_symtabs_matching
(objfile, maintenance_expand_file_matcher,
- maintenance_expand_name_matcher, ALL_DOMAIN, regexp);
+ maintenance_expand_name_matcher, NULL, ALL_DOMAIN, regexp);
}
}