rename DBX_REGISTER_NUMBER to DEBUGGER_REGNO

gcc/ada/ChangeLog:

	* sigtramp-vxworks-target.h: Rename DBX_REGISTER_NUMBER to
	  DEBUGGER_REGNO.

gcc/ChangeLog:

	* config/aarch64/aarch64-protos.h (aarch64_dbx_regno):
	Rename DBX_REGISTER_NUMBER to DEBUGGER_REGNO.
	(aarch64_debugger_regno): Likewise.
	* config/aarch64/aarch64.cc (aarch64_dbx_regno): Likewise.
	(aarch64_debugger_regno): Likewise.
	* config/aarch64/aarch64.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	(DWARF_FRAME_REGNUM): Likewise.
	* config/alpha/alpha.h (DWARF_FRAME_REGNUM): Likewise.
	* config/arc/arc.cc (arc_init_reg_tables): Likewise.
	* config/arc/arc.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/arm/arm-protos.h (arm_dbx_regno): Likewise.
	(arm_debugger_regno): Likewise.
	* config/arm/arm.cc (arm_dbx_regno): Likewise.
	(arm_debugger_regno): Likewise.
	* config/arm/arm.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/bfin/bfin.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/c6x/c6x.cc: Likewise.
	* config/c6x/c6x.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/cris/cris.h (enum reg_class): Likewise.
	(DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/csky/csky.cc (enum reg_class): Likewise.
	* config/csky/csky.h (DWARF_FRAME_REGNUM): Likewise.
	(DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/frv/frv.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/gcn/gcn-hsa.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/gcn/gcn.cc (print_operand): Likewise.
	* config/i386/bsd.h (ASM_QUAD): Likewise.
	* config/i386/cygming.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	(DWARF_FRAME_REGNUM): Likewise.
	* config/i386/darwin.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/djgpp.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/dragonfly.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/freebsd.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/gas.h: Likewise.
	* config/i386/gnu-user.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/i386.cc (enum reg_class): Likewise.
	* config/i386/i386.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/i386elf.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/iamcu.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/lynx.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/netbsd-elf.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/nto.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/openbsdelf.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/sysv4.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/vxworks.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/i386/x86-64.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/ia64/ia64-protos.h (ia64_dbx_regno): Likewise.
	(ia64_debugger_regno): Likewise.
	* config/ia64/ia64.cc (ia64_output_function_prologue): Likewise.
	(ia64_dbx_regno): Likewise.
	(ia64_debugger_regno): Likewise.
	(process_cfa_adjust_cfa): Likewise.
	(process_cfa_register): Likewise.
	(ia64_asm_unwind_emit): Likewise.
	* config/ia64/ia64.h: Likewise.
	* config/ia64/sysv4.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/lm32/lm32.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/m32c/m32c.cc (m32c_eh_return_stackadj_rtx): Likewise.
	* config/m32c/m32c.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/m68k/linux.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/m68k/m68k.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	(__transfer_from_trampoline): Likewise.
	* config/m68k/m68kelf.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/m68k/netbsd-elf.h (M68K_STATIC_CHAIN_REG_NAME): Likewise.
	(DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/microblaze/microblaze.cc (microblaze_option_override): Likewise.
	* config/microblaze/microblaze.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	(GP_DBX_FIRST): Likewise.
	(GP_DEBUGGER_FIRST): Likewise.
	* config/mips/vxworks.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/mmix/mmix-protos.h (mmix_dbx_regno): Likewise.
	(mmix_debugger_regno): Likewise.
	* config/mmix/mmix.cc (mmix_dbx_regno): Likewise.
	(mmix_debugger_regno): Likewise.
	* config/mmix/mmix.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/nds32/nds32-protos.h (nds32_dbx_regno): Likewise.
	(nds32_debugger_regno): Likewise.
	* config/nds32/nds32.cc (nds32_dbx_regno): Likewise.
	(nds32_debugger_regno): Likewise.
	(nds32_use_blocks_for_constant_p): Likewise.
	* config/nds32/nds32.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/nvptx/nvptx.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/or1k/or1k.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/pa/pa32-regs.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/pa/pa64-regs.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/rs6000/rs6000-protos.h (rs6000_dbx_regno): Likewise.
	(rs6000_debugger_regno): Likewise.
	* config/rs6000/rs6000.cc (rs6000_dbx_regno): Likewise.
	(rs6000_debugger_regno): Likewise.
	* config/rs6000/rs6000.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	(DWARF2_FRAME_REG_OUT): Likewise.
	* config/s390/s390.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/sh/elf.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/sh/linux.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/sh/sh.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	(SH_DBX_REGISTER_NUMBER): Likewise.
	(SH_DEBUGGER_REGNO): Likewise.
	* config/visium/visium.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/xtensa/elf.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/xtensa/linux.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/xtensa/uclinux.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* config/xtensa/xtensa-protos.h (xtensa_dbx_regno): Likewise.
	(xtensa_debugger_regno): Likewise.
	* config/xtensa/xtensa.cc (xtensa_dbx_regno): Likewise.
	(xtensa_debugger_regno): Likewise.
	* config/xtensa/xtensa.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	* defaults.h (DBX_REGISTER_NUMBER): Likewise.
	(DEBUGGER_REGNO): Likewise.
	(DWARF_FRAME_REGNUM): Likewise.
	* doc/tm.texi: Likewise.
	* doc/tm.texi.in: Likewise.
	* dwarf2out.cc (dbx_reg_number): Likewise.
	(debugger_reg_number): Likewise.
	(reg_loc_descriptor): Likewise.
	(multiple_reg_loc_descriptor): Likewise.
	(mem_loc_descriptor): Likewise.
	* except.cc: Likewise.

2 files changed, 5 insertions, 5 deletions

diff --git a/gcc/config/csky/csky.cc b/gcc/config/csky/csky.cc
index e315e09..a7dc6ce 100644
--- a/gcc/config/csky/csky.cc
+++ b/gcc/config/csky/csky.cc
@@ -172,7 +172,7 @@ enum reg_class regno_reg_class[FIRST_PSEUDO_REGISTER] =
 /* Arrays that map GCC register numbers to debugger register numbers,
    '-1' means that is INVALID_REGNUM.
    TODO: which rules according to here ?  */
-const int csky_dbx_regno[FIRST_PSEUDO_REGISTER] =
+const int csky_debugger_regno[FIRST_PSEUDO_REGISTER] =
 {
   0,  1,  2,  3,  4,  5,  6,  7,
   8,  9,  10, 11, 12, 13, 14, 15,
diff --git a/gcc/config/csky/csky.h b/gcc/config/csky/csky.h
index 22b1151..37410f0 100644
--- a/gcc/config/csky/csky.h
+++ b/gcc/config/csky/csky.h
@@ -997,7 +997,7 @@ while (0)
    is different from that used in other debug info sections.
    Given a GCC hard register number,
    this macro should return the .eh_frame register number.*/
-#define DWARF_FRAME_REGNUM(REG)	 DBX_REGISTER_NUMBER (REG)
+#define DWARF_FRAME_REGNUM(REG)	 DEBUGGER_REGNO (REG)
 
 /* If INCOMING_RETURN_ADDR_RTX is defined & the RTL is REG,
    define DWARF_FRAME_RETURN_COLUMN to DWARF_FRAME_REGNUM.  */
@@ -1006,9 +1006,9 @@ while (0)
 /* Use r0 and r1 to pass exception handling information.  */
 #define EH_RETURN_DATA_REGNO(N) ((N) < 2 ? N : INVALID_REGNUM)
 
-/* How to renumber registers for dbx and gdb.  */
-extern const int csky_dbx_regno[];
-#define DBX_REGISTER_NUMBER(REGNO) ((unsigned int) csky_dbx_regno[REGNO])
+/* How to renumber registers for gdb.  */
+extern const int csky_debugger_regno[];
+#define DEBUGGER_REGNO(REGNO) ((unsigned int) csky_debugger_regno[REGNO])
 
 
 /******************************************************************