2005-01-12 Andrew Cagney <cagney@gnu.org>

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

diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c
index d914ac733d9042c145e2045870208e68a59bd8df..7a4549f1eeaed0689bfb16748b090b4ac25c5c2d 100644 (file)
--- a/gdb/symfile-mem.c
+++ b/gdb/symfile-mem.c
@@ -48,22 +48,28 @@
 #include "symtab.h"
 #include "gdbcore.h"
 #include "objfiles.h"
+#include "exceptions.h"
 #include "gdbcmd.h"
 #include "target.h"
 #include "value.h"
 #include "symfile.h"
-#include "symfile-mem.h"
+#include "observer.h"
+#include "auxv.h"
+#include "elf/common.h"
 
 
 /* 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)
+   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, char *name,
+                            int from_tty)
 {
   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;
@@ -74,12 +80,12 @@ symbol_file_add_from_memory (bfd *templ, CORE_ADDR addr, int from_tty)
   nbfd = bfd_elf_bfd_from_remote_memory (templ, addr, &loadbase,
                                         target_read_memory);
   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");
+  if (name == NULL)
+    nbfd->filename = xstrdup ("shared object read from target memory");
+  else
+    nbfd->filename = name;
 
   if (!bfd_check_format (nbfd, bfd_object))
     {
@@ -89,7 +95,6 @@ symbol_file_add_from_memory (bfd *templ, CORE_ADDR addr, int from_tty)
       bfd_close (nbfd);
       error ("Got object file from memory but can't read symbols: %s.",
             bfd_errmsg (bfd_get_error ()));
-      return NULL;
     }
 
   sai = alloc_section_addr_info (bfd_count_sections (nbfd));
@@ -118,7 +123,7 @@ static void
 add_symbol_file_from_memory_command (char *args, int from_tty)
 {
   CORE_ADDR addr;
-  bfd *templ;
+  struct bfd *templ;
 
   if (args == NULL)
     error ("add-symbol-file-from-memory requires an expression argument");
@@ -134,12 +139,78 @@ add_symbol_file_from_memory_command (char *args, int from_tty)
     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, 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;
+  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 = data;
+
+  symbol_file_add_from_memory (args->bfd, args->sysinfo_ehdr, 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)
+{
+  CORE_ADDR sysinfo_ehdr;
+
+  if (target_auxv_search (target, AT_SYSINFO_EHDR, &sysinfo_ehdr) > 0
+      && sysinfo_ehdr != (CORE_ADDR) 0)
+    {
+      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");
+         warning ("try using the \"file\" command first");
+         return;
+       }
+      args.bfd = bfd;
+      args.sysinfo_ehdr = sysinfo_ehdr;
+      xasprintf (&args.name, "system-supplied DSO at 0x%s",
+                paddr_nz (sysinfo_ehdr));
+      /* 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 (uiout, symbol_file_add_from_memory_wrapper,
+                       &args, NULL, RETURN_MASK_ALL);
+    }
 }
 
 \f
 void
-_initialize_symfile_mem ()
+_initialize_symfile_mem (void)
 {
   add_cmd ("add-symbol-file-from-memory", class_files,
            add_symbol_file_from_memory_command,
@@ -148,4 +219,7 @@ 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);
 
+  /* Want to know of each new inferior so that its vsyscall info can
+     be extracted.  */
+  observer_attach_inferior_created (add_vsyscall_page);
 }