2003-09-17 Andrew Cagney <cagney@redhat.com>

	* sparc-tdep.c (legacy_register_name): Delete function.
	* mips-tdep.c (mips_dump_tdep): Do not print REGISTER_NAME.
	(mips_gdbarch_init): Refer to MIPS_REGISTER_NAME in comments.
	* infcmd.c (gdb_register_name): Delete variable.
	* gdbarch.sh (SDB_REG_TO_REGNUM): Delete reference to
	REGISTER_NAME and "tm.h".
	* gdbarch.h, gdbarch.c: Regenerate.
	* dpx2-nat.c (regmap): Refer to REGISTER_NAME and not
	REGISTER_NAMES in comments.
	* remote-st.c (get_reg_name), i386b-nat.c (tregmap): Ditto.
	* m68klinux-nat.c (regmap): Ditto.

2003-09-18  Andrew Cagney  <cagney@redhat.com>

	* gdbint.texinfo (Target Architecture Definition): Delete
	documentation on REGISTER_NAMES.

12 files changed, 29 insertions, 43 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 33db947068c..8e535494ac8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,17 @@
+2003-09-17  Andrew Cagney  <cagney@redhat.com>
+
+	* sparc-tdep.c (legacy_register_name): Delete function.
+	* mips-tdep.c (mips_dump_tdep): Do not print REGISTER_NAME.
+	(mips_gdbarch_init): Refer to MIPS_REGISTER_NAME in comments.
+	* infcmd.c (gdb_register_name): Delete variable.
+	* gdbarch.sh (SDB_REG_TO_REGNUM): Delete reference to
+	REGISTER_NAME and "tm.h".
+	* gdbarch.h, gdbarch.c: Regenerate.
+	* dpx2-nat.c (regmap): Refer to REGISTER_NAME and not
+	REGISTER_NAMES in comments.
+	* remote-st.c (get_reg_name), i386b-nat.c (tregmap): Ditto.
+	* m68klinux-nat.c (regmap): Ditto.
+
 2003-09-17  Jim Blandy  <jimb@redhat.com>
 
 	* Makefile.in (dis_asm_h): Note that this #includes "bfd.h".
diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index ce378b425b7..b471806c2a3 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-18  Andrew Cagney  <cagney@redhat.com>
+
+	* gdbint.texinfo (Target Architecture Definition): Delete
+	documentation on REGISTER_NAMES.
+
 2003-09-13  Mark Kettenis  <kettenis@gnu.org>
 
 	* gdbint.texinfo (Target Architecture Definition): Replace
diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo
index 3ed887b36df..45b7f75d718 100644
--- a/gdb/doc/gdbint.texinfo
+++ b/gdb/doc/gdbint.texinfo
@@ -38,7 +38,7 @@ Free Documentation License''.
 @page
 @tex
 \def\$#1${{#1}}  % Kluge: collect RCS revision info without $...$
-\xdef\manvers{\$Revision: 1.161 $}  % For use in headers, footers too
+\xdef\manvers{\$Revision: 1.162 $}  % For use in headers, footers too
 {\parskip=0pt
 \hfill Cygnus Solutions\par
 \hfill \manvers\par
@@ -3756,10 +3756,6 @@ register buffer at run-time.
 Return the name of register @var{i} as a string.  May return @code{NULL}
 or @code{NUL} to indicate that register @var{i} is not valid.
 
-@item REGISTER_NAMES
-@findex REGISTER_NAMES
-Deprecated in favor of @code{REGISTER_NAME}.
-
 @item DEPRECATED_REG_STRUCT_HAS_ADDR (@var{gcc_p}, @var{type})
 @findex DEPRECATED_REG_STRUCT_HAS_ADDR
 Define this to return 1 if the given type will be passed by pointer
diff --git a/gdb/dpx2-nat.c b/gdb/dpx2-nat.c
index 04018db8552..488c06a5383 100644
--- a/gdb/dpx2-nat.c
+++ b/gdb/dpx2-nat.c
@@ -32,7 +32,7 @@
 #include <sys/utsname.h>
 
 
-/* this table must line up with REGISTER_NAMES in tm-68k.h */
+/* This table must line up with REGISTER_NAME in "m68k-tdep.c".  */
 /* symbols like 'A0' come from <sys/reg.h> */
 static int regmap[] =
 {
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 9991371240a..a328cfb1156 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -422,9 +422,7 @@ extern void set_gdbarch_dwarf_reg_to_regnum (struct gdbarch *gdbarch, gdbarch_dw
 #define DWARF_REG_TO_REGNUM(dwarf_regnr) (gdbarch_dwarf_reg_to_regnum (current_gdbarch, dwarf_regnr))
 #endif
 
-/* Convert from an sdb register number to an internal gdb register number.
-   This should be defined in tm.h, if REGISTER_NAMES is not set up
-   to map one to one onto the sdb register numbers. */
+/* Convert from an sdb register number to an internal gdb register number. */
 
 typedef int (gdbarch_sdb_reg_to_regnum_ftype) (int sdb_regnr);
 extern int gdbarch_sdb_reg_to_regnum (struct gdbarch *gdbarch, int sdb_regnr);
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 47ca465c09f..ce05a8cf972 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -463,8 +463,6 @@ f:2:ECOFF_REG_TO_REGNUM:int:ecoff_reg_to_regnum:int ecoff_regnr:ecoff_regnr:::no
 # Provide a default mapping from a DWARF register number to a gdb REGNUM.
 f:2:DWARF_REG_TO_REGNUM:int:dwarf_reg_to_regnum:int dwarf_regnr:dwarf_regnr:::no_op_reg_to_regnum::0
 # Convert from an sdb register number to an internal gdb register number.
-# This should be defined in tm.h, if REGISTER_NAMES is not set up
-# to map one to one onto the sdb register numbers.
 f:2:SDB_REG_TO_REGNUM:int:sdb_reg_to_regnum:int sdb_regnr:sdb_regnr:::no_op_reg_to_regnum::0
 f:2:DWARF2_REG_TO_REGNUM:int:dwarf2_reg_to_regnum:int dwarf2_regnr:dwarf2_regnr:::no_op_reg_to_regnum::0
 f::REGISTER_NAME:const char *:register_name:int regnr:regnr
diff --git a/gdb/i386b-nat.c b/gdb/i386b-nat.c
index 3c8a17c2719..7c2a7d8deb3 100644
--- a/gdb/i386b-nat.c
+++ b/gdb/i386b-nat.c
@@ -23,7 +23,7 @@
 
 #include <machine/reg.h>
 
-/* this table must line up with REGISTER_NAMES in tm-i386.h */
+/* This table must line up with REGISTER_NAME in "i386-tdep.c".  */
 /* symbols like 'tEAX' come from <machine/reg.h> */
 static int tregmap[] =
 {
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index eee0b7368c6..e408d87047e 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -1476,9 +1476,6 @@ path_command (char *dirname, int from_tty)
 }
 
 
-#ifdef REGISTER_NAMES
-char *gdb_register_names[] = REGISTER_NAMES;
-#endif
 /* Print out the machine register regnum. If regnum is -1, print all
    registers (print_all == 1) or all non-float and non-vector
    registers (print_all == 0).
diff --git a/gdb/m68klinux-nat.c b/gdb/m68klinux-nat.c
index e51d20fa462..14070405b1c 100644
--- a/gdb/m68klinux-nat.c
+++ b/gdb/m68klinux-nat.c
@@ -54,7 +54,7 @@
 
 #include "target.h"
 
-/* This table must line up with REGISTER_NAMES in tm-m68k.h */
+/* This table must line up with REGISTER_NAME in "m68k-tdep.c".  */
 static const int regmap[] =
 {
   PT_D0, PT_D1, PT_D2, PT_D3, PT_D4, PT_D5, PT_D6, PT_D7,
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 1d120d7edb9..00c43e13c41 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -6047,11 +6047,8 @@ mips_gdbarch_init (struct gdbarch_info info,
 
   /* MIPS version of register names.  NOTE: At present the MIPS
      register name management is part way between the old -
-     #undef/#define REGISTER_NAMES and the new REGISTER_NAME(nr).
+     #undef/#define MIPS_REGISTER_NAMES and the new REGISTER_NAME(nr).
      Further work on it is required.  */
-  /* NOTE: many targets (esp. embedded) do not go thru the
-     gdbarch_register_name vector at all, instead bypassing it
-     by defining REGISTER_NAMES.  */
   set_gdbarch_register_name (gdbarch, mips_register_name);
   set_gdbarch_read_pc (gdbarch, mips_read_pc);
   set_gdbarch_write_pc (gdbarch, generic_target_write_pc);
@@ -6403,8 +6400,6 @@ mips_dump_tdep (struct gdbarch *current_gdbarch, struct ui_file *file)
 		      "mips_dump_tdep: RA_REGNUM = %d\n",
 		      RA_REGNUM);
   fprintf_unfiltered (file,
-		      "mips_dump_tdep: REGISTER_NAMES = delete?\n");
-  fprintf_unfiltered (file,
 		      "mips_dump_tdep: ROUND_DOWN = function?\n");
   fprintf_unfiltered (file,
 		      "mips_dump_tdep: ROUND_UP = function?\n");
diff --git a/gdb/remote-st.c b/gdb/remote-st.c
index 7c452a27a76..ce4c7ab13e5 100644
--- a/gdb/remote-st.c
+++ b/gdb/remote-st.c
@@ -385,9 +385,10 @@ st2000_wait (ptid_t ptid, struct target_waitstatus *status)
   return inferior_ptid;
 }
 
-/* Return the name of register number REGNO in the form input and output by
-   STDEBUG.  Currently, REGISTER_NAMES just happens to contain exactly what
-   STDEBUG wants.  Lets take advantage of that just as long as possible! */
+/* Return the name of register number REGNO in the form input and
+   output by STDEBUG.  Currently, REGISTER_NAME just happens return
+   exactly what STDEBUG wants.  Lets take advantage of that just as
+   long as possible! */
 
 static char *
 get_reg_name (int regno)
diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
index 3a81821881c..f3e953580c5 100644
--- a/gdb/sparc-tdep.c
+++ b/gdb/sparc-tdep.c
@@ -2815,24 +2815,6 @@ sparc_print_extra_frame_info (struct frame_info *fi)
 		     paddr_nz (get_frame_extra_info (fi)->fp_addr));
 }
 
-/* MULTI_ARCH support */
-
-const char *
-legacy_register_name (int i)
-{
-#ifdef REGISTER_NAMES
-  static char *names[] = REGISTER_NAMES;
-  if (i < 0 || i >= (sizeof (names) / sizeof (*names)))
-    return NULL;
-  else
-    return names[i];
-#else
-  internal_error (__FILE__, __LINE__,
-		  "legacy_register_name: called.");
-  return NULL;
-#endif
-}
-
 static const char *
 sparc32_register_name (int regno)
 {