* shnbsd-tdep.c (shnbsd_supply_reg): Add REGCACHE parameter, use it

	instead of current_regcache.  Make REGS const.
	(shnbsd_fill_reg): Add REGCACHE parameter; replace current_regcache.
	* shnbsd-tdep.h (shnbsd_supply_reg, shnbsd_fill_reg): Update
	prototypes.
	* shnbsd-nat.c: Include "regcache.h".
	(shnbsd_fetch_inferior_registers): Pass current_regcache to
	shnbsd_supply_reg.
	(shnbsd_store_inferior_registers): Pass current_regcache to
	shnbsd_fill_reg.
	* Makefile.in (shbsd-nat.o): Update dependencies.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 149a38ce6367e1270ec2b0d67bf5db2fc681b65a..c49861c50ccd44006615774c9c7c1b72dce0502c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,17 @@
+2007-05-06  Ulrich Weigand  <uweigand@de.ibm.com>
+
+       * shnbsd-tdep.c (shnbsd_supply_reg): Add REGCACHE parameter, use it
+       instead of current_regcache.  Make REGS const.
+       (shnbsd_fill_reg): Add REGCACHE parameter; replace current_regcache.
+       * shnbsd-tdep.h (shnbsd_supply_reg, shnbsd_fill_reg): Update
+       prototypes.
+       * shnbsd-nat.c: Include "regcache.h".
+       (shnbsd_fetch_inferior_registers): Pass current_regcache to
+       shnbsd_supply_reg.
+       (shnbsd_store_inferior_registers): Pass current_regcache to
+       shnbsd_fill_reg.
+       * Makefile.in (shbsd-nat.o): Update dependencies.
+
 2007-05-06  Ulrich Weigand  <uweigand@de.ibm.com>
 
        * mips-linux-tdep.c (supply_32bit_reg): Add REGCACHE parameter.  Use it

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 40823b64843a62986c1fd7498eca16ab1604ea06..a24eea4220e840fac08a9bbbe83c87d5400201db 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2553,7 +2553,7 @@ sh64-tdep.o: sh64-tdep.c $(defs_h) $(frame_h) $(frame_base_h) \
        $(gdb_string_h) $(gdb_assert_h) $(arch_utils_h) $(regcache_h) \
        $(osabi_h) $(elf_bfd_h) $(elf_sh_h) $(gdb_sim_sh_h)
 shnbsd-nat.o: shnbsd-nat.c $(defs_h) $(inferior_h) $(sh_tdep_h) \
-       $(shnbsd_tdep_h) $(inf_ptrace_h)
+       $(shnbsd_tdep_h) $(inf_ptrace_h) $(regcache_h)
 shnbsd-tdep.o: shnbsd-tdep.c $(defs_h) $(gdbcore_h) $(regcache_h) $(regset_h) \
        $(value_h) $(osabi_h) $(gdb_assert_h) $(gdb_string_h) $(sh_tdep_h) \
        $(shnbsd_tdep_h) $(solib_svr4_h)

diff --git a/gdb/shnbsd-nat.c b/gdb/shnbsd-nat.c
index 8139ed9caf60ef5585e4aafc65e8ffc48771c7c8..128dc0faeb6239590b67b3b6c851e5cb9c1c8d4f 100644 (file)
--- a/gdb/shnbsd-nat.c
+++ b/gdb/shnbsd-nat.c
@@ -31,6 +31,8 @@
 #include "sh-tdep.h"
 #include "shnbsd-tdep.h"
 #include "inf-ptrace.h"
+#include "regcache.h"
+
 
 /* Determine if PT_GETREGS fetches this register. */
 #define GETREGS_SUPPLIES(regno) \
@@ -50,7 +52,7 @@ shnbsd_fetch_inferior_registers (int regno)
                  (PTRACE_TYPE_ARG3) &inferior_registers, 0) == -1)
        perror_with_name (_("Couldn't get registers"));
 
-      shnbsd_supply_reg ((char *) &inferior_registers, regno);
+      shnbsd_supply_reg (current_regcache, (char *) &inferior_registers, regno);
 
       if (regno != -1)
        return;
@@ -68,7 +70,7 @@ shnbsd_store_inferior_registers (int regno)
                  (PTRACE_TYPE_ARG3) &inferior_registers, 0) == -1)
        perror_with_name (_("Couldn't get registers"));
 
-      shnbsd_fill_reg ((char *) &inferior_registers, regno);
+      shnbsd_fill_reg (current_regcache, (char *) &inferior_registers, regno);
 
       if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
                  (PTRACE_TYPE_ARG3) &inferior_registers, 0) == -1)

diff --git a/gdb/shnbsd-tdep.c b/gdb/shnbsd-tdep.c
index da2431d73265d83a311f934ffee064e43288f296..5108fc4ef6d8c883d64e6713785152b98ddd2f10 100644 (file)
--- a/gdb/shnbsd-tdep.c
+++ b/gdb/shnbsd-tdep.c
@@ -156,16 +156,16 @@ shnbsd_regset_from_core_section (struct gdbarch *gdbarch,
 }
 
 void
-shnbsd_supply_reg (char *regs, int regnum)
+shnbsd_supply_reg (struct regcache *regcache, const char *regs, int regnum)
 {
-  shnbsd_supply_gregset (&shnbsd_gregset, current_regcache, regnum,
+  shnbsd_supply_gregset (&shnbsd_gregset, regcache, regnum,
                         regs, SHNBSD_SIZEOF_GREGS);
 }
 
 void
-shnbsd_fill_reg (char *regs, int regnum)
+shnbsd_fill_reg (const struct regcache *regcache, char *regs, int regnum)
 {
-  shnbsd_collect_gregset (&shnbsd_gregset, current_regcache, regnum,
+  shnbsd_collect_gregset (&shnbsd_gregset, regcache, regnum,
                          regs, SHNBSD_SIZEOF_GREGS);
 }
 \f

diff --git a/gdb/shnbsd-tdep.h b/gdb/shnbsd-tdep.h
index e57fd585ca2692f04c31ffbc6b8615e158ad635c..2b366c0bbc201c60c30a61a9d011426b4fcf84a6 100644 (file)
--- a/gdb/shnbsd-tdep.h
+++ b/gdb/shnbsd-tdep.h
@@ -22,7 +22,7 @@
 #ifndef SH_NBSD_TDEP_H
 #define SH_NBSD_TDEP_H
 
-void shnbsd_supply_reg (char *, int);
-void shnbsd_fill_reg (char *, int);
+void shnbsd_supply_reg (struct regcache *, const char *, int);
+void shnbsd_fill_reg (const struct regcache *, char *, int);
 
 #endif /* SH_NBSD_TDEP_H */