vax.c (vax_rtx_costs): Whitespace cleanup.

2005-04-27  Matt Thomas <matt@3am-software.com>
            Jan-Benedict Glaw <jbglaw@microdata-pos.de>

	* config/vax/vax.c (vax_rtx_costs): Whitespace cleanup.
	(vax_output_mi_thunk): Ditto.
	(vax_notice_cc_update): Ditto.
	(INDEX_REGISTER_P): Add trailing \.
	(BASE_REGISTER_P): Add trailing \.
	(legitimate_address_p): Whitespace cleanup.  Remove trailing \.

Co-Authored-By: Jan-Benedict Glaw <jbglaw@microdata-pos.de>

From-SVN: r98835

2 files changed, 20 insertions, 36 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 69e29bd..ec6c009 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2005-04-27  Matt Thomas <matt@3am-software.com>
+            Jan-Benedict Glaw <jbglaw@microdata-pos.de>
+
+	* config/vax/vax.c (vax_rtx_costs): Whitespace cleanup.
+	(vax_output_mi_thunk): Ditto.
+	(vax_notice_cc_update): Ditto.
+	(INDEX_REGISTER_P): Add trailing \.
+	(BASE_REGISTER_P): Add trailing \.
+	(legitimate_address_p): Whitespace cleanup.  Remove trailing \.
+
 2005-04-27  Richard Guenther  <rguenth@gcc.gnu.org>
 
 	* tree-ssa-propagate.c (set_rhs): Check operand of
@@ -80,38 +90,17 @@
 	(INDEX_REGISTER_P): New.
 	(BASE_REGISTER_P): New.
 	(indirectable_constant_address_p): New.  Adapted from
-<<<<<<< ChangeLog
-	INDIRECTABLE_CONSTANT_ADDRESS_P in vax.h.
-	Use SYMBOL_REF_LOCAL_P.
-=======
 	INDIRECTABLE_CONSTANT_ADDRESS_P in vax.h. Use SYMBOL_REF_LOCAL_P.
->>>>>>> 2.8478
 	(indirectable_address_p): New.  Adapted from
 	INDIRECTABLE_ADDRESS_P in vax.h.
 	(nonindexed_address_p): New.  Adapted from
-<<<<<<< ChangeLog
-	GO_IF_NONINDEXED_ADDRESS in vax.h.
-	(index_temp_p): New.  Adapted from
-	INDEX_TERM_P in vax.h.
-	(reg_plus_index_p): New.  Adapted from
-	GO_IF_REG_PLUS_INDEX in vax.h.
-=======
 	GO_IF_NONINDEXED_ADDRESS in vax.h.
 	(index_temp_p): New.  Adapted from INDEX_TERM_P in vax.h.
 	(reg_plus_index_p): New.  Adapted from GO_IF_REG_PLUS_INDEX in vax.h.
->>>>>>> 2.8478
 	(legitimate_address_p): New.  Adapted from
-<<<<<<< ChangeLog
-	GO_IF_LEGITIMATE_ADDRESS in vax.h
-=======
 	GO_IF_LEGITIMATE_ADDRESS in vax.h.
->>>>>>> 2.8478
 	(vax_mode_dependent_address_p): New.  Adapted from
-<<<<<<< ChangeLog
-	GO_IF_MODE_DEPENDENT_ADDRESS in vax.h
-=======
 	GO_IF_MODE_DEPENDENT_ADDRESS in vax.h.
->>>>>>> 2.8478
 	* config/vax/vax.h (CONSTANT_ADDRESS_P): Use
 	legitimate_constant_address_p.
 	(CONSTANT_P): Use legitimate_constant_p.
@@ -120,13 +109,8 @@
 	(GO_IF_NONINDEXED_ADDRESS): Removed.
 	(INDEX_TEMP_P): Removed.
 	(GO_IF_REG_PLUS_INDEX): Removed.
-<<<<<<< ChangeLog
-	(GO_IF_LEGITIMATE_ADDRESS): Use legitimate_address_p.
-	Two definitions, depending on whether REG_OK_STRICT is defined.
-=======
 	(GO_IF_LEGITIMATE_ADDRESS): Use legitimate_address_p. Two
 	definitions, depending on whether REG_OK_STRICT is defined.
->>>>>>> 2.8478
 	(GO_IF_MODE_DEPENDENT_ADDRESS): Use vax_mode_dependent_address_p.
 	Two definitions, depending on whether REG_OK_STRICT is defined.
 	* config/vax/vax-protos.h (legitimate_constant_address_p): Prototype
diff --git a/gcc/config/vax/vax.c b/gcc/config/vax/vax.c
index c2396f6..18a1e01 100644
--- a/gcc/config/vax/vax.c
+++ b/gcc/config/vax/vax.c
@@ -587,7 +587,7 @@ vax_rtx_costs (rtx x, int code, int outer_code, int *total)
 		      && (unsigned HOST_WIDE_INT)-CONST_DOUBLE_LOW (x) < 64))
 		 ? 2 : 5;
       return true;
- 
+
     case POST_INC:
       *total = 2;
       return true;		/* Implies register operand.  */
@@ -815,16 +815,16 @@ vax_rtx_costs (rtx x, int code, int outer_code, int *total)
 
 static void
 vax_output_mi_thunk (FILE * file,
-                     tree thunk ATTRIBUTE_UNUSED, 
+                     tree thunk ATTRIBUTE_UNUSED,
                      HOST_WIDE_INT delta,
                      HOST_WIDE_INT vcall_offset ATTRIBUTE_UNUSED,
                      tree function)
 {
   fprintf (file, "\t.word 0x0ffc\n\taddl2 $" HOST_WIDE_INT_PRINT_DEC, delta);
   asm_fprintf (file, ",4(%Rap)\n");
-  fprintf (file, "\tjmp ");						
-  assemble_name (file,  XSTR (XEXP (DECL_RTL (function), 0), 0));	
-  fprintf (file, "+2\n");						
+  fprintf (file, "\tjmp ");
+  assemble_name (file,  XSTR (XEXP (DECL_RTL (function), 0), 0));
+  fprintf (file, "+2\n");
 }
 
 static rtx
@@ -857,7 +857,7 @@ vax_notice_update_cc (rtx exp, rtx insn ATTRIBUTE_UNUSED)
 	    {
 	    case NEG:
 	      if (GET_MODE_CLASS (GET_MODE (exp)) == MODE_FLOAT)
-	 	break;
+		break;
 	    case AND:
 	    case IOR:
 	    case XOR:
@@ -1123,12 +1123,12 @@ legitimate_constant_p (rtx x ATTRIBUTE_UNUSED)
 
 /* Nonzero if X is a hard reg that can be used as an index
    or, if not strict, if it is a pseudo reg.  */
-#define	INDEX_REGISTER_P(X, STRICT)
+#define	INDEX_REGISTER_P(X, STRICT) \
 (GET_CODE (X) == REG && (!(STRICT) || REGNO_OK_FOR_INDEX_P (REGNO (X))))
 
 /* Nonzero if X is a hard reg that can be used as a base reg
    or, if not strict, if it is a pseudo reg.  */
-#define	BASE_REGISTER_P(X, STRICT)
+#define	BASE_REGISTER_P(X, STRICT) \
 (GET_CODE (X) == REG && (!(STRICT) || REGNO_OK_FOR_BASE_P (REGNO (X))))
 
 #ifdef NO_EXTERNAL_INDIRECT_ADDRESS
@@ -1283,7 +1283,7 @@ legitimate_address_p (enum machine_mode mode, rtx x, int strict)
       && nonindexed_address_p (xfoo0, strict))
     return 1;
 
-  /* Handle offset(reg)[index] with offset added outermost */	\
+  /* Handle offset(reg)[index] with offset added outermost */
 
   if (indirectable_constant_address_p (xfoo0)
       && (BASE_REGISTER_P (xfoo1, strict)
@@ -1296,7 +1296,7 @@ legitimate_address_p (enum machine_mode mode, rtx x, int strict)
     return 1;
 
   return 0;
-} 
+}
 
 /* Return 1 if x (a legitimate address expression) has an effect that
    depends on the machine mode it is used for.  On the VAX, the predecrement