2013-02-04 Tristan Gingold <gingold@adacore.com>

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

diff --git a/gdb/gdb-stabs.h b/gdb/gdb-stabs.h
index e663754d70012d8e373139e5216889bad7a6a1de..57f67e2ee14e50010fabe67635d8655771698761 100644 (file)
--- a/gdb/gdb-stabs.h
+++ b/gdb/gdb-stabs.h
@@ -1,6 +1,5 @@
 /* Definitions for symbol-reading containing "stabs", for GDB.
 /* Definitions for symbol-reading containing "stabs", for GDB.

-   Copyright (C) 1992, 1993, 1995, 1996, 1997, 1999, 2000, 2007, 2008
-   Free Software Foundation, Inc.
+   Copyright (C) 1992-2013 Free Software Foundation, Inc.

    Contributed by Cygnus Support.  Written by John Gilmore.
 
    This file is part of GDB.
    Contributed by Cygnus Support.  Written by John Gilmore.
 
    This file is part of GDB.


@@ -27,6 +26,10 @@
 #if !defined (GDBSTABS_H)
 #define GDBSTABS_H
 
 #if !defined (GDBSTABS_H)
 #define GDBSTABS_H
 

+/* The tag used to find the DBX info attached to an objfile.  This is
+   global because it is referenced by several modules.  */
+extern const struct objfile_data *dbx_objfile_data_key;
+

 /* The stab_section_info chain remembers info from the ELF symbol table,
    while psymtabs are being built for the other symbol tables in the 
    objfile.  It is destroyed at the complation of psymtab-reading.
 /* The stab_section_info chain remembers info from the ELF symbol table,
    while psymtabs are being built for the other symbol tables in the 
    objfile.  It is destroyed at the complation of psymtab-reading.


@@ -36,14 +39,14 @@ struct stab_section_info
   {
     char *filename;
     struct stab_section_info *next;
   {
     char *filename;
     struct stab_section_info *next;

-    int found;                 /* Count of times it's found in searching */
+    int found;                 /* Count of times it's found in searching.  */

     size_t num_sections;
     CORE_ADDR sections[1];
   };
 
 /* Information is passed among various dbxread routines for accessing
     size_t num_sections;
     CORE_ADDR sections[1];
   };
 
 /* Information is passed among various dbxread routines for accessing

-   symbol files.  A pointer to this structure is kept in the
-   deprecated_sym_stab_info field of the objfile struct.  */
+   symbol files.  A pointer to this structure is kept in the objfile,
+   using the dbx_objfile_data_key.  */

 
 struct dbx_symfile_info
   {
 
 struct dbx_symfile_info
   {


@@ -54,10 +57,11 @@ struct dbx_symfile_info
     int stringtab_size;                /* Its size */
     file_ptr symtab_offset;    /* Offset in file to symbol table */
     int symbol_size;           /* Bytes in a single symbol */
     int stringtab_size;                /* Its size */
     file_ptr symtab_offset;    /* Offset in file to symbol table */
     int symbol_size;           /* Bytes in a single symbol */

-    struct stab_section_info *stab_section_info;       /* section starting points
-                                                          of the original .o files before linking. */
+    struct stab_section_info *stab_section_info;    /* Section starting points
+                                                      of the original .o files
+                                                      before linking.  */

 
 

-    /* See stabsread.h for the use of the following. */
+    /* See stabsread.h for the use of the following.  */

     struct header_file *header_files;
     int n_header_files;
     int n_allocated_header_files;
     struct header_file *header_files;
     int n_header_files;
     int n_allocated_header_files;


@@ -72,7 +76,8 @@ struct dbx_symfile_info
     asection *stab_section;
   };
 
     asection *stab_section;
   };
 

-#define DBX_SYMFILE_INFO(o)    ((o)->deprecated_sym_stab_info)
+#define DBX_SYMFILE_INFO(o) \
+  ((struct dbx_symfile_info *) objfile_data ((o), dbx_objfile_data_key))

 #define DBX_TEXT_ADDR(o)       (DBX_SYMFILE_INFO(o)->text_addr)
 #define DBX_TEXT_SIZE(o)       (DBX_SYMFILE_INFO(o)->text_size)
 #define DBX_SYMCOUNT(o)                (DBX_SYMFILE_INFO(o)->symcount)
 #define DBX_TEXT_ADDR(o)       (DBX_SYMFILE_INFO(o)->text_addr)
 #define DBX_TEXT_SIZE(o)       (DBX_SYMFILE_INFO(o)->text_size)
 #define DBX_SYMCOUNT(o)                (DBX_SYMFILE_INFO(o)->symcount)