mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-25 11:04:18 +08:00
43f3e411c4
Currently "symtabs" in gdb are stored as a single linked list of
struct symtab that contains both symbol symtabs (the blockvectors)
and file symtabs (the linetables).
This has led to confusion, bugs, and performance issues.
This patch is conceptually very simple: split struct symtab into
two pieces: one part containing things common across the entire
compilation unit, and one part containing things specific to each
source file.
Example.
For the case of a program built out of these files:
foo.c
foo1.h
foo2.h
bar.c
foo1.h
bar.h
Today we have a single list of struct symtabs:
objfile -> foo.c -> foo1.h -> foo2.h -> bar.c -> foo1.h -> bar.h -> NULL
where "->" means the "next" pointer in struct symtab.
With this patch, that turns into:
objfile -> foo.c(cu) -> bar.c(cu) -> NULL
| |
v v
foo.c bar.c
| |
v v
foo1.h foo1.h
| |
v v
foo2.h bar.h
| |
v v
NULL NULL
where "foo.c(cu)" and "bar.c(cu)" are struct compunit_symtab objects,
and the files foo.c, etc. are struct symtab objects.
So now, for example, when we want to iterate over all blockvectors
we can now just iterate over the compunit_symtab list.
Plus a lot of the data that was either unused or replicated for each
symtab in a compilation unit now lives in struct compunit_symtab.
E.g., the objfile pointer, the producer string, etc.
I thought of moving "language" out of struct symtab but there is
logic to try to compute the language based on previously seen files,
and I think that's best left as is for now.
With my standard monster benchmark with -readnow (which I can't actually
do, but based on my calculations), whereas today the list requires
77MB to store all the struct symtabs, it now only requires 37MB.
A modest space savings given the gigabytes needed for all the debug info,
etc. Still, it's nice. Plus, whereas today we create a copy of dirname
for each source file symtab in a compilation unit, we now only create one
for the compunit.
So this patch is basically just a data structure reorg,
I don't expect significant performance improvements from it.
Notes:
1) A followup patch can do a similar split for struct partial_symtab.
I have left that until after I get the changes I want in to
better utilize .gdb_index (it may affect how we do partial syms).
2) Another followup patch *could* rename struct symtab.
The term "symtab" is ambiguous and has been a source of confusion.
In this patch I'm leaving it alone, calling it the "historical" name
of "filetabs", which is what they are now: just the file-name + line-table.
gdb/ChangeLog:
Split struct symtab into two: struct symtab and compunit_symtab.
* amd64-tdep.c (amd64_skip_xmm_prologue): Fetch producer from compunit.
* block.c (blockvector_for_pc_sect): Change "struct symtab *" argument
to "struct compunit_symtab *". All callers updated.
(set_block_compunit_symtab): Renamed from set_block_symtab. Change
"struct symtab *" argument to "struct compunit_symtab *".
All callers updated.
(get_block_compunit_symtab): Renamed from get_block_symtab. Change
result to "struct compunit_symtab *". All callers updated.
(find_iterator_compunit_symtab): Renamed from find_iterator_symtab.
Change result to "struct compunit_symtab *". All callers updated.
* block.h (struct global_block) <compunit_symtab>: Renamed from symtab.
hange type to "struct compunit_symtab *". All uses updated.
(struct block_iterator) <d.compunit_symtab>: Renamed from "d.symtab".
Change type to "struct compunit_symtab *". All uses updated.
* buildsym.c (struct buildsym_compunit): New struct.
(subfiles, buildsym_compdir, buildsym_objfile, main_subfile): Delete.
(buildsym_compunit): New static global.
(finish_block_internal): Update to fetch objfile from
buildsym_compunit.
(make_blockvector): Delete objfile argument.
(start_subfile): Rewrite to use buildsym_compunit. Don't initialize
debugformat, producer.
(start_buildsym_compunit): New function.
(free_buildsym_compunit): Renamed from free_subfiles_list.
All callers updated.
(patch_subfile_names): Rewrite to use buildsym_compunit.
(get_compunit_symtab): New function.
(get_macro_table): Delete argument comp_dir. All callers updated.
(start_symtab): Change result to "struct compunit_symtab *".
All callers updated. Create the subfile of the main source file.
(watch_main_source_file_lossage): Rewrite to use buildsym_compunit.
(reset_symtab_globals): Update.
(end_symtab_get_static_block): Update to use buildsym_compunit.
(end_symtab_without_blockvector): Rewrite.
(end_symtab_with_blockvector): Change result to
"struct compunit_symtab *". All callers updated.
Update to use buildsym_compunit. Don't set symtab->dirname,
instead set it in the compunit.
Explicitly make sure main symtab is first in its list.
Set debugformat, producer, blockvector, block_line_section, and
macrotable in the compunit.
(end_symtab_from_static_block): Change result to
"struct compunit_symtab *". All callers updated.
(end_symtab, end_expandable_symtab): Ditto.
(set_missing_symtab): Change symtab argument to
"struct compunit_symtab *". All callers updated.
(augment_type_symtab): Ditto.
(record_debugformat): Update to use buildsym_compunit.
(record_producer): Update to use buildsym_compunit.
* buildsym.h (struct subfile) <dirname>: Delete.
<producer, debugformat>: Delete.
<buildsym_compunit>: New member.
(get_compunit_symtab): Declare.
* dwarf2read.c (struct type_unit_group) <compunit_symtab>: Renamed
from primary_symtab. Change type to "struct compunit_symtab *".
All uses updated.
(dwarf2_start_symtab): Change result to "struct compunit_symtab *".
All callers updated.
(dwarf_decode_macros): Delete comp_dir argument. All callers updated.
(struct dwarf2_per_cu_quick_data) <compunit_symtab>: Renamed from
symtab. Change type to "struct compunit_symtab *". All uses updated.
(dw2_instantiate_symtab): Change result to "struct compunit_symtab *".
All callers updated.
(dw2_find_last_source_symtab): Ditto.
(dw2_lookup_symbol): Ditto.
(recursively_find_pc_sect_compunit_symtab): Renamed from
recursively_find_pc_sect_symtab. Change result to
"struct compunit_symtab *". All callers updated.
(dw2_find_pc_sect_compunit_symtab): Renamed from
dw2_find_pc_sect_symtab. Change result to
"struct compunit_symtab *". All callers updated.
(get_compunit_symtab): Renamed from get_symtab. Change result to
"struct compunit_symtab *". All callers updated.
(recursively_compute_inclusions): Change type of immediate_parent
argument to "struct compunit_symtab *". All callers updated.
(compute_compunit_symtab_includes): Renamed from
compute_symtab_includes. All callers updated. Rewrite to compute
includes of compunit_symtabs and not symtabs.
(process_full_comp_unit): Update to work with struct compunit_symtab.
(process_full_type_unit): Ditto.
(dwarf_decode_lines_1): Delete argument comp_dir. All callers updated.
(dwarf_decode_lines): Remove special case handling of main subfile.
(macro_start_file): Delete argument comp_dir. All callers updated.
(dwarf_decode_macro_bytes): Ditto.
* guile/scm-block.c (bkscm_print_block_syms_progress_smob): Update to
use struct compunit_symtab.
* i386-tdep.c (i386_skip_prologue): Fetch producer from compunit.
* jit.c (finalize_symtab): Build compunit_symtab.
* jv-lang.c (get_java_class_symtab): Change result to
"struct compunit_symtab *". All callers updated.
* macroscope.c (sal_macro_scope): Fetch macro table from compunit.
* macrotab.c (struct macro_table) <compunit_symtab>: Renamed from
comp_dir. Change type to "struct compunit_symtab *".
All uses updated.
(new_macro_table): Change comp_dir argument to cust,
"struct compunit_symtab *". All callers updated.
* maint.c (struct cmd_stats) <nr_compunit_symtabs>: Renamed from
nr_primary_symtabs. All uses updated.
(count_symtabs_and_blocks): Update to handle compunits.
(report_command_stats): Update output, "primary symtabs" renamed to
"compunits".
* mdebugread.c (new_symtab): Change result to
"struct compunit_symtab *". All callers updated.
(parse_procedure): Change type of search_symtab argument to
"struct compunit_symtab *". All callers updated.
* objfiles.c (objfile_relocate1): Loop over blockvectors in a
separate loop.
* objfiles.h (struct objfile) <compunit_symtabs>: Renamed from
symtabs. Change type to "struct compunit_symtab *". All uses updated.
(ALL_OBJFILE_FILETABS): Renamed from ALL_OBJFILE_SYMTABS.
All uses updated.
(ALL_OBJFILE_COMPUNITS): Renamed from ALL_OBJFILE_PRIMARY_SYMTABS.
All uses updated.
(ALL_FILETABS): Renamed from ALL_SYMTABS. All uses updated.
(ALL_COMPUNITS): Renamed from ALL_PRIMARY_SYMTABS. All uses updated.
* psympriv.h (struct partial_symtab) <compunit_symtab>: Renamed from
symtab. Change type to "struct compunit_symtab *". All uses updated.
* psymtab.c (psymtab_to_symtab): Change result type to
"struct compunit_symtab *". All callers updated.
(find_pc_sect_compunit_symtab_from_partial): Renamed from
find_pc_sect_symtab_from_partial. Change result type to
"struct compunit_symtab *". All callers updated.
(lookup_symbol_aux_psymtabs): Change result type to
"struct compunit_symtab *". All callers updated.
(find_last_source_symtab_from_partial): Ditto.
* python/py-symtab.c (stpy_get_producer): Fetch producer from compunit.
* source.c (forget_cached_source_info_for_objfile): Fetch debugformat
and macro_table from compunit.
* symfile-debug.c (debug_qf_find_last_source_symtab): Change result
type to "struct compunit_symtab *". All callers updated.
(debug_qf_lookup_symbol): Ditto.
(debug_qf_find_pc_sect_compunit_symtab): Renamed from
debug_qf_find_pc_sect_symtab, change result type to
"struct compunit_symtab *". All callers updated.
* symfile.c (allocate_symtab): Delete objfile argument.
New argument cust.
(allocate_compunit_symtab): New function.
(add_compunit_symtab_to_objfile): New function.
* symfile.h (struct quick_symbol_functions) <lookup_symbol>:
Change result type to "struct compunit_symtab *". All uses updated.
<find_pc_sect_compunit_symtab>: Renamed from find_pc_sect_symtab.
Change result type to "struct compunit_symtab *". All uses updated.
* symmisc.c (print_objfile_statistics): Compute blockvector count in
separate loop.
(dump_symtab_1): Update test for primary source symtab.
(maintenance_info_symtabs): Update to handle compunit symtabs.
(maintenance_check_symtabs): Ditto.
* symtab.c (set_primary_symtab): Delete.
(compunit_primary_filetab): New function.
(compunit_language): New function.
(iterate_over_some_symtabs): Change type of arguments "first",
"after_last" to "struct compunit_symtab *". All callers updated.
Update to loop over symtabs in each compunit.
(error_in_psymtab_expansion): Rename symtab argument to cust,
and change type to "struct compunit_symtab *". All callers updated.
(find_pc_sect_compunit_symtab): Renamed from find_pc_sect_symtab.
Change result type to "struct compunit_symtab *". All callers updated.
(find_pc_compunit_symtab): Renamed from find_pc_symtab.
Change result type to "struct compunit_symtab *". All callers updated.
(find_pc_sect_line): Only loop over symtabs within selected compunit
instead of all symtabs in the objfile.
* symtab.h (struct symtab) <blockvector>: Moved to compunit_symtab.
<compunit_symtab> New member.
<block_line_section>: Moved to compunit_symtab.
<locations_valid>: Ditto.
<epilogue_unwind_valid>: Ditto.
<macro_table>: Ditto.
<dirname>: Ditto.
<debugformat>: Ditto.
<producer>: Ditto.
<objfile>: Ditto.
<call_site_htab>: Ditto.
<includes>: Ditto.
<user>: Ditto.
<primary>: Delete
(SYMTAB_COMPUNIT): New macro.
(SYMTAB_BLOCKVECTOR): Update definition.
(SYMTAB_OBJFILE): Update definition.
(SYMTAB_DIRNAME): Update definition.
(struct compunit_symtab): New type. Common members among all source
symtabs within a compilation unit moved here. All uses updated.
(COMPUNIT_OBJFILE): New macro.
(COMPUNIT_FILETABS): New macro.
(COMPUNIT_DEBUGFORMAT): New macro.
(COMPUNIT_PRODUCER): New macro.
(COMPUNIT_DIRNAME): New macro.
(COMPUNIT_BLOCKVECTOR): New macro.
(COMPUNIT_BLOCK_LINE_SECTION): New macro.
(COMPUNIT_LOCATIONS_VALID): New macro.
(COMPUNIT_EPILOGUE_UNWIND_VALID): New macro.
(COMPUNIT_CALL_SITE_HTAB): New macro.
(COMPUNIT_MACRO_TABLE): New macro.
(ALL_COMPUNIT_FILETABS): New macro.
(compunit_symtab_ptr): New typedef.
(DEF_VEC_P (compunit_symtab_ptr)): New vector type.
gdb/testsuite/ChangeLog:
* gdb.base/maint.exp: Update expected output.
292 lines
8.1 KiB
C
292 lines
8.1 KiB
C
/* Build symbol tables in GDB's internal format.
|
||
Copyright (C) 1986-2014 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/>. */
|
||
|
||
#if !defined (BUILDSYM_H)
|
||
#define BUILDSYM_H 1
|
||
|
||
struct objfile;
|
||
struct symbol;
|
||
struct addrmap;
|
||
struct compunit_symtab;
|
||
|
||
/* This module provides definitions used for creating and adding to
|
||
the symbol table. These routines are called from various symbol-
|
||
file-reading routines.
|
||
|
||
They originated in dbxread.c of gdb-4.2, and were split out to
|
||
make xcoffread.c more maintainable by sharing code.
|
||
|
||
Variables declared in this file can be defined by #define-ing the
|
||
name EXTERN to null. It is used to declare variables that are
|
||
normally extern, but which get defined in a single module using
|
||
this technique. */
|
||
|
||
struct block;
|
||
struct pending_block;
|
||
|
||
#ifndef EXTERN
|
||
#define EXTERN extern
|
||
#endif
|
||
|
||
#define HASHSIZE 127 /* Size of things hashed via
|
||
hashname(). */
|
||
|
||
/* Core address of start of text of current source file. This too
|
||
comes from the N_SO symbol. For Dwarf it typically comes from the
|
||
DW_AT_low_pc attribute of a DW_TAG_compile_unit DIE. */
|
||
|
||
EXTERN CORE_ADDR last_source_start_addr;
|
||
|
||
/* The list of sub-source-files within the current individual
|
||
compilation. Each file gets its own symtab with its own linetable
|
||
and associated info, but they all share one blockvector. */
|
||
|
||
struct subfile
|
||
{
|
||
struct subfile *next;
|
||
/* Space for this is malloc'd. */
|
||
char *name;
|
||
/* Space for this is malloc'd. */
|
||
struct linetable *line_vector;
|
||
int line_vector_length;
|
||
/* The "containing" compunit. */
|
||
struct buildsym_compunit *buildsym_compunit;
|
||
enum language language;
|
||
struct symtab *symtab;
|
||
};
|
||
|
||
EXTERN struct subfile *current_subfile;
|
||
|
||
/* Global variable which, when set, indicates that we are processing a
|
||
.o file compiled with gcc */
|
||
|
||
EXTERN unsigned char processing_gcc_compilation;
|
||
|
||
/* When set, we are processing a .o file compiled by sun acc. This is
|
||
misnamed; it refers to all stabs-in-elf implementations which use
|
||
N_UNDF the way Sun does, including Solaris gcc. Hopefully all
|
||
stabs-in-elf implementations ever invented will choose to be
|
||
compatible. */
|
||
|
||
EXTERN unsigned char processing_acc_compilation;
|
||
|
||
/* Count symbols as they are processed, for error messages. */
|
||
|
||
EXTERN unsigned int symnum;
|
||
|
||
/* Record the symbols defined for each context in a list. We don't
|
||
create a struct block for the context until we know how long to
|
||
make it. */
|
||
|
||
#define PENDINGSIZE 100
|
||
|
||
struct pending
|
||
{
|
||
struct pending *next;
|
||
int nsyms;
|
||
struct symbol *symbol[PENDINGSIZE];
|
||
};
|
||
|
||
/* Here are the three lists that symbols are put on. */
|
||
|
||
/* static at top level, and types */
|
||
|
||
EXTERN struct pending *file_symbols;
|
||
|
||
/* global functions and variables */
|
||
|
||
EXTERN struct pending *global_symbols;
|
||
|
||
/* everything local to lexical context */
|
||
|
||
EXTERN struct pending *local_symbols;
|
||
|
||
/* "using" directives local to lexical context. */
|
||
|
||
EXTERN struct using_direct *using_directives;
|
||
|
||
/* Stack representing unclosed lexical contexts (that will become
|
||
blocks, eventually). */
|
||
|
||
struct context_stack
|
||
{
|
||
/* Outer locals at the time we entered */
|
||
|
||
struct pending *locals;
|
||
|
||
/* Pending using directives at the time we entered. */
|
||
|
||
struct using_direct *using_directives;
|
||
|
||
/* Pointer into blocklist as of entry */
|
||
|
||
struct pending_block *old_blocks;
|
||
|
||
/* Name of function, if any, defining context */
|
||
|
||
struct symbol *name;
|
||
|
||
/* PC where this context starts */
|
||
|
||
CORE_ADDR start_addr;
|
||
|
||
/* Temp slot for exception handling. */
|
||
|
||
CORE_ADDR end_addr;
|
||
|
||
/* For error-checking matching push/pop */
|
||
|
||
int depth;
|
||
|
||
};
|
||
|
||
EXTERN struct context_stack *context_stack;
|
||
|
||
/* Index of first unused entry in context stack. */
|
||
|
||
EXTERN int context_stack_depth;
|
||
|
||
/* Currently allocated size of context stack. */
|
||
|
||
EXTERN int context_stack_size;
|
||
|
||
/* Non-zero if the context stack is empty. */
|
||
#define outermost_context_p() (context_stack_depth == 0)
|
||
|
||
/* Nonzero if within a function (so symbols should be local, if
|
||
nothing says specifically). */
|
||
|
||
EXTERN int within_function;
|
||
|
||
/* The type of the record_line function. */
|
||
typedef void (record_line_ftype) (struct subfile *subfile, int line,
|
||
CORE_ADDR pc);
|
||
|
||
|
||
|
||
#define next_symbol_text(objfile) (*next_symbol_text_func)(objfile)
|
||
|
||
/* Function to invoke get the next symbol. Return the symbol name. */
|
||
|
||
EXTERN char *(*next_symbol_text_func) (struct objfile *);
|
||
|
||
extern void add_symbol_to_list (struct symbol *symbol,
|
||
struct pending **listhead);
|
||
|
||
extern struct symbol *find_symbol_in_list (struct pending *list,
|
||
char *name, int length);
|
||
|
||
extern struct block *finish_block (struct symbol *symbol,
|
||
struct pending **listhead,
|
||
struct pending_block *old_blocks,
|
||
CORE_ADDR start, CORE_ADDR end);
|
||
|
||
extern void record_block_range (struct block *,
|
||
CORE_ADDR start, CORE_ADDR end_inclusive);
|
||
|
||
extern void really_free_pendings (void *dummy);
|
||
|
||
extern void start_subfile (const char *name);
|
||
|
||
extern void patch_subfile_names (struct subfile *subfile, char *name);
|
||
|
||
extern void push_subfile (void);
|
||
|
||
extern char *pop_subfile (void);
|
||
|
||
extern struct block *end_symtab_get_static_block (CORE_ADDR end_addr,
|
||
int expandable,
|
||
int required);
|
||
|
||
extern struct compunit_symtab *
|
||
end_symtab_from_static_block (struct block *static_block,
|
||
int section, int expandable);
|
||
|
||
extern struct compunit_symtab *end_symtab (CORE_ADDR end_addr, int section);
|
||
|
||
extern struct compunit_symtab *end_expandable_symtab (CORE_ADDR end_addr,
|
||
int section);
|
||
|
||
extern void augment_type_symtab (struct compunit_symtab *cust);
|
||
|
||
/* Defined in stabsread.c. */
|
||
|
||
extern void scan_file_globals (struct objfile *objfile);
|
||
|
||
extern void buildsym_new_init (void);
|
||
|
||
extern void buildsym_init (void);
|
||
|
||
extern struct context_stack *push_context (int desc, CORE_ADDR valu);
|
||
|
||
extern struct context_stack *pop_context (void);
|
||
|
||
extern record_line_ftype record_line;
|
||
|
||
extern struct compunit_symtab *start_symtab (struct objfile *objfile,
|
||
const char *name,
|
||
const char *comp_dir,
|
||
CORE_ADDR start_addr);
|
||
|
||
extern void restart_symtab (CORE_ADDR start_addr);
|
||
|
||
extern int hashname (const char *name);
|
||
|
||
extern void free_pending_blocks (void);
|
||
|
||
/* Record the name of the debug format in the current pending symbol
|
||
table. FORMAT must be a string with a lifetime at least as long as
|
||
the symtab's objfile. */
|
||
|
||
extern void record_debugformat (const char *format);
|
||
|
||
/* Record the name of the debuginfo producer (usually the compiler) in
|
||
the current pending symbol table. PRODUCER must be a string with a
|
||
lifetime at least as long as the symtab's objfile. */
|
||
|
||
extern void record_producer (const char *producer);
|
||
|
||
extern void merge_symbol_lists (struct pending **srclist,
|
||
struct pending **targetlist);
|
||
|
||
/* Set the name of the last source file. NAME is copied by this
|
||
function. */
|
||
|
||
extern void set_last_source_file (const char *name);
|
||
|
||
/* Fetch the name of the last source file. */
|
||
|
||
extern const char *get_last_source_file (void);
|
||
|
||
/* Return the compunit symtab object.
|
||
It is only valid to call this between calls to start_symtab and the
|
||
end_symtab* functions. */
|
||
|
||
extern struct compunit_symtab *buildsym_compunit_symtab (void);
|
||
|
||
/* Return the macro table.
|
||
Initialize it if this is the first use.
|
||
It is only valid to call this between calls to start_symtab and the
|
||
end_symtab* functions. */
|
||
|
||
extern struct macro_table *get_macro_table (void);
|
||
|
||
#undef EXTERN
|
||
|
||
#endif /* defined (BUILDSYM_H) */
|