X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fcore-regset.c;h=773afc904ee4bb3b084f5667166f772240329980;hb=b08b78e7d4bb56f395d3212eed6184ede236c760;hp=a43922d6426bf197d399b23a914164f3fb114766;hpb=7f7fe91e15ea6d4eb8e1f600ce962b944f5df2c0;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/core-regset.c b/gdb/core-regset.c
index a43922d642..773afc904e 100644
--- a/gdb/core-regset.c
+++ b/gdb/core-regset.c
@@ -1,13 +1,12 @@
 /* Machine independent GDB support for core files on systems using "regsets".
 
-   Copyright (C) 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2003, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1993-2015 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
-   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,
@@ -16,9 +15,7 @@
    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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* This file is used by most systems that use ELF for their core
    dumps.  This includes most systems that have SVR4-ish variant of
@@ -37,8 +34,6 @@
 #include "regcache.h"
 
 #include <fcntl.h>
-#include <errno.h>
-#include "gdb_string.h"
 #include <time.h>
 #ifdef HAVE_SYS_PROCFS_H
 #include <sys/procfs.h>
@@ -60,11 +55,16 @@
    REG_ADDR is ignored.  */
 
 static void
-fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which,
+fetch_core_registers (struct regcache *regcache,
+		      char *core_reg_sect,
+		      unsigned core_reg_size,
+		      int which,
 		      CORE_ADDR reg_addr)
 {
   gdb_gregset_t gregset;
   gdb_fpregset_t fpregset;
+  gdb_gregset_t *gregset_p = &gregset;
+  gdb_fpregset_t *fpregset_p = &fpregset;
 
   switch (which)
     {
@@ -74,7 +74,7 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which,
       else
 	{
 	  memcpy (&gregset, core_reg_sect, sizeof (gregset));
-	  supply_gregset (current_regcache, (const gdb_gregset_t *) &gregset);
+	  supply_gregset (regcache, (const gdb_gregset_t *) gregset_p);
 	}
       break;
 
@@ -84,8 +84,9 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which,
       else
 	{
 	  memcpy (&fpregset, core_reg_sect, sizeof (fpregset));
-	  if (FP0_REGNUM >= 0)
-	    supply_fpregset (current_regcache, (const gdb_fpregset_t *) &fpregset);
+	  if (gdbarch_fp0_regnum (get_regcache_arch (regcache)) >= 0)
+	    supply_fpregset (regcache,
+			     (const gdb_fpregset_t *) fpregset_p);
 	}
       break;