add missing pr number

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

diff --git a/gdb/corelow.c b/gdb/corelow.c
index a9d213284384c506bc5f71ed0c9a699b0bdc3d55..49de82d6352e77478ce958e40de8eda18b9c0859 100644 (file)
--- a/gdb/corelow.c
+++ b/gdb/corelow.c
@@ -1,14 +1,14 @@
 /* Core dump and executable file functions below target vector, for GDB.
 
 /* Core dump and executable file functions below target vector, for GDB.
 

-   Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994, 1995, 1996,
-   1997, 1998, 1999, 2000, 2001, 2003, 2004 Free Software Foundation,
-   Inc.
+   Copyright (C) 1986, 1987, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
+   1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+   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,


@@ -17,9 +17,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/>.  */

 
 #include "defs.h"
 #include "arch-utils.h"
 
 #include "defs.h"
 #include "arch-utils.h"


@@ -43,12 +41,11 @@
 #include "symfile.h"
 #include "exec.h"
 #include "readline/readline.h"
 #include "symfile.h"
 #include "exec.h"
 #include "readline/readline.h"

-#include "observer.h"

 #include "gdb_assert.h"
 #include "gdb_assert.h"

+#include "exceptions.h"
+#include "solib.h"
+#include "filenames.h"

 
 

-#ifndef O_BINARY
-#define O_BINARY 0
-#endif

 
 #ifndef O_LARGEFILE
 #define O_LARGEFILE 0
 
 #ifndef O_LARGEFILE
 #define O_LARGEFILE 0


@@ -70,11 +67,15 @@ static struct core_fns *core_vec = NULL;
 
 struct gdbarch *core_gdbarch = NULL;
 
 
 struct gdbarch *core_gdbarch = NULL;
 

-static void core_files_info (struct target_ops *);
+/* Per-core data.  Currently, only the section table.  Note that these
+   target sections are *not* mapped in the current address spaces' set
+   of target sections --- those should come only from pure executable
+   or shared library bfds.  The core bfd sections are an
+   implementation detail of the core target, just like ptrace is for
+   unix child targets.  */
+static struct target_section_table *core_data;

 
 

-#ifdef SOLIB_ADD
-static int solib_add_stub (void *);
-#endif
+static void core_files_info (struct target_ops *);

 
 static struct core_fns *sniff_core_bfd (bfd *);
 
 
 static struct core_fns *sniff_core_bfd (bfd *);
 


@@ -82,26 +83,23 @@ static int gdb_check_format (bfd *);
 
 static void core_open (char *, int);
 
 
 static void core_open (char *, int);
 

-static void core_detach (char *, int);
+static void core_detach (struct target_ops *ops, char *, int);

 
 static void core_close (int);
 
 static void core_close_cleanup (void *ignore);
 
 
 static void core_close (int);
 
 static void core_close_cleanup (void *ignore);
 

-static void get_core_registers (int);
-

 static void add_to_thread_list (bfd *, asection *, void *);
 
 static void add_to_thread_list (bfd *, asection *, void *);
 

-static int ignore (CORE_ADDR, char *);
-
-static int core_file_thread_alive (ptid_t tid);
-

 static void init_core_ops (void);
 
 void _initialize_corelow (void);
 
 struct target_ops core_ops;
 
 static void init_core_ops (void);
 
 void _initialize_corelow (void);
 
 struct target_ops core_ops;
 

+/* An arbitrary identifier for the core inferior.  */
+#define CORELOW_PID 1
+

 /* Link a new core_fns into the global core_file_fns list.  Called on gdb
    startup by the _initialize routine in each core file register reader, to
    register information about each format the the reader is prepared to
 /* Link a new core_fns into the global core_file_fns list.  Called on gdb
    startup by the _initialize routine in each core file register reader, to
    register information about each format the the reader is prepared to


@@ -153,12 +151,12 @@ sniff_core_bfd (bfd *abfd)
     }
   if (matches > 1)
     {
     }
   if (matches > 1)
     {

-      warning ("\"%s\": ambiguous core format, %d handlers match",
+      warning (_("\"%s\": ambiguous core format, %d handlers match"),

               bfd_get_filename (abfd), matches);
     }
   else if (matches == 0)
     {
               bfd_get_filename (abfd), matches);
     }
   else if (matches == 0)
     {

-      warning ("\"%s\": no core file handler recognizes format, using default",
+      warning (_("\"%s\": no core file handler recognizes format, using default"),

               bfd_get_filename (abfd));
     }
   if (yummy == NULL)
               bfd_get_filename (abfd));
     }
   if (yummy == NULL)


@@ -205,26 +203,24 @@ core_close (int quitting)
 
   if (core_bfd)
     {
 
   if (core_bfd)
     {

+      int pid = ptid_get_pid (inferior_ptid);

       inferior_ptid = null_ptid;       /* Avoid confusion from thread stuff */
       inferior_ptid = null_ptid;       /* Avoid confusion from thread stuff */

+      delete_inferior_silent (pid);

 
       /* Clear out solib state while the bfd is still open. See
          comments in clear_solib in solib.c. */
 
       /* Clear out solib state while the bfd is still open. See
          comments in clear_solib in solib.c. */

-#ifdef CLEAR_SOLIB
-      CLEAR_SOLIB ();
-#endif
+      clear_solib ();
+
+      xfree (core_data->sections);
+      xfree (core_data);
+      core_data = NULL;

 
       name = bfd_get_filename (core_bfd);
       if (!bfd_close (core_bfd))
 
       name = bfd_get_filename (core_bfd);
       if (!bfd_close (core_bfd))

-       warning ("cannot close \"%s\": %s",
+       warning (_("cannot close \"%s\": %s"),

                 name, bfd_errmsg (bfd_get_error ()));
       xfree (name);
       core_bfd = NULL;
                 name, bfd_errmsg (bfd_get_error ()));
       xfree (name);
       core_bfd = NULL;

-      if (core_ops.to_sections)
-       {
-         xfree (core_ops.to_sections);
-         core_ops.to_sections = NULL;
-         core_ops.to_sections_end = NULL;
-       }

     }
   core_vec = NULL;
   core_gdbarch = NULL;
     }
   core_vec = NULL;
   core_gdbarch = NULL;


@@ -236,25 +232,13 @@ core_close_cleanup (void *ignore)
   core_close (0/*ignored*/);
 }
 
   core_close (0/*ignored*/);
 }
 

-#ifdef SOLIB_ADD
-/* Stub function for catch_errors around shared library hacking.  FROM_TTYP
-   is really an int * which points to from_tty.  */
-
-static int
-solib_add_stub (void *from_ttyp)
-{
-  SOLIB_ADD (NULL, *(int *) from_ttyp, &current_target, auto_solib_add);
-  re_enable_breakpoints_in_shlibs ();
-  return 0;
-}
-#endif /* SOLIB_ADD */
-

 /* Look for sections whose names start with `.reg/' so that we can extract the
    list of threads in a core file.  */
 
 static void
 add_to_thread_list (bfd *abfd, asection *asect, void *reg_sect_arg)
 {
 /* Look for sections whose names start with `.reg/' so that we can extract the
    list of threads in a core file.  */
 
 static void
 add_to_thread_list (bfd *abfd, asection *asect, void *reg_sect_arg)
 {

+  ptid_t ptid;

   int thread_id;
   asection *reg_sect = (asection *) reg_sect_arg;
 
   int thread_id;
   asection *reg_sect = (asection *) reg_sect_arg;
 


@@ -263,13 +247,30 @@ add_to_thread_list (bfd *abfd, asection *asect, void *reg_sect_arg)
 
   thread_id = atoi (bfd_section_name (abfd, asect) + 5);
 
 
   thread_id = atoi (bfd_section_name (abfd, asect) + 5);
 

-  add_thread (pid_to_ptid (thread_id));
+  if (core_gdbarch
+      && gdbarch_core_reg_section_encodes_pid (core_gdbarch))
+    {
+      uint32_t merged_pid = thread_id;
+      ptid = ptid_build (merged_pid & 0xffff,
+                        merged_pid >> 16, 0);
+    }
+  else
+    ptid = ptid_build (ptid_get_pid (inferior_ptid), thread_id, 0);
+
+  if (ptid_get_lwp (inferior_ptid) == 0)
+    /* The main thread has already been added before getting here, and
+       this is the first time we hear about a thread id.  Assume this
+       is the main thread.  */
+    thread_change_ptid (inferior_ptid, ptid);
+  else
+    /* Nope, really a new thread.  */
+    add_thread (ptid);

 
 /* Warning, Will Robinson, looking at BFD private data! */
 
   if (reg_sect != NULL
       && asect->filepos == reg_sect->filepos)  /* Did we find .reg? */
 
 /* Warning, Will Robinson, looking at BFD private data! */
 
   if (reg_sect != NULL
       && asect->filepos == reg_sect->filepos)  /* Did we find .reg? */

-    inferior_ptid = pid_to_ptid (thread_id);   /* Yes, make it current */
+    inferior_ptid = ptid;                       /* Yes, make it current */

 }
 
 /* This routine opens and sets up the core file bfd.  */
 }
 
 /* This routine opens and sets up the core file bfd.  */


@@ -282,22 +283,23 @@ core_open (char *filename, int from_tty)
   struct cleanup *old_chain;
   char *temp;
   bfd *temp_bfd;
   struct cleanup *old_chain;
   char *temp;
   bfd *temp_bfd;

-  int ontop;

   int scratch_chan;
   int flags;
   int scratch_chan;
   int flags;

+  int corelow_pid = CORELOW_PID;

 
   target_preopen (from_tty);
   if (!filename)
     {
 
   target_preopen (from_tty);
   if (!filename)
     {

-      error (core_bfd ?
-            "No core file specified.  (Use `detach' to stop debugging a core file.)"
-            : "No core file specified.");
+      if (core_bfd)
+       error (_("No core file specified.  (Use `detach' to stop debugging a core file.)"));
+      else
+       error (_("No core file specified."));

     }
 
   filename = tilde_expand (filename);
     }
 
   filename = tilde_expand (filename);

-  if (filename[0] != '/')
+  if (!IS_ABSOLUTE_PATH(filename))

     {
     {

-      temp = concat (current_directory, "/", filename, NULL);
+      temp = concat (current_directory, "/", filename, (char *)NULL);

       xfree (filename);
       filename = temp;
     }
       xfree (filename);
       filename = temp;
     }


@@ -313,7 +315,9 @@ core_open (char *filename, int from_tty)
   if (scratch_chan < 0)
     perror_with_name (filename);
 
   if (scratch_chan < 0)
     perror_with_name (filename);
 

-  temp_bfd = bfd_fdopenr (filename, gnutarget, scratch_chan);
+  temp_bfd = bfd_fopen (filename, gnutarget, 
+                       write_files ? FOPEN_RUB : FOPEN_RB,
+                       scratch_chan);

   if (temp_bfd == NULL)
     perror_with_name (filename);
 
   if (temp_bfd == NULL)
     perror_with_name (filename);
 


@@ -325,7 +329,7 @@ core_open (char *filename, int from_tty)
          on error it does not free all the storage associated with the
          bfd).  */
       make_cleanup_bfd_close (temp_bfd);
          on error it does not free all the storage associated with the
          bfd).  */
       make_cleanup_bfd_close (temp_bfd);

-      error ("\"%s\" is not a core dump: %s",
+      error (_("\"%s\" is not a core dump: %s"),

             filename, bfd_errmsg (bfd_get_error ()));
     }
 
             filename, bfd_errmsg (bfd_get_error ()));
     }
 


@@ -349,10 +353,12 @@ core_open (char *filename, int from_tty)
 
   validate_files ();
 
 
   validate_files ();
 

+  core_data = XZALLOC (struct target_section_table);
+

   /* Find the data section */
   /* Find the data section */

-  if (build_section_table (core_bfd, &core_ops.to_sections,
-                          &core_ops.to_sections_end))
-    error ("\"%s\": Can't find sections: %s",
+  if (build_section_table (core_bfd,
+                          &core_data->sections, &core_data->sections_end))
+    error (_("\"%s\": Can't find sections: %s"),

           bfd_get_filename (core_bfd), bfd_errmsg (bfd_get_error ()));
 
   /* If we have no exec file, try to set the architecture from the
           bfd_get_filename (core_bfd), bfd_errmsg (bfd_get_error ()));
 
   /* If we have no exec file, try to set the architecture from the


@@ -362,16 +368,50 @@ core_open (char *filename, int from_tty)
   if (!exec_bfd)
     set_gdbarch_from_file (core_bfd);
 
   if (!exec_bfd)
     set_gdbarch_from_file (core_bfd);
 

-  ontop = !push_target (&core_ops);
+  push_target (&core_ops);

   discard_cleanups (old_chain);
 
   discard_cleanups (old_chain);
 

-  /* This is done first, before anything has a chance to query the
-     inferior for information such as symbols.  */
-  observer_notify_inferior_created (&core_ops, from_tty);
+  add_inferior_silent (corelow_pid);
+
+  /* Do this before acknowledging the inferior, so if
+     post_create_inferior throws (can happen easilly if you're loading
+     a core file with the wrong exec), we aren't left with threads
+     from the previous inferior.  */
+  init_thread_list ();
+
+  /* Set INFERIOR_PTID early, so an upper layer can rely on it being
+     set while in the target_find_new_threads call below.  */
+  inferior_ptid = pid_to_ptid (corelow_pid);
+
+  /* Assume ST --- Add a main task.  We'll later detect when we go
+     from ST to MT.  */
+  add_thread_silent (inferior_ptid);
+
+  /* Need to flush the register cache (and the frame cache) from a
+     previous debug session.  If inferior_ptid ends up the same as the
+     last debug session --- e.g., b foo; run; gcore core1; step; gcore
+     core2; core core1; core core2 --- then there's potential for
+     get_current_regcache to return the cached regcache of the
+     previous session, and the frame cache being stale.  */
+  registers_changed ();
+
+  /* Build up thread list from BFD sections, and possibly set the
+     current thread to the .reg/NN section matching the .reg
+     section. */
+  bfd_map_over_sections (core_bfd, add_to_thread_list,
+                        bfd_get_section_by_name (core_bfd, ".reg"));
+
+  post_create_inferior (&core_ops, from_tty);
+
+  /* Now go through the target stack looking for threads since there
+     may be a thread_stratum target loaded on top of target core by
+     now.  The layer above should claim threads found in the BFD
+     sections.  */
+  target_find_new_threads ();

 
   p = bfd_core_file_failing_command (core_bfd);
   if (p)
 
   p = bfd_core_file_failing_command (core_bfd);
   if (p)

-    printf_filtered ("Core was generated by `%s'.\n", p);
+    printf_filtered (_("Core was generated by `%s'.\n"), p);

 
   siggy = bfd_core_file_failing_signal (core_bfd);
   if (siggy > 0)
 
   siggy = bfd_core_file_failing_signal (core_bfd);
   if (siggy > 0)


@@ -379,59 +419,58 @@ core_open (char *filename, int from_tty)
        into gdb's internal signal value.  Unfortunately gdb's internal
        value is called ``target_signal'' and this function got the
        name ..._from_host(). */
        into gdb's internal signal value.  Unfortunately gdb's internal
        value is called ``target_signal'' and this function got the
        name ..._from_host(). */

-    printf_filtered ("Program terminated with signal %d, %s.\n", siggy,
-                    target_signal_to_string (target_signal_from_host (siggy)));
-
-  /* Build up thread list from BFD sections. */
-
-  init_thread_list ();
-  bfd_map_over_sections (core_bfd, add_to_thread_list,
-                        bfd_get_section_by_name (core_bfd, ".reg"));
+    printf_filtered (_("Program terminated with signal %d, %s.\n"), siggy,
+                    target_signal_to_string (
+                      (core_gdbarch != NULL) ?
+                       gdbarch_target_signal_from_host (core_gdbarch, siggy)
+                       : siggy));

 
 

-  if (ontop)
-    {
-      /* Fetch all registers from core file.  */
-      target_fetch_registers (-1);
+  /* Fetch all registers from core file.  */
+  target_fetch_registers (get_current_regcache (), -1);

 
 

-      /* Add symbols and section mappings for any shared libraries.  */
-#ifdef SOLIB_ADD
-      catch_errors (solib_add_stub, &from_tty, (char *) 0,
-                   RETURN_MASK_ALL);
-#endif
-
-      /* Now, set up the frame cache, and print the top of stack.  */
-      flush_cached_frames ();
-      select_frame (get_current_frame ());
-      print_stack_frame (get_selected_frame (), 1, SRC_AND_LOC);
-    }
-  else
-    {
-      warning (
-               "you won't be able to access this core file until you terminate\n\
-your %s; do ``info files''", target_longname);
-    }
+  /* Now, set up the frame cache, and print the top of stack.  */
+  reinit_frame_cache ();
+  print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC);

 }
 
 static void
 }
 
 static void

-core_detach (char *args, int from_tty)
+core_detach (struct target_ops *ops, char *args, int from_tty)

 {
   if (args)
 {
   if (args)

-    error ("Too many arguments");
-  unpush_target (&core_ops);
+    error (_("Too many arguments"));
+  unpush_target (ops);

   reinit_frame_cache ();
   if (from_tty)
   reinit_frame_cache ();
   if (from_tty)

-    printf_filtered ("No core file now.\n");
+    printf_filtered (_("No core file now.\n"));

 }
 
 }
 

+#ifdef DEPRECATED_IBM6000_TARGET
+
+/* Resize the core memory's section table, by NUM_ADDED.  Returns a
+   pointer into the first new slot.  This will not be necessary when
+   the rs6000 target is converted to use the standard solib
+   framework.  */
+
+struct target_section *
+deprecated_core_resize_section_table (int num_added)
+{
+  int old_count;
+
+  old_count = resize_section_table (core_data, num_added);
+  return core_data->sections + old_count;
+}
+
+#endif

 
 /* Try to retrieve registers from a section in core_bfd, and supply
    them to core_vec->core_read_registers, as the register set numbered
    WHICH.
 
 
 /* Try to retrieve registers from a section in core_bfd, and supply
    them to core_vec->core_read_registers, as the register set numbered
    WHICH.
 

-   If inferior_ptid is zero, do the single-threaded thing: look for a
-   section named NAME.  If inferior_ptid is non-zero, do the
-   multi-threaded thing: look for a section named "NAME/PID", where
-   PID is the shortest ASCII decimal representation of inferior_ptid.
+   If inferior_ptid's lwp member is zero, do the single-threaded
+   thing: look for a section named NAME.  If inferior_ptid's lwp
+   member is non-zero, do the multi-threaded thing: look for a section
+   named "NAME/LWP", where LWP is the shortest ASCII decimal
+   representation of inferior_ptid's lwp member.

 
    HUMAN_NAME is a human-readable name for the kind of registers the
    NAME section contains, for use in error messages.
 
    HUMAN_NAME is a human-readable name for the kind of registers the
    NAME section contains, for use in error messages.


@@ -440,26 +479,39 @@ core_detach (char *args, int from_tty)
    have a section by the appropriate name.  Otherwise, just do nothing.  */
 
 static void
    have a section by the appropriate name.  Otherwise, just do nothing.  */
 
 static void

-get_core_register_section (char *name,
+get_core_register_section (struct regcache *regcache,
+                          char *name,

                           int which,
                           char *human_name,
                           int required)
 {
                           int which,
                           char *human_name,
                           int required)
 {

-  char section_name[100];
+  static char *section_name = NULL;

   struct bfd_section *section;
   bfd_size_type size;
   char *contents;
 
   struct bfd_section *section;
   bfd_size_type size;
   char *contents;
 

-  if (PIDGET (inferior_ptid))
-    sprintf (section_name, "%s/%d", name, PIDGET (inferior_ptid));
+  xfree (section_name);
+
+  if (core_gdbarch
+      && gdbarch_core_reg_section_encodes_pid (core_gdbarch))
+    {
+      uint32_t merged_pid;
+
+      merged_pid = ptid_get_lwp (inferior_ptid);
+      merged_pid = merged_pid << 16 | ptid_get_pid (inferior_ptid);
+
+      section_name = xstrprintf ("%s/%s", name, plongest (merged_pid));
+    }
+  else if (ptid_get_lwp (inferior_ptid))
+    section_name = xstrprintf ("%s/%ld", name, ptid_get_lwp (inferior_ptid));

   else
   else

-    strcpy (section_name, name);
+    section_name = xstrdup (name);

 
   section = bfd_get_section_by_name (core_bfd, section_name);
   if (! section)
     {
       if (required)
 
   section = bfd_get_section_by_name (core_bfd, section_name);
   if (! section)
     {
       if (required)

-       warning ("Couldn't find %s registers in core file.\n", human_name);
+       warning (_("Couldn't find %s registers in core file."), human_name);

       return;
     }
 
       return;
     }
 


@@ -468,7 +520,7 @@ get_core_register_section (char *name,
   if (! bfd_get_section_contents (core_bfd, section, contents,
                                  (file_ptr) 0, size))
     {
   if (! bfd_get_section_contents (core_bfd, section, contents,
                                  (file_ptr) 0, size))
     {

-      warning ("Couldn't read %s registers from `%s' section in core file.\n",
+      warning (_("Couldn't read %s registers from `%s' section in core file."),

               human_name, name);
       return;
     }
               human_name, name);
       return;
     }


@@ -481,17 +533,17 @@ get_core_register_section (char *name,
       if (regset == NULL)
        {
          if (required)
       if (regset == NULL)
        {
          if (required)

-           warning ("Couldn't recognize %s registers in core file.\n",
+           warning (_("Couldn't recognize %s registers in core file."),

                     human_name);
          return;
        }
 
                     human_name);
          return;
        }
 

-      regset->supply_regset (regset, current_regcache, -1, contents, size);
+      regset->supply_regset (regset, regcache, -1, contents, size);

       return;
     }
 
   gdb_assert (core_vec);
       return;
     }
 
   gdb_assert (core_vec);

-  core_vec->core_read_registers (contents, size, which,
+  core_vec->core_read_registers (regcache, contents, size, which,

                                 ((CORE_ADDR)
                                  bfd_section_vma (core_bfd, section)));
 }
                                 ((CORE_ADDR)
                                  bfd_section_vma (core_bfd, section)));
 }


@@ -504,9 +556,10 @@ get_core_register_section (char *name,
 /* We just get all the registers, so we don't use regno.  */
 
 static void
 /* We just get all the registers, so we don't use regno.  */
 
 static void

-get_core_registers (int regno)
+get_core_registers (struct target_ops *ops,
+                   struct regcache *regcache, int regno)

 {
 {

-  int status;
+  int i;

 
   if (!(core_gdbarch && gdbarch_regset_from_core_section_p (core_gdbarch))
       && (core_vec == NULL || core_vec->core_read_registers == NULL))
 
   if (!(core_gdbarch && gdbarch_regset_from_core_section_p (core_gdbarch))
       && (core_vec == NULL || core_vec->core_read_registers == NULL))


@@ -516,34 +569,72 @@ get_core_registers (int regno)
       return;
     }
 
       return;
     }
 

-  get_core_register_section (".reg", 0, "general-purpose", 1);
-  get_core_register_section (".reg2", 2, "floating-point", 0);
-  get_core_register_section (".reg-xfp", 3, "extended floating-point", 0);
-
-  deprecated_registers_fetched ();
+  get_core_register_section (regcache,
+                            ".reg", 0, "general-purpose", 1);
+  get_core_register_section (regcache,
+                            ".reg2", 2, "floating-point", 0);
+  get_core_register_section (regcache,
+                            ".reg-xfp", 3, "extended floating-point", 0);
+  get_core_register_section (regcache,
+                            ".reg-ppc-vmx", 3, "ppc Altivec", 0);
+  get_core_register_section (regcache,
+                            ".reg-ppc-vsx", 4, "POWER7 VSX", 0);
+
+  /* Supply dummy value for all registers not found in the core.  */
+  for (i = 0; i < gdbarch_num_regs (get_regcache_arch (regcache)); i++)
+    if (!regcache_valid_p (regcache, i))
+      regcache_raw_supply (regcache, i, NULL);

 }
 
 static void
 core_files_info (struct target_ops *t)
 {
 }
 
 static void
 core_files_info (struct target_ops *t)
 {

-  print_section_info (t, core_bfd);
+  print_section_info (core_data, core_bfd);

 }
 \f
 }
 \f

+struct spuid_list
+{
+  gdb_byte *buf;
+  ULONGEST offset;
+  LONGEST len;
+  ULONGEST pos;
+  ULONGEST written;
+};
+
+static void
+add_to_spuid_list (bfd *abfd, asection *asect, void *list_p)
+{
+  struct spuid_list *list = list_p;
+  enum bfd_endian byte_order
+    = bfd_big_endian (abfd)? BFD_ENDIAN_BIG : BFD_ENDIAN_LITTLE;
+  int fd, pos = 0;
+
+  sscanf (bfd_section_name (abfd, asect), "SPU/%d/regs%n", &fd, &pos);
+  if (pos == 0)
+    return;
+
+  if (list->pos >= list->offset && list->pos + 4 <= list->offset + list->len)
+    {
+      store_unsigned_integer (list->buf + list->pos - list->offset,
+                             4, byte_order, fd);
+      list->written += 4;
+    }
+  list->pos += 4;
+}
+

 static LONGEST
 core_xfer_partial (struct target_ops *ops, enum target_object object,
 static LONGEST
 core_xfer_partial (struct target_ops *ops, enum target_object object,

-                  const char *annex, void *readbuf,
-                  const void *writebuf, ULONGEST offset, LONGEST len)
+                  const char *annex, gdb_byte *readbuf,
+                  const gdb_byte *writebuf, ULONGEST offset, LONGEST len)

 {
   switch (object)
     {
     case TARGET_OBJECT_MEMORY:
 {
   switch (object)
     {
     case TARGET_OBJECT_MEMORY:

-      if (readbuf)
-       return (*ops->to_xfer_memory) (offset, readbuf, len, 0/*write*/,
-                                      NULL, ops);
-      if (writebuf)
-       return (*ops->to_xfer_memory) (offset, readbuf, len, 1/*write*/,
-                                      NULL, ops);
-      return -1;
+      return section_table_xfer_memory_partial (readbuf, writebuf,
+                                               offset, len,
+                                               core_data->sections,
+                                               core_data->sections_end,
+                                               NULL);

 
     case TARGET_OBJECT_AUXV:
       if (readbuf)
 
     case TARGET_OBJECT_AUXV:
       if (readbuf)


@@ -569,7 +660,7 @@ core_xfer_partial (struct target_ops *ops, enum target_object object,
              && !bfd_get_section_contents (core_bfd, section, readbuf,
                                            (file_ptr) offset, size))
            {
              && !bfd_get_section_contents (core_bfd, section, readbuf,
                                            (file_ptr) offset, size))
            {

-             warning ("Couldn't read NT_AUXV note in core file.");
+             warning (_("Couldn't read NT_AUXV note in core file."));

              return -1;
            }
 
              return -1;
            }
 


@@ -601,7 +692,7 @@ core_xfer_partial (struct target_ops *ops, enum target_object object,
              && !bfd_get_section_contents (core_bfd, section, readbuf,
                                            (file_ptr) offset, size))
            {
              && !bfd_get_section_contents (core_bfd, section, readbuf,
                                            (file_ptr) offset, size))
            {

-             warning ("Couldn't read StackGhost cookie in core file.");
+             warning (_("Couldn't read StackGhost cookie in core file."));

              return -1;
            }
 
              return -1;
            }
 


@@ -609,6 +700,65 @@ core_xfer_partial (struct target_ops *ops, enum target_object object,
        }
       return -1;
 
        }
       return -1;
 

+    case TARGET_OBJECT_LIBRARIES:
+      if (core_gdbarch
+         && gdbarch_core_xfer_shared_libraries_p (core_gdbarch))
+       {
+         if (writebuf)
+           return -1;
+         return
+           gdbarch_core_xfer_shared_libraries (core_gdbarch,
+                                               readbuf, offset, len);
+       }
+      /* FALL THROUGH */
+
+    case TARGET_OBJECT_SPU:
+      if (readbuf && annex)
+       {
+         /* When the SPU contexts are stored in a core file, BFD
+            represents this with a fake section called "SPU/<annex>".  */
+
+         struct bfd_section *section;
+         bfd_size_type size;
+         char *contents;
+
+         char sectionstr[100];
+         xsnprintf (sectionstr, sizeof sectionstr, "SPU/%s", annex);
+
+         section = bfd_get_section_by_name (core_bfd, sectionstr);
+         if (section == NULL)
+           return -1;
+
+         size = bfd_section_size (core_bfd, section);
+         if (offset >= size)
+           return 0;
+         size -= offset;
+         if (size > len)
+           size = len;
+         if (size > 0
+             && !bfd_get_section_contents (core_bfd, section, readbuf,
+                                           (file_ptr) offset, size))
+           {
+             warning (_("Couldn't read SPU section in core file."));
+             return -1;
+           }
+
+         return size;
+       }
+      else if (readbuf)
+       {
+         /* NULL annex requests list of all present spuids.  */
+         struct spuid_list list;
+         list.buf = readbuf;
+         list.offset = offset;
+         list.len = len;
+         list.pos = 0;
+         list.written = 0;
+         bfd_map_over_sections (core_bfd, add_to_spuid_list, &list);
+         return list.written;
+       }
+      return -1;
+

     default:
       if (ops->beneath != NULL)
        return ops->beneath->to_xfer_partial (ops->beneath, object, annex,
     default:
       if (ops->beneath != NULL)
        return ops->beneath->to_xfer_partial (ops->beneath, object, annex,


@@ -622,7 +772,7 @@ core_xfer_partial (struct target_ops *ops, enum target_object object,
    `gdb internal error' (since generic_mourn calls breakpoint_init_inferior).  */
 
 static int
    `gdb internal error' (since generic_mourn calls breakpoint_init_inferior).  */
 
 static int

-ignore (CORE_ADDR addr, char *contents)
+ignore (struct gdbarch *gdbarch, struct bp_target_info *bp_tgt)

 {
   return 0;
 }
 {
   return 0;
 }


@@ -635,11 +785,64 @@ ignore (CORE_ADDR addr, char *contents)
    behaviour.
  */
 static int
    behaviour.
  */
 static int

-core_file_thread_alive (ptid_t tid)
+core_thread_alive (struct target_ops *ops, ptid_t ptid)

 {
   return 1;
 }
 
 {
   return 1;
 }
 

+/* Ask the current architecture what it knows about this core file.
+   That will be used, in turn, to pick a better architecture.  This
+   wrapper could be avoided if targets got a chance to specialize
+   core_ops.  */
+
+static const struct target_desc *
+core_read_description (struct target_ops *target)
+{
+  if (core_gdbarch && gdbarch_core_read_description_p (core_gdbarch))
+    return gdbarch_core_read_description (core_gdbarch, target, core_bfd);
+
+  return NULL;
+}
+
+static char *
+core_pid_to_str (struct target_ops *ops, ptid_t ptid)
+{
+  static char buf[64];
+
+  if (core_gdbarch
+      && gdbarch_core_pid_to_str_p (core_gdbarch))
+    {
+      char *ret = gdbarch_core_pid_to_str (core_gdbarch, ptid);
+      if (ret != NULL)
+       return ret;
+    }
+
+  if (ptid_get_lwp (ptid) == 0)
+    xsnprintf (buf, sizeof buf, "<main task>");
+  else
+    xsnprintf (buf, sizeof buf, "Thread %ld", ptid_get_lwp (ptid));
+
+  return buf;
+}
+
+static int
+core_has_memory (struct target_ops *ops)
+{
+  return (core_bfd != NULL);
+}
+
+static int
+core_has_stack (struct target_ops *ops)
+{
+  return (core_bfd != NULL);
+}
+
+static int
+core_has_registers (struct target_ops *ops)
+{
+  return (core_bfd != NULL);
+}
+

 /* Fill in core_ops with its defined operations and properties.  */
 
 static void
 /* Fill in core_ops with its defined operations and properties.  */
 
 static void


@@ -655,32 +858,24 @@ init_core_ops (void)
   core_ops.to_detach = core_detach;
   core_ops.to_fetch_registers = get_core_registers;
   core_ops.to_xfer_partial = core_xfer_partial;
   core_ops.to_detach = core_detach;
   core_ops.to_fetch_registers = get_core_registers;
   core_ops.to_xfer_partial = core_xfer_partial;

-  core_ops.to_xfer_memory = xfer_memory;

   core_ops.to_files_info = core_files_info;
   core_ops.to_insert_breakpoint = ignore;
   core_ops.to_remove_breakpoint = ignore;
   core_ops.to_create_inferior = find_default_create_inferior;
   core_ops.to_files_info = core_files_info;
   core_ops.to_insert_breakpoint = ignore;
   core_ops.to_remove_breakpoint = ignore;
   core_ops.to_create_inferior = find_default_create_inferior;

-  core_ops.to_thread_alive = core_file_thread_alive;
+  core_ops.to_thread_alive = core_thread_alive;
+  core_ops.to_read_description = core_read_description;
+  core_ops.to_pid_to_str = core_pid_to_str;

   core_ops.to_stratum = core_stratum;
   core_ops.to_stratum = core_stratum;

-  core_ops.to_has_memory = 1;
-  core_ops.to_has_stack = 1;
-  core_ops.to_has_registers = 1;
+  core_ops.to_has_memory = core_has_memory;
+  core_ops.to_has_stack = core_has_stack;
+  core_ops.to_has_registers = core_has_registers;

   core_ops.to_magic = OPS_MAGIC;
 }
 
   core_ops.to_magic = OPS_MAGIC;
 }
 

-/* non-zero if we should not do the add_target call in
-   _initialize_corelow; not initialized (i.e., bss) so that
-   the target can initialize it (i.e., data) if appropriate.
-   This needs to be set at compile time because we don't know
-   for sure whether the target's initialize routine is called
-   before us or after us. */
-int coreops_suppress_target;
-

 void
 _initialize_corelow (void)
 {
   init_core_ops ();
 
 void
 _initialize_corelow (void)
 {
   init_core_ops ();
 

-  if (!coreops_suppress_target)
-    add_target (&core_ops);
+  add_target (&core_ops);

 }
 }