2003-11-16 Andrew Cagney <cagney@redhat.com>

	* mips-tdep.c (mips_register_byte): Delete function.
	(mips_gdbarch_init): Do not set "deprecated_register_byte".
	* config/mips/tm-mips.h (MIPS_REGISTER_BYTE): Delete macro.
	* config/mips/tm-irix6.h (MIPS_REGISTER_BYTE): Delete macro.
	* config/mips/tm-irix5.h (MIPS_REGISTER_BYTE): Delete macro.

5 files changed, 8 insertions, 66 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 611839d..c73118d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2003-11-16  Andrew Cagney  <cagney@redhat.com>
+
+	* mips-tdep.c (mips_register_byte): Delete function.
+	(mips_gdbarch_init): Do not set "deprecated_register_byte".
+	* config/mips/tm-mips.h (MIPS_REGISTER_BYTE): Delete macro.
+	* config/mips/tm-irix6.h (MIPS_REGISTER_BYTE): Delete macro.
+	* config/mips/tm-irix5.h (MIPS_REGISTER_BYTE): Delete macro.
+
 2003-11-16  Mark Kettenis  <kettenis@gnu.org>
 
 	* i386-tdep.c (i386_extract_return_value): Don't use bfd_byte.
diff --git a/gdb/config/mips/tm-irix5.h b/gdb/config/mips/tm-irix5.h
index da440b6..5faf7e5 100644
--- a/gdb/config/mips/tm-irix5.h
+++ b/gdb/config/mips/tm-irix5.h
@@ -67,26 +67,6 @@
 #define SIGFRAME_REGSAVE_OFF	(SIGFRAME_BASE + 3 * 4)
 #define SIGFRAME_FPREGSAVE_OFF	(SIGFRAME_BASE + 3 * 4 + 32 * 4 + 4)
 
-/* FIXME: cagney/2000-04-04: Testing the _MIPS_SIM_NABI32 and
-   _MIPS_SIM in a tm-*.h file is simply wrong!  Those are
-   host-dependant macros (provided by /usr/include) and stop any
-   chance of the target being cross compiled */
-#if defined (_MIPS_SIM_NABI32) && _MIPS_SIM == _MIPS_SIM_NABI32
-/*
- * Irix 6 (n32 ABI) has 32-bit GP regs and 64-bit FP regs
- */
-
-#undef  MIPS_REGISTER_BYTE
-#define MIPS_REGISTER_BYTE(N) \
-     (((N) < FP0_REGNUM) ? (N) * mips_regsize (current_gdbarch) : \
-      ((N) < FP0_REGNUM + 32) ?     \
-      FP0_REGNUM * mips_regsize (current_gdbarch) + \
-      ((N) - FP0_REGNUM) * sizeof(double) : \
-      32 * sizeof(double) + ((N) - 32) * mips_regsize (current_gdbarch))
-
-#endif /* N32 */
-
-
 /* The signal handler trampoline is called _sigtramp.  */
 #undef IN_SIGTRAMP
 #define IN_SIGTRAMP(pc, name) ((name) && STREQ ("_sigtramp", name))
diff --git a/gdb/config/mips/tm-irix6.h b/gdb/config/mips/tm-irix6.h
index 037ac81..bf4842a 100644
--- a/gdb/config/mips/tm-irix6.h
+++ b/gdb/config/mips/tm-irix6.h
@@ -61,15 +61,6 @@
 #define FCRCS_REGNUM 69		/* FP control/status */
 #define FCRIR_REGNUM 70		/* FP implementation/revision */
 
-
-#undef  MIPS_REGISTER_BYTE
-#define MIPS_REGISTER_BYTE(N) \
-     (((N) < FP0_REGNUM) ? (N) * mips_regsize (current_gdbarch) : \
-      ((N) < FP0_REGNUM + 32) ?     \
-      FP0_REGNUM * mips_regsize (current_gdbarch) + \
-      ((N) - FP0_REGNUM) * sizeof(double) : \
-      32 * sizeof(double) + ((N) - 32) * mips_regsize (current_gdbarch))
-
 /* The signal handler trampoline is called _sigtramp.  */
 #undef IN_SIGTRAMP
 #define IN_SIGTRAMP(pc, name) ((name) && STREQ ("_sigtramp", name))
diff --git a/gdb/config/mips/tm-mips.h b/gdb/config/mips/tm-mips.h
index 1da59fb..331ab09 100644
--- a/gdb/config/mips/tm-mips.h
+++ b/gdb/config/mips/tm-mips.h
@@ -89,11 +89,6 @@ extern int mips_step_skips_delay (CORE_ADDR);
 #define	PRID_REGNUM 89		/* Processor ID */
 #define	LAST_EMBED_REGNUM 89	/* Last one */
 
-/* Index within `registers' of the first byte of the space for
-   register N.  */
-
-#define MIPS_REGISTER_BYTE(N) ((N) * mips_regsize (current_gdbarch))
-
 /* Special symbol found in blocks associated with routines.  We can hang
    mips_extra_func_info_t's off of this.  */
 
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 959d9c6..3a5b89b 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -656,37 +656,6 @@ mips_register_raw_size (int regnum)
     internal_error (__FILE__, __LINE__, "Register %d out of range", regnum);
 }
 
-/* Register offset in a buffer for each register.
-
-   FIXME: cagney/2003-06-15: This is so bogus.  Instead REGISTER_TYPE
-   should strictly return the layout of the buffer.  Unfortunately
-   remote.c and the MIPS have come to rely on a custom layout that
-   doesn't 1:1 map onto the register type.  */
-
-static int
-mips_register_byte (int regnum)
-{
-  gdb_assert (regnum >= 0);
-  if (regnum < NUM_REGS)
-    /* Pick up the relevant per-tm file register byte method.  */
-    return MIPS_REGISTER_BYTE (regnum);
-  else if (regnum < 2 * NUM_REGS)
-    {
-      int reg;
-      int byte;
-      /* Start with the end of the raw register buffer - assum that
-	 MIPS_REGISTER_BYTE (NUM_REGS) returns that end.  */
-      byte = MIPS_REGISTER_BYTE (NUM_REGS);
-      /* Add space for all the proceeding registers based on their
-         real size.  */
-      for (reg = NUM_REGS; reg < regnum; reg++)
-	byte += TYPE_LENGTH (gdbarch_register_type (current_gdbarch, reg));
-      return byte;
-    }
-  else
-    internal_error (__FILE__, __LINE__, "Register %d out of range", regnum);
-}
-
 /* Convert between RAW and VIRTUAL registers.  The RAW register size
    defines the remote-gdb packet. */
 
@@ -5835,7 +5804,6 @@ mips_gdbarch_init (struct gdbarch_info info,
   set_gdbarch_double_bit (gdbarch, 64);
   set_gdbarch_long_double_bit (gdbarch, 64);
   set_gdbarch_deprecated_register_raw_size (gdbarch, mips_register_raw_size);
-  set_gdbarch_deprecated_register_byte (gdbarch, mips_register_byte);
   set_gdbarch_register_reggroup_p (gdbarch, mips_register_reggroup_p);
   set_gdbarch_pseudo_register_read (gdbarch, mips_pseudo_register_read);
   set_gdbarch_pseudo_register_write (gdbarch, mips_pseudo_register_write);