Correct invalid assumptions made by (mostly) DWARF-2 tests

[deliverable/binutils-gdb.git] / gdb / buildsym.h

diff --git a/gdb/buildsym.h b/gdb/buildsym.h
index 8ce01b2b1971728a56afd7f041de6b1681bbaf7a..bddec5fe03659f47b50f06426916be5eb3b19481 100644 (file)
--- a/gdb/buildsym.h
+++ b/gdb/buildsym.h
@@ -22,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-
@@ -56,17 +57,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;
 
@@ -192,15 +194,14 @@ extern struct symbol *find_symbol_in_list (struct pending *list,
 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);
+                                   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);
 
@@ -209,24 +210,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 (struct compunit_symtab *cust);
 
 /* Defined in stabsread.c.  */
 
@@ -242,8 +238,10 @@ extern struct context_stack *pop_context (void);
 
 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);
 
@@ -275,10 +273,18 @@ extern void set_last_source_file (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