From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mark Kettenis <kettenis@chello.nl>
To: gdb-patches@sources.redhat.com
Subject: [PATCH] Some regset-related cleanup for i386bsd-nat.c
Date: Mon, 31 May 2004 10:01:00 -0000
Message-id: <200405311001.i4VA1Ok1041099@elgar.kettenis.dyndns.org>
X-SW-Source: 2004-05/msg00789.html

Committed,

Mark


Index: ChangeLog
from  Mark Kettenis  <kettenis@gnu.org>

	* i386bsd-nat.c: Don't include "gregset.h".
	(supply_gregset, fill_gregset): Make static.
	(supply_fpregset, fill_fpregset): Remove.
	* Makefile.in (i386bsd-nat.o): Update dependencies.

Index: i386bsd-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/i386bsd-nat.c,v
retrieving revision 1.27
diff -u -p -r1.27 i386bsd-nat.c
--- i386bsd-nat.c 15 May 2004 17:04:10 -0000 1.27
+++ i386bsd-nat.c 31 May 2004 09:59:38 -0000
@@ -43,8 +43,8 @@ typedef struct reg gregset_t;
 typedef struct fpreg fpregset_t;
 #endif
 
-#include "gregset.h"
 #include "i386-tdep.h"
+#include "i387-tdep.h"
 
 
 /* In older BSD versions we cannot get at some of the segment
@@ -120,7 +120,7 @@ cannot_fetch_register (int regnum)
 /* Fill GDB's register array with the general-purpose register values
    in *GREGSETP.  */
 
-void
+static void
 supply_gregset (gregset_t *gregsetp)
 {
   struct regcache *regcache = current_regcache;
@@ -139,7 +139,7 @@ supply_gregset (gregset_t *gregsetp)
    *GREGSETPS with the value in GDB's register array.  If REGNUM is -1,
    do this for all registers.  */
 
-void
+static void
 fill_gregset (gregset_t *gregsetp, int regnum)
 {
   struct regcache *regcache = current_regcache;
@@ -150,26 +150,7 @@ fill_gregset (gregset_t *gregsetp, int r
       regcache_raw_collect (regcache, i, REG_ADDR (gregsetp, i));
 }
 
-#include "i387-tdep.h"
-
-/* Fill GDB's register array with the floating-point register values
-   in *FPREGSETP.  */
 
-void
-supply_fpregset (fpregset_t *fpregsetp)
-{
-  i387_supply_fsave (current_regcache, -1, fpregsetp);
-}
-
-/* Fill register REGNUM (if it is a floating-point register) in
-   *FPREGSETP with the value in GDB's register array.  If REGNUM is
-   -1, do this for all registers.  */
-
-void
-fill_fpregset (fpregset_t *fpregsetp, int regnum)
-{
-  i387_collect_fsave (current_regcache, regnum, fpregsetp);
-}
 
 /* Fetch register REGNUM from the inferior.  If REGNUM is -1, do this
    for all registers (including the floating point registers).  */
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.582
diff -u -p -r1.582 Makefile.in
--- Makefile.in 30 May 2004 18:29:10 -0000 1.582
+++ Makefile.in 31 May 2004 09:59:41 -0000
@@ -1855,7 +1855,7 @@ hpread.o: hpread.c $(defs_h) $(bfd_h) $(
 hpux-thread.o: hpux-thread.c $(defs_h) $(gdbthread_h) $(target_h) \
 	$(inferior_h) $(regcache_h) $(gdb_stat_h) $(gdbcore_h)
 i386bsd-nat.o: i386bsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \
-	$(gdb_assert_h) $(gregset_h) $(i386_tdep_h) $(i387_tdep_h)
+	$(gdb_assert_h) $(i386_tdep_h) $(i387_tdep_h)
 i386bsd-tdep.o: i386bsd-tdep.c $(defs_h) $(arch_utils_h) $(frame_h) \
 	$(gdbcore_h) $(regcache_h) $(osabi_h) $(gdb_string_h) $(i386_tdep_h)
 i386-cygwin-tdep.o: i386-cygwin-tdep.c $(defs_h) $(osabi_h) $(gdb_string_h) \