mn10300.h (DBX_REGISTER_NUMBER): Reverted 2000-08-26's patch.

* config/mn10300/mn10300.h (DBX_REGISTER_NUMBER): Reverted
2000-08-26's patch.
(EXTRA_CONSTRAINT): Formatting changes.

From-SVN: r40031

gcc/ChangeLog

+2001-02-24  Alexandre Oliva  <aoliva@redhat.com>
+
+	* config/mn10300/mn10300.h (DBX_REGISTER_NUMBER): Reverted
+	2000-08-26's patch.
+	(EXTRA_CONSTRAINT): Formatting changes.
+
 2001-02-23  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* rtl.c (rtl_check_failed_code2): Fix typo in last change.

gcc/config/mn10300/mn10300.h

@@ -698,7 +698,9 @@ struct cum_arg {int nbytes; };
 	    && INT_8_BITS (INTVAL (XEXP (XEXP (OP, 0), 1))))))
 	 
 #define EXTRA_CONSTRAINT(OP, C) \
- ((C) == 'R' ? OK_FOR_R (OP) : (C) == 'S' ? GET_CODE (OP) == SYMBOL_REF : 0)
+ ((C) == 'R' ? OK_FOR_R (OP) \
+  : (C) == 'S' ? GET_CODE (OP) == SYMBOL_REF \
+  : 0)
 
 /* Maximum number of registers that can appear in a valid memory address.  */
 
@@ -1049,12 +1051,7 @@ do { char dstr[30];					\
 
 #define DWARF2_ASM_LINE_DEBUG_INFO 1
 
-#define DBX_REGISTER_NUMBER(REGNO) \
-  (REGNO_DATA_P ((REGNO)) ? (0 + (REGNO) - FIRST_DATA_REGNUM) \
-   : REGNO_ADDRESS_P ((REGNO)) ? (4 + (REGNO) - FIRST_ADDRESS_REGNUM) \
-   : REGNO_SP_P ((REGNO)) ? 8 \
-   : REGNO_EXTENDED_P ((REGNO)) ? (15 + (REGNO) - FIRST_EXTENDED_REGNUM) \
-   : -1)
+#define DBX_REGISTER_NUMBER(REGNO) (REGNO)
 
 /* GDB always assumes the current function's frame begins at the value
    of the stack pointer upon entry to the current function.  Accessing