Remove need_step_over from struct lwp_info

[deliverable/binutils-gdb.git] / gdb / symfile-mem.c

diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c
index d914ac733d9042c145e2045870208e68a59bd8df..79739a601febc365d5bb1d86a3495027c7b79963 100644 (file)
--- a/gdb/symfile-mem.c
+++ b/gdb/symfile-mem.c
@@ -1,13 +1,12 @@
 /* Reading symbol files from memory.
 
 /* Reading symbol files from memory.
 

-   Copyright 1986, 1987, 1989, 1991, 1994, 1995, 1996, 1998, 2000,
-   2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1986-2016 Free Software Foundation, Inc.

 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -16,9 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 /* This file defines functions (and commands to exercise those
    functions) for reading debugging information from object files
 
 /* This file defines functions (and commands to exercise those
    functions) for reading debugging information from object files


@@ -52,45 +49,69 @@
 #include "target.h"
 #include "value.h"
 #include "symfile.h"
 #include "target.h"
 #include "value.h"
 #include "symfile.h"

-#include "symfile-mem.h"
+#include "observer.h"
+#include "auxv.h"
+#include "elf/common.h"
+#include "gdb_bfd.h"

 
 

+/* Verify parameters of target_read_memory_bfd and target_read_memory are
+   compatible.  */
+
+gdb_static_assert (sizeof (CORE_ADDR) == sizeof (bfd_vma));
+gdb_static_assert (sizeof (gdb_byte) == sizeof (bfd_byte));
+gdb_static_assert (sizeof (ssize_t) <= sizeof (bfd_size_type));
+
+/* Provide bfd/ compatible prototype for target_read_memory.  Casting would not
+   be enough as LEN width may differ.  */
+
+static int
+target_read_memory_bfd (bfd_vma memaddr, bfd_byte *myaddr, bfd_size_type len)
+{
+  /* MYADDR must be already allocated for the LEN size so it has to fit in
+     ssize_t.  */
+  gdb_assert ((ssize_t) len == len);
+
+  return target_read_memory (memaddr, myaddr, len);
+}

 
 /* Read inferior memory at ADDR to find the header of a loaded object file
 
 /* Read inferior memory at ADDR to find the header of a loaded object file

-   and read its in-core symbols out of inferior memory.  TEMPL is a bfd
-   representing the target's format.  */
-struct objfile *
-symbol_file_add_from_memory (bfd *templ, CORE_ADDR addr, int from_tty)
+   and read its in-core symbols out of inferior memory.  SIZE, if
+   non-zero, is the known size of the object.  TEMPL is a bfd
+   representing the target's format.  NAME is the name to use for this
+   symbol file in messages; it can be NULL or a malloc-allocated string
+   which will be attached to the BFD.  */
+static struct objfile *
+symbol_file_add_from_memory (struct bfd *templ, CORE_ADDR addr,
+                            size_t size, char *name, int from_tty)

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

-  bfd *nbfd;
-  asection *sec;
+  struct bfd *nbfd;
+  struct bfd_section *sec;

   bfd_vma loadbase;
   struct section_addr_info *sai;
   unsigned int i;
   bfd_vma loadbase;
   struct section_addr_info *sai;
   unsigned int i;

+  struct cleanup *cleanup;

 
   if (bfd_get_flavour (templ) != bfd_target_elf_flavour)
 
   if (bfd_get_flavour (templ) != bfd_target_elf_flavour)

-    error ("add-symbol-file-from-memory not supported for this target");
+    error (_("add-symbol-file-from-memory not supported for this target"));

 
 

-  nbfd = bfd_elf_bfd_from_remote_memory (templ, addr, &loadbase,
-                                        target_read_memory);
+  nbfd = bfd_elf_bfd_from_remote_memory (templ, addr, size, &loadbase,
+                                        target_read_memory_bfd);

   if (nbfd == NULL)
   if (nbfd == NULL)

-    {
-      error ("Failed to read a valid object file image from memory.");
-      return NULL;
-    }
+    error (_("Failed to read a valid object file image from memory."));

 
 

-  nbfd->filename = xstrdup ("shared object read from target memory");
+  gdb_bfd_ref (nbfd);
+  xfree (bfd_get_filename (nbfd));
+  if (name == NULL)
+    nbfd->filename = xstrdup ("shared object read from target memory");
+  else
+    nbfd->filename = name;
+
+  cleanup = make_cleanup_bfd_unref (nbfd);

 
   if (!bfd_check_format (nbfd, bfd_object))
 
   if (!bfd_check_format (nbfd, bfd_object))

-    {
-      /* FIXME: should be checking for errors from bfd_close (for one thing,
-         on error it does not free all the storage associated with the
-         bfd).  */
-      bfd_close (nbfd);
-      error ("Got object file from memory but can't read symbols: %s.",
-            bfd_errmsg (bfd_get_error ()));
-      return NULL;
-    }
+    error (_("Got object file from memory but can't read symbols: %s."),
+          bfd_errmsg (bfd_get_error ()));

 
   sai = alloc_section_addr_info (bfd_count_sections (nbfd));
   make_cleanup (xfree, sai);
 
   sai = alloc_section_addr_info (bfd_count_sections (nbfd));
   make_cleanup (xfree, sai);


@@ -103,13 +124,18 @@ symbol_file_add_from_memory (bfd *templ, CORE_ADDR addr, int from_tty)
        sai->other[i].sectindex = sec->index;
        ++i;
       }
        sai->other[i].sectindex = sec->index;
        ++i;
       }

+  sai->num_sections = i;

 
 

-  objf = symbol_file_add_from_bfd (nbfd, from_tty,
-                                   sai, 0, OBJF_SHARED);
+  objf = symbol_file_add_from_bfd (nbfd, bfd_get_filename (nbfd),
+                                  from_tty ? SYMFILE_VERBOSE : 0,
+                                   sai, OBJF_SHARED, NULL);
+
+  add_target_sections_of_objfile (objf);

 
   /* This might change our ideas about frames already looked at.  */
   reinit_frame_cache ();
 
 
   /* This might change our ideas about frames already looked at.  */
   reinit_frame_cache ();
 

+  do_cleanups (cleanup);

   return objf;
 }
 
   return objf;
 }
 


@@ -118,10 +144,10 @@ static void
 add_symbol_file_from_memory_command (char *args, int from_tty)
 {
   CORE_ADDR addr;
 add_symbol_file_from_memory_command (char *args, int from_tty)
 {
   CORE_ADDR addr;

-  bfd *templ;
+  struct bfd *templ;

 
   if (args == NULL)
 
   if (args == NULL)

-    error ("add-symbol-file-from-memory requires an expression argument");
+    error (_("add-symbol-file-from-memory requires an expression argument"));

 
   addr = parse_and_eval_address (args);
 
 
   addr = parse_and_eval_address (args);
 


@@ -131,21 +157,98 @@ add_symbol_file_from_memory_command (char *args, int from_tty)
   else
     templ = exec_bfd;
   if (templ == NULL)
   else
     templ = exec_bfd;
   if (templ == NULL)

-    error ("\
-Must use symbol-file or exec-file before add-symbol-file-from-memory.");
+    error (_("Must use symbol-file or exec-file "
+            "before add-symbol-file-from-memory."));

 
 

-  symbol_file_add_from_memory (templ, addr, from_tty);
+  symbol_file_add_from_memory (templ, addr, 0, NULL, from_tty);
+}
+
+/* Arguments for symbol_file_add_from_memory_wrapper.  */
+
+struct symbol_file_add_from_memory_args
+{
+  struct bfd *bfd;
+  CORE_ADDR sysinfo_ehdr;
+  size_t size;
+  char *name;
+  int from_tty;
+};
+
+/* Wrapper function for symbol_file_add_from_memory, for
+   catch_exceptions.  */
+
+static int
+symbol_file_add_from_memory_wrapper (struct ui_out *uiout, void *data)
+{
+  struct symbol_file_add_from_memory_args *args
+    = (struct symbol_file_add_from_memory_args *) data;
+
+  symbol_file_add_from_memory (args->bfd, args->sysinfo_ehdr, args->size,
+                              args->name, args->from_tty);
+  return 0;
+}
+
+/* Try to add the symbols for the vsyscall page, if there is one.
+   This function is called via the inferior_created observer.  */
+
+static void
+add_vsyscall_page (struct target_ops *target, int from_tty)
+{
+  struct mem_range vsyscall_range;
+
+  if (gdbarch_vsyscall_range (target_gdbarch (), &vsyscall_range))
+    {
+      struct bfd *bfd;
+      struct symbol_file_add_from_memory_args args;
+
+      if (core_bfd != NULL)
+       bfd = core_bfd;
+      else if (exec_bfd != NULL)
+       bfd = exec_bfd;
+      else
+       /* FIXME: cagney/2004-05-06: Should not require an existing
+         BFD when trying to create a run-time BFD of the VSYSCALL
+         page in the inferior.  Unfortunately that's the current
+         interface so for the moment bail.  Introducing a
+         ``bfd_runtime'' (a BFD created using the loaded image) file
+         format should fix this.  */
+       {
+         warning (_("Could not load vsyscall page "
+                    "because no executable was specified"));
+         return;
+       }
+      args.bfd = bfd;
+      args.sysinfo_ehdr = vsyscall_range.start;
+      args.size = vsyscall_range.length;
+
+      args.name = xstrprintf ("system-supplied DSO at %s",
+                             paddress (target_gdbarch (), vsyscall_range.start));
+      /* Pass zero for FROM_TTY, because the action of loading the
+        vsyscall DSO was not triggered by the user, even if the user
+        typed "run" at the TTY.  */
+      args.from_tty = 0;
+      catch_exceptions (current_uiout, symbol_file_add_from_memory_wrapper,
+                       &args, RETURN_MASK_ALL);
+    }

 }
 
 \f
 }
 
 \f

+
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_symfile_mem;
+

 void
 void

-_initialize_symfile_mem ()
+_initialize_symfile_mem (void)

 {
   add_cmd ("add-symbol-file-from-memory", class_files,
            add_symbol_file_from_memory_command,
 {
   add_cmd ("add-symbol-file-from-memory", class_files,
            add_symbol_file_from_memory_command,

-           "\
-Load the symbols out of memory from a dynamically loaded object file.\n\
-Give an expression for the address of the file's shared object file header.",
+          _("Load the symbols out of memory from a "
+            "dynamically loaded object file.\n"
+            "Give an expression for the address "
+            "of the file's shared object file header."),

            &cmdlist);
 
            &cmdlist);
 

+  /* Want to know of each new inferior so that its vsyscall info can
+     be extracted.  */
+  observer_attach_inferior_created (add_vsyscall_page);

 }
 }