/* Support routines for building symbol tables in GDB's internal format.
- Copyright (C) 1986-2004, 2007-2012 Free Software Foundation, Inc.
+ Copyright (C) 1986-2014 Free Software Foundation, Inc.
This file is part of GDB.
#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 "bcache.h"
#include "filenames.h" /* For DOSish file names. */
static struct subfile *subfiles;
+/* The "main" subfile.
+ In C this is the ".c" file (and similarly for other languages).
+ This becomes the "primary" symtab of the compilation unit. */
+
+static struct subfile *main_subfile;
+
/* List of free `struct pending' structures for reuse. */
static struct pending *free_pendings;
the end, then we just toss the addrmap. */
static int pending_addrmap_interesting;
-\f
+/* 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. All the symtabs for the CU will point to this. */
+static struct macro_table *pending_macros;
+
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
needed, and realloc'd down to the size actually used, when
void
free_pending_blocks (void)
{
- /* The links are made in the objfile_obstack, so we only need to
- reset PENDING_BLOCKS. */
- pending_blocks = NULL;
+ if (pending_blocks != NULL)
+ {
+ obstack_free (&pending_block_obstack, NULL);
+ pending_blocks = NULL;
+ }
}
/* Take one of the lists of symbols and make a block from it. Keep
struct pending_block *old_blocks,
CORE_ADDR start, CORE_ADDR end,
struct objfile *objfile,
- int is_global)
+ int is_global, int expandable)
{
struct gdbarch *gdbarch = get_objfile_arch (objfile);
struct pending *next, *next1;
}
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;
struct objfile *objfile)
{
return finish_block_internal (symbol, listhead, old_blocks,
- start, end, objfile, 0);
+ start, end, objfile, 0, 0);
}
/* Record BLOCK on the list of all blocks in the file. Put it after
{
struct pending_block *pblock;
+ if (pending_blocks == NULL)
+ obstack_init (&pending_block_obstack);
+
pblock = (struct pending_block *)
- obstack_alloc (&objfile->objfile_obstack, sizeof (struct pending_block));
+ obstack_alloc (&pending_block_obstack, sizeof (struct pending_block));
pblock->block = block;
if (opblock)
{
= addrmap_create_fixed (pending_addrmap, &objfile->objfile_obstack);
else
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
- order and moan about it. */
+ 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++)
current_subfile = subfile;
/* Save its name and compilation directory name. */
- subfile->name = (name == NULL) ? NULL : xstrdup (name);
+ subfile->name = xstrdup (name);
subfile->dirname = (dirname == NULL) ? NULL : xstrdup (dirname);
/* Initialize line-number recording for this subfile. */
}
}
+/* Delete the subfiles list. */
+
+static void
+free_subfiles_list (void)
+{
+ struct subfile *subfile, *nextsub;
+
+ for (subfile = subfiles; subfile != NULL; subfile = nextsub)
+ {
+ nextsub = subfile->next;
+ xfree (subfile->name);
+ xfree (subfile->dirname);
+ xfree (subfile->line_vector);
+ xfree (subfile);
+ }
+ subfiles = NULL;
+ current_subfile = NULL;
+ main_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
{
subfile->dirname = subfile->name;
subfile->name = xstrdup (name);
- last_source_file = 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++
return ln1->line - ln2->line;
}
\f
+/* Return the macro table.
+ Initialize it if this is the first use. */
+
+struct macro_table *
+get_macro_table (struct objfile *objfile, const char *comp_dir)
+{
+ if (! pending_macros)
+ pending_macros = new_macro_table (&objfile->per_bfd->storage_obstack,
+ objfile->per_bfd->macro_cache,
+ comp_dir);
+ return pending_macros;
+}
+\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
lowest address of objects in the file (or 0 if not known). */
void
-start_symtab (char *name, char *dirname, CORE_ADDR start_addr)
+start_symtab (const char *name, const char *dirname, CORE_ADDR start_addr)
+{
+ restart_symtab (start_addr);
+ set_last_source_file (name);
+ start_subfile (name, dirname);
+ /* Save this so that we don't have to go looking for it at the end
+ of the subfiles list. */
+ main_subfile = current_subfile;
+}
+
+/* Restart compilation for a symtab.
+ This is used when a symtab is built from multiple sources.
+ The symtab is first built with start_symtab and then for each additional
+ piece call restart_symtab. */
+
+void
+restart_symtab (CORE_ADDR start_addr)
{
- last_source_file = name;
+ set_last_source_file (NULL);
last_source_start_addr = start_addr;
file_symbols = NULL;
global_symbols = NULL;
/* We shouldn't have any address map at this point. */
gdb_assert (! pending_addrmap);
- /* Initialize the list of sub source files with one entry for this
- file (the top-level source file). */
-
- subfiles = NULL;
- current_subfile = NULL;
- start_subfile (name, dirname);
+ /* Reset the sub source files list. The list should already be empty,
+ but free it anyway in case some code didn't finish cleaning up after
+ an error. */
+ free_subfiles_list ();
}
/* Subroutine of end_symtab to simplify it. Look for a subfile that
static void
watch_main_source_file_lossage (void)
{
- struct subfile *mainsub, *subfile;
+ struct subfile *subfile;
- /* Find the main source file.
- This loop could be eliminated if start_symtab saved it for us. */
- mainsub = NULL;
- for (subfile = subfiles; subfile; subfile = subfile->next)
- {
- /* The main subfile is guaranteed to be the last one. */
- if (subfile->next == NULL)
- mainsub = 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 (main_subfile == NULL)
+ return;
/* If the main source file doesn't have any line number or symbol
- info, look for an alias in another subfile.
+ 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
- && mainsub->symtab == NULL)
+ if (main_subfile->line_vector == NULL
+ && main_subfile->symtab == NULL)
{
- const char *mainbase = lbasename (mainsub->name);
+ const char *mainbase = lbasename (main_subfile->name);
int nr_matches = 0;
struct subfile *prevsub;
struct subfile *mainsub_alias = NULL;
if (nr_matches == 1)
{
- gdb_assert (mainsub_alias != NULL && mainsub_alias != mainsub);
+ gdb_assert (mainsub_alias != NULL && mainsub_alias != main_subfile);
/* 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;
+ main_subfile->line_vector = mainsub_alias->line_vector;
+ main_subfile->line_vector_length = mainsub_alias->line_vector_length;
+ main_subfile->symtab = mainsub_alias->symtab;
if (prev_mainsub_alias == NULL)
subfiles = mainsub_alias->next;
- (BLOCK_START (b) < BLOCK_START (a)));
}
-/* 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.
+/* Reset globals used to build symtabs. */
- 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.
+static void
+reset_symtab_globals (void)
+{
+ set_last_source_file (NULL);
+ free_subfiles_list ();
+ pending_macros = NULL;
+ if (pending_addrmap)
+ {
+ obstack_free (&pending_addrmap_obstack, NULL);
+ pending_addrmap = NULL;
+ }
+}
- 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). */
+/* 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).
-struct symtab *
-end_symtab (CORE_ADDR end_addr, struct objfile *objfile, int section)
-{
- struct symtab *symtab = NULL;
- struct blockvector *blockvector;
- struct subfile *subfile;
- struct context_stack *cstk;
- struct subfile *nextsub;
+ END_ADDR is the same as for end_symtab: the address of the end of the
+ file's text.
+
+ 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 block *
+end_symtab_get_static_block (CORE_ADDR end_addr, struct objfile *objfile,
+ int expandable, int required)
+{
/* 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);
/* 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)
{
unsigned count = 0;
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)
{
- /* 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_internal (0, &global_symbols, 0, last_source_start_addr,
- end_addr, objfile, 1);
- blockvector = make_blockvector (objfile);
+ /* Define the STATIC_BLOCK. */
+ return finish_block_internal (NULL, &file_symbols, NULL,
+ last_source_start_addr, end_addr, objfile,
+ 0, expandable);
+ }
+}
+
+/* Subroutine of end_symtab_from_static_block to simplify it.
+ Handle the "no blockvector" case.
+ When this happens there is nothing to record, so just free up
+ any memory we allocated while reading debug info. */
+
+static void
+end_symtab_without_blockvector (struct objfile *objfile)
+{
+ struct subfile *subfile;
+
+ /* Since we are ignoring these subfiles, we also need
+ to unlink the associated empty symtab that we created.
+ Otherwise, we can run into trouble because various parts
+ such as the block-vector are uninitialized whereas
+ the rest of the code assumes that they are.
+
+ We can only unlink the symtab. We can't free it because
+ it was allocated on the objfile obstack. */
+
+ for (subfile = subfiles; subfile != NULL; subfile = subfile->next)
+ {
+ if (subfile->symtab)
+ {
+ struct symtab *s;
+
+ if (objfile->symtabs == subfile->symtab)
+ objfile->symtabs = objfile->symtabs->next;
+ else
+ ALL_OBJFILE_SYMTABS (objfile, s)
+ if (s->next == subfile->symtab)
+ {
+ s->next = s->next->next;
+ break;
+ }
+ subfile->symtab = NULL;
+ }
}
+}
+
+/* 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. */
+
+static struct symtab *
+end_symtab_with_blockvector (struct block *static_block,
+ struct objfile *objfile, int section,
+ int expandable)
+{
+ struct symtab *symtab;
+ struct blockvector *blockvector;
+ struct subfile *subfile;
+ CORE_ADDR end_addr;
+
+ gdb_assert (static_block != NULL);
+ gdb_assert (subfiles != NULL);
+
+ end_addr = BLOCK_END (static_block);
+
+ /* Create the GLOBAL_BLOCK and build the blockvector. */
+ finish_block_internal (NULL, &global_symbols, NULL,
+ last_source_start_addr, end_addr, objfile,
+ 1, expandable);
+ blockvector = make_blockvector (objfile);
- /* Read the line table if it has to be read separately. */
+ /* 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->sf->sym_read_linetable (objfile);
/* 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
watch_main_source_file_lossage ();
/* Now create the symtab objects proper, one for each subfile. */
- /* (The main file is the last one on the chain.) */
- for (subfile = subfiles; subfile; subfile = nextsub)
+ for (subfile = subfiles; subfile != NULL; subfile = subfile->next)
{
int linetablesize = 0;
- symtab = 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)
{
- if (subfile->line_vector)
- {
- 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);
- }
-
- /* Now, allocate a symbol table. */
- if (subfile->symtab == NULL)
- symtab = allocate_symtab (subfile->name, objfile);
- else
- symtab = subfile->symtab;
-
- /* 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;
- }
-
- /* 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. */
- symtab->debugformat = subfile->debugformat;
-
- /* Similarly for the producer. */
- symtab->producer = subfile->producer;
+ 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);
+ }
- /* All symtabs for the main file and the subfiles share a
- blockvector, so we need to clear primary for everything
- but the main file. */
+ /* Allocate a symbol table if necessary. */
+ if (subfile->symtab == NULL)
+ subfile->symtab = allocate_symtab (subfile->name, objfile);
+ symtab = subfile->symtab;
- symtab->primary = 0;
+ /* 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
- {
- if (subfile->symtab)
- {
- /* Since we are ignoring that subfile, we also need
- to unlink the associated empty symtab that we created.
- Otherwise, we can run into trouble because various parts
- such as the block-vector are uninitialized whereas
- the rest of the code assumes that they are.
-
- We can only unlink the symtab because it was allocated
- on the objfile obstack. */
- struct symtab *s;
-
- if (objfile->symtabs == subfile->symtab)
- objfile->symtabs = objfile->symtabs->next;
- else
- ALL_OBJFILE_SYMTABS (objfile, s)
- if (s->next == subfile->symtab)
- {
- s->next = s->next->next;
- break;
- }
- subfile->symtab = NULL;
- }
- }
- if (subfile->name != NULL)
{
- xfree ((void *) subfile->name);
+ symtab->linetable = NULL;
}
- if (subfile->dirname != NULL)
+ symtab->block_line_section = section;
+ if (subfile->dirname)
{
- xfree ((void *) subfile->dirname);
+ /* Reallocate the dirname on the symbol obstack. */
+ symtab->dirname =
+ obstack_copy0 (&objfile->objfile_obstack,
+ subfile->dirname,
+ strlen (subfile->dirname));
}
- if (subfile->line_vector != NULL)
+ else
{
- xfree ((void *) subfile->line_vector);
+ symtab->dirname = NULL;
}
- nextsub = subfile->next;
- xfree ((void *) subfile);
+ /* 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. */
+ symtab->debugformat = subfile->debugformat;
+
+ /* Similarly for the producer. */
+ symtab->producer = subfile->producer;
+
+ /* All symtabs for the main file and the subfiles share a
+ blockvector, so we need to clear primary for everything
+ but the main file. */
+ set_symtab_primary (symtab, 0);
}
- /* Set this for the main source file. */
- if (symtab)
+ /* The main source file is the primary symtab. */
+ gdb_assert (main_subfile->symtab != NULL);
+ symtab = main_subfile->symtab;
+ set_symtab_primary (symtab, 1);
+ {
+ struct block *b = BLOCKVECTOR_BLOCK (symtab->blockvector, GLOBAL_BLOCK);
+
+ set_block_symtab (b, symtab);
+ }
+
+ /* Default any symbols without a specified symtab to the primary symtab. */
+ {
+ int block_i;
+
+ 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_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_SYMTAB (sym) = symtab;
+ }
+ }
+
+ return symtab;
+}
+
+/* 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 symtab *
+end_symtab_from_static_block (struct block *static_block,
+ struct objfile *objfile, int section,
+ int expandable)
+{
+ struct symtab *s;
+
+ if (static_block == NULL)
+ {
+ end_symtab_without_blockvector (objfile);
+ s = NULL;
+ }
+ else
{
- symtab->primary = 1;
+ s = end_symtab_with_blockvector (static_block, objfile, section,
+ expandable);
+ }
- if (symtab->blockvector)
- {
- struct block *b = BLOCKVECTOR_BLOCK (symtab->blockvector,
- GLOBAL_BLOCK);
+ reset_symtab_globals ();
+
+ return s;
+}
+
+/* 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 symtab *
+end_symtab (CORE_ADDR end_addr, struct objfile *objfile, int section)
+{
+ struct block *static_block;
+
+ static_block = end_symtab_get_static_block (end_addr, objfile, 0, 0);
+ return end_symtab_from_static_block (static_block, objfile, section, 0);
+}
+
+/* Same as end_symtab except create a symtab that can be later added to. */
+
+struct symtab *
+end_expandable_symtab (CORE_ADDR end_addr, struct objfile *objfile,
+ int section)
+{
+ struct block *static_block;
+
+ static_block = end_symtab_get_static_block (end_addr, objfile, 1, 0);
+ return end_symtab_from_static_block (static_block, objfile, section, 1);
+}
+
+/* Subroutine of augment_type_symtab to simplify it.
+ Attach SYMTAB to all symbols in PENDING_LIST that don't have one. */
- set_block_symtab (b, symtab);
+static void
+set_missing_symtab (struct pending *pending_list, struct symtab *symtab)
+{
+ struct pending *pending;
+ int i;
+
+ for (pending = pending_list; pending != NULL; pending = pending->next)
+ {
+ for (i = 0; i < pending->nsyms; ++i)
+ {
+ if (SYMBOL_SYMTAB (pending->symbol[i]) == NULL)
+ SYMBOL_SYMTAB (pending->symbol[i]) = symtab;
}
}
+}
- /* Default any symbols without a specified symtab to the primary
- symtab. */
- if (blockvector)
- {
- int block_i;
+/* 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. */
- 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;
+void
+augment_type_symtab (struct objfile *objfile, struct symtab *primary_symtab)
+{
+ const struct blockvector *blockvector = primary_symtab->blockvector;
- /* 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;
+ if (context_stack_depth > 0)
+ {
+ 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);
- /* 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_SYMTAB (sym) = symtab;
- }
+ /* First mark any symbols without a specified symtab as belonging
+ to the primary symtab. */
+ set_missing_symtab (file_symbols, primary_symtab);
+
+ dict_add_pending (BLOCK_DICT (block), file_symbols);
}
- last_source_file = NULL;
- current_subfile = NULL;
- pending_macros = NULL;
- if (pending_addrmap)
+ if (global_symbols != NULL)
{
- obstack_free (&pending_addrmap_obstack, NULL);
- pending_addrmap = NULL;
+ struct block *block = BLOCKVECTOR_BLOCK (blockvector, GLOBAL_BLOCK);
+
+ /* First mark any symbols without a specified symtab as belonging
+ to the primary symtab. */
+ set_missing_symtab (global_symbols, primary_symtab);
+
+ dict_add_pending (BLOCK_DICT (block), global_symbols);
}
- return symtab;
+ reset_symtab_globals ();
}
/* Push a context block. Args are an identifying nesting level
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->using_directives = using_directives;
new->name = NULL;
local_symbols = NULL;
- param_symbols = NULL;
using_directives = NULL;
return new;
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. */
global_symbols = NULL;
pending_blocks = NULL;
pending_macros = NULL;
+ using_directives = NULL;
+ subfile_stack = NULL;
/* We shouldn't have any address map at this point. */
gdb_assert (! pending_addrmap);