X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fbuildsym.h;h=c8e1bd0d5a734a55924e61b8f55d84b37b2dce69;hb=b2c759ce68102931140ce34c2ac00619ba363622;hp=536d50a58eb53c5139ced1badf938c88edcfe8a0;hpb=e2882c85786571175a0b0bfc3bcd2f14620b1ea3;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/buildsym.h b/gdb/buildsym.h index 536d50a58e..c8e1bd0d5a 100644 --- a/gdb/buildsym.h +++ b/gdb/buildsym.h @@ -1,5 +1,5 @@ /* Build symbol tables in GDB's internal format. - Copyright (C) 1986-2018 Free Software Foundation, Inc. + Copyright (C) 1986-2020 Free Software Foundation, Inc. This file is part of GDB. @@ -19,6 +19,8 @@ #if !defined (BUILDSYM_H) #define BUILDSYM_H 1 +#include "gdb_obstack.h" + struct objfile; struct symbol; struct addrmap; @@ -30,31 +32,13 @@ enum language; 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. */ + make xcoffread.c more maintainable by sharing code. */ struct block; struct pending_block; struct dynamic_prop; -#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. */ @@ -73,25 +57,6 @@ struct subfile 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. */ @@ -105,28 +70,6 @@ struct pending 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 *local_using_directives; - -/* global "using" directives. */ - -EXTERN struct using_direct *global_using_directives; - /* Stack representing unclosed lexical contexts (that will become blocks, eventually). */ @@ -167,149 +110,300 @@ struct context_stack }; -EXTERN struct context_stack *context_stack; +/* Buildsym's counterpart to struct compunit_symtab. */ -/* Index of first unused entry in context stack. */ +struct buildsym_compunit +{ + /* Start recording information about a primary source file (IOW, not an + included source file). + COMP_DIR is the directory in which the compilation unit was compiled + (or NULL if not known). */ + + buildsym_compunit (struct objfile *objfile_, const char *name, + const char *comp_dir_, enum language language_, + CORE_ADDR last_addr); + + /* Reopen an existing compunit_symtab so that additional symbols can + be added to it. Arguments are as for the main constructor. CUST + is the expandable compunit_symtab to be reopened. */ + + buildsym_compunit (struct objfile *objfile_, const char *name, + const char *comp_dir_, enum language language_, + CORE_ADDR last_addr, struct compunit_symtab *cust) + : m_objfile (objfile_), + m_last_source_file (name == nullptr ? nullptr : xstrdup (name)), + m_comp_dir (comp_dir_ == nullptr ? nullptr : xstrdup (comp_dir_)), + m_compunit_symtab (cust), + m_language (language_), + m_last_source_start_addr (last_addr) + { + } -EXTERN int context_stack_depth; + ~buildsym_compunit (); -/* Currently allocated size of context stack. */ + DISABLE_COPY_AND_ASSIGN (buildsym_compunit); -EXTERN int context_stack_size; + void set_last_source_file (const char *name) + { + char *new_name = name == NULL ? NULL : xstrdup (name); + m_last_source_file.reset (new_name); + } -/* Non-zero if the context stack is empty. */ -#define outermost_context_p() (context_stack_depth == 0) + const char *get_last_source_file () + { + return m_last_source_file.get (); + } -/* Nonzero if within a function (so symbols should be local, if - nothing says specifically). */ + struct macro_table *get_macro_table (); -EXTERN int within_function; + struct macro_table *release_macros () + { + struct macro_table *result = m_pending_macros; + m_pending_macros = nullptr; + return result; + } -/* The type of the record_line function. */ -typedef void (record_line_ftype) (struct subfile *subfile, int line, - CORE_ADDR pc); + /* This function is called to discard any pending blocks. */ - + void free_pending_blocks () + { + m_pending_block_obstack.clear (); + m_pending_blocks = nullptr; + } -#define next_symbol_text(objfile) (*next_symbol_text_func)(objfile) + struct block *finish_block (struct symbol *symbol, + struct pending_block *old_blocks, + const struct dynamic_prop *static_link, + CORE_ADDR start, CORE_ADDR end); -/* Function to invoke get the next symbol. Return the symbol name. */ + void record_block_range (struct block *block, + CORE_ADDR start, CORE_ADDR end_inclusive); -EXTERN const char *(*next_symbol_text_func) (struct objfile *); + void start_subfile (const char *name); -extern void add_symbol_to_list (struct symbol *symbol, - struct pending **listhead); + void patch_subfile_names (struct subfile *subfile, const char *name); -extern struct symbol *find_symbol_in_list (struct pending *list, - char *name, int length); + void push_subfile (); -extern struct block *finish_block (struct symbol *symbol, - struct pending **listhead, - struct pending_block *old_blocks, - const struct dynamic_prop *static_link, - CORE_ADDR start, - CORE_ADDR end); + const char *pop_subfile (); -extern void record_block_range (struct block *, - CORE_ADDR start, CORE_ADDR end_inclusive); + void record_line (struct subfile *subfile, int line, CORE_ADDR pc); -class scoped_free_pendings -{ -public: + struct compunit_symtab *get_compunit_symtab () + { + return m_compunit_symtab; + } - scoped_free_pendings () = default; - ~scoped_free_pendings (); + void set_last_source_start_addr (CORE_ADDR addr) + { + m_last_source_start_addr = addr; + } - DISABLE_COPY_AND_ASSIGN (scoped_free_pendings); -}; + CORE_ADDR get_last_source_start_addr () + { + return m_last_source_start_addr; + } + + struct using_direct **get_local_using_directives () + { + return &m_local_using_directives; + } + + void set_local_using_directives (struct using_direct *new_local) + { + m_local_using_directives = new_local; + } + + struct using_direct **get_global_using_directives () + { + return &m_global_using_directives; + } + + bool outermost_context_p () const + { + return m_context_stack.empty (); + } + + struct context_stack *get_current_context_stack () + { + if (m_context_stack.empty ()) + return nullptr; + return &m_context_stack.back (); + } + + int get_context_stack_depth () const + { + return m_context_stack.size (); + } + + struct subfile *get_current_subfile () + { + return m_current_subfile; + } + + struct pending **get_local_symbols () + { + return &m_local_symbols; + } + + struct pending **get_file_symbols () + { + return &m_file_symbols; + } -extern void start_subfile (const char *name); + struct pending **get_global_symbols () + { + return &m_global_symbols; + } + + void record_debugformat (const char *format) + { + m_debugformat = format; + } + + void record_producer (const char *producer) + { + m_producer = producer; + } + + struct context_stack *push_context (int desc, CORE_ADDR valu); + + struct context_stack pop_context (); + + struct block *end_symtab_get_static_block (CORE_ADDR end_addr, + int expandable, int required); + + struct compunit_symtab *end_symtab_from_static_block + (struct block *static_block, int section, int expandable); + + struct compunit_symtab *end_symtab (CORE_ADDR end_addr, int section); -extern void patch_subfile_names (struct subfile *subfile, const char *name); + struct compunit_symtab *end_expandable_symtab (CORE_ADDR end_addr, + int section); -extern void push_subfile (void); + void augment_type_symtab (); -extern char *pop_subfile (void); +private: -extern struct block *end_symtab_get_static_block (CORE_ADDR end_addr, - int expandable, - int required); + void record_pending_block (struct block *block, struct pending_block *opblock); -extern struct compunit_symtab * - end_symtab_from_static_block (struct block *static_block, - int section, int expandable); + struct block *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); -extern struct compunit_symtab *end_symtab (CORE_ADDR end_addr, int section); + struct blockvector *make_blockvector (); -extern struct compunit_symtab *end_expandable_symtab (CORE_ADDR end_addr, - int section); + void watch_main_source_file_lossage (); -extern void augment_type_symtab (void); + struct compunit_symtab *end_symtab_with_blockvector + (struct block *static_block, int section, int expandable); -/* Defined in stabsread.c. */ + /* The objfile we're reading debug info from. */ + struct objfile *m_objfile; -extern void scan_file_globals (struct objfile *objfile); + /* List of subfiles (source files). + Files are added to the front of the list. + This is important mostly for the language determination hacks we use, + which iterate over previously added files. */ + struct subfile *m_subfiles = nullptr; -extern void buildsym_new_init (void); + /* The subfile of the main source file. */ + struct subfile *m_main_subfile = nullptr; -extern void buildsym_init (void); + /* 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. */ + gdb::unique_xmalloc_ptr m_last_source_file; -extern struct context_stack *push_context (int desc, CORE_ADDR valu); + /* E.g., DW_AT_comp_dir if DWARF. Space for this is malloc'd. */ + gdb::unique_xmalloc_ptr m_comp_dir; -extern struct context_stack *pop_context (void); + /* Space for this is not malloc'd, and is assumed to have at least + the same lifetime as objfile. */ + const char *m_producer = nullptr; -extern record_line_ftype record_line; + /* Space for this is not malloc'd, and is assumed to have at least + the same lifetime as objfile. */ + const char *m_debugformat = nullptr; -extern struct compunit_symtab *start_symtab (struct objfile *objfile, - const char *name, - const char *comp_dir, - CORE_ADDR start_addr, - enum language language); + /* The compunit we are building. */ + struct compunit_symtab *m_compunit_symtab = nullptr; -extern void restart_symtab (struct compunit_symtab *cust, - const char *name, CORE_ADDR start_addr); + /* Language of this compunit_symtab. */ + enum language m_language; -extern int hashname (const char *name); + /* The macro table for the compilation unit whose symbols we're + currently reading. */ + struct macro_table *m_pending_macros = nullptr; -extern void free_pending_blocks (void); + /* True if symtab has line number info. This prevents an otherwise + empty symtab from being tossed. */ + bool m_have_line_numbers = false; -/* 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. */ + /* 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. */ + CORE_ADDR m_last_source_start_addr; -extern void record_debugformat (const char *format); + /* Stack of subfile names. */ + std::vector m_subfile_stack; -/* 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. */ + /* The "using" directives local to lexical context. */ + struct using_direct *m_local_using_directives = nullptr; -extern void record_producer (const char *producer); + /* Global "using" directives. */ + struct using_direct *m_global_using_directives = nullptr; -extern void merge_symbol_lists (struct pending **srclist, - struct pending **targetlist); + /* The stack of contexts that are pushed by push_context and popped + by pop_context. */ + std::vector m_context_stack; -/* Set the name of the last source file. NAME is copied by this - function. */ + struct subfile *m_current_subfile = nullptr; -extern void set_last_source_file (const char *name); + /* 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. */ + struct addrmap *m_pending_addrmap = nullptr; -/* Fetch the name of the last source file. */ + /* The obstack on which we allocate pending_addrmap. + If pending_addrmap is NULL, this is uninitialized; otherwise, it is + initialized (and holds pending_addrmap). */ + auto_obstack m_pending_addrmap_obstack; -extern const char *get_last_source_file (void); + /* True if we recorded any ranges in the addrmap that are different + from those in the blockvector already. We set this to false when + we start processing a symfile, and if it's still false at the + end, then we just toss the addrmap. */ + bool m_pending_addrmap_interesting = false; -/* Return the compunit symtab object. - It is only valid to call this between calls to start_symtab and the - end_symtab* functions. */ + /* An obstack used for allocating pending blocks. */ + auto_obstack m_pending_block_obstack; -extern struct compunit_symtab *buildsym_compunit_symtab (void); + /* 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. */ + struct pending_block *m_pending_blocks = nullptr; -/* 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. */ + /* Pending static symbols and types at the top level. */ + struct pending *m_file_symbols = nullptr; -extern struct macro_table *get_macro_table (void); + /* Pending global functions and variables. */ + struct pending *m_global_symbols = nullptr; -#undef EXTERN + /* Pending symbols that are local to the lexical context. */ + struct pending *m_local_symbols = nullptr; +}; + + + +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); #endif /* defined (BUILDSYM_H) */