* i386-tdep.c (i386_mmx_regnum_to_fp_regnum): Renamed from

mmx_regnum_to_fp_regnum.  Adjust all callers.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 700bdbac567dd7889358be8d9ce816a480b76426..2caa790861574890b483723cc371fe45997c7447 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2003-04-19  Mark Kettenis  <kettenis@gnu.org>
 
+       * i386-tdep.c (i386_mmx_regnum_to_fp_regnum): Renamed from
+       mmx_regnum_to_fp_regnum.  Adjust all callers.
+
        * i386-tdep.c (i386_get_longjmp_target): Use
        TYPE_LENGTH(builtin_type_void_func_ptr) instead of TARGET_PTR_BIT
        and TARGET_CHAR_BIT.  Use extract_typed_address instead of

diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index dde3b255de2b6bb7f6c22a6188d1ac57d5c01cdf..071c1324eda8a3e37b2990d638d20f36032befb2 100644 (file)
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -1141,19 +1141,21 @@ i386_register_type (struct gdbarch *gdbarch, int regnum)
 }
 
 /* Map a cooked register onto a raw register or memory.  For the i386,
-   the MMX registers need to be mapped onto floating point registers.  */
+   the MMX registers need to be mapped onto floating-point registers.  */
 
 static int
-mmx_regnum_to_fp_regnum (struct regcache *regcache, int regnum)
+i386_mmx_regnum_to_fp_regnum (struct regcache *regcache, int regnum)
 {
   int mmxi;
   ULONGEST fstat;
   int tos;
   int fpi;
+
   mmxi = regnum - MM0_REGNUM;
   regcache_raw_read_unsigned (regcache, FSTAT_REGNUM, &fstat);
   tos = (fstat >> 11) & 0x7;
   fpi = (mmxi + tos) % 8;
+
   return (FP0_REGNUM + fpi);
 }
 
@@ -1164,9 +1166,10 @@ i386_pseudo_register_read (struct gdbarch *gdbarch, struct regcache *regcache,
   if (i386_mmx_regnum_p (regnum))
     {
       char *mmx_buf = alloca (MAX_REGISTER_RAW_SIZE);
-      int fpnum = mmx_regnum_to_fp_regnum (regcache, regnum);
-      regcache_raw_read (regcache, fpnum, mmx_buf);
+      int fpnum = i386_mmx_regnum_to_fp_regnum (regcache, regnum);
+
       /* Extract (always little endian).  */
+      regcache_raw_read (regcache, fpnum, mmx_buf);
       memcpy (buf, mmx_buf, REGISTER_RAW_SIZE (regnum));
     }
   else
@@ -1180,7 +1183,8 @@ i386_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache,
   if (i386_mmx_regnum_p (regnum))
     {
       char *mmx_buf = alloca (MAX_REGISTER_RAW_SIZE);
-      int fpnum = mmx_regnum_to_fp_regnum (regcache, regnum);
+      int fpnum = i386_mmx_regnum_to_fp_regnum (regcache, regnum);
+
       /* Read ...  */
       regcache_raw_read (regcache, fpnum, mmx_buf);
       /* ... Modify ... (always little endian).  */