From feae6502eab5208b73767a1070a644c292c19706 Mon Sep 17 00:00:00 2001
From: Mark Kettenis <kettenis@gnu.org>
Date: Sat, 15 May 2004 17:04:10 +0000
Subject: [PATCH] * i386bsd-nat.c (supply_gregset): Use regcache_raw_supply.
 (fill_gregset): Use regcache_raw_collect.

---
 gdb/ChangeLog     |  3 +++
 gdb/i386bsd-nat.c | 14 ++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4737ff09365..02f70a4bf84 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2004-05-15  Mark Kettenis  <kettenis@gnu.org>
 
+	* i386bsd-nat.c (supply_gregset): Use regcache_raw_supply.
+	(fill_gregset): Use regcache_raw_collect.
+
 	* config/djgpp/fnchange.lst: Add entries for ppcobsd-nat.c and
 	ppcobsd-tdep.c.
 
diff --git a/gdb/i386bsd-nat.c b/gdb/i386bsd-nat.c
index 0f06b2b9ba5..ab4d14cd434 100644
--- a/gdb/i386bsd-nat.c
+++ b/gdb/i386bsd-nat.c
@@ -123,14 +123,15 @@ cannot_fetch_register (int regnum)
 void
 supply_gregset (gregset_t *gregsetp)
 {
-  int i;
+  struct regcache *regcache = current_regcache;
+  int regnum;
 
-  for (i = 0; i < I386_NUM_GREGS; i++)
+  for (regnum = 0; regnum < I386_NUM_GREGS; regnum++)
     {
-      if (CANNOT_FETCH_REGISTER (i))
-	supply_register (i, NULL);
+      if (CANNOT_FETCH_REGISTER (regnum))
+	regcache_raw_supply (regcache, regnum, NULL);
       else
-	supply_register (i, REG_ADDR (gregsetp, i));
+	regcache_raw_supply (regcache, regnum, REG_ADDR (gregsetp, regnum));
     }
 }
 
@@ -141,11 +142,12 @@ supply_gregset (gregset_t *gregsetp)
 void
 fill_gregset (gregset_t *gregsetp, int regnum)
 {
+  struct regcache *regcache = current_regcache;
   int i;
 
   for (i = 0; i < I386_NUM_GREGS; i++)
     if ((regnum == -1 || regnum == i) && ! CANNOT_STORE_REGISTER (i))
-      regcache_collect (i, REG_ADDR (gregsetp, i));
+      regcache_raw_collect (regcache, i, REG_ADDR (gregsetp, i));
 }
 
 #include "i387-tdep.h"