* TODO: Add item suggesting an "info bfd" command.

[binutils.git] / gdb / elfread.c

diff --git a/gdb/elfread.c b/gdb/elfread.c
index 214197cbfb23db4ada9dffa309724ee3cd03cef9..107bdafa37e4489aa0438df9315b5f15fe2ce67a 100644 (file)
--- a/gdb/elfread.c
+++ b/gdb/elfread.c
@@ -1,5 +1,5 @@
 /* Read ELF (Executable and Linking Format) object files for GDB.
 /* Read ELF (Executable and Linking Format) object files for GDB.

-   Copyright 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc.

    Written by Fred Fish at Cygnus Support.
 
 This file is part of GDB.
    Written by Fred Fish at Cygnus Support.
 
 This file is part of GDB.


@@ -16,12 +16,12 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 
 #include "defs.h"
 #include "bfd.h"
 
 #include "defs.h"
 #include "bfd.h"

-#include <string.h>
-#include "libelf.h"
+#include "gdb_string.h"
+#include "elf-bfd.h"

 #include "elf/mips.h"
 #include "symtab.h"
 #include "symfile.h"
 #include "elf/mips.h"
 #include "symtab.h"
 #include "symfile.h"


@@ -78,10 +78,7 @@ elf_symtab_read PARAMS ((bfd *,  CORE_ADDR, struct objfile *, int));
 static void
 free_elfinfo PARAMS ((void *));
 
 static void
 free_elfinfo PARAMS ((void *));
 

-static struct section_offsets *
-elf_symfile_offsets PARAMS ((struct objfile *, CORE_ADDR));
-
-static void
+static struct minimal_symbol *

 record_minimal_symbol_and_info PARAMS ((char *, CORE_ADDR,
                                        enum minimal_symbol_type, char *,
                                        struct objfile *));
 record_minimal_symbol_and_info PARAMS ((char *, CORE_ADDR,
                                        enum minimal_symbol_type, char *,
                                        struct objfile *));


@@ -171,7 +168,7 @@ elf_interpreter (abfd)
 
 #endif
 
 
 #endif
 

-static void
+static struct minimal_symbol *

 record_minimal_symbol_and_info (name, address, ms_type, info, objfile)
      char *name;
      CORE_ADDR address;
 record_minimal_symbol_and_info (name, address, ms_type, info, objfile)
      char *name;
      CORE_ADDR address;


@@ -205,9 +202,8 @@ record_minimal_symbol_and_info (name, address, ms_type, info, objfile)
       break;
     }
 
       break;
     }
 

-  name = obsavestring (name, strlen (name), &objfile -> symbol_obstack);
-  prim_record_minimal_symbol_and_info (name, address, ms_type, info, section,
-                                      objfile);
+  return prim_record_minimal_symbol_and_info
+    (name, address, ms_type, info, section, objfile);

 }
 
 /*
 }
 
 /*


@@ -219,7 +215,7 @@ LOCAL FUNCTION
 SYNOPSIS
 
        void elf_symtab_read (bfd *abfd, CORE_ADDR addr,
 SYNOPSIS
 
        void elf_symtab_read (bfd *abfd, CORE_ADDR addr,

-                             struct objfile *objfile)
+                             struct objfile *objfile, int dynamic)

 
 DESCRIPTION
 
 
 DESCRIPTION
 


@@ -258,18 +254,30 @@ elf_symtab_read (abfd, addr, objfile, dynamic)
   /* If filesym is nonzero, it points to a file symbol, but we haven't
      seen any section info for it yet.  */
   asymbol *filesym = 0;
   /* If filesym is nonzero, it points to a file symbol, but we haven't
      seen any section info for it yet.  */
   asymbol *filesym = 0;

+#ifdef SOFUN_ADDRESS_MAYBE_MISSING
+  /* Name of filesym, as saved on the symbol_obstack.  */
+  char *filesymname = obsavestring ("", 0, &objfile->symbol_obstack);
+#endif

   struct dbx_symfile_info *dbx = (struct dbx_symfile_info *)
                                 objfile->sym_stab_info;
   unsigned long size;
   int stripped = (bfd_get_symcount (abfd) == 0);
  
   if (dynamic)
   struct dbx_symfile_info *dbx = (struct dbx_symfile_info *)
                                 objfile->sym_stab_info;
   unsigned long size;
   int stripped = (bfd_get_symcount (abfd) == 0);
  
   if (dynamic)

-    storage_needed = bfd_get_dynamic_symtab_upper_bound (abfd);
+    {
+      storage_needed = bfd_get_dynamic_symtab_upper_bound (abfd);
+
+      /* Nothing to be done if there is no dynamic symtab.  */
+      if (storage_needed < 0)
+       return;
+    }

   else
   else

-    storage_needed = bfd_get_symtab_upper_bound (abfd);
-  if (storage_needed < 0)
-    error ("Can't read symbols from %s: %s", bfd_get_filename (abfd),
-          bfd_errmsg (bfd_get_error ()));
+    {
+      storage_needed = bfd_get_symtab_upper_bound (abfd);
+      if (storage_needed < 0)
+       error ("Can't read symbols from %s: %s", bfd_get_filename (abfd),
+              bfd_errmsg (bfd_get_error ()));
+    }

   if (storage_needed > 0)
     {
       symbol_table = (asymbol **) xmalloc (storage_needed);
   if (storage_needed > 0)
     {
       symbol_table = (asymbol **) xmalloc (storage_needed);


@@ -292,13 +300,38 @@ elf_symtab_read (abfd, addr, objfile, dynamic)
              continue;
            }
 
              continue;
            }
 

+         if (dynamic
+             && sym -> section == &bfd_und_section
+             && (sym -> flags & BSF_FUNCTION))
+           {
+             struct minimal_symbol *msym;
+
+             /* Symbol is a reference to a function defined in
+                a shared library.
+                If its value is non zero then it is usually the address
+                of the corresponding entry in the procedure linkage table,
+                relative to the base address.
+                If its value is zero then the dynamic linker has to resolve
+                the symbol. We are unable to find any meaningful address
+                for this symbol in the executable file, so we skip it.  */
+             symaddr = sym -> value;
+             if (symaddr == 0)
+               continue;
+             symaddr += addr;
+             msym = record_minimal_symbol_and_info
+               ((char *) sym -> name, symaddr,
+               mst_solib_trampoline, NULL, objfile);
+#ifdef SOFUN_ADDRESS_MAYBE_MISSING
+             if (msym != NULL)
+               msym->filename = filesymname;
+#endif
+             continue;
+           }
+

          /* If it is a nonstripped executable, do not enter dynamic
             symbols, as the dynamic symbol table is usually a subset
          /* If it is a nonstripped executable, do not enter dynamic
             symbols, as the dynamic symbol table is usually a subset

-            of the main symbol table.
-            On Irix 5 however, the symbols for the procedure linkage
-            table entries have meaningful values only in the dynamic
-            symbol table, so we always examine undefined symbols.  */
-         if (dynamic && !stripped && sym -> section != &bfd_und_section)
+            of the main symbol table.  */
+         if (dynamic && !stripped)

            continue;
          if (sym -> flags & BSF_FILE)
            {
            continue;
          if (sym -> flags & BSF_FILE)
            {


@@ -311,9 +344,16 @@ elf_symtab_read (abfd, addr, objfile, dynamic)
                  sectinfo = NULL;
                }
              filesym = sym;
                  sectinfo = NULL;
                }
              filesym = sym;

+#ifdef SOFUN_ADDRESS_MAYBE_MISSING
+             filesymname =
+               obsavestring ((char *)filesym->name, strlen (filesym->name),
+                             &objfile->symbol_obstack);
+#endif

            }
          else if (sym -> flags & (BSF_GLOBAL | BSF_LOCAL | BSF_WEAK))
            {
            }
          else if (sym -> flags & (BSF_GLOBAL | BSF_LOCAL | BSF_WEAK))
            {

+             struct minimal_symbol *msym;
+

              /* Select global/local/weak symbols.  Note that bfd puts abs
                 symbols in their own section, so all symbols we are
                 interested in will have a section. */
              /* Select global/local/weak symbols.  Note that bfd puts abs
                 symbols in their own section, so all symbols we are
                 interested in will have a section. */


@@ -327,29 +367,7 @@ elf_symtab_read (abfd, addr, objfile, dynamic)
              /* For non-absolute symbols, use the type of the section
                 they are relative to, to intuit text/data.  Bfd provides
                 no way of figuring this out for absolute symbols. */
              /* For non-absolute symbols, use the type of the section
                 they are relative to, to intuit text/data.  Bfd provides
                 no way of figuring this out for absolute symbols. */

-             if (sym -> section == &bfd_und_section
-                 && (sym -> flags & BSF_GLOBAL)
-                 && (sym -> flags & BSF_FUNCTION))
-               {
-                 /* Symbol is a reference to a function defined in
-                    a shared library.
-                    If its value is non zero then it is usually the
-                    absolute address of the corresponding entry in
-                    the procedure linkage table.
-                    If its value is zero then the dynamic linker has to
-                    resolve the symbol. We are unable to find any
-                    meaningful address for this symbol in the
-                    executable file, so we skip it.
-                    Irix 5 has a zero value for all shared library functions
-                    in the main symbol table, but the dynamic symbol table
-                    provides the right values.  */
-                 ms_type = mst_solib_trampoline;
-                 symaddr = sym -> value;
-                 if (symaddr == 0)
-                   continue;
-                 symaddr += addr;
-               }
-             else if (sym -> section == &bfd_abs_section)
+             if (sym -> section == &bfd_abs_section)

                {
                  /* This is a hack to get the minimal symbol type
                     right for Irix 5, which has absolute adresses
                {
                  /* This is a hack to get the minimal symbol type
                     right for Irix 5, which has absolute adresses


@@ -378,7 +396,10 @@ elf_symtab_read (abfd, addr, objfile, dynamic)
                    {
                      ms_type = mst_text;
                    }
                    {
                      ms_type = mst_text;
                    }

-                 else if (sym->name[0] == '.' && sym->name[1] == 'L')
+                 else if ((sym->name[0] == '.' && sym->name[1] == 'L')
+                          || ((sym -> flags & BSF_LOCAL)
+                              && sym->name[0] == '$'
+                              && sym->name[1] == 'L'))

                    /* Looks like a compiler-generated label.  Skip it.
                       The assembler should be skipping these (to keep
                       executables small), but apparently with gcc on the
                    /* Looks like a compiler-generated label.  Skip it.
                       The assembler should be skipping these (to keep
                       executables small), but apparently with gcc on the


@@ -386,6 +407,17 @@ elf_symtab_read (abfd, addr, objfile, dynamic)
                       should be harmless (but I encourage people to fix this
                       in the assembler instead of adding checks here).  */
                    continue;
                       should be harmless (but I encourage people to fix this
                       in the assembler instead of adding checks here).  */
                    continue;

+#ifdef HARRIS_TARGET
+                 else if (sym->name[0] == '.' && sym->name[1] == '.')
+                   {
+                     /* Looks like a Harris compiler generated label for the
+                        purpose of marking instructions that are relevant to
+                        DWARF dies.  The assembler can't get rid of these 
+                        because they are relocatable addresses that the
+                        linker needs to resolve. */
+                     continue;
+                   }
+#endif   

                  else
                    {
                      ms_type = mst_file_text;
                  else
                    {
                      ms_type = mst_file_text;


@@ -488,8 +520,13 @@ elf_symtab_read (abfd, addr, objfile, dynamic)
                }
              /* Pass symbol size field in via BFD.  FIXME!!!  */
              size = ((elf_symbol_type *) sym) -> internal_elf_sym.st_size;
                }
              /* Pass symbol size field in via BFD.  FIXME!!!  */
              size = ((elf_symbol_type *) sym) -> internal_elf_sym.st_size;

-             record_minimal_symbol_and_info ((char *) sym -> name, symaddr,
-                                             ms_type, (PTR) size, objfile);
+             msym = record_minimal_symbol_and_info
+               ((char *) sym -> name, symaddr,
+                ms_type, (PTR) size, objfile);
+#ifdef SOFUN_ADDRESS_MAYBE_MISSING
+             if (msym != NULL)
+               msym->filename = filesymname;
+#endif

            }
        }
       do_cleanups (back_to);
            }
        }
       do_cleanups (back_to);


@@ -566,7 +603,12 @@ elf_symfile_read (objfile, section_offsets, mainline)
      special ELF sections.  We first have to find them... */
 
   bfd_map_over_sections (abfd, elf_locate_sections, (PTR) &ei);
      special ELF sections.  We first have to find them... */
 
   bfd_map_over_sections (abfd, elf_locate_sections, (PTR) &ei);

-  if (ei.dboffset && ei.lnoffset)
+  if (dwarf2_has_info (abfd) && !offset)
+    {
+      /* DWARF 2 sections */
+      dwarf2_build_psymtabs (objfile, section_offsets, mainline);
+    }
+  else if (ei.dboffset && ei.lnoffset)

     {
       /* DWARF sections */
       dwarf_build_psymtabs (objfile,
     {
       /* DWARF sections */
       dwarf_build_psymtabs (objfile,


@@ -675,36 +717,15 @@ elf_symfile_finish (objfile)
    just a stub. */
 
 static void
    just a stub. */
 
 static void

-elf_symfile_init (ignore)
-     struct objfile *ignore;
-{
-}
-
-/* ELF specific parsing routine for section offsets.
-
-   Plain and simple for now.  */
-
-static
-struct section_offsets *
-elf_symfile_offsets (objfile, addr)
+elf_symfile_init (objfile)

      struct objfile *objfile;
      struct objfile *objfile;

-     CORE_ADDR addr;

 {
 {

-  struct section_offsets *section_offsets;
-  int i;
-
-  objfile->num_sections = SECT_OFF_MAX;
-  section_offsets = (struct section_offsets *)
-    obstack_alloc (&objfile -> psymbol_obstack,
-                  sizeof (struct section_offsets)
-                  + sizeof (section_offsets->offsets) * (SECT_OFF_MAX-1));
-
-  for (i = 0; i < SECT_OFF_MAX; i++)
-    ANOFFSET (section_offsets, i) = addr;
-
-  return section_offsets;
+  /* ELF objects may be reordered, so set OBJF_REORDERED.  If we
+     find this causes a significant slowdown in gdb then we could
+     set it in the debug symbol readers only when necessary.  */
+  objfile->flags |= OBJF_REORDERED;

 }
 }

-\f
+

 /* When handling an ELF file that contains Sun STABS debug info,
    some of the debug info is relative to the particular chunk of the
    section that was generated in its individual .o file.  E.g.
 /* When handling an ELF file that contains Sun STABS debug info,
    some of the debug info is relative to the particular chunk of the
    section that was generated in its individual .o file.  E.g.


@@ -781,7 +802,8 @@ static struct sym_fns elf_sym_fns =
   elf_symfile_init,    /* sym_init: read initial info, setup for sym_read() */
   elf_symfile_read,    /* sym_read: read a symbol file into symtab */
   elf_symfile_finish,  /* sym_finish: finished with file, cleanup */
   elf_symfile_init,    /* sym_init: read initial info, setup for sym_read() */
   elf_symfile_read,    /* sym_read: read a symbol file into symtab */
   elf_symfile_finish,  /* sym_finish: finished with file, cleanup */

-  elf_symfile_offsets, /* sym_offsets:  Translate ext. to int. relocation */
+  default_symfile_offsets,
+                       /* sym_offsets:  Translate ext. to int. relocation */

   NULL                 /* next: pointer to next struct sym_fns */
 };
 
   NULL                 /* next: pointer to next struct sym_fns */
 };