binutils-gdb/gdb/psympriv.h
Simon Marchi af5bf4ada4 Replace psymbol_allocation_list with std::vector
psymbol_allocation_list is basically a vector implementation.  We can
replace it with an std::vector, now that objfile has been C++-ified.

I sent this to the buildbot, there are a few suspicious failures, but
I don't think they are related to this patch.  For example on powerpc:

new FAIL: gdb.base/catch-syscall.exp: execve: syscall execve has returned
new FAIL: gdb.base/catch-syscall.exp: execve: continue to main
new FAIL: gdb.base/catch-syscall.exp: execve: continue until exit

I get the same failures when testing manually on gcc112, without this
patch.

gdb/ChangeLog:

	* objfiles.h: Don't include symfile.h.
	(struct partial_symbol): Remove forward-declaration.
	(struct objfile) <global_psymbols, static_psymbols>: Change type
	to std::vector<partial_symbol *>.
	* objfiles.c (objfile::objfile): Don't memset those fields.
	(objfile::~objfile): Don't free those fields.
	* psympriv.h (struct psymbol_allocation_list): Remove
	forward-declaration.
	(add_psymbol_to_list): Change psymbol_allocation_list parameter
	to std::vector.
	(start_psymtab_common): Change parameters to std::vector.
	* psymtab.c: Include algorithm.
	(require_partial_symbols): Call shrink_to_fit.
	(find_pc_sect_psymbol): Adjust to vector change.
	(match_partial_symbol): Likewise.
	(lookup_partial_symbol): Likewise.
	(psym_relocate): Likewise.
	(dump_psymtab): Likewise.
	(recursively_search_psymtabs): Likewise.
	(compare_psymbols): Remove.
	(sort_pst_symbols): Adjust to vector change.
	(start_psymtab_common): Likewise.
	(end_psymtab_common): Likewise.
	(psymbol_bcache_full): De-constify return value.
	(add_psymbol_to_bcache): Likewise.
	(extend_psymbol_list): Remove.
	(append_psymbol_to_list): Adjust to vector change.
	(add_psymbol_to_list): Likewise.
	(init_psymbol_list): Likewise.
	(maintenance_info_psymtabs): Likewise.
	(maintenance_check_psymtabs): Likewise.
	* symfile.h (struct psymbol_allocation_list): Remove.
	* symfile.c (reread_symbols): Adjust to vector change.
	* dbxread.c (start_psymtab): Change type of parameters.
	(dbx_symfile_read): Adjust to vector change.
	(read_dbx_symtab): Likewise.
	(start_psymtab): Change type of parameters.
	* dwarf2read.c (dwarf2_build_psymtabs): Adjust to vector change.
	(create_partial_symtab): Likewise.
	(add_partial_symbol): Likewise.
	(write_one_signatured_type): Likewise.
	(recursively_write_psymbols): Likewise.
	* mdebugread.c (parse_partial_symbols): Likewise.
	* xcoffread.c (xcoff_start_psymtab): Change type of parameters.
	(scan_xcoff_symtab): Adjust to vector change.
	(xcoff_initial_scan): Likewise.
2017-10-14 08:07:46 -04:00

268 lines
8.8 KiB
C++

/* Private partial symbol table definitions.
Copyright (C) 2009-2017 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 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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, see <http://www.gnu.org/licenses/>. */
#ifndef PSYMPRIV_H
#define PSYMPRIV_H
#include "psymtab.h"
#include "objfiles.h"
/* A partial_symbol records the name, domain, and address class of
symbols whose types we have not parsed yet. For functions, it also
contains their memory address, so we can find them from a PC value.
Each partial_symbol sits in a partial_symtab, all of which are chained
on a partial symtab list and which points to the corresponding
normal symtab once the partial_symtab has been referenced. */
/* This structure is space critical. See space comments at the top of
symtab.h. */
struct partial_symbol
{
/* The general symbol info required for all types of symbols. */
struct general_symbol_info ginfo;
/* Name space code. */
ENUM_BITFIELD(domain_enum_tag) domain : SYMBOL_DOMAIN_BITS;
/* Address class (for info_symbols). Note that we don't allow
synthetic "aclass" values here at present, simply because there's
no need. */
ENUM_BITFIELD(address_class) aclass : SYMBOL_ACLASS_BITS;
};
#define PSYMBOL_DOMAIN(psymbol) (psymbol)->domain
#define PSYMBOL_CLASS(psymbol) (psymbol)->aclass
/* A convenience enum to give names to some constants used when
searching psymtabs. This is internal to psymtab and should not be
used elsewhere. */
enum psymtab_search_status
{
PST_NOT_SEARCHED,
PST_SEARCHED_AND_FOUND,
PST_SEARCHED_AND_NOT_FOUND
};
/* Each source file that has not been fully read in is represented by
a partial_symtab. This contains the information on where in the
executable the debugging symbols for a specific file are, and a
list of names of global symbols which are located in this file.
They are all chained on partial symtab lists.
Even after the source file has been read into a symtab, the
partial_symtab remains around. They are allocated on an obstack,
objfile_obstack. */
struct partial_symtab
{
/* Chain of all existing partial symtabs. */
struct partial_symtab *next;
/* Name of the source file which this partial_symtab defines,
or if the psymtab is anonymous then a descriptive name for
debugging purposes, or "". It must not be NULL. */
const char *filename;
/* Full path of the source file. NULL if not known. */
char *fullname;
/* Directory in which it was compiled, or NULL if we don't know. */
const char *dirname;
/* Range of text addresses covered by this file; texthigh is the
beginning of the next section. Do not use if PSYMTABS_ADDRMAP_SUPPORTED
is set. */
CORE_ADDR textlow;
CORE_ADDR texthigh;
/* If NULL, this is an ordinary partial symbol table.
If non-NULL, this holds a single includer of this partial symbol
table, and this partial symbol table is a shared one.
A shared psymtab is one that is referenced by multiple other
psymtabs, and which conceptually has its contents directly
included in those.
Shared psymtabs have special semantics. When a search finds a
symbol in a shared table, we instead return one of the non-shared
tables that include this one.
A shared psymtabs can be referred to by other shared ones.
The psymtabs that refer to a shared psymtab will list the shared
psymtab in their 'dependencies' array.
In DWARF terms, a shared psymtab is a DW_TAG_partial_unit; but
of course using a name based on that would be too confusing, so
"shared" was chosen instead.
Only a single user is needed because, when expanding a shared
psymtab, we only need to expand its "canonical" non-shared user.
The choice of which one should be canonical is left to the
debuginfo reader; it can be arbitrary. */
struct partial_symtab *user;
/* Array of pointers to all of the partial_symtab's which this one
depends on. Since this array can only be set to previous or
the current (?) psymtab, this dependency tree is guaranteed not
to have any loops. "depends on" means that symbols must be read
for the dependencies before being read for this psymtab; this is
for type references in stabs, where if foo.c includes foo.h, declarations
in foo.h may use type numbers defined in foo.c. For other debugging
formats there may be no need to use dependencies. */
struct partial_symtab **dependencies;
int number_of_dependencies;
/* Global symbol list. This list will be sorted after readin to
improve access. Binary search will be the usual method of
finding a symbol within it. globals_offset is an integer offset
within global_psymbols[]. */
int globals_offset;
int n_global_syms;
/* Static symbol list. This list will *not* be sorted after readin;
to find a symbol in it, exhaustive search must be used. This is
reasonable because searches through this list will eventually
lead to either the read in of a files symbols for real (assumed
to take a *lot* of time; check) or an error (and we don't care
how long errors take). This is an offset and size within
static_psymbols[]. */
int statics_offset;
int n_static_syms;
/* Non-zero if the symtab corresponding to this psymtab has been
readin. This is located here so that this structure packs better
on 64-bit systems. */
unsigned char readin;
/* True iff objfile->psymtabs_addrmap is properly populated for this
partial_symtab. For discontiguous overlapping psymtabs is the only usable
info in PSYMTABS_ADDRMAP. */
unsigned char psymtabs_addrmap_supported;
/* True if the name of this partial symtab is not a source file name. */
unsigned char anonymous;
/* A flag that is temporarily used when searching psymtabs. */
ENUM_BITFIELD (psymtab_search_status) searched_flag : 2;
/* Pointer to compunit eventually allocated for this source file, 0 if
!readin or if we haven't looked for the symtab after it was readin. */
struct compunit_symtab *compunit_symtab;
/* Pointer to function which will read in the symtab corresponding to
this psymtab. */
void (*read_symtab) (struct partial_symtab *, struct objfile *);
/* Information that lets read_symtab() locate the part of the symbol table
that this psymtab corresponds to. This information is private to the
format-dependent symbol reading routines. For further detail examine
the various symbol reading modules. */
void *read_symtab_private;
};
/* Add any kind of symbol to a partial_symbol vector. */
extern void add_psymbol_to_list (const char *, int,
int, domain_enum,
enum address_class,
std::vector<partial_symbol *> *,
CORE_ADDR,
enum language, struct objfile *);
extern void init_psymbol_list (struct objfile *, int);
extern struct partial_symtab *start_psymtab_common (struct objfile *,
const char *, CORE_ADDR,
std::vector<partial_symbol *> &,
std::vector<partial_symbol *> &);
extern void end_psymtab_common (struct objfile *, struct partial_symtab *);
extern struct partial_symtab *allocate_psymtab (const char *,
struct objfile *)
ATTRIBUTE_NONNULL (1);
extern void discard_psymtab (struct objfile *, struct partial_symtab *);
/* Used when recording partial symbol tables. On destruction,
discards any partial symbol tables that have been built. However,
the tables can be kept by calling the "keep" method. */
class psymtab_discarder
{
public:
psymtab_discarder (struct objfile *objfile)
: m_objfile (objfile),
m_psymtab (objfile->psymtabs)
{
}
~psymtab_discarder ()
{
if (m_objfile != NULL)
while (m_objfile->psymtabs != m_psymtab)
discard_psymtab (m_objfile, m_objfile->psymtabs);
}
/* Keep any partial symbol tables that were built. */
void keep ()
{
m_objfile = NULL;
}
private:
/* The objfile. If NULL this serves as a sentinel to indicate that
the psymtabs should be kept. */
struct objfile *m_objfile;
/* How far back to free. */
struct partial_symtab *m_psymtab;
};
/* Traverse all psymtabs in one objfile. */
#define ALL_OBJFILE_PSYMTABS(objfile, p) \
for ((p) = (objfile) -> psymtabs; (p) != NULL; (p) = (p) -> next)
#endif /* PSYMPRIV_H */