* Makefile.in (mips-linux-tdep.o): Update dependencies.

* mips-linux-tdep.c: Include "regcache.h".
	(fill_fpregset, mips64_fill_fpregset): Use regcache_raw_collect.

gdb/ChangeLog

@@ -1,3 +1,9 @@
+2004-11-14  Daniel Jacobowitz  <dan@debian.org>
+
+	* Makefile.in (mips-linux-tdep.o): Update dependencies.
+	* mips-linux-tdep.c: Include "regcache.h".
+	(fill_fpregset, mips64_fill_fpregset): Use regcache_raw_collect.
+
 2004-11-14  Daniel Jacobowitz  <dan@debian.org>
 
 	* Makefile.in (linux-thread-db.o): Fix typo in last change.

gdb/Makefile.in

@@ -2234,7 +2234,8 @@ mips-irix-tdep.o: mips-irix-tdep.c $(defs_h) $(osabi_h) $(elf_bfd_h)
 mips-linux-nat.o: mips-linux-nat.c $(defs_h) $(mips_tdep_h)
 mips-linux-tdep.o: mips-linux-tdep.c $(defs_h) $(gdbcore_h) $(target_h) \
 	$(solib_svr4_h) $(osabi_h) $(mips_tdep_h) $(gdb_string_h) \
-	$(gdb_assert_h) $(frame_h) $(trad_frame_h) $(tramp_frame_h)
+	$(gdb_assert_h) $(frame_h) $(regcache_h) $(trad_frame_h) \
+	$(tramp_frame_h)
 mips-mdebug-tdep.o: mips-mdebug-tdep.c $(defs_h) $(frame_h) $(mips_tdep_h) \
 	$(trad_frame_h) $(block_h) $(symtab_h) $(objfiles_h) $(elf_mips_h) \
 	$(elf_bfd_h) $(gdb_assert_h) $(frame_unwind_h) $(frame_base_h) \

gdb/mips-linux-tdep.c

@@ -28,6 +28,7 @@
 #include "gdb_string.h"
 #include "gdb_assert.h"
 #include "frame.h"
+#include "regcache.h"
 #include "trad-frame.h"
 #include "tramp-frame.h"
 
@@ -221,15 +222,13 @@ fill_fpregset (elf_fpregset_t *fpregsetp, int regno)
 
   if ((regno >= FP0_REGNUM) && (regno < FP0_REGNUM + 32))
     {
-      from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)];
       to = (char *) (*fpregsetp + regno - FP0_REGNUM);
-      memcpy (to, from, register_size (current_gdbarch, regno - FP0_REGNUM));
+      regcache_raw_collect (current_regcache, regno, to);
     }
   else if (regno == mips_regnum (current_gdbarch)->fp_control_status)
     {
-      from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)];
       to = (char *) (*fpregsetp + 32);
-      memcpy (to, from, register_size (current_gdbarch, regno));
+      regcache_raw_collect (current_regcache, regno, to);
     }
   else if (regno == -1)
     {
@@ -500,15 +499,13 @@ mips64_fill_fpregset (mips64_elf_fpregset_t *fpregsetp, int regno)
 
   if ((regno >= FP0_REGNUM) && (regno < FP0_REGNUM + 32))
     {
-      from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)];
       to = (char *) (*fpregsetp + regno - FP0_REGNUM);
-      memcpy (to, from, register_size (current_gdbarch, regno - FP0_REGNUM));
+      regcache_raw_collect (current_regcache, regno, to);
     }
   else if (regno == mips_regnum (current_gdbarch)->fp_control_status)
     {
-      from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)];
       to = (char *) (*fpregsetp + 32);
-      memcpy (to, from, register_size (current_gdbarch, regno));
+      regcache_raw_collect (current_regcache, regno, to);
     }
   else if (regno == -1)
     {