* symfile.c (reread_symbols): Include bfd_errmsg string in error

[deliverable/binutils-gdb.git] / gdb / objfiles.c

diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index eebb24ad20108563ccd753fb642c0fc189060489..5cd01e5210e2223897d95c71882f0a079c5be7ac 100644 (file)
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -25,6 +25,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "bfd.h"               /* Binary File Description */
 #include "symtab.h"
 #include "symfile.h"
 #include "bfd.h"               /* Binary File Description */
 #include "symtab.h"
 #include "symfile.h"

+#include "objfiles.h"
+#include "gdb-stabs.h"
+#include "target.h"

 
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>


@@ -33,91 +36,176 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Prototypes for local functions */
 
 
 /* Prototypes for local functions */
 

+#if !defined(NO_MMALLOC) && defined(HAVE_MMAP)
+

 static int
 static int

-open_mapped_file PARAMS ((char *basefile, long mtime, int mapped));
+open_existing_mapped_file PARAMS ((char *, long, int));
+
+static int
+open_mapped_file PARAMS ((char *filename, long mtime, int mapped));

 
 static CORE_ADDR
 map_to_address PARAMS ((void));
 
 
 static CORE_ADDR
 map_to_address PARAMS ((void));
 

-/* Externally visible variables that are owned by this module. */
+#endif  /* !defined(NO_MMALLOC) && defined(HAVE_MMAP) */
+
+/* Message to be printed before the error message, when an error occurs.  */
+
+extern char *error_pre_print;
+
+/* Externally visible variables that are owned by this module.
+   See declarations in objfile.h for more info. */

 
 struct objfile *object_files;          /* Linked list of all objfiles */
 
 struct objfile *object_files;          /* Linked list of all objfiles */

+struct objfile *current_objfile;       /* For symbol file being read in */
+struct objfile *symfile_objfile;       /* Main symbol table loaded from */
+

 int mapped_symbol_files;               /* Try to use mapped symbol files */
 
 int mapped_symbol_files;               /* Try to use mapped symbol files */
 

-/* Allocate a new objfile struct, fill it in as best we can, and return it.
-   It is also linked into the list of all known object files. */
+/* Locate all mappable sections of a BFD file. 
+   objfile_p_char is a char * to get it through
+   bfd_map_over_sections; we cast it back to its proper type.  */
+
+static void
+add_to_objfile_sections (abfd, asect, objfile_p_char)
+     bfd *abfd;
+     sec_ptr asect;
+     PTR objfile_p_char;
+{
+  struct objfile *objfile = (struct objfile *) objfile_p_char;
+  struct obj_section section;
+  flagword aflag;
+
+  aflag = bfd_get_section_flags (abfd, asect);
+  if (!(aflag & SEC_ALLOC))
+    return;
+  if (0 == bfd_section_size (abfd, asect))
+    return;
+  section.offset = 0;
+  section.objfile = objfile;
+  section.the_bfd_section = asect;
+  section.addr = bfd_section_vma (abfd, asect);
+  section.endaddr = section.addr + bfd_section_size (abfd, asect);
+  obstack_grow (&objfile->psymbol_obstack, &section, sizeof(section));
+  objfile->sections_end = (struct obj_section *) (((unsigned long) objfile->sections_end) + 1);
+}
+
+/* Builds a section table for OBJFILE.
+   Returns 0 if OK, 1 on error (in which case bfd_error contains the
+   error).  */
+
+int
+build_objfile_section_table (objfile)
+     struct objfile *objfile;
+{
+  /* objfile->sections can be already set when reading a mapped symbol
+     file.  I believe that we do need to rebuild the section table in
+     this case (we rebuild other things derived from the bfd), but we
+     can't free the old one (it's in the psymbol_obstack).  So we just
+     waste some memory.  */
+
+  objfile->sections_end = 0;
+  bfd_map_over_sections (objfile->obfd, add_to_objfile_sections, (char *)objfile);
+  objfile->sections = (struct obj_section *)
+    obstack_finish (&objfile->psymbol_obstack);
+  objfile->sections_end = objfile->sections + (unsigned long) objfile->sections_end;
+  return(0);
+}
+
+/* Given a pointer to an initialized bfd (ABFD) and a flag that indicates
+   whether or not an objfile is to be mapped (MAPPED), allocate a new objfile
+   struct, fill it in as best we can, link it into the list of all known
+   objfiles, and return a pointer to the new objfile struct. */

 
 struct objfile *
 
 struct objfile *

-allocate_objfile (abfd, filename, mapped)
+allocate_objfile (abfd, mapped)

      bfd *abfd;
      bfd *abfd;

-     char *filename;

      int mapped;
 {
   struct objfile *objfile = NULL;
      int mapped;
 {
   struct objfile *objfile = NULL;

-  int fd;
-  void *md;
-  CORE_ADDR mapto;
+  struct objfile *last_one = NULL;

 
   mapped |= mapped_symbol_files;
 
 #if !defined(NO_MMALLOC) && defined(HAVE_MMAP)
 
   mapped |= mapped_symbol_files;
 
 #if !defined(NO_MMALLOC) && defined(HAVE_MMAP)

-
-  /* If we can support mapped symbol files, try to open/reopen the mapped file
-     that corresponds to the file from which we wish to read symbols.  If the
-     objfile is to be mapped, we must malloc the structure itself using the
-     mmap version, and arrange that all memory allocation for the objfile uses
-     the mmap routines.  If we are reusing an existing mapped file, from which
-     we get our objfile pointer, we have to make sure that we update the
-     pointers to the alloc/free functions in the obstack, in case these
-     functions have moved within the current gdb. */
-
-  fd = open_mapped_file (filename, bfd_get_mtime (abfd), mapped);
-  if (fd >= 0)
-    {
-      if (((mapto = map_to_address ()) == NULL) ||
-         ((md = mmalloc_attach (fd, (void *) mapto)) == NULL))
-       {
-         close (fd);
-       }
-      else if ((objfile = (struct objfile *) mmalloc_getkey (md, 0)) != NULL)
-       {
-         objfile -> md = md;
-         /* Update pointers to functions to *our* copies */
-         obstack_chunkfun (&objfile -> psymbol_obstack, xmmalloc);
-         obstack_freefun (&objfile -> psymbol_obstack, mfree);
-         obstack_chunkfun (&objfile -> symbol_obstack, xmmalloc);
-         obstack_freefun (&objfile -> symbol_obstack, mfree);
-         obstack_chunkfun (&objfile -> type_obstack, xmmalloc);
-         obstack_freefun (&objfile -> type_obstack, mfree);
-         /* Update memory corruption handler function addresses */
-         init_malloc (objfile -> md);
-       }
-      else
-       {
-         objfile = (struct objfile *) xmmalloc (md, sizeof (struct objfile));
-         (void) memset (objfile, 0, sizeof (struct objfile));
-         objfile -> md = md;
-         objfile -> flags |= OBJF_MAPPED;
-         mmalloc_setkey (objfile -> md, 0, objfile);
-         obstack_full_begin (&objfile -> psymbol_obstack, 0, 0,
-                             xmmalloc, mfree, objfile -> md,
-                             OBSTACK_MMALLOC_LIKE);
-         obstack_full_begin (&objfile -> symbol_obstack, 0, 0,
-                             xmmalloc, mfree, objfile -> md,
-                             OBSTACK_MMALLOC_LIKE);
-         obstack_full_begin (&objfile -> type_obstack, 0, 0,
-                             xmmalloc, mfree, objfile -> md,
-                             OBSTACK_MMALLOC_LIKE);
-         /* Set up to detect internal memory corruption */
-         init_malloc (objfile -> md);
-       }
-    }
-
-  if (mapped && (objfile == NULL))
-    {
-      warning ("symbol table for '%s' will not be mapped", filename);
-    }
-
+  {
+
+    /* If we can support mapped symbol files, try to open/reopen the
+       mapped file that corresponds to the file from which we wish to
+       read symbols.  If the objfile is to be mapped, we must malloc
+       the structure itself using the mmap version, and arrange that
+       all memory allocation for the objfile uses the mmap routines.
+       If we are reusing an existing mapped file, from which we get
+       our objfile pointer, we have to make sure that we update the
+       pointers to the alloc/free functions in the obstack, in case
+       these functions have moved within the current gdb.  */
+
+    int fd;
+
+    fd = open_mapped_file (bfd_get_filename (abfd), bfd_get_mtime (abfd),
+                          mapped);
+    if (fd >= 0)
+      {
+       CORE_ADDR mapto;
+       PTR md;
+
+       if (((mapto = map_to_address ()) == 0) ||
+           ((md = mmalloc_attach (fd, (PTR) mapto)) == NULL))
+         {
+           close (fd);
+         }
+       else if ((objfile = (struct objfile *) mmalloc_getkey (md, 0)) != NULL)
+         {
+           /* Update memory corruption handler function addresses. */
+           init_malloc (md);
+           objfile -> md = md;
+           objfile -> mmfd = fd;
+           /* Update pointers to functions to *our* copies */
+           obstack_chunkfun (&objfile -> psymbol_obstack, xmmalloc);
+           obstack_freefun (&objfile -> psymbol_obstack, mfree);
+           obstack_chunkfun (&objfile -> symbol_obstack, xmmalloc);
+           obstack_freefun (&objfile -> symbol_obstack, mfree);
+           obstack_chunkfun (&objfile -> type_obstack, xmmalloc);
+           obstack_freefun (&objfile -> type_obstack, mfree);
+           /* If already in objfile list, unlink it. */
+           unlink_objfile (objfile);
+           /* Forget things specific to a particular gdb, may have changed. */
+           objfile -> sf = NULL;
+         }
+       else
+         {
+
+           /* Set up to detect internal memory corruption.  MUST be
+              done before the first malloc.  See comments in
+              init_malloc() and mmcheck().  */
+
+           init_malloc (md);
+
+           objfile = (struct objfile *)
+             xmmalloc (md, sizeof (struct objfile));
+           memset (objfile, 0, sizeof (struct objfile));
+           objfile -> md = md;
+           objfile -> mmfd = fd;
+           objfile -> flags |= OBJF_MAPPED;
+           mmalloc_setkey (objfile -> md, 0, objfile);
+           obstack_specify_allocation_with_arg (&objfile -> psymbol_obstack,
+                                                0, 0, xmmalloc, mfree,
+                                                objfile -> md);
+           obstack_specify_allocation_with_arg (&objfile -> symbol_obstack,
+                                                0, 0, xmmalloc, mfree,
+                                                objfile -> md);
+           obstack_specify_allocation_with_arg (&objfile -> type_obstack,
+                                                0, 0, xmmalloc, mfree,
+                                                objfile -> md);
+         }
+      }
+
+    if (mapped && (objfile == NULL))
+      {
+       warning ("symbol table for '%s' will not be mapped",
+                bfd_get_filename (abfd));
+      }
+  }

 #else  /* defined(NO_MMALLOC) || !defined(HAVE_MMAP) */
 
   if (mapped)
 #else  /* defined(NO_MMALLOC) || !defined(HAVE_MMAP) */
 
   if (mapped)


@@ -140,76 +228,128 @@ allocate_objfile (abfd, filename, mapped)
   if (objfile == NULL)
     {
       objfile = (struct objfile *) xmalloc (sizeof (struct objfile));
   if (objfile == NULL)
     {
       objfile = (struct objfile *) xmalloc (sizeof (struct objfile));

-      (void) memset (objfile, 0, sizeof (struct objfile));
+      memset (objfile, 0, sizeof (struct objfile));

       objfile -> md = NULL;
       objfile -> md = NULL;

-      obstack_full_begin (&objfile -> psymbol_obstack, 0, 0, xmalloc, free,
-                         (void *) 0, 0);
-      obstack_full_begin (&objfile -> symbol_obstack, 0, 0, xmalloc, free,
-                         (void *) 0, 0);
-      obstack_full_begin (&objfile -> type_obstack, 0, 0, xmalloc, free,
-                         (void *) 0, 0);
-
+      obstack_specify_allocation (&objfile -> psymbol_obstack, 0, 0, xmalloc,
+                                 free);
+      obstack_specify_allocation (&objfile -> symbol_obstack, 0, 0, xmalloc,
+                                 free);
+      obstack_specify_allocation (&objfile -> type_obstack, 0, 0, xmalloc,
+                                 free);

     }
 
     }
 

-  /* Now, malloc a fresh copy of the filename string. */
-
-  objfile -> name = xmmalloc (objfile -> md, strlen (filename) + 1);
-  strcpy (objfile -> name, filename);
+  /* Update the per-objfile information that comes from the bfd, ensuring
+     that any data that is reference is saved in the per-objfile data
+     region. */

 
   objfile -> obfd = abfd;
 
   objfile -> obfd = abfd;

-
+  if (objfile -> name != NULL)
+    {
+      mfree (objfile -> md, objfile -> name);
+    }
+  objfile -> name = mstrsave (objfile -> md, bfd_get_filename (abfd));

   objfile -> mtime = bfd_get_mtime (abfd);
 
   objfile -> mtime = bfd_get_mtime (abfd);
 

-  /* Push this file onto the head of the linked list of other such files. */
+  /* Build section table.  */

 
 

-  objfile -> next = object_files;
-  object_files = objfile;
+  if (build_objfile_section_table (objfile))
+    {
+      error ("Can't find the file sections in `%s': %s", 
+            objfile -> name, bfd_errmsg (bfd_get_error ()));
+    }

 
 

+  /* Add this file onto the tail of the linked list of other such files. */
+
+  objfile -> next = NULL;
+  if (object_files == NULL)
+    object_files = objfile;
+  else
+    {
+      for (last_one = object_files;
+          last_one -> next;
+          last_one = last_one -> next);
+      last_one -> next = objfile;
+    }

   return (objfile);
 }
 
   return (objfile);
 }
 

+/* Unlink OBJFILE from the list of known objfiles, if it is found in the
+   list.

 
 

-/* Destroy an objfile and all the symtabs and psymtabs under it.  Note
-   that as much as possible is allocated on the symbol_obstack and
-   psymbol_obstack, so that the memory can be efficiently freed. */
+   It is not a bug, or error, to call this function if OBJFILE is not known
+   to be in the current list.  This is done in the case of mapped objfiles,
+   for example, just to ensure that the mapped objfile doesn't appear twice
+   in the list.  Since the list is threaded, linking in a mapped objfile
+   twice would create a circular list.
+
+   If OBJFILE turns out to be in the list, we zap it's NEXT pointer after
+   unlinking it, just to ensure that we have completely severed any linkages
+   between the OBJFILE and the list. */

 
 void
 
 void

-free_objfile (objfile)
+unlink_objfile (objfile)

      struct objfile *objfile;
 {
      struct objfile *objfile;
 {

-  struct objfile *ofp;
+  struct objfile** objpp;

 
 

-  if (objfile -> name)
-    {
-      mfree (objfile -> md, objfile -> name);
-    }
-  if (objfile -> obfd)
+  for (objpp = &object_files; *objpp != NULL; objpp = &((*objpp) -> next))

     {
     {

-      bfd_close (objfile -> obfd);
+      if (*objpp == objfile) 
+       {
+         *objpp = (*objpp) -> next;
+         objfile -> next = NULL;
+         break;
+       }

     }
     }

+}

 
 

-  /* Remove it from the chain of all objfiles.  */

 
 

-  if (object_files == objfile)
+/* Destroy an objfile and all the symtabs and psymtabs under it.  Note
+   that as much as possible is allocated on the symbol_obstack and
+   psymbol_obstack, so that the memory can be efficiently freed.
+
+   Things which we do NOT free because they are not in malloc'd memory
+   or not in memory specific to the objfile include:
+
+       objfile -> sf
+
+   FIXME:  If the objfile is using reusable symbol information (via mmalloc),
+   then we need to take into account the fact that more than one process
+   may be using the symbol information at the same time (when mmalloc is
+   extended to support cooperative locking).  When more than one process
+   is using the mapped symbol info, we need to be more careful about when
+   we free objects in the reusable area. */
+
+void
+free_objfile (objfile)
+     struct objfile *objfile;
+{
+  /* First do any symbol file specific actions required when we are
+     finished with a particular symbol file.  Note that if the objfile
+     is using reusable symbol information (via mmalloc) then each of
+     these routines is responsible for doing the correct thing, either
+     freeing things which are valid only during this particular gdb
+     execution, or leaving them to be reused during the next one. */
+
+  if (objfile -> sf != NULL)

     {
     {

-      object_files = objfile -> next;
+      (*objfile -> sf -> sym_finish) (objfile);

     }
     }

-  else
+
+  /* We always close the bfd. */
+
+  if (objfile -> obfd != NULL)

     {
     {

-      for (ofp = object_files; ofp; ofp = ofp -> next)
-       {
-         if (ofp -> next == objfile)
-           {
-             ofp -> next = objfile -> next;
-           }
-       }
+      char *name = bfd_get_filename (objfile->obfd);
+      if (!bfd_close (objfile -> obfd))
+       warning ("cannot close \"%s\": %s",
+                name, bfd_errmsg (bfd_get_error ()));
+      free (name);

     }
 
     }
 

-  obstack_free (&objfile -> psymbol_obstack, 0);
-  obstack_free (&objfile -> symbol_obstack, 0);
-  obstack_free (&objfile -> type_obstack, 0);
+  /* Remove it from the chain of all objfiles. */

 
 

-#if 0  /* FIXME!! */
+  unlink_objfile (objfile);

 
   /* Before the symbol table code was redone to make it easier to
      selectively load and remove information particular to a specific
 
   /* Before the symbol table code was redone to make it easier to
      selectively load and remove information particular to a specific


@@ -218,21 +358,66 @@ free_objfile (objfile)
      is unknown, but we play it safe for now and keep each action until
      it is shown to be no longer needed. */
      
      is unknown, but we play it safe for now and keep each action until
      it is shown to be no longer needed. */
      

-  clear_symtab_users_once ();

 #if defined (CLEAR_SOLIB)
   CLEAR_SOLIB ();
 #if defined (CLEAR_SOLIB)
   CLEAR_SOLIB ();

+  /* CLEAR_SOLIB closes the bfd's for any shared libraries.  But
+     the to_sections for a core file might refer to those bfd's.  So
+     detach any core file.  */
+  {
+    struct target_ops *t = find_core_target ();
+    if (t != NULL)
+      (t->to_detach) (NULL, 0);
+  }

 #endif
 #endif

+  /* I *think* all our callers call clear_symtab_users.  If so, no need
+     to call this here.  */

   clear_pc_function_cache ();
 
   clear_pc_function_cache ();
 

-#endif
+  /* The last thing we do is free the objfile struct itself for the
+     non-reusable case, or detach from the mapped file for the reusable
+     case.  Note that the mmalloc_detach or the mfree is the last thing
+     we can do with this objfile. */
+
+#if !defined(NO_MMALLOC) && defined(HAVE_MMAP)
+
+  if (objfile -> flags & OBJF_MAPPED)
+    {
+      /* Remember the fd so we can close it.  We can't close it before
+        doing the detach, and after the detach the objfile is gone. */
+      int mmfd;
+
+      mmfd = objfile -> mmfd;
+      mmalloc_detach (objfile -> md);
+      objfile = NULL;
+      close (mmfd);
+    }
+
+#endif /* !defined(NO_MMALLOC) && defined(HAVE_MMAP) */

 
 

-  /* The last thing we do is free the objfile struct itself */
+  /* If we still have an objfile, then either we don't support reusable
+     objfiles or this one was not reusable.  So free it normally. */

 
 

-  mfree (objfile -> md, objfile);
+  if (objfile != NULL)
+    {
+      if (objfile -> name != NULL)
+       {
+         mfree (objfile -> md, objfile -> name);
+       }
+      if (objfile->global_psymbols.list)
+       mfree (objfile->md, objfile->global_psymbols.list);
+      if (objfile->static_psymbols.list)
+       mfree (objfile->md, objfile->static_psymbols.list);
+      /* Free the obstacks for non-reusable objfiles */
+      obstack_free (&objfile -> psymbol_obstack, 0);
+      obstack_free (&objfile -> symbol_obstack, 0);
+      obstack_free (&objfile -> type_obstack, 0);
+      mfree (objfile -> md, objfile);
+      objfile = NULL;
+    }

 }
 
 
 }
 
 

-/* Free all the object files at once.  */
+/* Free all the object files at once and clean up their users.  */

 
 void
 free_all_objfiles ()
 
 void
 free_all_objfiles ()


@@ -243,8 +428,189 @@ free_all_objfiles ()
     {
       free_objfile (objfile);
     }
     {
       free_objfile (objfile);
     }

+  clear_symtab_users ();

 }
 }

+\f
+/* Relocate OBJFILE to NEW_OFFSETS.  There should be OBJFILE->NUM_SECTIONS
+   entries in new_offsets.  */
+void
+objfile_relocate (objfile, new_offsets)
+     struct objfile *objfile;
+     struct section_offsets *new_offsets;
+{
+  struct section_offsets *delta = (struct section_offsets *) alloca
+    (sizeof (struct section_offsets)
+     + objfile->num_sections * sizeof (delta->offsets));
+
+  {
+    int i;
+    int something_changed = 0;
+    for (i = 0; i < objfile->num_sections; ++i)
+      {
+       ANOFFSET (delta, i) =
+         ANOFFSET (new_offsets, i) - ANOFFSET (objfile->section_offsets, i);
+       if (ANOFFSET (delta, i) != 0)
+         something_changed = 1;
+      }
+    if (!something_changed)
+      return;
+  }
+
+  /* OK, get all the symtabs.  */
+  {
+    struct symtab *s;
+
+    ALL_OBJFILE_SYMTABS (objfile, s)
+      {
+       struct linetable *l;
+       struct blockvector *bv;
+       int i;
+       
+       /* First the line table.  */
+       l = LINETABLE (s);
+       if (l)
+         {
+           for (i = 0; i < l->nitems; ++i)
+             l->item[i].pc += ANOFFSET (delta, s->block_line_section);
+         }
+
+       /* Don't relocate a shared blockvector more than once.  */
+       if (!s->primary)
+         continue;
+
+       bv = BLOCKVECTOR (s);
+       for (i = 0; i < BLOCKVECTOR_NBLOCKS (bv); ++i)
+         {
+           struct block *b;
+           int j;
+           
+           b = BLOCKVECTOR_BLOCK (bv, i);
+           BLOCK_START (b) += ANOFFSET (delta, s->block_line_section);
+           BLOCK_END (b) += ANOFFSET (delta, s->block_line_section);
+
+           for (j = 0; j < BLOCK_NSYMS (b); ++j)
+             {
+               struct symbol *sym = BLOCK_SYM (b, j);
+               /* The RS6000 code from which this was taken skipped
+                  any symbols in STRUCT_NAMESPACE or UNDEF_NAMESPACE.
+                  But I'm leaving out that test, on the theory that
+                  they can't possibly pass the tests below.  */
+               if ((SYMBOL_CLASS (sym) == LOC_LABEL
+                    || SYMBOL_CLASS (sym) == LOC_STATIC)
+                   && SYMBOL_SECTION (sym) >= 0)
+                 {
+                   SYMBOL_VALUE_ADDRESS (sym) +=
+                     ANOFFSET (delta, SYMBOL_SECTION (sym));
+                 }
+#ifdef MIPS_EFI_SYMBOL_NAME
+               /* Relocate Extra Function Info for ecoff.  */
+
+               else
+                 if (SYMBOL_CLASS (sym) == LOC_CONST
+                     && SYMBOL_NAMESPACE (sym) == LABEL_NAMESPACE
+                     && STRCMP (SYMBOL_NAME (sym), MIPS_EFI_SYMBOL_NAME) == 0)
+                   ecoff_relocate_efi (sym, ANOFFSET (delta, s->block_line_section));
+#endif
+             }
+         }
+      }
+  }
+
+  {
+    struct partial_symtab *p;
+
+    ALL_OBJFILE_PSYMTABS (objfile, p)
+      {
+       /* FIXME: specific to symbol readers which use gdb-stabs.h.
+          We can only get away with it since objfile_relocate is only
+          used on XCOFF, which lacks psymtabs, and for gdb-stabs.h
+          targets.  */
+       p->textlow += ANOFFSET (delta, SECT_OFF_TEXT);
+       p->texthigh += ANOFFSET (delta, SECT_OFF_TEXT);
+      }
+  }
+
+  {
+    struct partial_symbol *psym;
+
+    for (psym = objfile->global_psymbols.list;
+        psym < objfile->global_psymbols.next;
+        psym++)
+      if (SYMBOL_SECTION (psym) >= 0)
+       SYMBOL_VALUE_ADDRESS (psym) += ANOFFSET (delta, SYMBOL_SECTION (psym));
+    for (psym = objfile->static_psymbols.list;
+        psym < objfile->static_psymbols.next;
+        psym++)
+      if (SYMBOL_SECTION (psym) >= 0)
+       SYMBOL_VALUE_ADDRESS (psym) += ANOFFSET (delta, SYMBOL_SECTION (psym));
+  }
+
+  {
+    struct minimal_symbol *msym;
+    ALL_OBJFILE_MSYMBOLS (objfile, msym)
+      if (SYMBOL_SECTION (msym) >= 0)
+       SYMBOL_VALUE_ADDRESS (msym) += ANOFFSET (delta, SYMBOL_SECTION (msym));
+  }
+
+  {
+    int i;
+    for (i = 0; i < objfile->num_sections; ++i)
+      ANOFFSET (objfile->section_offsets, i) = ANOFFSET (new_offsets, i);
+  }
+
+  {
+    struct obj_section *s;
+    bfd *abfd;
+
+    abfd = symfile_objfile->obfd;
+
+    for (s = symfile_objfile->sections;
+        s < symfile_objfile->sections_end; ++s)
+      {
+       flagword flags;
+
+       flags = bfd_get_section_flags (abfd, s->the_bfd_section);
+
+       if (flags & SEC_CODE)
+         {
+           s->addr += ANOFFSET (delta, SECT_OFF_TEXT);
+           s->endaddr += ANOFFSET (delta, SECT_OFF_TEXT);
+         }
+       else if (flags & (SEC_DATA | SEC_LOAD))
+         {
+           s->addr += ANOFFSET (delta, SECT_OFF_DATA);
+           s->endaddr += ANOFFSET (delta, SECT_OFF_DATA);
+         }
+       else if (flags & SEC_ALLOC)
+         {
+           s->addr += ANOFFSET (delta, SECT_OFF_BSS);
+           s->endaddr += ANOFFSET (delta, SECT_OFF_BSS);
+         }
+      }
+  }
+
+  if (objfile->ei.entry_point != ~0)
+    objfile->ei.entry_point += ANOFFSET (delta, SECT_OFF_TEXT);
+
+  if (objfile->ei.entry_func_lowpc != INVALID_ENTRY_LOWPC)
+    {
+      objfile->ei.entry_func_lowpc += ANOFFSET (delta, SECT_OFF_TEXT);
+      objfile->ei.entry_func_highpc += ANOFFSET (delta, SECT_OFF_TEXT);
+    }

 
 

+  if (objfile->ei.entry_file_lowpc != INVALID_ENTRY_LOWPC)
+    {
+      objfile->ei.entry_file_lowpc += ANOFFSET (delta, SECT_OFF_TEXT);
+      objfile->ei.entry_file_highpc += ANOFFSET (delta, SECT_OFF_TEXT);
+    }
+
+  if (objfile->ei.main_func_lowpc != INVALID_ENTRY_LOWPC)
+    {
+      objfile->ei.main_func_lowpc += ANOFFSET (delta, SECT_OFF_TEXT);
+      objfile->ei.main_func_highpc += ANOFFSET (delta, SECT_OFF_TEXT);
+    }
+}
+\f

 /* Many places in gdb want to test just to see if we have any partial
    symbols available.  This function returns zero if none are currently
    available, nonzero otherwise. */
 /* Many places in gdb want to test just to see if we have any partial
    symbols available.  This function returns zero if none are currently
    available, nonzero otherwise. */


@@ -253,17 +619,15 @@ int
 have_partial_symbols ()
 {
   struct objfile *ofp;
 have_partial_symbols ()
 {
   struct objfile *ofp;

-  int havethem = 0;

 
 

-  for (ofp = object_files; ofp; ofp = ofp -> next)
+  ALL_OBJFILES (ofp)

     {
       if (ofp -> psymtabs != NULL)
        {
     {
       if (ofp -> psymtabs != NULL)
        {

-         havethem++;
-         break;
+         return 1;

        }
     }
        }
     }

-  return (havethem);
+  return 0;

 }
 
 /* Many places in gdb want to test just to see if we have any full
 }
 
 /* Many places in gdb want to test just to see if we have any full


@@ -274,17 +638,15 @@ int
 have_full_symbols ()
 {
   struct objfile *ofp;
 have_full_symbols ()
 {
   struct objfile *ofp;

-  int havethem = 0;

 
 

-  for (ofp = object_files; ofp; ofp = ofp -> next)
+  ALL_OBJFILES (ofp)

     {
       if (ofp -> symtabs != NULL)
        {
     {
       if (ofp -> symtabs != NULL)
        {

-         havethem++;
-         break;
+         return 1;

        }
     }
        }
     }

-  return (havethem);
+  return 0;

 }
 
 /* Many places in gdb want to test just to see if we have any minimal
 }
 
 /* Many places in gdb want to test just to see if we have any minimal


@@ -295,185 +657,138 @@ int
 have_minimal_symbols ()
 {
   struct objfile *ofp;
 have_minimal_symbols ()
 {
   struct objfile *ofp;

-  int havethem = 0;

 
 

-  for (ofp = object_files; ofp; ofp = ofp -> next)
+  ALL_OBJFILES (ofp)

     {
       if (ofp -> msymbols != NULL)
        {
     {
       if (ofp -> msymbols != NULL)
        {

-         havethem++;
-         break;
+         return 1;

        }
     }
        }
     }

-  return (havethem);
+  return 0;

 }
 
 }
 

-/* Call the function specified by FUNC for each currently available objfile,
-   for as long as this function continues to return NULL.  If the function
-   ever returns non-NULL, then the iteration over the objfiles is terminated,
-   and the result is returned to the caller.  The function called has full
-   control over the form and content of the information returned via the
-   non-NULL result, which may be as simple as a pointer to the objfile that
-   the iteration terminated on, or as complex as a pointer to a private
-   structure containing multiple results. */
-
-PTR
-iterate_over_objfiles (func, arg1, arg2, arg3)
-     PTR (*func) PARAMS ((struct objfile *, PTR, PTR, PTR));
-     PTR arg1;
-     PTR arg2;
-     PTR arg3;
-{
-  register struct objfile *objfile;
-  PTR result = NULL;
+#if !defined(NO_MMALLOC) && defined(HAVE_MMAP)

 
 

-  for (objfile = object_files;
-       objfile != NULL && result == NULL;
-       objfile = objfile -> next)
-    {
-      result = (*func)(objfile, arg1, arg2, arg3);
-    }
-  return (result);
-}
+/* Given the name of a mapped symbol file in SYMSFILENAME, and the timestamp
+   of the corresponding symbol file in MTIME, try to open an existing file
+   with the name SYMSFILENAME and verify it is more recent than the base
+   file by checking it's timestamp against MTIME.

 
 

-/* Call the function specified by FUNC for each currently available symbol
-   table, for as long as this function continues to return NULL.  If the
-   function ever returns non-NULL, then the iteration over the symbol tables
-   is terminated, and the result is returned to the caller.  The function
-   called has full control over the form and content of the information
-   returned via the non-NULL result, which may be as simple as a pointer
-   to the symtab that the iteration terminated on, or as complex as a
-   pointer to a private structure containing multiple results. */
-
-PTR 
-iterate_over_symtabs (func, arg1, arg2, arg3)
-     PTR (*func) PARAMS ((struct objfile *, struct symtab *, PTR, PTR, PTR));
-     PTR arg1;
-     PTR arg2;
-     PTR arg3;
-{
-  register struct objfile *objfile;
-  register struct symtab *symtab;
-  PTR result = NULL;
+   If SYMSFILENAME does not exist (or can't be stat'd), simply returns -1.

 
 

-  for (objfile = object_files;
-       objfile != NULL && result == NULL;
-       objfile = objfile -> next)
-    {
-      for (symtab = objfile -> symtabs;
-          symtab != NULL && result == NULL;
-          symtab = symtab -> next)
-       {
-         result = (*func)(objfile, symtab, arg1, arg2, arg3);
-       }
-    }
-  return (result);
-}
+   If SYMSFILENAME does exist, but is out of date, we check to see if the
+   user has specified creation of a mapped file.  If so, we don't issue
+   any warning message because we will be creating a new mapped file anyway,
+   overwriting the old one.  If not, then we issue a warning message so that
+   the user will know why we aren't using this existing mapped symbol file.
+   In either case, we return -1.
+
+   If SYMSFILENAME does exist and is not out of date, but can't be opened for
+   some reason, then prints an appropriate system error message and returns -1.

 
 

-/* Call the function specified by FUNC for each currently available partial
-   symbol table, for as long as this function continues to return NULL.  If
-   the function ever returns non-NULL, then the iteration over the partial
-   symbol tables is terminated, and the result is returned to the caller.
-
-   The function called has full control over the form and content of the
-   information returned via the non-NULL result, which may be as simple as a
-   pointer to the partial symbol table that the iteration terminated on, or
-   as complex as a pointer to a private structure containing multiple
-   results. */
-
-PTR 
-iterate_over_psymtabs (func, arg1, arg2, arg3)
-     PTR (*func) PARAMS ((struct objfile *, struct partial_symtab *,
-                         PTR, PTR, PTR));
-     PTR arg1;
-     PTR arg2;
-     PTR arg3;
+   Otherwise, returns the open file descriptor.  */
+
+static int
+open_existing_mapped_file (symsfilename, mtime, mapped)
+     char *symsfilename;
+     long mtime;
+     int mapped;

 {
 {

-  register struct objfile *objfile;
-  register struct partial_symtab *psymtab;
-  PTR result = NULL;
+  int fd = -1;
+  struct stat sbuf;

 
 

-  for (objfile = object_files;
-       objfile != NULL && result == NULL;
-       objfile = objfile -> next)
+  if (stat (symsfilename, &sbuf) == 0)

     {
     {

-      for (psymtab = objfile -> psymtabs;
-          psymtab != NULL && result == NULL;
-          psymtab = psymtab -> next)
+      if (sbuf.st_mtime < mtime)
+       {
+         if (!mapped)
+           {
+             warning ("mapped symbol file `%s' is out of date, ignored it",
+                      symsfilename);
+           }
+       }
+      else if ((fd = open (symsfilename, O_RDWR)) < 0)

        {
        {

-         result = (*func)(objfile, psymtab, arg1, arg2, arg3);
+         if (error_pre_print)
+           {
+             printf_unfiltered (error_pre_print);
+           }
+         print_sys_errmsg (symsfilename, errno);

        }
     }
        }
     }

-  return (result);
+  return (fd);

 }
 
 }
 

-
-/* Look for a mapped symbol file that corresponds to BASEFILE and is more
+/* Look for a mapped symbol file that corresponds to FILENAME and is more

    recent than MTIME.  If MAPPED is nonzero, the user has asked that gdb
    recent than MTIME.  If MAPPED is nonzero, the user has asked that gdb

-   use a mapped symbol file for this base file, so create a new one if
-   one does not currently exist.
+   use a mapped symbol file for this file, so create a new one if one does
+   not currently exist.

 
    If found, then return an open file descriptor for the file, otherwise
    return -1.
 
    This routine is responsible for implementing the policy that generates
    the name of the mapped symbol file from the name of a file containing
 
    If found, then return an open file descriptor for the file, otherwise
    return -1.
 
    This routine is responsible for implementing the policy that generates
    the name of the mapped symbol file from the name of a file containing

-   symbols that gdb would like to read. */
+   symbols that gdb would like to read.  Currently this policy is to append
+   ".syms" to the name of the file.
+
+   This routine is also responsible for implementing the policy that
+   determines where the mapped symbol file is found (the search path).
+   This policy is that when reading an existing mapped file, a file of
+   the correct name in the current directory takes precedence over a
+   file of the correct name in the same directory as the symbol file.
+   When creating a new mapped file, it is always created in the current
+   directory.  This helps to minimize the chances of a user unknowingly
+   creating big mapped files in places like /bin and /usr/local/bin, and
+   allows a local copy to override a manually installed global copy (in
+   /bin for example).  */

 
 static int
 
 static int

-open_mapped_file (basefile, mtime, mapped)
-     char *basefile;
+open_mapped_file (filename, mtime, mapped)
+     char *filename;

      long mtime;
      int mapped;
 {
   int fd;
      long mtime;
      int mapped;
 {
   int fd;

-  char *symfilename;
-  struct stat sbuf;
-
-  /* For now, all we do is look in the local directory for a file with
-     the name of the base file and an extension of ".syms" */
-
-  symfilename = concat ("./", basename (basefile), ".syms", (char *) NULL);
+  char *symsfilename;

 
 

-  /* Check to see if the desired file already exists and is more recent than
-     the corresponding base file (specified by the passed MTIME parameter).
-     The open will fail if the file does not already exist. */
+  /* First try to open an existing file in the current directory, and
+     then try the directory where the symbol file is located. */

 
 

-  if ((fd = open (symfilename, O_RDWR)) >= 0)
+  symsfilename = concat ("./", basename (filename), ".syms", (char *) NULL);
+  if ((fd = open_existing_mapped_file (symsfilename, mtime, mapped)) < 0)

     {
     {

-      if (fstat (fd, &sbuf) != 0)
-       {
-         close (fd);
-         perror_with_name (symfilename);
-       }
-      else if (sbuf.st_mtime > mtime)
-       {
-         return (fd);
-       }
-      else
-       {
-         close (fd);
-         fd = -1;
-       }
+      free (symsfilename);
+      symsfilename = concat (filename, ".syms", (char *) NULL);
+      fd = open_existing_mapped_file (symsfilename, mtime, mapped);

     }
 
     }
 

-  /* Either the file does not already exist, or the base file has changed
-     since it was created.  In either case, if the user has specified use of
-     a mapped file, then create a new mapped file, truncating any existing
-     one.
-
-     In the case where there is an existing file, but it is out of date, and
-     the user did not specify mapped, the existing file is just silently
-     ignored.  Perhaps we should warn about this case (FIXME?).
+  /* If we don't have an open file by now, then either the file does not
+     already exist, or the base file has changed since it was created.  In
+     either case, if the user has specified use of a mapped file, then
+     create a new mapped file, truncating any existing one.  If we can't
+     create one, print a system error message saying why we can't.

 
      By default the file is rw for everyone, with the user's umask taking
      care of turning off the permissions the user wants off. */
 
 
      By default the file is rw for everyone, with the user's umask taking
      care of turning off the permissions the user wants off. */
 

-  if (mapped)
+  if ((fd < 0) && mapped)

     {
     {

-      fd = open (symfilename, O_RDWR | O_CREAT | O_TRUNC, 0666);
+      free (symsfilename);
+      symsfilename = concat ("./", basename (filename), ".syms",
+                            (char *) NULL);
+      if ((fd = open (symsfilename, O_RDWR | O_CREAT | O_TRUNC, 0666)) < 0)
+       {
+         if (error_pre_print)
+           {
+             printf_unfiltered (error_pre_print);
+           }
+         print_sys_errmsg (symsfilename, errno);
+       }

     }
 
     }
 

+  free (symsfilename);

   return (fd);
 }
 
   return (fd);
 }
 


@@ -521,3 +836,43 @@ map_to_address ()
 #endif
 
 }
 #endif
 
 }

+
+#endif /* !defined(NO_MMALLOC) && defined(HAVE_MMAP) */
+
+/* Returns a section whose range includes PC or NULL if none found. */
+
+struct obj_section *
+find_pc_section(pc)
+     CORE_ADDR pc;
+{
+  struct obj_section *s;
+  struct objfile *objfile;
+  
+  ALL_OBJFILES (objfile)
+    for (s = objfile->sections; s < objfile->sections_end; ++s)
+      if (s->addr <= pc
+         && pc < s->endaddr)
+       return(s);
+
+  return(NULL);
+}
+
+/* In SVR4, we recognize a trampoline by it's section name. 
+   That is, if the pc is in a section named ".plt" then we are in
+   a trampoline.  */
+
+int
+in_plt_section(pc, name)
+     CORE_ADDR pc;
+     char *name;
+{
+  struct obj_section *s;
+  int retval = 0;
+  
+  s = find_pc_section(pc);
+  
+  retval = (s != NULL
+           && s->the_bfd_section->name != NULL
+           && STREQ (s->the_bfd_section->name, ".plt"));
+  return(retval);
+}