/* Build symbol tables in GDB's internal format.
- Copyright (C) 1986-2013 Free Software Foundation, Inc.
+ Copyright (C) 1986-2017 Free Software Foundation, Inc.
This file is part of GDB.
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-
struct block;
struct pending_block;
+struct dynamic_prop;
+
#ifndef EXTERN
#define EXTERN extern
#endif
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;
/* "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). */
/* 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 */
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;
EXTERN int within_function;
+/* The type of the record_line function. */
+typedef void (record_line_ftype) (struct subfile *subfile, int line,
+ CORE_ADDR pc);
+
\f
#define next_symbol_text(objfile) (*next_symbol_text_func)(objfile)
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);
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. */
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 (const char *name, const 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);
extern const char *get_last_source_file (void);
-/* Return the macro table. */
+/* 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 (struct objfile *objfile,
- const char *comp_dir);
+extern struct macro_table *get_macro_table (void);
#undef EXTERN