X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fbuildsym.h;h=3e0132782c09cd07c52106718eea98ec061e4445;hb=c5ac15402a894e87a118526a066880f596b3c78d;hp=0db96bf2f96878171796f7f401acf2911e648531;hpb=43c7c83dacecdb9a2796e4eed6f891ce3f8c3654;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/buildsym.h b/gdb/buildsym.h index 0db96bf2f9..3e0132782c 100644 --- a/gdb/buildsym.h +++ b/gdb/buildsym.h @@ -1,6 +1,5 @@ /* Build symbol tables in GDB's internal format. - Copyright (C) 1986-1993, 1995-2000, 2002-2003, 2007-2012 Free - Software Foundation, Inc. + Copyright (C) 1986-2016 Free Software Foundation, Inc. This file is part of GDB. @@ -23,6 +22,7 @@ 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- @@ -37,6 +37,9 @@ struct addrmap; this technique. */ struct block; +struct pending_block; + +struct dynamic_prop; #ifndef EXTERN #define EXTERN extern @@ -45,12 +48,6 @@ struct block; #define HASHSIZE 127 /* Size of things hashed via hashname(). */ -/* 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. */ - -EXTERN char *last_source_file; - /* 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. */ @@ -62,17 +59,18 @@ EXTERN CORE_ADDR last_source_start_addr; and associated info, but they all share one blockvector. */ struct subfile - { - struct subfile *next; - char *name; - char *dirname; - struct linetable *line_vector; - int line_vector_length; - enum language language; - const char *producer; - const char *debugformat; - struct symtab *symtab; - }; +{ + 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; @@ -122,7 +120,11 @@ EXTERN struct pending *local_symbols; /* "using" directives local to lexical context. */ -EXTERN struct using_direct *using_directives; +EXTERN struct using_direct *local_using_directives; + +/* global "using" directives. */ + +EXTERN struct using_direct *global_using_directives; /* Stack representing unclosed lexical contexts (that will become blocks, eventually). */ @@ -135,7 +137,7 @@ struct context_stack /* Pending using directives at the time we entered. */ - struct using_direct *using_directives; + struct using_direct *local_using_directives; /* Pointer into blocklist as of entry */ @@ -145,6 +147,11 @@ struct context_stack struct symbol *name; + /* Expression that computes the frame base of the lexically enclosing + function, if any. NULL otherwise. */ + + struct dynamic_prop *static_link; + /* PC where this context starts */ CORE_ADDR start_addr; @@ -177,54 +184,18 @@ EXTERN int context_stack_size; EXTERN int within_function; -/* 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; - }; +/* The type of the record_line function. */ +typedef void (record_line_ftype) (struct subfile *subfile, int line, + CORE_ADDR pc); -/* 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. */ - -EXTERN struct pending_block *pending_blocks; -struct subfile_stack - { - struct subfile_stack *next; - char *name; - }; - -EXTERN struct subfile_stack *subfile_stack; - #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 *); -/* Vector of types defined so far, indexed by their type numbers. - Used for both stabs and coff. (In newer sun systems, dbx uses a - pair of numbers in parens, as in "(SUBFILENUM,NUMWITHINSUBFILE)". - Then these numbers must be translated through the type_translations - hash table to get the index into the type vector.) */ - -EXTERN struct type **type_vector; - -/* Number of elements allocated for type_vector currently. */ - -EXTERN int type_vector_length; - -/* Initial size of type vector. Is realloc'd larger if needed, and - realloc'd down to the size actually used, when completed. */ - -#define INITIAL_TYPE_VECTOR_LENGTH 160 - extern void add_symbol_to_list (struct symbol *symbol, struct pending **listhead); @@ -232,17 +203,18 @@ 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, - struct objfile *objfile); + struct pending **listhead, + struct pending_block *old_blocks, + const struct dynamic_prop *static_link, + 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, const char *dirname); +extern void start_subfile (const char *name); extern void patch_subfile_names (struct subfile *subfile, char *name); @@ -251,24 +223,19 @@ extern void push_subfile (void); extern char *pop_subfile (void); extern struct block *end_symtab_get_static_block (CORE_ADDR end_addr, - struct objfile *objfile, int expandable, int required); -extern struct symtab *end_symtab_from_static_block (struct block *static_block, - struct objfile *objfile, - int section, - int expandable); +extern struct compunit_symtab * + end_symtab_from_static_block (struct block *static_block, + int section, int expandable); -extern struct symtab *end_symtab (CORE_ADDR end_addr, - struct objfile *objfile, int section); +extern struct compunit_symtab *end_symtab (CORE_ADDR end_addr, int section); -extern struct symtab *end_expandable_symtab (CORE_ADDR end_addr, - struct objfile *objfile, - int section); +extern struct compunit_symtab *end_expandable_symtab (CORE_ADDR end_addr, + int section); -extern void augment_type_symtab (struct objfile *objfile, - struct symtab *primary_symtab); +extern void augment_type_symtab (void); /* Defined in stabsread.c. */ @@ -282,11 +249,15 @@ extern struct context_stack *push_context (int desc, CORE_ADDR valu); extern struct context_stack *pop_context (void); -extern void record_line (struct subfile *subfile, int line, CORE_ADDR pc); +extern record_line_ftype record_line; -extern void start_symtab (char *name, char *dirname, CORE_ADDR start_addr); +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 void restart_symtab (struct compunit_symtab *cust, + const char *name, CORE_ADDR start_addr); extern int hashname (const char *name); @@ -307,10 +278,27 @@ extern void record_producer (const char *producer); extern void merge_symbol_lists (struct pending **srclist, struct pending **targetlist); -/* The macro table for the compilation unit whose symbols we're - currently reading. All the symtabs for this CU will point to - this. */ -EXTERN struct macro_table *pending_macros; +/* 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