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.

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)

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.  */

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,

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.  */
 };