/* Support routines for building symbol tables in GDB's internal format.
- Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
- 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2007, 2008, 2009
- Free Software Foundation, Inc.
+ Copyright (C) 1986-2004, 2007-2012 Free Software Foundation, Inc.
This file is part of GDB.
file-reading routines.
Routines to support specific debugging information formats (stabs,
- DWARF, etc) belong somewhere else. */
+ DWARF, etc) belong somewhere else. */
#include "defs.h"
#include "bfd.h"
#include "gdb_assert.h"
#include "complaints.h"
#include "gdb_string.h"
-#include "expression.h" /* For "enum exp_opcode" used by... */
+#include "expression.h" /* For "enum exp_opcode" used by... */
#include "bcache.h"
-#include "filenames.h" /* For DOSish file names */
+#include "filenames.h" /* For DOSish file names. */
#include "macrotab.h"
#include "demangle.h" /* Needed by SYMBOL_INIT_DEMANGLED_NAME. */
#include "block.h"
/* Ask buildsym.h to define the vars it normally declares `extern'. */
#define EXTERN
/**/
-#include "buildsym.h" /* Our own declarations */
+#include "buildsym.h" /* Our own declarations. */
#undef EXTERN
/* For cleanup_undefined_types and finish_global_stabs (somewhat
\f
static int compare_line_numbers (const void *ln1p, const void *ln2p);
+
+static void record_pending_block (struct objfile *objfile,
+ struct block *block,
+ struct pending_block *opblock);
\f
/* Initial sizes of data structures. These are realloc'd larger if
#define INITIAL_LINE_VECTOR_LENGTH 1000
\f
-/* maintain the lists of symbols and blocks */
+/* Maintain the lists of symbols and blocks. */
-/* Add a pending list to free_pendings. */
-void
-add_free_pendings (struct pending *list)
-{
- struct pending *link = list;
-
- if (list)
- {
- while (link->next) link = link->next;
- link->next = free_pendings;
- free_pendings = list;
- }
-}
-
-/* Add a symbol to one of the lists of symbols. While we're at it, if
- we're in the C++ case and don't have full namespace debugging info,
- check to see if it references an anonymous namespace; if so, add an
- appropriate using directive. */
+/* Add a symbol to one of the lists of symbols. */
void
add_symbol_to_list (struct symbol *symbol, struct pending **listhead)
if (symbol->ginfo.name && symbol->ginfo.name[0] == '#')
return;
- /* We keep PENDINGSIZE symbols in each link of the list. If we
+ /* We keep PENDINGSIZE symbols in each link of the list. If we
don't have a link with room in it, add a new link. */
if (*listhead == NULL || (*listhead)->nsyms == PENDINGSIZE)
{
find_symbol_in_list (struct pending *list, char *name, int length)
{
int j;
- char *pp;
+ const char *pp;
while (list != NULL)
{
for (j = list->nsyms; --j >= 0;)
{
pp = SYMBOL_LINKAGE_NAME (list->symbol[j]);
- if (*pp == *name && strncmp (pp, name, length) == 0 &&
- pp[length] == '\0')
+ if (*pp == *name && strncmp (pp, name, length) == 0
+ && pp[length] == '\0')
{
return (list->symbol[j]);
}
}
/* At end of reading syms, or in case of quit, really free as many
- `struct pending's as we can easily find. */
+ `struct pending's as we can easily find. */
void
really_free_pendings (void *dummy)
}
}
-/* This function is called to discard any pending blocks. */
+/* This function is called to discard any pending blocks. */
void
free_pending_blocks (void)
the order the symbols have in the list (reversed from the input
file). Put the block on the list of pending blocks. */
-struct block *
-finish_block (struct symbol *symbol, struct pending **listhead,
- struct pending_block *old_blocks,
- CORE_ADDR start, CORE_ADDR end,
- struct objfile *objfile)
+static struct block *
+finish_block_internal (struct symbol *symbol, struct pending **listhead,
+ struct pending_block *old_blocks,
+ CORE_ADDR start, CORE_ADDR end,
+ struct objfile *objfile,
+ int is_global)
{
+ struct gdbarch *gdbarch = get_objfile_arch (objfile);
struct pending *next, *next1;
struct block *block;
struct pending_block *pblock;
struct pending_block *opblock;
- block = allocate_block (&objfile->objfile_obstack);
+ block = (is_global
+ ? allocate_global_block (&objfile->objfile_obstack)
+ : allocate_block (&objfile->objfile_obstack));
if (symbol)
{
BLOCK_START (block) = start;
BLOCK_END (block) = end;
- /* Superblock filled in when containing block is made */
- BLOCK_SUPERBLOCK (block) = NULL;
- BLOCK_NAMESPACE (block) = NULL;
/* Put the block in as the value of the symbol that names it. */
{
/* No parameter type information is recorded with the
function's type. Set that from the type of the
- parameter symbols. */
+ parameter symbols. */
int nparams = 0, iparams;
struct symbol *sym;
- ALL_BLOCK_SYMBOLS (block, iter, sym)
+
+ /* Here we want to directly access the dictionary, because
+ we haven't fully initialized the block yet. */
+ ALL_DICT_SYMBOLS (BLOCK_DICT (block), iter, sym)
{
if (SYMBOL_IS_ARGUMENT (sym))
nparams++;
TYPE_ALLOC (ftype, nparams * sizeof (struct field));
iparams = 0;
- ALL_BLOCK_SYMBOLS (block, iter, sym)
+ /* Here we want to directly access the dictionary, because
+ we haven't fully initialized the block yet. */
+ ALL_DICT_SYMBOLS (BLOCK_DICT (block), iter, sym)
{
if (iparams == nparams)
break;
*listhead = NULL;
/* Check to be sure that the blocks have an end address that is
- greater than starting address */
+ greater than starting address. */
if (BLOCK_END (block) < BLOCK_START (block))
{
if (symbol)
{
complaint (&symfile_complaints,
- _("block end address less than block start address in %s (patched it)"),
+ _("block end address less than block "
+ "start address in %s (patched it)"),
SYMBOL_PRINT_NAME (symbol));
}
else
{
complaint (&symfile_complaints,
- _("block end address 0x%s less than block start address 0x%s (patched it)"),
- paddr_nz (BLOCK_END (block)), paddr_nz (BLOCK_START (block)));
+ _("block end address %s less than block "
+ "start address %s (patched it)"),
+ paddress (gdbarch, BLOCK_END (block)),
+ paddress (gdbarch, BLOCK_START (block)));
}
- /* Better than nothing */
+ /* Better than nothing. */
BLOCK_END (block) = BLOCK_START (block);
}
if (BLOCK_SUPERBLOCK (pblock->block) == NULL)
{
/* Check to be sure the blocks are nested as we receive
- them. If the compiler/assembler/linker work, this just
+ them. If the compiler/assembler/linker work, this just
burns a small amount of time.
Skip blocks which correspond to a function; they're not
else
{
complaint (&symfile_complaints,
- _("inner block (0x%s-0x%s) not inside outer block (0x%s-0x%s)"),
- paddr_nz (BLOCK_START (pblock->block)),
- paddr_nz (BLOCK_END (pblock->block)),
- paddr_nz (BLOCK_START (block)),
- paddr_nz (BLOCK_END (block)));
+ _("inner block (%s-%s) not "
+ "inside outer block (%s-%s)"),
+ paddress (gdbarch, BLOCK_START (pblock->block)),
+ paddress (gdbarch, BLOCK_END (pblock->block)),
+ paddress (gdbarch, BLOCK_START (block)),
+ paddress (gdbarch, BLOCK_END (block)));
}
if (BLOCK_START (pblock->block) < BLOCK_START (block))
BLOCK_START (pblock->block) = BLOCK_START (block);
}
block_set_using (block, using_directives, &objfile->objfile_obstack);
+ using_directives = NULL;
record_pending_block (objfile, block, opblock);
return block;
}
+struct block *
+finish_block (struct symbol *symbol, struct pending **listhead,
+ struct pending_block *old_blocks,
+ CORE_ADDR start, CORE_ADDR end,
+ struct objfile *objfile)
+{
+ return finish_block_internal (symbol, listhead, old_blocks,
+ start, end, objfile, 0);
+}
/* Record BLOCK on the list of all blocks in the file. Put it after
OPBLOCK, or at the beginning if opblock is NULL. This puts the
Allocate the pending block struct in the objfile_obstack to save
time. This wastes a little space. FIXME: Is it worth it? */
-void
+static void
record_pending_block (struct objfile *objfile, struct block *block,
struct pending_block *opblock)
{
(sizeof (struct blockvector)
+ (i - 1) * sizeof (struct block *)));
- /* Copy the blocks into the blockvector. This is done in reverse
+ /* Copy the blocks into the blockvector. This is done in reverse
order, which happens to put the blocks into the proper order
- (ascending starting address). finish_block has hair to insert
+ (ascending starting address). finish_block has hair to insert
each block into the list after its subblocks in order to make
sure this is true. */
BLOCKVECTOR_MAP (blockvector) = 0;
/* Some compilers output blocks in the wrong order, but we depend on
- their being in the right order so we can binary search. Check the
+ their being in the right order so we can binary search. Check the
order and moan about it. */
if (BLOCKVECTOR_NBLOCKS (blockvector) > 1)
{
/* Start recording information about source code that came from an
included (or otherwise merged-in) source file with a different
name. NAME is the name of the file (cannot be NULL), DIRNAME is
- the directory in which the file was compiled (or NULL if not known). */
+ the directory in which the file was compiled (or NULL if not
+ known). */
void
-start_subfile (char *name, char *dirname)
+start_subfile (const char *name, const char *dirname)
{
struct subfile *subfile;
xfree (subfile_name);
}
- /* This subfile is not known. Add an entry for it. Make an entry
+ /* This subfile is not known. Add an entry for it. Make an entry
for this subfile in the list of all subfiles of the current main
source file. */
subfiles = subfile;
current_subfile = subfile;
- /* Save its name and compilation directory name */
+ /* Save its name and compilation directory name. */
subfile->name = (name == NULL) ? NULL : xstrdup (name);
subfile->dirname = (dirname == NULL) ? NULL : xstrdup (dirname);
language then as well, but it is too late for us to use that
information while reading symbols, since symtabs aren't allocated
until after all the symbols have been processed for a given
- source file. */
+ source file. */
subfile->language = deduce_language_from_filename (subfile->name);
- if (subfile->language == language_unknown &&
- subfile->next != NULL)
+ if (subfile->language == language_unknown
+ && subfile->next != NULL)
{
subfile->language = subfile->next->language;
}
/* Initialize the debug format string to NULL. We may supply it
- later via a call to record_debugformat. */
+ later via a call to record_debugformat. */
subfile->debugformat = NULL;
/* Similarly for the producer. */
value to dirname and remembering the new name. Some sanity
checking is performed to ensure that the state of the subfile
struct is reasonable and that the old name we are assuming to be a
- directory name actually is (by checking for a trailing '/'). */
+ directory name actually is (by checking for a trailing '/'). */
void
patch_subfile_names (struct subfile *subfile, char *name)
{
if (subfile != NULL && subfile->dirname == NULL && subfile->name != NULL
- && subfile->name[strlen (subfile->name) - 1] == '/')
+ && IS_DIR_SEPARATOR (subfile->name[strlen (subfile->name) - 1]))
{
subfile->dirname = subfile->name;
subfile->name = xstrdup (name);
are allocated we try to deduce a language then as well, but
it is too late for us to use that information while reading
symbols, since symtabs aren't allocated until after all the
- symbols have been processed for a given source file. */
+ symbols have been processed for a given source file. */
subfile->language = deduce_language_from_filename (subfile->name);
- if (subfile->language == language_unknown &&
- subfile->next != NULL)
+ if (subfile->language == language_unknown
+ && subfile->next != NULL)
{
subfile->language = subfile->next->language;
}
push_subfile (void)
{
struct subfile_stack *tem
- = (struct subfile_stack *) xmalloc (sizeof (struct subfile_stack));
+ = (struct subfile_stack *) xmalloc (sizeof (struct subfile_stack));
tem->next = subfile_stack;
subfile_stack = tem;
if (current_subfile == NULL || current_subfile->name == NULL)
{
- internal_error (__FILE__, __LINE__, _("failed internal consistency check"));
+ internal_error (__FILE__, __LINE__,
+ _("failed internal consistency check"));
}
tem->name = current_subfile->name;
}
if (link == NULL)
{
- internal_error (__FILE__, __LINE__, _("failed internal consistency check"));
+ internal_error (__FILE__, __LINE__,
+ _("failed internal consistency check"));
}
name = link->name;
subfile_stack = link->next;
record_line (struct subfile *subfile, int line, CORE_ADDR pc)
{
struct linetable_entry *e;
- /* Ignore the dummy line number in libg.o */
+ /* Ignore the dummy line number in libg.o */
if (line == 0xffff)
{
return;
start_subfile (name, dirname);
}
-/* Subroutine of end_symtab to simplify it.
- Look for a subfile that matches the main source file's basename.
- If there is only one, and if the main source file doesn't have any
- symbol or line number information, then copy this file's symtab and
- line_vector to the main source file's subfile and discard the other subfile.
- This can happen because of a compiler bug or from the user playing games
- with #line or from things like a distributed build system that manipulates
- the debug info. */
+/* Subroutine of end_symtab to simplify it. Look for a subfile that
+ matches the main source file's basename. If there is only one, and
+ if the main source file doesn't have any symbol or line number
+ information, then copy this file's symtab and line_vector to the
+ main source file's subfile and discard the other subfile. This can
+ happen because of a compiler bug or from the user playing games
+ with #line or from things like a distributed build system that
+ manipulates the debug info. */
static void
watch_main_source_file_lossage (void)
mainsub = subfile;
}
- /* If the main source file doesn't have any line number or symbol info,
- look for an alias in another subfile.
- We have to watch for mainsub == NULL here. It's a quirk of end_symtab,
- it can return NULL so there may not be a main subfile. */
+ /* If the main source file doesn't have any line number or symbol
+ info, look for an alias in another subfile.
+
+ We have to watch for mainsub == NULL here. It's a quirk of
+ end_symtab, it can return NULL so there may not be a main
+ subfile. */
if (mainsub
&& mainsub->line_vector == NULL
subfile->next;
subfile = subfile->next)
{
- if (strcmp (lbasename (subfile->name), mainbase) == 0)
+ if (filename_cmp (lbasename (subfile->name), mainbase) == 0)
{
++nr_matches;
mainsub_alias = subfile;
TAG_compile_unit DIE. This can happen when we link in an object
file that was compiled from an empty source file. Returning NULL
is probably not the correct thing to do, because then gdb will
- never know about this empty file (FIXME). */
+ never know about this empty file (FIXME). */
struct symtab *
end_symtab (CORE_ADDR end_addr, struct objfile *objfile, int section)
are no-ops. FIXME: Is this handled right in case of QUIT? Can
we make this cleaner? */
- cleanup_undefined_types ();
+ cleanup_undefined_types (objfile);
finish_global_stabs (objfile);
if (pending_blocks == NULL
{
/* Define the STATIC_BLOCK & GLOBAL_BLOCK, and build the
blockvector. */
- finish_block (0, &file_symbols, 0, last_source_start_addr, end_addr,
- objfile);
- finish_block (0, &global_symbols, 0, last_source_start_addr, end_addr,
- objfile);
+ finish_block (0, &file_symbols, 0, last_source_start_addr,
+ end_addr, objfile);
+ finish_block_internal (0, &global_symbols, 0, last_source_start_addr,
+ end_addr, objfile, 1);
blockvector = make_blockvector (objfile);
}
int linetablesize = 0;
symtab = NULL;
- /* If we have blocks of symbols, make a symtab. Otherwise, just
+ /* If we have blocks of symbols, make a symtab. Otherwise, just
ignore this file and any line number info in it. */
if (blockvector)
{
symtab->macro_table = pending_macros;
if (subfile->line_vector)
{
- /* Reallocate the line table on the symbol obstack */
+ /* Reallocate the line table on the symbol obstack. */
symtab->linetable = (struct linetable *)
obstack_alloc (&objfile->objfile_obstack, linetablesize);
memcpy (symtab->linetable, subfile->line_vector, linetablesize);
symtab->block_line_section = section;
if (subfile->dirname)
{
- /* Reallocate the dirname on the symbol obstack */
+ /* Reallocate the dirname on the symbol obstack. */
symtab->dirname = (char *)
obstack_alloc (&objfile->objfile_obstack,
strlen (subfile->dirname) + 1);
{
symtab->dirname = NULL;
}
- symtab->free_code = free_linetable;
- symtab->free_func = NULL;
/* Use whatever language we have been using for this
subfile, not the one that was deduced in allocate_symtab
from the filename. We already did our own deducing when
we created the subfile, and we may have altered our
opinion of what language it is from things we found in
- the symbols. */
+ the symbols. */
symtab->language = subfile->language;
- /* Save the debug format string (if any) in the symtab */
- if (subfile->debugformat != NULL)
- {
- symtab->debugformat = obsavestring (subfile->debugformat,
- strlen (subfile->debugformat),
- &objfile->objfile_obstack);
- }
+ /* Save the debug format string (if any) in the symtab. */
+ symtab->debugformat = subfile->debugformat;
/* Similarly for the producer. */
- if (subfile->producer != NULL)
- symtab->producer = obsavestring (subfile->producer,
- strlen (subfile->producer),
- &objfile->objfile_obstack);
+ symtab->producer = subfile->producer;
/* All symtabs for the main file and the subfiles share a
blockvector, so we need to clear primary for everything
{
xfree ((void *) subfile->line_vector);
}
- if (subfile->debugformat != NULL)
- {
- xfree ((void *) subfile->debugformat);
- }
- if (subfile->producer != NULL)
- xfree (subfile->producer);
nextsub = subfile->next;
xfree ((void *) subfile);
if (symtab)
{
symtab->primary = 1;
+
+ if (symtab->blockvector)
+ {
+ struct block *b = BLOCKVECTOR_BLOCK (symtab->blockvector,
+ GLOBAL_BLOCK);
+
+ set_block_symtab (b, symtab);
+ }
}
/* Default any symbols without a specified symtab to the primary
struct symbol *sym;
struct dict_iterator iter;
- for (sym = dict_iterator_first (BLOCK_DICT (block), &iter);
- sym != NULL;
- sym = dict_iterator_next (&iter))
+ /* Inlined functions may have symbols not in the global or
+ static symbol lists. */
+ if (BLOCK_FUNCTION (block) != NULL)
+ if (SYMBOL_SYMTAB (BLOCK_FUNCTION (block)) == NULL)
+ SYMBOL_SYMTAB (BLOCK_FUNCTION (block)) = symtab;
+
+ /* Note that we only want to fix up symbols from the local
+ blocks, not blocks coming from included symtabs. */
+ ALL_DICT_SYMBOLS (BLOCK_DICT (block), iter, sym)
if (SYMBOL_SYMTAB (sym) == NULL)
SYMBOL_SYMTAB (sym) = symtab;
}
}
/* Pop a context block. Returns the address of the context block just
- popped. */
+ popped. */
struct context_stack *
pop_context (void)
\f
-/* Compute a small integer hash code for the given name. */
+/* Compute a small integer hash code for the given name. */
int
-hashname (char *name)
+hashname (const char *name)
{
return (hash(name,strlen(name)) % HASHSIZE);
}
\f
void
-record_debugformat (char *format)
+record_debugformat (const char *format)
{
- current_subfile->debugformat = xstrdup (format);
+ current_subfile->debugformat = format;
}
void
record_producer (const char *producer)
{
- /* The producer is not always provided in the debugging info.
- Do nothing if PRODUCER is NULL. */
- if (producer == NULL)
- return;
-
- current_subfile->producer = xstrdup (producer);
+ current_subfile->producer = producer;
}
/* Merge the first symbol list SRCLIST into the second symbol list
free_pendings list. Caller must set SRCLIST to a null list after
calling this function.
- Void return. */
+ Void return. */
void
merge_symbol_lists (struct pending **srclist, struct pending **targetlist)
projects / deliverable / binutils-gdb.git / blobdiff