X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fbuildsym.c;h=79f8305763443afc827399ee4c095e98799f3caa;hb=8aaaf7577f070c91086533d959ac36a15d1d604f;hp=8fc7b75c96959f11c5ba555eeee98a85f5688a01;hpb=dccbb60975cdbcd6a906a79d0c4308b040fdac1b;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index 8fc7b75c96..79f8305763 100644
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -1,5 +1,5 @@
/* Support routines for building symbol tables in GDB's internal format.
- Copyright (C) 1986-2014 Free Software Foundation, Inc.
+ Copyright (C) 1986-2019 Free Software Foundation, Inc.
This file is part of GDB.
@@ -16,14 +16,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
-/* 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. */
-
#include "defs.h"
+#include "buildsym-legacy.h"
#include "bfd.h"
#include "gdb_obstack.h"
#include "symtab.h"
@@ -31,9 +25,7 @@
#include "objfiles.h"
#include "gdbtypes.h"
#include "complaints.h"
-#include
#include "expression.h" /* For "enum exp_opcode" used by... */
-#include "bcache.h"
#include "filenames.h" /* For DOSish file names. */
#include "macrotab.h"
#include "demangle.h" /* Needed by SYMBOL_INIT_DEMANGLED_NAME. */
@@ -41,51 +33,13 @@
#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. */
-#undef EXTERN
+#include
/* For cleanup_undefined_stabs_types and finish_global_stabs (somewhat
questionable--see comment where we call them). */
#include "stabsread.h"
-/* List of subfiles. */
-
-static struct subfile *subfiles;
-
-/* List of free `struct pending' structures for reuse. */
-
-static struct pending *free_pendings;
-
-/* Non-zero if symtab has line number info. This prevents an
- otherwise empty symtab from being tossed. */
-
-static int have_line_numbers;
-
-/* 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. */
@@ -95,38 +49,81 @@ struct pending_block
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. */
+/* Initial sizes of data structures. These are realloc'd larger if
+ needed, and realloc'd down to the size actually used, when
+ completed. */
-static struct pending_block *pending_blocks;
+#define INITIAL_LINE_VECTOR_LENGTH 1000
+
-struct subfile_stack
- {
- struct subfile_stack *next;
- char *name;
- };
+buildsym_compunit::buildsym_compunit (struct objfile *objfile_,
+ const char *name,
+ const char *comp_dir_,
+ enum language language_,
+ CORE_ADDR last_addr)
+ : m_objfile (objfile_),
+ m_last_source_file (name == nullptr ? nullptr : xstrdup (name)),
+ m_comp_dir (comp_dir_ == nullptr ? nullptr : xstrdup (comp_dir_)),
+ m_language (language_),
+ m_last_source_start_addr (last_addr)
+{
+ /* Allocate the compunit symtab now. The caller needs it to allocate
+ non-primary symtabs. It is also needed by get_macro_table. */
+ m_compunit_symtab = allocate_compunit_symtab (m_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. */
+ m_main_subfile = m_current_subfile;
+}
-static struct subfile_stack *subfile_stack;
+buildsym_compunit::~buildsym_compunit ()
+{
+ struct subfile *subfile, *nextsub;
-/* 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;
+ if (m_pending_macros != nullptr)
+ free_macro_table (m_pending_macros);
-static int compare_line_numbers (const void *ln1p, const void *ln2p);
+ for (subfile = m_subfiles;
+ subfile != NULL;
+ subfile = nextsub)
+ {
+ nextsub = subfile->next;
+ xfree (subfile->name);
+ xfree (subfile->line_vector);
+ xfree (subfile);
+ }
-static void record_pending_block (struct objfile *objfile,
- struct block *block,
- struct pending_block *opblock);
+ struct pending *next, *next1;
-/* Initial sizes of data structures. These are realloc'd larger if
- needed, and realloc'd down to the size actually used, when
- completed. */
+ for (next = m_file_symbols; next != NULL; next = next1)
+ {
+ next1 = next->next;
+ xfree ((void *) next);
+ }
-#define INITIAL_CONTEXT_STACK_SIZE 10
-#define INITIAL_LINE_VECTOR_LENGTH 1000
-
+ for (next = m_global_symbols; next != NULL; next = next1)
+ {
+ next1 = next->next;
+ xfree ((void *) next);
+ }
+}
+
+struct macro_table *
+buildsym_compunit::get_macro_table ()
+{
+ if (m_pending_macros == nullptr)
+ m_pending_macros = new_macro_table (&m_objfile->per_bfd->storage_obstack,
+ &m_objfile->per_bfd->macro_cache,
+ m_compunit_symtab);
+ return m_pending_macros;
+}
/* Maintain the lists of symbols and blocks. */
@@ -138,23 +135,14 @@ add_symbol_to_list (struct symbol *symbol, struct pending **listhead)
struct pending *link;
/* If this is an alias for another symbol, don't add it. */
- if (symbol->ginfo.name && symbol->ginfo.name[0] == '#')
+ if (symbol->name && symbol->name[0] == '#')
return;
/* 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)
{
- if (free_pendings)
- {
- link = free_pendings;
- free_pendings = link->next;
- }
- else
- {
- link = (struct pending *) xmalloc (sizeof (struct pending));
- }
-
+ link = XNEW (struct pending);
link->next = *listhead;
*listhead = link;
link->nsyms = 0;
@@ -176,7 +164,7 @@ find_symbol_in_list (struct pending *list, char *name, int length)
{
for (j = list->nsyms; --j >= 0;)
{
- pp = SYMBOL_LINKAGE_NAME (list->symbol[j]);
+ pp = list->symbol[j]->linkage_name ();
if (*pp == *name && strncmp (pp, name, length) == 0
&& pp[length] == '\0')
{
@@ -188,56 +176,27 @@ find_symbol_in_list (struct pending *list, char *name, int length)
return (NULL);
}
-/* At end of reading syms, or in case of quit, really free as many
- `struct pending's as we can easily find. */
+/* 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
+ block in the list after all its subblocks. */
void
-really_free_pendings (void *dummy)
+buildsym_compunit::record_pending_block (struct block *block,
+ struct pending_block *opblock)
{
- struct pending *next, *next1;
-
- for (next = free_pendings; next; next = next1)
- {
- next1 = next->next;
- xfree ((void *) next);
- }
- free_pendings = NULL;
-
- free_pending_blocks ();
-
- for (next = file_symbols; next != NULL; next = next1)
- {
- next1 = next->next;
- xfree ((void *) next);
- }
- file_symbols = NULL;
-
- for (next = global_symbols; next != NULL; next = next1)
- {
- next1 = next->next;
- xfree ((void *) next);
- }
- global_symbols = NULL;
-
- if (pending_macros)
- free_macro_table (pending_macros);
+ struct pending_block *pblock;
- if (pending_addrmap)
+ pblock = XOBNEW (&m_pending_block_obstack, struct pending_block);
+ pblock->block = block;
+ if (opblock)
{
- obstack_free (&pending_addrmap_obstack, NULL);
- pending_addrmap = NULL;
+ pblock->next = opblock->next;
+ opblock->next = pblock;
}
-}
-
-/* This function is called to discard any pending blocks. */
-
-void
-free_pending_blocks (void)
-{
- if (pending_blocks != NULL)
+ else
{
- obstack_free (&pending_block_obstack, NULL);
- pending_blocks = NULL;
+ pblock->next = m_pending_blocks;
+ m_pending_blocks = pblock;
}
}
@@ -245,39 +204,41 @@ 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. */
-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, int expandable)
+struct block *
+buildsym_compunit::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 gdbarch *gdbarch = get_objfile_arch (objfile);
+ struct gdbarch *gdbarch = get_objfile_arch (m_objfile);
struct pending *next, *next1;
struct block *block;
struct pending_block *pblock;
struct pending_block *opblock;
block = (is_global
- ? allocate_global_block (&objfile->objfile_obstack)
- : allocate_block (&objfile->objfile_obstack));
+ ? allocate_global_block (&m_objfile->objfile_obstack)
+ : allocate_block (&m_objfile->objfile_obstack));
if (symbol)
{
- BLOCK_DICT (block) = dict_create_linear (&objfile->objfile_obstack,
- *listhead);
+ BLOCK_MULTIDICT (block)
+ = mdict_create_linear (&m_objfile->objfile_obstack, *listhead);
}
else
{
if (expandable)
{
- BLOCK_DICT (block) = dict_create_hashed_expandable ();
- dict_add_pending (BLOCK_DICT (block), *listhead);
+ BLOCK_MULTIDICT (block) = mdict_create_hashed_expandable (m_language);
+ mdict_add_pending (BLOCK_MULTIDICT (block), *listhead);
}
else
{
- BLOCK_DICT (block) =
- dict_create_hashed (&objfile->objfile_obstack, *listhead);
+ BLOCK_MULTIDICT (block) =
+ mdict_create_hashed (&m_objfile->objfile_obstack, *listhead);
}
}
@@ -289,7 +250,7 @@ finish_block_internal (struct symbol *symbol, struct pending **listhead,
if (symbol)
{
struct type *ftype = SYMBOL_TYPE (symbol);
- struct dict_iterator iter;
+ struct mdict_iterator miter;
SYMBOL_BLOCK_VALUE (symbol) = block;
BLOCK_FUNCTION (block) = symbol;
@@ -303,7 +264,7 @@ finish_block_internal (struct symbol *symbol, struct pending **listhead,
/* 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)
+ ALL_DICT_SYMBOLS (BLOCK_MULTIDICT (block), miter, sym)
{
if (SYMBOL_IS_ARGUMENT (sym))
nparams++;
@@ -317,7 +278,7 @@ finish_block_internal (struct symbol *symbol, struct pending **listhead,
iparams = 0;
/* 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)
+ ALL_DICT_SYMBOLS (BLOCK_MULTIDICT (block), miter, sym)
{
if (iparams == nparams)
break;
@@ -337,13 +298,15 @@ finish_block_internal (struct symbol *symbol, struct pending **listhead,
BLOCK_FUNCTION (block) = NULL;
}
- /* Now "free" the links of the list, and empty the list. */
+ if (static_link != NULL)
+ objfile_register_static_link (m_objfile, block, static_link);
+
+ /* Now free the links of the list, and empty the list. */
for (next = *listhead; next; next = next1)
{
next1 = next->next;
- next->next = free_pendings;
- free_pendings = next;
+ xfree (next);
}
*listhead = NULL;
@@ -354,15 +317,13 @@ finish_block_internal (struct symbol *symbol, struct pending **listhead,
{
if (symbol)
{
- complaint (&symfile_complaints,
- _("block end address less than block "
+ complaint (_("block end address less than block "
"start address in %s (patched it)"),
- SYMBOL_PRINT_NAME (symbol));
+ symbol->print_name ());
}
else
{
- complaint (&symfile_complaints,
- _("block end address %s less than block "
+ complaint (_("block end address %s less than block "
"start address %s (patched it)"),
paddress (gdbarch, BLOCK_END (block)),
paddress (gdbarch, BLOCK_START (block)));
@@ -375,7 +336,7 @@ finish_block_internal (struct symbol *symbol, struct pending **listhead,
start of this scope that don't have superblocks yet. */
opblock = NULL;
- for (pblock = pending_blocks;
+ for (pblock = m_pending_blocks;
pblock && pblock != old_blocks;
pblock = pblock->next)
{
@@ -394,14 +355,12 @@ finish_block_internal (struct symbol *symbol, struct pending **listhead,
{
if (symbol)
{
- complaint (&symfile_complaints,
- _("inner block not inside outer block in %s"),
- SYMBOL_PRINT_NAME (symbol));
+ complaint (_("inner block not inside outer block in %s"),
+ symbol->print_name ());
}
else
{
- complaint (&symfile_complaints,
- _("inner block (%s-%s) not "
+ complaint (_("inner block (%s-%s) not "
"inside outer block (%s-%s)"),
paddress (gdbarch, BLOCK_START (pblock->block)),
paddress (gdbarch, BLOCK_END (pblock->block)),
@@ -418,56 +377,31 @@ finish_block_internal (struct symbol *symbol, struct pending **listhead,
opblock = pblock;
}
- block_set_using (block, using_directives, &objfile->objfile_obstack);
- using_directives = NULL;
+ block_set_using (block,
+ (is_global
+ ? m_global_using_directives
+ : m_local_using_directives),
+ &m_objfile->objfile_obstack);
+ if (is_global)
+ m_global_using_directives = NULL;
+ else
+ m_local_using_directives = NULL;
- record_pending_block (objfile, block, opblock);
+ record_pending_block (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)
+buildsym_compunit::finish_block (struct symbol *symbol,
+ 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,
- start, end, objfile, 0, 0);
+ return finish_block_internal (symbol, &m_local_symbols,
+ 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
- block in the list after all its subblocks.
-
- Allocate the pending block struct in the objfile_obstack to save
- time. This wastes a little space. FIXME: Is it worth it? */
-
-static void
-record_pending_block (struct objfile *objfile, struct block *block,
- struct pending_block *opblock)
-{
- struct pending_block *pblock;
-
- if (pending_blocks == NULL)
- obstack_init (&pending_block_obstack);
-
- pblock = (struct pending_block *)
- obstack_alloc (&pending_block_obstack, sizeof (struct pending_block));
- pblock->block = block;
- if (opblock)
- {
- pblock->next = opblock->next;
- opblock->next = pblock;
- }
- else
- {
- pblock->next = pending_blocks;
- pending_blocks = pblock;
- }
-}
-
-
/* 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
@@ -477,8 +411,9 @@ record_pending_block (struct objfile *objfile, struct block *block,
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)
+buildsym_compunit::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
@@ -487,20 +422,16 @@ record_block_range (struct block *block,
need to record this block in the addrmap. */
if (start != BLOCK_START (block)
|| end_inclusive + 1 != BLOCK_END (block))
- pending_addrmap_interesting = 1;
+ m_pending_addrmap_interesting = true;
- if (! pending_addrmap)
- {
- obstack_init (&pending_addrmap_obstack);
- pending_addrmap = addrmap_create_mutable (&pending_addrmap_obstack);
- }
+ if (m_pending_addrmap == nullptr)
+ m_pending_addrmap = addrmap_create_mutable (&m_pending_addrmap_obstack);
- addrmap_set_empty (pending_addrmap, start, end_inclusive, block);
+ addrmap_set_empty (m_pending_addrmap, start, end_inclusive, block);
}
-
-static struct blockvector *
-make_blockvector (struct objfile *objfile)
+struct blockvector *
+buildsym_compunit::make_blockvector ()
{
struct pending_block *next;
struct blockvector *blockvector;
@@ -508,12 +439,12 @@ make_blockvector (struct objfile *objfile)
/* Count the length of the list of blocks. */
- for (next = pending_blocks, i = 0; next; next = next->next, i++)
- {;
+ for (next = m_pending_blocks, i = 0; next; next = next->next, i++)
+ {
}
blockvector = (struct blockvector *)
- obstack_alloc (&objfile->objfile_obstack,
+ obstack_alloc (&m_objfile->objfile_obstack,
(sizeof (struct blockvector)
+ (i - 1) * sizeof (struct block *)));
@@ -524,7 +455,7 @@ make_blockvector (struct objfile *objfile)
sure this is true. */
BLOCKVECTOR_NBLOCKS (blockvector) = i;
- for (next = pending_blocks; next; next = next->next)
+ for (next = m_pending_blocks; next; next = next->next)
{
BLOCKVECTOR_BLOCK (blockvector, --i) = next->block;
}
@@ -533,9 +464,9 @@ make_blockvector (struct objfile *objfile)
/* If we needed an address map for this symtab, record it in the
blockvector. */
- if (pending_addrmap && pending_addrmap_interesting)
+ if (m_pending_addrmap != nullptr && m_pending_addrmap_interesting)
BLOCKVECTOR_MAP (blockvector)
- = addrmap_create_fixed (pending_addrmap, &objfile->objfile_obstack);
+ = addrmap_create_fixed (m_pending_addrmap, &m_objfile->objfile_obstack);
else
BLOCKVECTOR_MAP (blockvector) = 0;
@@ -555,7 +486,7 @@ make_blockvector (struct objfile *objfile)
CORE_ADDR start
= BLOCK_START (BLOCKVECTOR_BLOCK (blockvector, i));
- complaint (&symfile_complaints, _("block at %s out of order"),
+ complaint (_("block at %s out of order"),
hex_string ((LONGEST) start));
}
}
@@ -566,19 +497,19 @@ make_blockvector (struct objfile *objfile)
/* 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). */
+ name. NAME is the name of the file (cannot be NULL). */
void
-start_subfile (const char *name, const char *dirname)
+buildsym_compunit::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. */
+ subfile_dirname = m_comp_dir.get ();
- for (subfile = subfiles; subfile; subfile = subfile->next)
+ /* See if this subfile is already registered. */
+
+ for (subfile = m_subfiles; subfile; subfile = subfile->next)
{
char *subfile_name;
@@ -586,15 +517,15 @@ start_subfile (const char *name, const char *dirname)
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_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;
+ m_current_subfile = subfile;
if (subfile_name != subfile->name)
xfree (subfile_name);
return;
@@ -603,19 +534,18 @@ start_subfile (const char *name, const char *dirname)
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 = this;
- subfile = (struct subfile *) xmalloc (sizeof (struct subfile));
- memset ((char *) subfile, 0, sizeof (struct subfile));
- subfile->next = subfiles;
- subfiles = subfile;
- current_subfile = subfile;
+ subfile->next = m_subfiles;
+ m_subfiles = subfile;
+
+ m_current_subfile = subfile;
- /* Save its name and compilation directory name. */
subfile->name = xstrdup (name);
- subfile->dirname = (dirname == NULL) ? NULL : xstrdup (dirname);
/* Initialize line-number recording for this subfile. */
subfile->line_vector = NULL;
@@ -638,13 +568,6 @@ start_subfile (const char *name, const char *dirname)
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;
-
- /* Similarly for the producer. */
- subfile->producer = 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. */
@@ -656,7 +579,7 @@ start_subfile (const char *name, const char *dirname)
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 = m_subfiles; s != NULL; s = s->next)
if (s->language == language_c)
s->language = sublang;
}
@@ -684,12 +607,15 @@ start_subfile (const char *name, const char *dirname)
directory name actually is (by checking for a trailing '/'). */
void
-patch_subfile_names (struct subfile *subfile, char *name)
+buildsym_compunit::patch_subfile_names (struct subfile *subfile,
+ const char *name)
{
- if (subfile != NULL && subfile->dirname == NULL && subfile->name != NULL
+ if (subfile != NULL
+ && m_comp_dir == NULL
+ && subfile->name != NULL
&& IS_DIR_SEPARATOR (subfile->name[strlen (subfile->name) - 1]))
{
- subfile->dirname = subfile->name;
+ m_comp_dir.reset (subfile->name);
subfile->name = xstrdup (name);
set_last_source_file (name);
@@ -719,43 +645,28 @@ patch_subfile_names (struct subfile *subfile, char *name)
order. */
void
-push_subfile (void)
+buildsym_compunit::push_subfile ()
{
- struct subfile_stack *tem
- = (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"));
- }
- tem->name = current_subfile->name;
+ gdb_assert (m_current_subfile != NULL);
+ gdb_assert (m_current_subfile->name != NULL);
+ m_subfile_stack.push_back (m_current_subfile->name);
}
-char *
-pop_subfile (void)
+const char *
+buildsym_compunit::pop_subfile ()
{
- char *name;
- struct subfile_stack *link = subfile_stack;
-
- if (link == NULL)
- {
- internal_error (__FILE__, __LINE__,
- _("failed internal consistency check"));
- }
- name = link->name;
- subfile_stack = link->next;
- xfree ((void *) link);
- return (name);
+ gdb_assert (!m_subfile_stack.empty ());
+ const char *name = m_subfile_stack.back ();
+ m_subfile_stack.pop_back ();
+ return name;
}
/* Add a linetable entry for line number LINE and address PC to the
line vector for SUBFILE. */
void
-record_line (struct subfile *subfile, int line, CORE_ADDR pc)
+buildsym_compunit::record_line (struct subfile *subfile, int line,
+ CORE_ADDR pc)
{
struct linetable_entry *e;
@@ -773,7 +684,7 @@ record_line (struct subfile *subfile, int line, CORE_ADDR pc)
xmalloc (sizeof (struct linetable)
+ subfile->line_vector_length * sizeof (struct linetable_entry));
subfile->line_vector->nitems = 0;
- have_line_numbers = 1;
+ m_have_line_numbers = true;
}
if (subfile->line_vector->nitems + 1 >= subfile->line_vector_length)
@@ -816,89 +727,22 @@ record_line (struct subfile *subfile, int line, CORE_ADDR pc)
/* Needed in order to sort line tables from IBM xcoff files. Sigh! */
-static int
-compare_line_numbers (const void *ln1p, const void *ln2p)
+static bool
+lte_is_less_than (const linetable_entry &ln1, const linetable_entry &ln2)
{
- struct linetable_entry *ln1 = (struct linetable_entry *) ln1p;
- struct linetable_entry *ln2 = (struct linetable_entry *) ln2p;
-
/* Note: this code does not assume that CORE_ADDRs can fit in ints.
Please keep it that way. */
- if (ln1->pc < ln2->pc)
- return -1;
+ if (ln1.pc < ln2.pc)
+ return true;
- if (ln1->pc > ln2->pc)
- return 1;
+ if (ln1.pc > ln2.pc)
+ return false;
/* If pc equal, sort by line. I'm not sure whether this is optimum
behavior (see comment at struct linetable in symtab.h). */
- return ln1->line - ln2->line;
+ return ln1.line < ln2.line;
}
-/* 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;
-}
-
-/* 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.
-
- 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). START_ADDR is the
- lowest address of objects in the file (or 0 if not known). */
-
-void
-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);
-}
-
-/* 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)
-{
- set_last_source_file (NULL);
- last_source_start_addr = start_addr;
- file_symbols = NULL;
- global_symbols = 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_size = INITIAL_CONTEXT_STACK_SIZE;
- context_stack = (struct context_stack *)
- xmalloc (context_stack_size * sizeof (struct context_stack));
- }
- context_stack_depth = 0;
-
- /* 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;
-}
-
/* 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
@@ -906,32 +750,21 @@ restart_symtab (CORE_ADDR start_addr)
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. */
+ 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)
+void
+buildsym_compunit::watch_main_source_file_lossage ()
{
struct subfile *mainsub, *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;
- }
+ /* Get the main source file. */
+ mainsub = m_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. */
+ info, look for an alias in another subfile. */
- if (mainsub
- && mainsub->line_vector == NULL
+ if (mainsub->line_vector == NULL
&& mainsub->symtab == NULL)
{
const char *mainbase = lbasename (mainsub->name);
@@ -941,11 +774,12 @@ watch_main_source_file_lossage (void)
struct subfile *prev_mainsub_alias = NULL;
prevsub = NULL;
- for (subfile = subfiles;
- /* Stop before we get to the last one. */
- subfile->next;
+ for (subfile = m_subfiles;
+ subfile != NULL;
subfile = subfile->next)
{
+ if (subfile == mainsub)
+ continue;
if (filename_cmp (lbasename (subfile->name), mainbase) == 0)
{
++nr_matches;
@@ -968,42 +802,15 @@ watch_main_source_file_lossage (void)
mainsub->symtab = mainsub_alias->symtab;
if (prev_mainsub_alias == NULL)
- subfiles = mainsub_alias->next;
+ m_subfiles = mainsub_alias->next;
else
prev_mainsub_alias->next = mainsub_alias->next;
+ xfree (mainsub_alias->name);
xfree (mainsub_alias);
}
}
}
-/* Helper function for qsort. Parameters are `struct block *' pointers,
- function sorts them in descending order by their BLOCK_START. */
-
-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;
-
- return ((BLOCK_START (b) > BLOCK_START (a))
- - (BLOCK_START (b) < BLOCK_START (a)));
-}
-
-/* Reset globals used to build symtabs. */
-
-static void
-reset_symtab_globals (void)
-{
- set_last_source_file (NULL);
- current_subfile = NULL;
- pending_macros = NULL;
- if (pending_addrmap)
- {
- obstack_free (&pending_addrmap_obstack, NULL);
- pending_addrmap = NULL;
- }
-}
-
/* 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
@@ -1019,60 +826,56 @@ reset_symtab_globals (void)
not contain any symbols. */
struct block *
-end_symtab_get_static_block (CORE_ADDR end_addr, struct objfile *objfile,
- int expandable, int required)
+buildsym_compunit::end_symtab_get_static_block (CORE_ADDR end_addr,
+ int expandable, int required)
{
/* Finish the lexical context of the last function in the file; pop
the context stack. */
- if (context_stack_depth > 0)
+ if (!m_context_stack.empty ())
{
- struct context_stack *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, cstk.old_blocks, NULL,
+ cstk.start_addr, end_addr);
- if (context_stack_depth > 0)
+ if (!m_context_stack.empty ())
{
/* This is said to happen with SCO. The old coffread.c
code simply emptied the context stack, so we do the
same. FIXME: Find out why it is happening. This is not
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_depth = 0;
+ complaint (_("Context stack not empty in end_symtab"));
+ m_context_stack.clear ();
}
}
/* 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)
+ if ((m_objfile->flags & OBJF_REORDERED) && m_pending_blocks)
{
- unsigned count = 0;
struct pending_block *pb;
- struct block **barray, **bp;
- struct cleanup *back_to;
- for (pb = pending_blocks; pb != NULL; pb = pb->next)
- count++;
+ std::vector barray;
- barray = xmalloc (sizeof (*barray) * count);
- back_to = make_cleanup (xfree, barray);
+ for (pb = m_pending_blocks; pb != NULL; pb = pb->next)
+ barray.push_back (pb->block);
- bp = barray;
- for (pb = pending_blocks; pb != NULL; pb = pb->next)
- *bp++ = pb->block;
+ /* Sort blocks by start address in descending order. Blocks with the
+ same start address must remain in the original order to preserve
+ inline function caller/callee relationships. */
+ std::stable_sort (barray.begin (), barray.end (),
+ [] (const block *a, const block *b)
+ {
+ return BLOCK_START (a) > BLOCK_START (b);
+ });
- 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);
+ int i = 0;
+ for (pb = m_pending_blocks; pb != NULL; pb = pb->next)
+ pb->block = barray[i++];
}
/* Cleanup any undefined types that have been left hanging around
@@ -1085,15 +888,16 @@ end_symtab_get_static_block (CORE_ADDR end_addr, struct objfile *objfile,
are no-ops. FIXME: Is this handled right in case of QUIT? Can
we make this cleaner? */
- cleanup_undefined_stabs_types (objfile);
- finish_global_stabs (objfile);
+ cleanup_undefined_stabs_types (m_objfile);
+ finish_global_stabs (m_objfile);
if (!required
- && pending_blocks == NULL
- && file_symbols == NULL
- && global_symbols == NULL
- && have_line_numbers == 0
- && pending_macros == NULL)
+ && m_pending_blocks == NULL
+ && m_file_symbols == NULL
+ && m_global_symbols == NULL
+ && !m_have_line_numbers
+ && m_pending_macros == NULL
+ && m_global_using_directives == NULL)
{
/* Ignore symtabs that have no functions with real debugging info. */
return NULL;
@@ -1101,224 +905,214 @@ end_symtab_get_static_block (CORE_ADDR end_addr, struct objfile *objfile,
else
{
/* Define the STATIC_BLOCK. */
- return finish_block_internal (NULL, &file_symbols, NULL,
- last_source_start_addr, end_addr, objfile,
- 0, expandable);
+ return finish_block_internal (NULL, get_file_symbols (), NULL, NULL,
+ m_last_source_start_addr,
+ end_addr, 0, expandable);
}
}
-/* 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. */
+/* 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. */
-struct symtab *
-end_symtab_from_static_block (struct block *static_block,
- struct objfile *objfile, int section,
- int expandable)
+struct compunit_symtab *
+buildsym_compunit::end_symtab_with_blockvector (struct block *static_block,
+ int section, int expandable)
{
- struct symtab *symtab = NULL;
+ struct compunit_symtab *cu = m_compunit_symtab;
struct blockvector *blockvector;
struct subfile *subfile;
- struct subfile *nextsub;
+ CORE_ADDR end_addr;
- if (static_block == NULL)
- {
- /* Ignore symtabs that have no functions with real debugging info. */
- blockvector = NULL;
- }
- else
- {
- CORE_ADDR end_addr = BLOCK_END (static_block);
-
- /* Define after STATIC_BLOCK also 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);
- }
+ gdb_assert (static_block != NULL);
+ gdb_assert (m_subfiles != NULL);
+
+ end_addr = BLOCK_END (static_block);
+
+ /* Create the GLOBAL_BLOCK and build the blockvector. */
+ finish_block_internal (NULL, get_global_symbols (), NULL, NULL,
+ m_last_source_start_addr, end_addr,
+ 1, expandable);
+ blockvector = make_blockvector ();
/* 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);
+ if (m_objfile->sf->sym_read_linetable != NULL)
+ m_objfile->sf->sym_read_linetable (m_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
line number information. */
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.) */
+ /* Now create the symtab objects proper, if not already done,
+ one for each subfile. */
- for (subfile = subfiles; subfile; subfile = nextsub)
+ for (subfile = m_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 =
- obstack_copy0 (&objfile->objfile_obstack,
- subfile->dirname,
- strlen (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;
+ 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 (m_objfile->flags & OBJF_REORDERED)
+ std::sort (subfile->line_vector->item,
+ subfile->line_vector->item
+ + subfile->line_vector->nitems,
+ lte_is_less_than);
+ }
- /* Save the debug format string (if any) in the symtab. */
- symtab->debugformat = subfile->debugformat;
+ /* Allocate a symbol table if necessary. */
+ if (subfile->symtab == NULL)
+ subfile->symtab = allocate_symtab (cu, subfile->name);
+ struct symtab *symtab = subfile->symtab;
- /* Similarly for the producer. */
- symtab->producer = subfile->producer;
+ /* Fill in its components. */
- /* 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);
- }
- 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)
+ if (subfile->line_vector)
{
- xfree ((void *) subfile->name);
+ /* Reallocate the line table on the symbol obstack. */
+ SYMTAB_LINETABLE (symtab) = (struct linetable *)
+ obstack_alloc (&m_objfile->objfile_obstack, linetablesize);
+ memcpy (SYMTAB_LINETABLE (symtab), subfile->line_vector,
+ linetablesize);
}
- if (subfile->dirname != NULL)
- {
- xfree ((void *) subfile->dirname);
- }
- if (subfile->line_vector != NULL)
+ else
{
- xfree ((void *) subfile->line_vector);
+ SYMTAB_LINETABLE (symtab) = 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;
}
- /* Set this for the main source file. */
- if (symtab)
+ /* Make sure the symtab of main_subfile is the first in its list. */
+ {
+ struct symtab *main_symtab, *prev_symtab;
+
+ main_symtab = m_main_subfile->symtab;
+ prev_symtab = NULL;
+ for (symtab *symtab : compunit_filetabs (cu))
+ {
+ 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 (m_comp_dir != NULL)
{
- set_symtab_primary (symtab, 1);
+ /* Reallocate the dirname on the symbol obstack. */
+ const char *comp_dir = m_comp_dir.get ();
+ COMPUNIT_DIRNAME (cu) = obstack_strdup (&m_objfile->objfile_obstack,
+ comp_dir);
+ }
- if (symtab->blockvector)
- {
- struct block *b = BLOCKVECTOR_BLOCK (symtab->blockvector,
- GLOBAL_BLOCK);
+ /* Save the debug format string (if any) in the symtab. */
+ COMPUNIT_DEBUGFORMAT (cu) = m_debugformat;
- set_block_symtab (b, symtab);
- }
- }
+ /* Similarly for the producer. */
+ COMPUNIT_PRODUCER (cu) = m_producer;
- /* Default any symbols without a specified symtab to the primary
- symtab. */
- if (blockvector)
- {
- int block_i;
+ COMPUNIT_BLOCKVECTOR (cu) = blockvector;
+ {
+ struct block *b = BLOCKVECTOR_BLOCK (blockvector, GLOBAL_BLOCK);
- 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;
- }
- }
+ set_block_compunit_symtab (b, cu);
+ }
- reset_symtab_globals ();
+ COMPUNIT_BLOCK_LINE_SECTION (cu) = section;
- return symtab;
+ COMPUNIT_MACRO_TABLE (cu) = release_macros ();
+
+ /* Default any symbols without a specified symtab to the primary symtab. */
+ {
+ int block_i;
+
+ /* The main source file's symtab. */
+ struct 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 mdict_iterator miter;
+
+ /* 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_MULTIDICT (block), miter, 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 *
+buildsym_compunit::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);
+
+ return cu;
}
/* Finish the symbol definitions for one main source file, close off
@@ -1342,32 +1136,33 @@ end_symtab_from_static_block (struct block *static_block,
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 compunit_symtab *
+buildsym_compunit::end_symtab (CORE_ADDR end_addr, 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);
+ 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 symtab *
-end_expandable_symtab (CORE_ADDR end_addr, struct objfile *objfile,
- int section)
+struct compunit_symtab *
+buildsym_compunit::end_expandable_symtab (CORE_ADDR end_addr, 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);
+ 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 SYMTAB to all symbols in PENDING_LIST that don't have one. */
+ 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 symtab *symtab)
+set_missing_symtab (struct pending *pending_list,
+ struct compunit_symtab *cu)
{
struct pending *pending;
int i;
@@ -1376,8 +1171,8 @@ set_missing_symtab (struct pending *pending_list, struct symtab *symtab)
{
for (i = 0; i < pending->nsyms; ++i)
{
- if (SYMBOL_SYMTAB (pending->symbol[i]) == NULL)
- SYMBOL_SYMTAB (pending->symbol[i]) = symtab;
+ if (symbol_symtab (pending->symbol[i]) == NULL)
+ symbol_set_symtab (pending->symbol[i], COMPUNIT_FILETABS (cu));
}
}
}
@@ -1387,47 +1182,42 @@ set_missing_symtab (struct pending *pending_list, struct symtab *symtab)
This is the case for DWARF4 Type Units. */
void
-augment_type_symtab (struct objfile *objfile, struct symtab *primary_symtab)
+buildsym_compunit::augment_type_symtab ()
{
- const struct blockvector *blockvector = primary_symtab->blockvector;
-
- 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 compunit_symtab *cust = m_compunit_symtab;
+ const struct blockvector *blockvector = COMPUNIT_BLOCKVECTOR (cust);
+
+ if (!m_context_stack.empty ())
+ complaint (_("Context stack not empty in augment_type_symtab"));
+ if (m_pending_blocks != NULL)
+ complaint (_("Blocks in a type symtab"));
+ if (m_pending_macros != NULL)
+ complaint (_("Macro in a type symtab"));
+ if (m_have_line_numbers)
+ complaint (_("Line numbers recorded in a type symtab"));
+
+ if (m_file_symbols != NULL)
{
struct block *block = BLOCKVECTOR_BLOCK (blockvector, STATIC_BLOCK);
/* First mark any symbols without a specified symtab as belonging
to the primary symtab. */
- set_missing_symtab (file_symbols, primary_symtab);
+ set_missing_symtab (m_file_symbols, cust);
- dict_add_pending (BLOCK_DICT (block), file_symbols);
+ mdict_add_pending (BLOCK_MULTIDICT (block), m_file_symbols);
}
- if (global_symbols != NULL)
+ if (m_global_symbols != 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);
+ set_missing_symtab (m_global_symbols, cust);
- dict_add_pending (BLOCK_DICT (block), global_symbols);
+ mdict_add_pending (BLOCK_MULTIDICT (block),
+ m_global_symbols);
}
-
- reset_symtab_globals ();
}
/* Push a context block. Args are an identifying nesting level
@@ -1435,145 +1225,32 @@ augment_type_symtab (struct objfile *objfile, struct symtab *primary_symtab)
context. */
struct context_stack *
-push_context (int desc, CORE_ADDR valu)
+buildsym_compunit::push_context (int desc, CORE_ADDR valu)
{
- struct context_stack *new;
+ m_context_stack.emplace_back ();
+ struct context_stack *newobj = &m_context_stack.back ();
- if (context_stack_depth == context_stack_size)
- {
- context_stack_size *= 2;
- context_stack = (struct context_stack *)
- xrealloc ((char *) context_stack,
- (context_stack_size * sizeof (struct context_stack)));
- }
-
- new = &context_stack[context_stack_depth++];
- new->depth = desc;
- new->locals = local_symbols;
- new->old_blocks = pending_blocks;
- new->start_addr = valu;
- new->using_directives = using_directives;
- new->name = NULL;
+ newobj->depth = desc;
+ newobj->locals = m_local_symbols;
+ newobj->old_blocks = m_pending_blocks;
+ newobj->start_addr = valu;
+ newobj->local_using_directives = m_local_using_directives;
+ newobj->name = NULL;
- local_symbols = NULL;
- using_directives = NULL;
+ m_local_symbols = NULL;
+ m_local_using_directives = NULL;
- return new;
+ return newobj;
}
/* Pop a context block. Returns the address of the context block just
popped. */
-struct context_stack *
-pop_context (void)
-{
- gdb_assert (context_stack_depth > 0);
- return (&context_stack[--context_stack_depth]);
-}
-
-
-
-/* Compute a small integer hash code for the given name. */
-
-int
-hashname (const char *name)
-{
- return (hash(name,strlen(name)) % HASHSIZE);
-}
-
-
-void
-record_debugformat (const char *format)
-{
- current_subfile->debugformat = format;
-}
-
-void
-record_producer (const char *producer)
-{
- current_subfile->producer = producer;
-}
-
-/* Merge the first symbol list SRCLIST into the second symbol list
- TARGETLIST by repeated calls to add_symbol_to_list(). This
- procedure "frees" each link of SRCLIST by adding it to the
- free_pendings list. Caller must set SRCLIST to a null list after
- calling this function.
-
- Void return. */
-
-void
-merge_symbol_lists (struct pending **srclist, struct pending **targetlist)
-{
- int i;
-
- if (!srclist || !*srclist)
- return;
-
- /* Merge in elements from current link. */
- for (i = 0; i < (*srclist)->nsyms; i++)
- add_symbol_to_list ((*srclist)->symbol[i], targetlist);
-
- /* Recurse on next. */
- merge_symbol_lists (&(*srclist)->next, targetlist);
-
- /* "Free" the current link. */
- (*srclist)->next = free_pendings;
- free_pendings = (*srclist);
-}
-
-
-/* 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;
-}
-
-
-
-/* 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;
- using_directives = NULL;
- subfile_stack = NULL;
-
- /* We shouldn't have any address map at this point. */
- gdb_assert (! pending_addrmap);
- pending_addrmap_interesting = 0;
-}
-
-/* Initialize anything that needs initializing when a completely new
- symbol file is specified (not just adding some symbols from another
- file, e.g. a shared library). */
-
-void
-buildsym_new_init (void)
+struct context_stack
+buildsym_compunit::pop_context ()
{
- buildsym_init ();
+ gdb_assert (!m_context_stack.empty ());
+ struct context_stack result = m_context_stack.back ();
+ m_context_stack.pop_back ();
+ return result;
}