btrace: fix test build error in gdb.btrace/instruction_history.c

[deliverable/binutils-gdb.git] / gdb / i386v4-nat.c

diff --git a/gdb/i386v4-nat.c b/gdb/i386v4-nat.c
index 7d9f29a82a43a60513f5b579ffdb0fb2a1bb0dd8..4d1020b8d63e286657648db3a41251bba2b389fb 100644 (file)
--- a/gdb/i386v4-nat.c
+++ b/gdb/i386v4-nat.c
@@ -1,13 +1,12 @@
 /* Native-dependent code for Unix SVR4 running on i386's.
 
 /* Native-dependent code for Unix SVR4 running on i386's.
 

-   Copyright (C) 1988, 1989, 1991, 1992, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2004, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1988-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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "defs.h"
 #include "value.h"
 
 #include "defs.h"
 #include "value.h"


@@ -104,13 +101,13 @@ static int regmap[] =
    in *GREGSETP.  */
 
 void
    in *GREGSETP.  */
 
 void

-supply_gregset (gregset_t *gregsetp)
+supply_gregset (struct regcache *regcache, const gregset_t *gregsetp)

 {
 {

-  greg_t *regp = (greg_t *) gregsetp;
+  const greg_t *regp = (const greg_t *) gregsetp;

   int regnum;
 
   for (regnum = 0; regnum < I386_NUM_GREGS; regnum++)
   int regnum;
 
   for (regnum = 0; regnum < I386_NUM_GREGS; regnum++)

-    regcache_raw_supply (current_regcache, regnum, regp + regmap[regnum]);
+    regcache_raw_supply (regcache, regnum, regp + regmap[regnum]);

 }
 
 /* Fill register REGNUM (if it is a general-purpose register) in
 }
 
 /* Fill register REGNUM (if it is a general-purpose register) in


@@ -118,14 +115,15 @@ supply_gregset (gregset_t *gregsetp)
    do this for all registers.  */
 
 void
    do this for all registers.  */
 
 void

-fill_gregset (gregset_t *gregsetp, int regnum)
+fill_gregset (const struct regcache *regcache,
+             gregset_t *gregsetp, int regnum)

 {
   greg_t *regp = (greg_t *) gregsetp;
   int i;
 
   for (i = 0; i < I386_NUM_GREGS; i++)
     if (regnum == -1 || regnum == i)
 {
   greg_t *regp = (greg_t *) gregsetp;
   int i;
 
   for (i = 0; i < I386_NUM_GREGS; i++)
     if (regnum == -1 || regnum == i)

-      regcache_raw_collect (current_regcache, i, regp + regmap[i]);
+      regcache_raw_collect (regcache, i, regp + regmap[i]);

 }
 
 #endif /* HAVE_GREGSET_T */
 }
 
 #endif /* HAVE_GREGSET_T */


@@ -136,12 +134,12 @@ fill_gregset (gregset_t *gregsetp, int regnum)
    *FPREGSETP.  */
 
 void
    *FPREGSETP.  */
 
 void

-supply_fpregset (fpregset_t *fpregsetp)
+supply_fpregset (struct regcache *regcache, const fpregset_t *fpregsetp)

 {
 {

-  if (FP0_REGNUM == 0)
+  if (gdbarch_fp0_regnum (get_regcache_arch (regcache)) == 0)

     return;
 
     return;
 

-  i387_supply_fsave (current_regcache, -1, fpregsetp);
+  i387_supply_fsave (regcache, -1, fpregsetp);

 }
 
 /* Fill register REGNO (if it is a floating-point register) in
 }
 
 /* Fill register REGNO (if it is a floating-point register) in


@@ -149,12 +147,13 @@ supply_fpregset (fpregset_t *fpregsetp)
    do this for all registers.  */
 
 void
    do this for all registers.  */
 
 void

-fill_fpregset (fpregset_t *fpregsetp, int regno)
+fill_fpregset (const struct regcache *regcache,
+              fpregset_t *fpregsetp, int regno)

 {
 {

-  if (FP0_REGNUM == 0)
+  if (gdbarch_fp0_regnum (get_regcache_arch (regcache)) == 0)

     return;
 
     return;
 

-  i387_fill_fsave ((char *) fpregsetp, regno);
+  i387_collect_fsave (regcache, regno, fpregsetp);

 }
 
 #endif /* HAVE_FPREGSET_T */
 }
 
 #endif /* HAVE_FPREGSET_T */