/* Support routines for building symbol tables in GDB's internal format.
- Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
- 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
- Free Software Foundation, Inc.
+ Copyright (C) 1986-2016 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,
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 <http://www.gnu.org/licenses/>. */
/* This module provides subroutines used for creating and adding to
the symbol table. These routines are called from various symbol-
file-reading routines.
Routines to support specific debugging information formats (stabs,
- DWARF, etc) belong somewhere else. */
+ DWARF, etc) belong somewhere else.
+
+ The basic way this module is used is as follows:
+
+ buildsym_init ();
+ cleanups = make_cleanup (really_free_pendings, NULL);
+ cust = start_symtab (...);
+ ... read debug info ...
+ cust = end_symtab (...);
+ do_cleanups (cleanups);
+
+ The compunit symtab pointer ("cust") is returned from both start_symtab
+ and end_symtab to simplify the debug info readers.
+
+ There are minor variations on this, e.g., dwarf2read.c splits end_symtab
+ into two calls: end_symtab_get_static_block, end_symtab_from_static_block,
+ but all debug info readers follow this basic flow.
+
+ Reading DWARF Type Units is another variation:
+
+ buildsym_init ();
+ cleanups = make_cleanup (really_free_pendings, NULL);
+ cust = start_symtab (...);
+ ... read debug info ...
+ cust = end_expandable_symtab (...);
+ do_cleanups (cleanups);
+
+ And then reading subsequent Type Units within the containing "Comp Unit"
+ will use a second flow:
+
+ buildsym_init ();
+ cleanups = make_cleanup (really_free_pendings, NULL);
+ cust = restart_symtab (...);
+ ... read debug info ...
+ cust = augment_type_symtab (...);
+ do_cleanups (cleanups);
+
+ dbxread.c and xcoffread.c use another variation:
+
+ buildsym_init ();
+ cleanups = make_cleanup (really_free_pendings, NULL);
+ cust = start_symtab (...);
+ ... read debug info ...
+ cust = end_symtab (...);
+ ... start_symtab + read + end_symtab repeated ...
+ do_cleanups (cleanups);
+*/
#include "defs.h"
#include "bfd.h"
#include "symfile.h"
#include "objfiles.h"
#include "gdbtypes.h"
-#include "gdb_assert.h"
#include "complaints.h"
-#include "gdb_string.h"
-#include "expression.h" /* For "enum exp_opcode" used by... */
-#include "language.h" /* For "local_hex_string" */
+#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"
#include "cp-support.h"
#include "dictionary.h"
+#include "addrmap.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
+/* For cleanup_undefined_stabs_types and finish_global_stabs (somewhat
questionable--see comment where we call them). */
#include "stabsread.h"
+/* Buildsym's counterpart to struct compunit_symtab.
+ TODO(dje): Move all related global state into here. */
+
+struct buildsym_compunit
+{
+ /* The objfile we're reading debug info from. */
+ struct objfile *objfile;
+
+ /* List of subfiles (source files).
+ Files are added to the front of the list.
+ This is important mostly for the language determination hacks we use,
+ which iterate over previously added files. */
+ struct subfile *subfiles;
+
+ /* The subfile of the main source file. */
+ struct subfile *main_subfile;
+
+ /* E.g., DW_AT_comp_dir if DWARF. Space for this is malloc'd. */
+ char *comp_dir;
+
+ /* Space for this is not malloc'd, and is assumed to have at least
+ the same lifetime as objfile. */
+ const char *producer;
+
+ /* Space for this is not malloc'd, and is assumed to have at least
+ the same lifetime as objfile. */
+ const char *debugformat;
+
+ /* The compunit we are building. */
+ struct compunit_symtab *compunit_symtab;
+};
+
+/* The work-in-progress of the compunit we are building.
+ This is created first, before any subfiles by start_symtab. */
+
+static struct buildsym_compunit *buildsym_compunit;
+
/* List of free `struct pending' structures for reuse. */
static struct pending *free_pendings;
otherwise empty symtab from being tossed. */
static int have_line_numbers;
-\f
+
+/* The mutable address map for the compilation unit whose symbols
+ we're currently reading. The symtabs' shared blockvector will
+ point to a fixed copy of this. */
+static struct addrmap *pending_addrmap;
+
+/* The obstack on which we allocate pending_addrmap.
+ If pending_addrmap is NULL, this is uninitialized; otherwise, it is
+ initialized (and holds pending_addrmap). */
+static struct obstack pending_addrmap_obstack;
+
+/* Non-zero if we recorded any ranges in the addrmap that are
+ different from those in the blockvector already. We set this to
+ zero when we start processing a symfile, and if it's still zero at
+ the end, then we just toss the addrmap. */
+static int pending_addrmap_interesting;
+
+/* An obstack used for allocating pending blocks. */
+
+static struct obstack pending_block_obstack;
+
+/* List of blocks already made (lexical contexts already closed).
+ This is used at the end to make the blockvector. */
+
+struct pending_block
+ {
+ struct pending_block *next;
+ struct block *block;
+ };
+
+/* Pointer to the head of a linked list of symbol blocks which have
+ already been finalized (lexical contexts already closed) and which
+ are just waiting to be built into a blockvector when finalizing the
+ associated symtab. */
+
+static struct pending_block *pending_blocks;
+
+struct subfile_stack
+ {
+ struct subfile_stack *next;
+ char *name;
+ };
+
+static struct subfile_stack *subfile_stack;
+
+/* The macro table for the compilation unit whose symbols we're
+ currently reading. */
+static struct macro_table *pending_macros;
+
+static void free_buildsym_compunit (void);
+
static int compare_line_numbers (const void *ln1p, const void *ln2p);
-\f
+
+static void record_pending_block (struct objfile *objfile,
+ struct block *block,
+ struct pending_block *opblock);
/* Initial sizes of data structures. These are realloc'd larger if
needed, and realloc'd down to the size actually used, when
#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)
{
}
else
{
- link = (struct pending *) xmalloc (sizeof (struct pending));
+ link = XNEW (struct pending);
}
link->next = *listhead;
}
(*listhead)->symbol[(*listhead)->nsyms++] = symbol;
-
- /* Check to see if we might need to look for a mention of anonymous
- namespaces. */
-
- if (SYMBOL_LANGUAGE (symbol) == language_cplus)
- cp_scan_for_anonymous_namespaces (symbol);
}
/* Find a symbol named NAME on a LIST. NAME need not be
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 = DEPRECATED_SYMBOL_NAME (list->symbol[j]);
- if (*pp == *name && strncmp (pp, name, length) == 0 &&
- pp[length] == '\0')
+ pp = SYMBOL_LINKAGE_NAME (list->symbol[j]);
+ if (*pp == *name && strncmp (pp, name, length) == 0
+ && pp[length] == '\0')
{
return (list->symbol[j]);
}
return (NULL);
}
-/* At end of reading syms, or in case of quit, really free as many
- `struct pending's as we can easily find. */
+/* At end of reading syms, or in case of quit, ensure everything associated
+ with building symtabs is freed. This is intended to be registered as a
+ cleanup before doing psymtab->symtab expansion.
+
+ N.B. This is *not* intended to be used when building psymtabs. Some debug
+ info readers call this anyway, which is harmless if confusing. */
void
really_free_pendings (void *dummy)
if (pending_macros)
free_macro_table (pending_macros);
+ pending_macros = NULL;
+
+ if (pending_addrmap)
+ obstack_free (&pending_addrmap_obstack, NULL);
+ pending_addrmap = NULL;
+
+ free_buildsym_compunit ();
}
-/* This function is called to discard any pending blocks. */
+/* This function is called to discard any pending blocks. */
void
free_pending_blocks (void)
{
-#if 0 /* Now we make the links in the
- objfile_obstack, so don't free
- them. */
- struct pending_block *bnext, *bnext1;
-
- for (bnext = pending_blocks; bnext; bnext = bnext1)
+ if (pending_blocks != NULL)
{
- bnext1 = bnext->next;
- xfree ((void *) bnext);
+ obstack_free (&pending_block_obstack, NULL);
+ pending_blocks = NULL;
}
-#endif
- pending_blocks = NULL;
}
/* Take one of the lists of symbols and make a block from it. Keep
the order the symbols have in the list (reversed from the input
file). Put the block on the list of pending blocks. */
-void
-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,
+ const struct dynamic_prop *static_link,
+ CORE_ADDR start, CORE_ADDR end,
+ int is_global, int expandable)
{
+ struct objfile *objfile = buildsym_compunit->objfile;
+ 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)
{
}
else
{
- BLOCK_DICT (block) = dict_create_hashed (&objfile->objfile_obstack,
- *listhead);
+ if (expandable)
+ {
+ BLOCK_DICT (block) = dict_create_hashed_expandable ();
+ dict_add_pending (BLOCK_DICT (block), *listhead);
+ }
+ else
+ {
+ BLOCK_DICT (block) =
+ dict_create_hashed (&objfile->objfile_obstack, *listhead);
+ }
}
BLOCK_START (block) = start;
BLOCK_END (block) = end;
- /* Superblock filled in when containing block is made */
- BLOCK_SUPERBLOCK (block) = NULL;
- BLOCK_NAMESPACE (block) = NULL;
-
- BLOCK_GCC_COMPILED (block) = processing_gcc_compilation;
/* 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)
{
- switch (SYMBOL_CLASS (sym))
- {
- case LOC_ARG:
- case LOC_REF_ARG:
- case LOC_REGPARM:
- case LOC_REGPARM_ADDR:
- case LOC_BASEREG_ARG:
- case LOC_LOCAL_ARG:
- case LOC_COMPUTED_ARG:
- nparams++;
- break;
- case LOC_UNDEF:
- case LOC_CONST:
- case LOC_STATIC:
- case LOC_INDIRECT:
- case LOC_REGISTER:
- case LOC_LOCAL:
- case LOC_TYPEDEF:
- case LOC_LABEL:
- case LOC_BLOCK:
- case LOC_CONST_BYTES:
- case LOC_BASEREG:
- case LOC_UNRESOLVED:
- case LOC_OPTIMIZED_OUT:
- case LOC_COMPUTED:
- default:
- break;
- }
+ if (SYMBOL_IS_ARGUMENT (sym))
+ nparams++;
}
if (nparams > 0)
{
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;
- switch (SYMBOL_CLASS (sym))
+ if (SYMBOL_IS_ARGUMENT (sym))
{
- case LOC_ARG:
- case LOC_REF_ARG:
- case LOC_REGPARM:
- case LOC_REGPARM_ADDR:
- case LOC_BASEREG_ARG:
- case LOC_LOCAL_ARG:
- case LOC_COMPUTED_ARG:
TYPE_FIELD_TYPE (ftype, iparams) = SYMBOL_TYPE (sym);
TYPE_FIELD_ARTIFICIAL (ftype, iparams) = 0;
iparams++;
- break;
- case LOC_UNDEF:
- case LOC_CONST:
- case LOC_STATIC:
- case LOC_INDIRECT:
- case LOC_REGISTER:
- case LOC_LOCAL:
- case LOC_TYPEDEF:
- case LOC_LABEL:
- case LOC_BLOCK:
- case LOC_CONST_BYTES:
- case LOC_BASEREG:
- case LOC_UNRESOLVED:
- case LOC_OPTIMIZED_OUT:
- case LOC_COMPUTED:
- default:
- break;
}
}
}
}
-
- /* If we're in the C++ case, set the block's scope. */
- if (SYMBOL_LANGUAGE (symbol) == language_cplus)
- {
- cp_set_block_scope (symbol, block, &objfile->objfile_obstack);
- }
}
else
{
BLOCK_FUNCTION (block) = NULL;
}
+ if (static_link != NULL)
+ objfile_register_static_link (objfile, block, static_link);
+
/* Now "free" the links of the list, and empty the list. */
for (next = *listhead; next; next = next1)
}
*listhead = NULL;
-#if 1
/* 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);
}
-#endif
/* Install this block as the superblock of all blocks made since the
start of this scope that don't have superblocks yet. */
{
if (BLOCK_SUPERBLOCK (pblock->block) == NULL)
{
-#if 1
/* Check to be sure the blocks are nested as we receive
- them. If the compiler/assembler/linker work, this just
- burns a small amount of time. */
- if (BLOCK_START (pblock->block) < BLOCK_START (block) ||
- BLOCK_END (pblock->block) > BLOCK_END (block))
+ 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
+ physically nested inside this other blocks, only
+ lexically nested. */
+ if (BLOCK_FUNCTION (pblock->block) == NULL
+ && (BLOCK_START (pblock->block) < BLOCK_START (block)
+ || BLOCK_END (pblock->block) > BLOCK_END (block)))
{
if (symbol)
{
complaint (&symfile_complaints,
- "inner block not inside outer block in %s",
+ _("inner block not inside outer block in %s"),
SYMBOL_PRINT_NAME (symbol));
}
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);
if (BLOCK_END (pblock->block) > BLOCK_END (block))
BLOCK_END (pblock->block) = BLOCK_END (block);
}
-#endif
BLOCK_SUPERBLOCK (pblock->block) = block;
}
opblock = pblock;
}
+ block_set_using (block,
+ (is_global
+ ? global_using_directives
+ : local_using_directives),
+ &objfile->objfile_obstack);
+ if (is_global)
+ global_using_directives = NULL;
+ else
+ local_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,
+ const struct dynamic_prop *static_link,
+ CORE_ADDR start, CORE_ADDR end)
+{
+ return finish_block_internal (symbol, listhead, old_blocks, static_link,
+ start, end, 0, 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)
{
struct pending_block *pblock;
- pblock = (struct pending_block *)
- obstack_alloc (&objfile->objfile_obstack, sizeof (struct pending_block));
+ if (pending_blocks == NULL)
+ obstack_init (&pending_block_obstack);
+
+ pblock = XOBNEW (&pending_block_obstack, struct pending_block);
pblock->block = block;
if (opblock)
{
}
}
+
+/* Record that the range of addresses from START to END_INCLUSIVE
+ (inclusive, like it says) belongs to BLOCK. BLOCK's start and end
+ addresses must be set already. You must apply this function to all
+ BLOCK's children before applying it to BLOCK.
+
+ If a call to this function complicates the picture beyond that
+ already provided by BLOCK_START and BLOCK_END, then we create an
+ address map for the block. */
+void
+record_block_range (struct block *block,
+ CORE_ADDR start, CORE_ADDR end_inclusive)
+{
+ /* If this is any different from the range recorded in the block's
+ own BLOCK_START and BLOCK_END, then note that the address map has
+ become interesting. Note that even if this block doesn't have
+ any "interesting" ranges, some later block might, so we still
+ need to record this block in the addrmap. */
+ if (start != BLOCK_START (block)
+ || end_inclusive + 1 != BLOCK_END (block))
+ pending_addrmap_interesting = 1;
+
+ if (! pending_addrmap)
+ {
+ obstack_init (&pending_addrmap_obstack);
+ pending_addrmap = addrmap_create_mutable (&pending_addrmap_obstack);
+ }
+
+ addrmap_set_empty (pending_addrmap, start, end_inclusive, block);
+}
+
static struct blockvector *
-make_blockvector (struct objfile *objfile)
+make_blockvector (void)
{
+ struct objfile *objfile = buildsym_compunit->objfile;
struct pending_block *next;
struct blockvector *blockvector;
int i;
(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_BLOCK (blockvector, --i) = next->block;
}
-#if 0 /* Now we make the links in the
- obstack, so don't free them. */
- /* Now free the links of the list, and empty the list. */
+ free_pending_blocks ();
- for (next = pending_blocks; next; next = next1)
- {
- next1 = next->next;
- xfree (next);
- }
-#endif
- pending_blocks = NULL;
+ /* If we needed an address map for this symtab, record it in the
+ blockvector. */
+ if (pending_addrmap && pending_addrmap_interesting)
+ BLOCKVECTOR_MAP (blockvector)
+ = addrmap_create_fixed (pending_addrmap, &objfile->objfile_obstack);
+ else
+ BLOCKVECTOR_MAP (blockvector) = 0;
-#if 1 /* FIXME, shut this off after a while
- to speed up symbol reading. */
/* 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
- order and moan about it. FIXME. */
+ their being in the right order so we can binary search. Check the
+ order and moan about it.
+ Note: Remember that the first two blocks are the global and static
+ blocks. We could special case that fact and begin checking at block 2.
+ To avoid making that assumption we do not. */
if (BLOCKVECTOR_NBLOCKS (blockvector) > 1)
{
for (i = 1; i < BLOCKVECTOR_NBLOCKS (blockvector); i++)
CORE_ADDR start
= BLOCK_START (BLOCKVECTOR_BLOCK (blockvector, i));
- complaint (&symfile_complaints, "block at %s out of order",
- local_hex_string ((LONGEST) start));
+ complaint (&symfile_complaints, _("block at %s out of order"),
+ hex_string ((LONGEST) start));
}
}
}
-#endif
return (blockvector);
}
\f
/* 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 it resides (or NULL if not known). */
+ name. NAME is the name of the file (cannot be NULL). */
void
-start_subfile (char *name, char *dirname)
+start_subfile (const char *name)
{
+ const char *subfile_dirname;
struct subfile *subfile;
- /* See if this subfile is already known as a subfile of the current
- main source file. */
+ gdb_assert (buildsym_compunit != NULL);
+
+ subfile_dirname = buildsym_compunit->comp_dir;
- for (subfile = subfiles; subfile; subfile = subfile->next)
+ /* See if this subfile is already registered. */
+
+ for (subfile = buildsym_compunit->subfiles; subfile; subfile = subfile->next)
{
- if (FILENAME_CMP (subfile->name, name) == 0)
+ char *subfile_name;
+
+ /* If NAME is an absolute path, and this subfile is not, then
+ attempt to create an absolute path to compare. */
+ if (IS_ABSOLUTE_PATH (name)
+ && !IS_ABSOLUTE_PATH (subfile->name)
+ && subfile_dirname != NULL)
+ subfile_name = concat (subfile_dirname, SLASH_STRING,
+ subfile->name, (char *) NULL);
+ else
+ subfile_name = subfile->name;
+
+ if (FILENAME_CMP (subfile_name, name) == 0)
{
current_subfile = subfile;
+ if (subfile_name != subfile->name)
+ xfree (subfile_name);
return;
}
+ if (subfile_name != subfile->name)
+ xfree (subfile_name);
}
- /* 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. */
+ /* This subfile is not known. Add an entry for it. */
+
+ subfile = XNEW (struct subfile);
+ memset (subfile, 0, sizeof (struct subfile));
+ subfile->buildsym_compunit = buildsym_compunit;
+
+ subfile->next = buildsym_compunit->subfiles;
+ buildsym_compunit->subfiles = subfile;
- subfile = (struct subfile *) xmalloc (sizeof (struct subfile));
- memset ((char *) subfile, 0, sizeof (struct subfile));
- subfile->next = subfiles;
- subfiles = subfile;
current_subfile = subfile;
- /* Save its name and compilation directory name */
- subfile->name = (name == NULL) ? NULL : savestring (name, strlen (name));
- subfile->dirname =
- (dirname == NULL) ? NULL : savestring (dirname, strlen (dirname));
+ subfile->name = xstrdup (name);
/* Initialize line-number recording for this subfile. */
subfile->line_vector = NULL;
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. */
- subfile->debugformat = NULL;
-
/* If the filename of this subfile ends in .C, then change the
language of any pending subfiles from C to C++. We also accept
any other C++ suffixes accepted by deduce_language_from_filename. */
enum language sublang = deduce_language_from_filename (subfile->name);
if (sublang == language_cplus || sublang == language_fortran)
- for (s = subfiles; s != NULL; s = s->next)
+ for (s = buildsym_compunit->subfiles; s != NULL; s = s->next)
if (s->language == language_c)
s->language = sublang;
}
}
}
+/* Start recording information about a primary source file (IOW, not an
+ included source file).
+ COMP_DIR is the directory in which the compilation unit was compiled
+ (or NULL if not known). */
+
+static struct buildsym_compunit *
+start_buildsym_compunit (struct objfile *objfile, const char *comp_dir)
+{
+ struct buildsym_compunit *bscu;
+
+ bscu = XNEW (struct buildsym_compunit);
+ memset (bscu, 0, sizeof (struct buildsym_compunit));
+
+ bscu->objfile = objfile;
+ bscu->comp_dir = (comp_dir == NULL) ? NULL : xstrdup (comp_dir);
+
+ /* Initialize the debug format string to NULL. We may supply it
+ later via a call to record_debugformat. */
+ bscu->debugformat = NULL;
+
+ /* Similarly for the producer. */
+ bscu->producer = NULL;
+
+ return bscu;
+}
+
+/* Delete the buildsym compunit. */
+
+static void
+free_buildsym_compunit (void)
+{
+ struct subfile *subfile, *nextsub;
+
+ if (buildsym_compunit == NULL)
+ return;
+ for (subfile = buildsym_compunit->subfiles;
+ subfile != NULL;
+ subfile = nextsub)
+ {
+ nextsub = subfile->next;
+ xfree (subfile->name);
+ xfree (subfile->line_vector);
+ xfree (subfile);
+ }
+ xfree (buildsym_compunit->comp_dir);
+ xfree (buildsym_compunit);
+ buildsym_compunit = NULL;
+ current_subfile = NULL;
+}
+
/* For stabs readers, the first N_SO symbol is assumed to be the
source file name, and the subfile struct is initialized using that
assumption. If another N_SO symbol is later seen, immediately
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] == '/')
+ if (subfile != NULL
+ && buildsym_compunit->comp_dir == NULL
+ && subfile->name != NULL
+ && IS_DIR_SEPARATOR (subfile->name[strlen (subfile->name) - 1]))
{
- subfile->dirname = subfile->name;
- subfile->name = savestring (name, strlen (name));
- last_source_file = name;
+ buildsym_compunit->comp_dir = subfile->name;
+ subfile->name = xstrdup (name);
+ set_last_source_file (name);
/* Default the source language to whatever can be deduced from
the filename. If nothing can be deduced (such as for a C/C++
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;
}
void
push_subfile (void)
{
- struct subfile_stack *tem
- = (struct subfile_stack *) xmalloc (sizeof (struct subfile_stack));
+ struct subfile_stack *tem = XNEW (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;
* sizeof (struct linetable_entry))));
}
+ /* Normally, we treat lines as unsorted. But the end of sequence
+ marker is special. We sort line markers at the same PC by line
+ number, so end of sequence markers (which have line == 0) appear
+ first. This is right if the marker ends the previous function,
+ and there is no padding before the next function. But it is
+ wrong if the previous line was empty and we are now marking a
+ switch to a different subfile. We must leave the end of sequence
+ marker at the end of this group of lines, not sort the empty line
+ to after the marker. The easiest way to accomplish this is to
+ delete any empty lines from our table, if they are followed by
+ end of sequence markers. All we lose is the ability to set
+ breakpoints at some lines which contain no instructions
+ anyway. */
+ if (line == 0 && subfile->line_vector->nitems > 0)
+ {
+ e = subfile->line_vector->item + subfile->line_vector->nitems - 1;
+ while (subfile->line_vector->nitems > 0 && e->pc == pc)
+ {
+ e--;
+ subfile->line_vector->nitems--;
+ }
+ }
+
e = subfile->line_vector->item + subfile->line_vector->nitems++;
e->line = line;
- e->pc = ADDR_BITS_REMOVE(pc);
+ e->pc = pc;
}
/* Needed in order to sort line tables from IBM xcoff files. Sigh! */
return ln1->line - ln2->line;
}
\f
-/* Start a new symtab for a new source file. Called, for example,
- when a stabs symbol of type N_SO is seen, or when a DWARF
- TAG_compile_unit DIE is seen. It indicates the start of data for
- one original source file. */
+/* See buildsym.h. */
-void
-start_symtab (char *name, char *dirname, CORE_ADDR start_addr)
+struct compunit_symtab *
+buildsym_compunit_symtab (void)
{
+ gdb_assert (buildsym_compunit != NULL);
+
+ return buildsym_compunit->compunit_symtab;
+}
+
+/* See buildsym.h. */
+
+struct macro_table *
+get_macro_table (void)
+{
+ struct objfile *objfile;
+
+ gdb_assert (buildsym_compunit != NULL);
- last_source_file = name;
+ objfile = buildsym_compunit->objfile;
+
+ if (! pending_macros)
+ {
+ pending_macros = new_macro_table (&objfile->per_bfd->storage_obstack,
+ objfile->per_bfd->macro_cache,
+ buildsym_compunit->compunit_symtab);
+ }
+
+ return pending_macros;
+}
+\f
+/* Init state to prepare for building a symtab.
+ Note: This can't be done in buildsym_init because dbxread.c and xcoffread.c
+ can call start_symtab+end_symtab multiple times after one call to
+ buildsym_init. */
+
+static void
+prepare_for_building (const char *name, CORE_ADDR start_addr)
+{
+ set_last_source_file (name);
last_source_start_addr = start_addr;
- file_symbols = NULL;
- global_symbols = NULL;
+
+ local_symbols = NULL;
+ local_using_directives = NULL;
within_function = 0;
have_line_numbers = 0;
- /* Context stack is initially empty. Allocate first one with room
- for 10 levels; reuse it forever afterward. */
- if (context_stack == NULL)
+ context_stack_depth = 0;
+
+ /* These should have been reset either by successful completion of building
+ a symtab, or by the really_free_pendings cleanup. */
+ gdb_assert (file_symbols == NULL);
+ gdb_assert (global_symbols == NULL);
+ gdb_assert (global_using_directives == NULL);
+ gdb_assert (pending_macros == NULL);
+ gdb_assert (pending_addrmap == NULL);
+ gdb_assert (current_subfile == NULL);
+}
+
+/* Start a new symtab for a new source file in OBJFILE. Called, for example,
+ when a stabs symbol of type N_SO is seen, or when a DWARF
+ TAG_compile_unit DIE is seen. It indicates the start of data for
+ one original source file.
+
+ NAME is the name of the file (cannot be NULL). COMP_DIR is the directory in
+ which the file was compiled (or NULL if not known). START_ADDR is the
+ lowest address of objects in the file (or 0 if not known). */
+
+struct compunit_symtab *
+start_symtab (struct objfile *objfile, const char *name, const char *comp_dir,
+ CORE_ADDR start_addr)
+{
+ prepare_for_building (name, start_addr);
+
+ buildsym_compunit = start_buildsym_compunit (objfile, comp_dir);
+
+ /* Allocate the compunit symtab now. The caller needs it to allocate
+ non-primary symtabs. It is also needed by get_macro_table. */
+ buildsym_compunit->compunit_symtab = allocate_compunit_symtab (objfile,
+ name);
+
+ /* Build the subfile for NAME (the main source file) so that we can record
+ a pointer to it for later.
+ IMPORTANT: Do not allocate a struct symtab for NAME here.
+ It can happen that the debug info provides a different path to NAME than
+ DIRNAME,NAME. We cope with this in watch_main_source_file_lossage but
+ that only works if the main_subfile doesn't have a symtab yet. */
+ start_subfile (name);
+ /* Save this so that we don't have to go looking for it at the end
+ of the subfiles list. */
+ buildsym_compunit->main_subfile = current_subfile;
+
+ return buildsym_compunit->compunit_symtab;
+}
+
+/* Restart compilation for a symtab.
+ CUST is the result of end_expandable_symtab.
+ NAME, START_ADDR are the source file we are resuming with.
+
+ This is used when a symtab is built from multiple sources.
+ The symtab is first built with start_symtab/end_expandable_symtab
+ and then for each additional piece call restart_symtab/augment_*_symtab.
+ Note: At the moment there is only augment_type_symtab. */
+
+void
+restart_symtab (struct compunit_symtab *cust,
+ const char *name, CORE_ADDR start_addr)
+{
+ prepare_for_building (name, start_addr);
+
+ buildsym_compunit = start_buildsym_compunit (COMPUNIT_OBJFILE (cust),
+ COMPUNIT_DIRNAME (cust));
+ buildsym_compunit->compunit_symtab = cust;
+}
+
+/* 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. This can also happen from an innocent
+ symlink in the paths, we don't canonicalize paths here. */
+
+static void
+watch_main_source_file_lossage (void)
+{
+ struct subfile *mainsub, *subfile;
+
+ /* We have to watch for buildsym_compunit == NULL here. It's a quirk of
+ end_symtab, it can return NULL so there may not be a main subfile. */
+ if (buildsym_compunit == NULL)
+ return;
+
+ /* Get the main source file. */
+ mainsub = buildsym_compunit->main_subfile;
+
+ /* If the main source file doesn't have any line number or symbol
+ info, look for an alias in another subfile. */
+
+ if (mainsub->line_vector == NULL
+ && mainsub->symtab == NULL)
{
- context_stack_size = INITIAL_CONTEXT_STACK_SIZE;
- context_stack = (struct context_stack *)
- xmalloc (context_stack_size * sizeof (struct context_stack));
+ const char *mainbase = lbasename (mainsub->name);
+ int nr_matches = 0;
+ struct subfile *prevsub;
+ struct subfile *mainsub_alias = NULL;
+ struct subfile *prev_mainsub_alias = NULL;
+
+ prevsub = NULL;
+ for (subfile = buildsym_compunit->subfiles;
+ subfile != NULL;
+ subfile = subfile->next)
+ {
+ if (subfile == mainsub)
+ continue;
+ if (filename_cmp (lbasename (subfile->name), mainbase) == 0)
+ {
+ ++nr_matches;
+ mainsub_alias = subfile;
+ prev_mainsub_alias = prevsub;
+ }
+ prevsub = subfile;
+ }
+
+ if (nr_matches == 1)
+ {
+ gdb_assert (mainsub_alias != NULL && mainsub_alias != mainsub);
+
+ /* Found a match for the main source file.
+ Copy its line_vector and symtab to the main subfile
+ and then discard it. */
+
+ mainsub->line_vector = mainsub_alias->line_vector;
+ mainsub->line_vector_length = mainsub_alias->line_vector_length;
+ mainsub->symtab = mainsub_alias->symtab;
+
+ if (prev_mainsub_alias == NULL)
+ buildsym_compunit->subfiles = mainsub_alias->next;
+ else
+ prev_mainsub_alias->next = mainsub_alias->next;
+ xfree (mainsub_alias->name);
+ xfree (mainsub_alias);
+ }
}
- context_stack_depth = 0;
+}
- /* Set up support for C++ namespace support, in case we need it. */
+/* Helper function for qsort. Parameters are `struct block *' pointers,
+ function sorts them in descending order by their BLOCK_START. */
- cp_initialize_namespace ();
+static int
+block_compar (const void *ap, const void *bp)
+{
+ const struct block *a = *(const struct block **) ap;
+ const struct block *b = *(const struct block **) bp;
- /* Initialize the list of sub source files with one entry for this
- file (the top-level source file). */
+ return ((BLOCK_START (b) > BLOCK_START (a))
+ - (BLOCK_START (b) < BLOCK_START (a)));
+}
- subfiles = NULL;
- current_subfile = NULL;
- start_subfile (name, dirname);
+/* Reset state after a successful building of a symtab.
+ This exists because dbxread.c and xcoffread.c can call
+ start_symtab+end_symtab multiple times after one call to buildsym_init,
+ and before the really_free_pendings cleanup is called.
+ We keep the free_pendings list around for dbx/xcoff sake. */
+
+static void
+reset_symtab_globals (void)
+{
+ set_last_source_file (NULL);
+
+ local_symbols = NULL;
+ local_using_directives = NULL;
+ file_symbols = NULL;
+ global_symbols = NULL;
+ global_using_directives = NULL;
+
+ /* We don't free pending_macros here because if the symtab was successfully
+ built then ownership was transferred to the symtab. */
+ pending_macros = NULL;
+
+ if (pending_addrmap)
+ obstack_free (&pending_addrmap_obstack, NULL);
+ pending_addrmap = NULL;
+
+ free_buildsym_compunit ();
}
-/* Finish the symbol definitions for one main source file, close off
- all the lexical contexts for that file (creating struct block's for
- them), then make the struct symtab for that file and put it in the
- list of all such.
+/* Implementation of the first part of end_symtab. It allows modifying
+ STATIC_BLOCK before it gets finalized by end_symtab_from_static_block.
+ If the returned value is NULL there is no blockvector created for
+ this symtab (you still must call end_symtab_from_static_block).
- END_ADDR is the address of the end of the file's text. SECTION is
- the section number (in objfile->section_offsets) of the blockvector
- and linetable.
+ END_ADDR is the same as for end_symtab: the address of the end of the
+ file's text.
- Note that it is possible for end_symtab() to return NULL. In
- particular, for the DWARF case at least, it will return NULL when
- it finds a compilation unit that has exactly one DIE, a
- 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). */
+ If EXPANDABLE is non-zero the STATIC_BLOCK dictionary is made
+ expandable.
+
+ If REQUIRED is non-zero, then a symtab is created even if it does
+ not contain any symbols. */
-struct symtab *
-end_symtab (CORE_ADDR end_addr, struct objfile *objfile, int section)
+struct block *
+end_symtab_get_static_block (CORE_ADDR end_addr, int expandable, int required)
{
- struct symtab *symtab = NULL;
- struct blockvector *blockvector;
- struct subfile *subfile;
- struct context_stack *cstk;
- struct subfile *nextsub;
+ struct objfile *objfile = buildsym_compunit->objfile;
/* Finish the lexical context of the last function in the file; pop
the context stack. */
if (context_stack_depth > 0)
{
- cstk = pop_context ();
+ struct context_stack *cstk = pop_context ();
+
/* Make a block for the local symbols within. */
- finish_block (cstk->name, &local_symbols, cstk->old_blocks,
- cstk->start_addr, end_addr, objfile);
+ finish_block (cstk->name, &local_symbols, cstk->old_blocks, NULL,
+ cstk->start_addr, end_addr);
if (context_stack_depth > 0)
{
believed to happen in most cases (even for coffread.c);
it used to be an abort(). */
complaint (&symfile_complaints,
- "Context stack not empty in end_symtab");
+ _("Context stack not empty in end_symtab"));
context_stack_depth = 0;
}
}
/* Reordered executables may have out of order pending blocks; if
OBJF_REORDERED is true, then sort the pending blocks. */
+
if ((objfile->flags & OBJF_REORDERED) && pending_blocks)
{
- /* FIXME! Remove this horrid bubble sort and use merge sort!!! */
- int swapped;
- do
- {
- struct pending_block *pb, *pbnext;
+ unsigned count = 0;
+ struct pending_block *pb;
+ struct block **barray, **bp;
+ struct cleanup *back_to;
- pb = pending_blocks;
- pbnext = pb->next;
- swapped = 0;
+ for (pb = pending_blocks; pb != NULL; pb = pb->next)
+ count++;
- while (pbnext)
- {
- /* swap blocks if unordered! */
+ barray = XNEWVEC (struct block *, count);
+ back_to = make_cleanup (xfree, barray);
- if (BLOCK_START (pb->block) < BLOCK_START (pbnext->block))
- {
- struct block *tmp = pb->block;
- pb->block = pbnext->block;
- pbnext->block = tmp;
- swapped = 1;
- }
- pb = pbnext;
- pbnext = pbnext->next;
- }
- }
- while (swapped);
+ bp = barray;
+ for (pb = pending_blocks; pb != NULL; pb = pb->next)
+ *bp++ = pb->block;
+
+ qsort (barray, count, sizeof (*barray), block_compar);
+
+ bp = barray;
+ for (pb = pending_blocks; pb != NULL; pb = pb->next)
+ pb->block = *bp++;
+
+ do_cleanups (back_to);
}
/* Cleanup any undefined types that have been left hanging around
(this needs to be done before the finish_blocks so that
file_symbols is still good).
- Both cleanup_undefined_types and finish_global_stabs are stabs
+ Both cleanup_undefined_stabs_types and finish_global_stabs are stabs
specific, but harmless for other symbol readers, since on gdb
startup or when finished reading stabs, the state is set so these
are no-ops. FIXME: Is this handled right in case of QUIT? Can
we make this cleaner? */
- cleanup_undefined_types ();
+ cleanup_undefined_stabs_types (objfile);
finish_global_stabs (objfile);
- if (pending_blocks == NULL
+ if (!required
+ && pending_blocks == NULL
&& file_symbols == NULL
&& global_symbols == NULL
&& have_line_numbers == 0
- && pending_macros == NULL)
+ && pending_macros == NULL
+ && global_using_directives == NULL)
{
- /* Ignore symtabs that have no functions with real debugging
- info. */
- blockvector = NULL;
+ /* Ignore symtabs that have no functions with real debugging info. */
+ return NULL;
}
else
{
- /* 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);
- blockvector = make_blockvector (objfile);
- cp_finalize_namespace (BLOCKVECTOR_BLOCK (blockvector, STATIC_BLOCK),
- &objfile->objfile_obstack);
+ /* Define the STATIC_BLOCK. */
+ return finish_block_internal (NULL, &file_symbols, NULL, NULL,
+ last_source_start_addr, end_addr,
+ 0, expandable);
}
+}
-#ifndef PROCESS_LINENUMBER_HOOK
-#define PROCESS_LINENUMBER_HOOK()
-#endif
- PROCESS_LINENUMBER_HOOK (); /* Needed for xcoff. */
+/* Subroutine of end_symtab_from_static_block to simplify it.
+ Handle the "have blockvector" case.
+ See end_symtab_from_static_block for a description of the arguments. */
- /* Now create the symtab objects proper, one for each subfile. */
- /* (The main file is the last one on the chain.) */
+static struct compunit_symtab *
+end_symtab_with_blockvector (struct block *static_block,
+ int section, int expandable)
+{
+ struct objfile *objfile = buildsym_compunit->objfile;
+ struct compunit_symtab *cu = buildsym_compunit->compunit_symtab;
+ struct symtab *symtab;
+ struct blockvector *blockvector;
+ struct subfile *subfile;
+ CORE_ADDR end_addr;
- for (subfile = subfiles; subfile; subfile = nextsub)
- {
- int linetablesize = 0;
- symtab = NULL;
+ gdb_assert (static_block != NULL);
+ gdb_assert (buildsym_compunit != NULL);
+ gdb_assert (buildsym_compunit->subfiles != NULL);
- /* If we have blocks of symbols, make a symtab. Otherwise, just
- ignore this file and any line number info in it. */
- if (blockvector)
- {
- if (subfile->line_vector)
- {
- linetablesize = sizeof (struct linetable) +
- subfile->line_vector->nitems * sizeof (struct linetable_entry);
-#if 0
- /* I think this is artifact from before it went on the
- obstack. I doubt we'll need the memory between now
- and when we free it later in this function. */
- /* First, shrink the linetable to make more memory. */
- subfile->line_vector = (struct linetable *)
- xrealloc ((char *) subfile->line_vector, linetablesize);
-#endif
-
- /* Like the pending blocks, the line table may be
- scrambled in reordered executables. Sort it if
- OBJF_REORDERED is true. */
- if (objfile->flags & OBJF_REORDERED)
- qsort (subfile->line_vector->item,
- subfile->line_vector->nitems,
- sizeof (struct linetable_entry), compare_line_numbers);
- }
+ end_addr = BLOCK_END (static_block);
- /* Now, allocate a symbol table. */
- symtab = allocate_symtab (subfile->name, objfile);
+ /* Create the GLOBAL_BLOCK and build the blockvector. */
+ finish_block_internal (NULL, &global_symbols, NULL, NULL,
+ last_source_start_addr, end_addr,
+ 1, expandable);
+ blockvector = make_blockvector ();
- /* Fill in its components. */
- symtab->blockvector = blockvector;
- symtab->macro_table = pending_macros;
- if (subfile->line_vector)
- {
- /* 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);
- }
- else
- {
- symtab->linetable = NULL;
- }
- symtab->block_line_section = section;
- if (subfile->dirname)
- {
- /* Reallocate the dirname on the symbol obstack */
- symtab->dirname = (char *)
- obstack_alloc (&objfile->objfile_obstack,
- strlen (subfile->dirname) + 1);
- strcpy (symtab->dirname, subfile->dirname);
- }
- else
- {
- 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. */
- 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);
- }
+ /* Read the line table if it has to be read separately.
+ This is only used by xcoffread.c. */
+ if (objfile->sf->sym_read_linetable != NULL)
+ objfile->sf->sym_read_linetable (objfile);
- /* All symtabs for the main file and the subfiles share a
- blockvector, so we need to clear primary for everything
- but the main file. */
+ /* Handle the case where the debug info specifies a different path
+ for the main source file. It can cause us to lose track of its
+ line number information. */
+ watch_main_source_file_lossage ();
- symtab->primary = 0;
- }
- if (subfile->name != NULL)
+ /* Now create the symtab objects proper, if not already done,
+ one for each subfile. */
+
+ for (subfile = buildsym_compunit->subfiles;
+ subfile != NULL;
+ subfile = subfile->next)
+ {
+ int linetablesize = 0;
+
+ if (subfile->line_vector)
{
- xfree ((void *) subfile->name);
+ linetablesize = sizeof (struct linetable) +
+ subfile->line_vector->nitems * sizeof (struct linetable_entry);
+
+ /* Like the pending blocks, the line table may be
+ scrambled in reordered executables. Sort it if
+ OBJF_REORDERED is true. */
+ if (objfile->flags & OBJF_REORDERED)
+ qsort (subfile->line_vector->item,
+ subfile->line_vector->nitems,
+ sizeof (struct linetable_entry), compare_line_numbers);
}
- if (subfile->dirname != NULL)
+
+ /* Allocate a symbol table if necessary. */
+ if (subfile->symtab == NULL)
+ subfile->symtab = allocate_symtab (cu, subfile->name);
+ symtab = subfile->symtab;
+
+ /* Fill in its components. */
+
+ if (subfile->line_vector)
{
- xfree ((void *) subfile->dirname);
+ /* Reallocate the line table on the symbol obstack. */
+ SYMTAB_LINETABLE (symtab) = (struct linetable *)
+ obstack_alloc (&objfile->objfile_obstack, linetablesize);
+ memcpy (SYMTAB_LINETABLE (symtab), subfile->line_vector,
+ linetablesize);
}
- if (subfile->line_vector != NULL)
+ else
{
- xfree ((void *) subfile->line_vector);
+ SYMTAB_LINETABLE (symtab) = NULL;
}
- if (subfile->debugformat != 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. */
+ symtab->language = subfile->language;
+ }
+
+ /* Make sure the symtab of main_subfile is the first in its list. */
+ {
+ struct symtab *main_symtab, *prev_symtab;
+
+ main_symtab = buildsym_compunit->main_subfile->symtab;
+ prev_symtab = NULL;
+ ALL_COMPUNIT_FILETABS (cu, symtab)
+ {
+ if (symtab == main_symtab)
+ {
+ if (prev_symtab != NULL)
+ {
+ prev_symtab->next = main_symtab->next;
+ main_symtab->next = COMPUNIT_FILETABS (cu);
+ COMPUNIT_FILETABS (cu) = main_symtab;
+ }
+ break;
+ }
+ prev_symtab = symtab;
+ }
+ gdb_assert (main_symtab == COMPUNIT_FILETABS (cu));
+ }
+
+ /* Fill out the compunit symtab. */
+
+ if (buildsym_compunit->comp_dir != NULL)
+ {
+ /* Reallocate the dirname on the symbol obstack. */
+ COMPUNIT_DIRNAME (cu)
+ = (const char *) obstack_copy0 (&objfile->objfile_obstack,
+ buildsym_compunit->comp_dir,
+ strlen (buildsym_compunit->comp_dir));
+ }
+
+ /* Save the debug format string (if any) in the symtab. */
+ COMPUNIT_DEBUGFORMAT (cu) = buildsym_compunit->debugformat;
+
+ /* Similarly for the producer. */
+ COMPUNIT_PRODUCER (cu) = buildsym_compunit->producer;
+
+ COMPUNIT_BLOCKVECTOR (cu) = blockvector;
+ {
+ struct block *b = BLOCKVECTOR_BLOCK (blockvector, GLOBAL_BLOCK);
+
+ set_block_compunit_symtab (b, cu);
+ }
+
+ COMPUNIT_BLOCK_LINE_SECTION (cu) = section;
+
+ COMPUNIT_MACRO_TABLE (cu) = pending_macros;
+
+ /* Default any symbols without a specified symtab to the primary symtab. */
+ {
+ int block_i;
+
+ /* The main source file's symtab. */
+ symtab = COMPUNIT_FILETABS (cu);
+
+ for (block_i = 0; block_i < BLOCKVECTOR_NBLOCKS (blockvector); block_i++)
+ {
+ struct block *block = BLOCKVECTOR_BLOCK (blockvector, block_i);
+ struct symbol *sym;
+ struct dict_iterator 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_set_symtab (BLOCK_FUNCTION (block), symtab);
+
+ /* Note that we only want to fix up symbols from the local
+ blocks, not blocks coming from included symtabs. That is why
+ we use ALL_DICT_SYMBOLS here and not ALL_BLOCK_SYMBOLS. */
+ ALL_DICT_SYMBOLS (BLOCK_DICT (block), iter, sym)
+ if (symbol_symtab (sym) == NULL)
+ symbol_set_symtab (sym, symtab);
+ }
+ }
+
+ add_compunit_symtab_to_objfile (cu);
+
+ return cu;
+}
+
+/* Implementation of the second part of end_symtab. Pass STATIC_BLOCK
+ as value returned by end_symtab_get_static_block.
+
+ SECTION is the same as for end_symtab: the section number
+ (in objfile->section_offsets) of the blockvector and linetable.
+
+ If EXPANDABLE is non-zero the GLOBAL_BLOCK dictionary is made
+ expandable. */
+
+struct compunit_symtab *
+end_symtab_from_static_block (struct block *static_block,
+ int section, int expandable)
+{
+ struct compunit_symtab *cu;
+
+ if (static_block == NULL)
+ {
+ /* Handle the "no blockvector" case.
+ When this happens there is nothing to record, so there's nothing
+ to do: memory will be freed up later.
+
+ Note: We won't be adding a compunit to the objfile's list of
+ compunits, so there's nothing to unchain. However, since each symtab
+ is added to the objfile's obstack we can't free that space.
+ We could do better, but this is believed to be a sufficiently rare
+ event. */
+ cu = NULL;
+ }
+ else
+ cu = end_symtab_with_blockvector (static_block, section, expandable);
+
+ reset_symtab_globals ();
+
+ return cu;
+}
+
+/* Finish the symbol definitions for one main source file, close off
+ all the lexical contexts for that file (creating struct block's for
+ them), then make the struct symtab for that file and put it in the
+ list of all such.
+
+ END_ADDR is the address of the end of the file's text. SECTION is
+ the section number (in objfile->section_offsets) of the blockvector
+ and linetable.
+
+ Note that it is possible for end_symtab() to return NULL. In
+ particular, for the DWARF case at least, it will return NULL when
+ it finds a compilation unit that has exactly one DIE, a
+ 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).
+
+ If you need to modify STATIC_BLOCK before it is finalized you should
+ call end_symtab_get_static_block and end_symtab_from_static_block
+ yourself. */
+
+struct compunit_symtab *
+end_symtab (CORE_ADDR end_addr, int section)
+{
+ struct block *static_block;
+
+ static_block = end_symtab_get_static_block (end_addr, 0, 0);
+ return end_symtab_from_static_block (static_block, section, 0);
+}
+
+/* Same as end_symtab except create a symtab that can be later added to. */
+
+struct compunit_symtab *
+end_expandable_symtab (CORE_ADDR end_addr, int section)
+{
+ struct block *static_block;
+
+ static_block = end_symtab_get_static_block (end_addr, 1, 0);
+ return end_symtab_from_static_block (static_block, section, 1);
+}
+
+/* Subroutine of augment_type_symtab to simplify it.
+ Attach the main source file's symtab to all symbols in PENDING_LIST that
+ don't have one. */
+
+static void
+set_missing_symtab (struct pending *pending_list,
+ struct compunit_symtab *cu)
+{
+ struct pending *pending;
+ int i;
+
+ for (pending = pending_list; pending != NULL; pending = pending->next)
+ {
+ for (i = 0; i < pending->nsyms; ++i)
{
- xfree ((void *) subfile->debugformat);
+ if (symbol_symtab (pending->symbol[i]) == NULL)
+ symbol_set_symtab (pending->symbol[i], COMPUNIT_FILETABS (cu));
}
-
- nextsub = subfile->next;
- xfree ((void *) subfile);
}
+}
+
+/* Same as end_symtab, but for the case where we're adding more symbols
+ to an existing symtab that is known to contain only type information.
+ This is the case for DWARF4 Type Units. */
- /* Set this for the main source file. */
- if (symtab)
+void
+augment_type_symtab (void)
+{
+ struct compunit_symtab *cust = buildsym_compunit->compunit_symtab;
+ const struct blockvector *blockvector = COMPUNIT_BLOCKVECTOR (cust);
+
+ if (context_stack_depth > 0)
{
- symtab->primary = 1;
+ complaint (&symfile_complaints,
+ _("Context stack not empty in augment_type_symtab"));
+ context_stack_depth = 0;
}
+ if (pending_blocks != NULL)
+ complaint (&symfile_complaints, _("Blocks in a type symtab"));
+ if (pending_macros != NULL)
+ complaint (&symfile_complaints, _("Macro in a type symtab"));
+ if (have_line_numbers)
+ complaint (&symfile_complaints,
+ _("Line numbers recorded in a type symtab"));
+
+ if (file_symbols != NULL)
+ {
+ struct block *block = BLOCKVECTOR_BLOCK (blockvector, STATIC_BLOCK);
- last_source_file = NULL;
- current_subfile = NULL;
- pending_macros = NULL;
+ /* First mark any symbols without a specified symtab as belonging
+ to the primary symtab. */
+ set_missing_symtab (file_symbols, cust);
+
+ dict_add_pending (BLOCK_DICT (block), file_symbols);
+ }
+
+ if (global_symbols != NULL)
+ {
+ struct block *block = BLOCKVECTOR_BLOCK (blockvector, GLOBAL_BLOCK);
- return symtab;
+ /* First mark any symbols without a specified symtab as belonging
+ to the primary symtab. */
+ set_missing_symtab (global_symbols, cust);
+
+ dict_add_pending (BLOCK_DICT (block), global_symbols);
+ }
+
+ reset_symtab_globals ();
}
/* Push a context block. Args are an identifying nesting level
struct context_stack *
push_context (int desc, CORE_ADDR valu)
{
- struct context_stack *new;
+ struct context_stack *newobj;
if (context_stack_depth == context_stack_size)
{
(context_stack_size * sizeof (struct context_stack)));
}
- new = &context_stack[context_stack_depth++];
- new->depth = desc;
- new->locals = local_symbols;
- new->params = param_symbols;
- new->old_blocks = pending_blocks;
- new->start_addr = valu;
- new->name = NULL;
+ newobj = &context_stack[context_stack_depth++];
+ newobj->depth = desc;
+ newobj->locals = local_symbols;
+ newobj->old_blocks = pending_blocks;
+ newobj->start_addr = valu;
+ newobj->local_using_directives = local_using_directives;
+ newobj->name = NULL;
local_symbols = NULL;
- param_symbols = NULL;
+ local_using_directives = NULL;
- return new;
+ return newobj;
}
/* 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 = savestring (format, strlen (format));
+ buildsym_compunit->debugformat = format;
+}
+
+void
+record_producer (const char *producer)
+{
+ buildsym_compunit->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)
free_pendings = (*srclist);
}
\f
+
+/* Name of source file whose symbol data we are now processing. This
+ comes from a symbol of type N_SO for stabs. For Dwarf it comes
+ from the DW_AT_name attribute of a DW_TAG_compile_unit DIE. */
+
+static char *last_source_file;
+
+/* See buildsym.h. */
+
+void
+set_last_source_file (const char *name)
+{
+ xfree (last_source_file);
+ last_source_file = name == NULL ? NULL : xstrdup (name);
+}
+
+/* See buildsym.h. */
+
+const char *
+get_last_source_file (void)
+{
+ return last_source_file;
+}
+
+\f
+
/* Initialize anything that needs initializing when starting to read a
fresh piece of a symbol file, e.g. reading in the stuff
corresponding to a psymtab. */
void
buildsym_init (void)
{
- free_pendings = NULL;
- file_symbols = NULL;
- global_symbols = NULL;
- pending_blocks = NULL;
- pending_macros = NULL;
+ subfile_stack = NULL;
+
+ pending_addrmap_interesting = 0;
+
+ /* Context stack is initially empty. Allocate first one with room
+ for a few levels; reuse it forever afterward. */
+ if (context_stack == NULL)
+ {
+ context_stack_size = INITIAL_CONTEXT_STACK_SIZE;
+ context_stack = XNEWVEC (struct context_stack, context_stack_size);
+ }
+
+ /* Ensure the really_free_pendings cleanup was called after
+ the last time. */
+ gdb_assert (free_pendings == NULL);
+ gdb_assert (pending_blocks == NULL);
+ gdb_assert (file_symbols == NULL);
+ gdb_assert (global_symbols == NULL);
+ gdb_assert (global_using_directives == NULL);
+ gdb_assert (pending_macros == NULL);
+ gdb_assert (pending_addrmap == NULL);
+ gdb_assert (buildsym_compunit == NULL);
}
/* Initialize anything that needs initializing when a completely new
projects / deliverable / binutils-gdb.git / blobdiff