OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify calls to init_psymbol_list 

Existing callers to init_psymbol_list were checking to see if psymbols
had already been initialized.  It seemed better to me to do this check
directly in init_psymbol_list, simplifying the callers.

gdb/ChangeLog
2019-01-10  Tom Tromey  <tom@tromey.com>

	* xcoffread.c (xcoff_initial_scan): Unconditionally call
	init_psymbol_list.
	* psymtab.c (init_psymbol_list): Do nothing if already called.
	* psympriv.h (init_psymbol_list): Add comment.
	* dwarf2read.c (dwarf2_build_psymtabs): Unconditionally call
	init_psymbol_list.
	* dbxread.c (dbx_symfile_read): Unconditionally call
	init_psymbol_list.
This commit is contained in:
Tom Tromey 2018-05-10 16:23:47 -06:00
parent 75aedd27e6
commit 6eee24ce30
6 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gdb/ChangeLog
View File

@ -1,3 +1,14 @@
2019-01-10 Tom Tromey <tom@tromey.com>
* xcoffread.c (xcoff_initial_scan): Unconditionally call
init_psymbol_list.
* psymtab.c (init_psymbol_list): Do nothing if already called.
* psympriv.h (init_psymbol_list): Add comment.
* dwarf2read.c (dwarf2_build_psymtabs): Unconditionally call
init_psymbol_list.
* dbxread.c (dbx_symfile_read): Unconditionally call
init_psymbol_list.
2019-01-10 Tom Tromey <tom@tromey.com>
* xcoffread.c (scan_xcoff_symtab): Update.

4
gdb/dbxread.c
View File

@ -536,9 +536,7 @@ dbx_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
perror_with_name (objfile_name (objfile));
/* Size the symbol table. */
if (objfile->global_psymbols.capacity () == 0
&& objfile->static_psymbols.capacity () == 0)
init_psymbol_list (objfile, DBX_SYMCOUNT (objfile));
init_psymbol_list (objfile, DBX_SYMCOUNT (objfile));
symbol_size = DBX_SYMBOL_SIZE (objfile);
symbol_table_offset = DBX_SYMTAB_OFFSET (objfile);

4
gdb/dwarf2read.c
View File

@ -6299,9 +6299,7 @@ dwarf2_build_psymtabs (struct objfile *objfile)
struct dwarf2_per_objfile *dwarf2_per_objfile
= get_dwarf2_per_objfile (objfile);
if (objfile->global_psymbols.capacity () == 0
&& objfile->static_psymbols.capacity () == 0)
init_psymbol_list (objfile, 1024);
init_psymbol_list (objfile, 1024);
TRY
{

6
gdb/psympriv.h
View File

@ -290,7 +290,11 @@ extern void add_psymbol_to_list (const char *, int,
CORE_ADDR,
enum language, struct objfile *);
extern void init_psymbol_list (struct objfile *, int);
/* Initialize storage for partial symbols. If partial symbol storage
has already been initialized, this does nothing. TOTAL_SYMBOLS is
an estimate of how many symbols there will be. */
extern void init_psymbol_list (struct objfile *objfile, int total_symbols);
extern struct partial_symtab *start_psymtab_common (struct objfile *,
const char *, CORE_ADDR);

21
gdb/psymtab.c
View File

@ -1662,20 +1662,21 @@ add_psymbol_to_list (const char *name, int namelength, int copy_name,
append_psymbol_to_list (list, psym, objfile);
}
/* Initialize storage for partial symbols. */
/* See psympriv.h. */
void
init_psymbol_list (struct objfile *objfile, int total_symbols)
{
/* Free any previously allocated psymbol lists. */
objfile->global_psymbols.clear ();
objfile->static_psymbols.clear ();
/* Current best guess is that approximately a twentieth
of the total symbols (in a debugging file) are global or static
oriented symbols, then multiply that by slop factor of two. */
objfile->global_psymbols.reserve (total_symbols / 10);
objfile->static_psymbols.reserve (total_symbols / 10);
if (objfile->global_psymbols.capacity () == 0
&& objfile->static_psymbols.capacity () == 0)
{
/* Current best guess is that approximately a twentieth of the
total symbols (in a debugging file) are global or static
oriented symbols, then multiply that by slop factor of
two. */
objfile->global_psymbols.reserve (total_symbols / 10);
objfile->static_psymbols.reserve (total_symbols / 10);
}
}
/* See psympriv.h. */

13
gdb/xcoffread.c
View File

@ -2991,14 +2991,11 @@ xcoff_initial_scan (struct objfile *objfile, symfile_add_flags symfile_flags)
if (val != size)
perror_with_name (_("reading symbol table"));
/* If we are reinitializing, or if we have never loaded syms yet, init. */
if (objfile->global_psymbols.capacity () == 0
&& objfile->static_psymbols.capacity () == 0)
/* I'm not sure how how good num_symbols is; the rule of thumb in
init_psymbol_list was developed for a.out. On the one hand,
num_symbols includes auxents. On the other hand, it doesn't
include N_SLINE. */
init_psymbol_list (objfile, num_symbols);
/* I'm not sure how how good num_symbols is; the rule of thumb in
init_psymbol_list was developed for a.out. On the one hand,
num_symbols includes auxents. On the other hand, it doesn't
include N_SLINE. */
init_psymbol_list (objfile, num_symbols);
scoped_free_pendings free_pending;
minimal_symbol_reader reader (objfile);