2004-10-30 Andrew Cagney <cagney@gnu.org>

	* mips-tdep.h (MIPS_PRID_REGNUM): Add.
	* config/mips/tm-mips.h (PRID_REGNUM): Delete.
	* mips-tdep.c: Update.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2a3f8d39f43ae40dae620a5cf5465e396f1219f1..2d55764ea3b18dc2135bd5a6a3c16b49df25777d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2004-10-30  Andrew Cagney  <cagney@gnu.org>
 
+       * mips-tdep.h (MIPS_PRID_REGNUM): Add.
+       * config/mips/tm-mips.h (PRID_REGNUM): Delete.
+       * mips-tdep.c: Update.
+
        * mips-tdep.h (MIPS_FIRST_EMBED_REGNUM)
        (MIPS_LAST_EMBED_REGNUM): Add.
        * config/mips/tm-mips.h (FIRST_EMBED_REGNUM)

diff --git a/gdb/config/mips/tm-mips.h b/gdb/config/mips/tm-mips.h
index 68c63481a41c6f309fd2a083d19bc6da3f410a6c..8f840c3ad7250c26e9d8c134ce8b1d682518011f 100644 (file)
--- a/gdb/config/mips/tm-mips.h
+++ b/gdb/config/mips/tm-mips.h
@@ -44,7 +44,6 @@ extern int mips_step_skips_delay (CORE_ADDR);
 #define STEP_SKIPS_DELAY(pc) (mips_step_skips_delay (pc))
 
 #define RA_REGNUM 31           /* Contains return address value */
-#define        PRID_REGNUM 89          /* Processor ID */
 
 /* 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 5885d81890fc8fed5b4daed05008aa8797778912..fca688203b1697ea26653f200ea9ca2f349dccc6 100644 (file)
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -4320,7 +4320,7 @@ deprecated_mips_set_processor_regs_hack (void)
   struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
   CORE_ADDR prid;
 
-  prid = read_register (PRID_REGNUM);
+  prid = read_register (MIPS_PRID_REGNUM);
 
   if ((prid & ~0xf) == 0x700)
     tdep->mips_processor_reg_names = mips_r3041_reg_names;
@@ -5292,8 +5292,6 @@ mips_dump_tdep (struct gdbarch *current_gdbarch, struct ui_file *file)
   fprintf_unfiltered (file,
                      "mips_dump_tdep: mips_abi_regsize() = %d\n",
                      mips_abi_regsize (current_gdbarch));
-  fprintf_unfiltered (file,
-                     "mips_dump_tdep: PRID_REGNUM = %d\n", PRID_REGNUM);
   fprintf_unfiltered (file,
                      "mips_dump_tdep: PROC_FRAME_ADJUST = function?\n");
   fprintf_unfiltered (file,

diff --git a/gdb/mips-tdep.h b/gdb/mips-tdep.h
index 975dc2211d91ff00095450ac94586d8f765429c3..f48799391a9471afdf3eeeedc992b466857d9769 100644 (file)
--- a/gdb/mips-tdep.h
+++ b/gdb/mips-tdep.h
@@ -86,6 +86,7 @@ enum
   MIPS_EMBED_FP0_REGNUM = 38,
   MIPS_UNUSED_REGNUM = 73,     /* Never used, FIXME */
   MIPS_FIRST_EMBED_REGNUM = 74,        /* First CP0 register for embedded use.  */
+  MIPS_PRID_REGNUM = 89,       /* Processor ID.  */
   MIPS_LAST_EMBED_REGNUM = 89  /* Last one.  */
 };