vax.c (split_quadword_operands): Use MEM_P() instead of GET_CODE() == MEM and REG_P() instead of GET_CODE() == REG.

	* config/vax/vax.c (split_quadword_operands): Use MEM_P()
	instead of GET_CODE() == MEM and REG_P() instead of
	GET_CODE() == REG.
	(print_operand_address): Likewise.
	(vax_address_cost): Likewise.
	(vax_rtx_costs): Likewise.
	(vax_notice_update_cc): Likewise.
	(vax_output_int_add): Likewise.
	(INDEX_REGISTER_P): Likewise.
	(BASE_REGISTER_P): Likewise.
	(nonindexed_address_p): Likewise.
	(vax_mode_dependent_address_p): Likewise.
	* config/vax/vax.h (EXTRA_CONSTRAINT): Likewise.
	(PRINT_OPERAND): Likewise.
	* config/vax/vax.md (ashlsi3): Likewise.
	(ashlsi3): Likewise.
	(some more unnamed insns): Likewise.

From-SVN: r112090

4 files changed, 60 insertions, 40 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 415ce1d..2a05ddb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,23 @@
+2006-03-15  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
+
+	* config/vax/vax.c (split_quadword_operands): Use MEM_P()
+	instead of GET_CODE() == MEM and REG_P() instead of
+	GET_CODE() == REG.
+	(print_operand_address): Likewise.
+	(vax_address_cost): Likewise.
+	(vax_rtx_costs): Likewise.
+	(vax_notice_update_cc): Likewise.
+	(vax_output_int_add): Likewise.
+	(INDEX_REGISTER_P): Likewise.
+	(BASE_REGISTER_P): Likewise.
+	(nonindexed_address_p): Likewise.
+	(vax_mode_dependent_address_p): Likewise.
+	* config/vax/vax.h (EXTRA_CONSTRAINT): Likewise.
+	(PRINT_OPERAND): Likewise.
+	* config/vax/vax.md (ashlsi3): Likewise.
+	(ashlsi3): Likewise.
+	(some more unnamed insns): Likewise.
+
 2006-03-15  Kazu Hirata  <kazu@codesourcery.com>
 
 	* tree-ssa-dce.c (EXECUTE_IF_CONTROL_DEPENDENT): Make it an
diff --git a/gcc/config/vax/vax.c b/gcc/config/vax/vax.c
index 9fc8951..8a34258 100644
--- a/gcc/config/vax/vax.c
+++ b/gcc/config/vax/vax.c
@@ -179,7 +179,7 @@ split_quadword_operands (rtx * operands, rtx * low, int n ATTRIBUTE_UNUSED)
     {
       if (low[i])
 	/* it's already been figured out */;
-      else if (GET_CODE (operands[i]) == MEM
+      else if (MEM_P (operands[i])
 	       && (GET_CODE (XEXP (operands[i], 0)) == POST_INC))
 	{
 	  rtx addr = XEXP (operands[i], 0);
@@ -237,13 +237,13 @@ print_operand_address (FILE * file, rtx addr)
       reg1 = 0; ireg = 0; breg = 0; offset = 0;
 
       if (CONSTANT_ADDRESS_P (XEXP (addr, 0))
-	  || GET_CODE (XEXP (addr, 0)) == MEM)
+	  || MEM_P (XEXP (addr, 0)))
 	{
 	  offset = XEXP (addr, 0);
 	  addr = XEXP (addr, 1);
 	}
       else if (CONSTANT_ADDRESS_P (XEXP (addr, 1))
-	       || GET_CODE (XEXP (addr, 1)) == MEM)
+	       || MEM_P (XEXP (addr, 1)))
 	{
 	  offset = XEXP (addr, 1);
 	  addr = XEXP (addr, 0);
@@ -258,12 +258,12 @@ print_operand_address (FILE * file, rtx addr)
 	  ireg = XEXP (addr, 0);
 	  addr = XEXP (addr, 1);
 	}
-      else if (GET_CODE (XEXP (addr, 1)) == REG)
+      else if (REG_P (XEXP (addr, 1)))
 	{
 	  reg1 = XEXP (addr, 1);
 	  addr = XEXP (addr, 0);
 	}
-      else if (GET_CODE (XEXP (addr, 0)) == REG)
+      else if (REG_P (XEXP (addr, 0)))
 	{
 	  reg1 = XEXP (addr, 0);
 	  addr = XEXP (addr, 1);
@@ -271,7 +271,7 @@ print_operand_address (FILE * file, rtx addr)
       else
 	gcc_unreachable ();
 
-      if (GET_CODE (addr) == REG)
+      if (REG_P (addr))
 	{
 	  if (reg1)
 	    ireg = addr;
@@ -284,7 +284,7 @@ print_operand_address (FILE * file, rtx addr)
 	{
 	  gcc_assert (GET_CODE (addr) == PLUS);
 	  if (CONSTANT_ADDRESS_P (XEXP (addr, 0))
-	      || GET_CODE (XEXP (addr, 0)) == MEM)
+	      || MEM_P (XEXP (addr, 0)))
 	    {
 	      if (offset)
 		{
@@ -298,7 +298,7 @@ print_operand_address (FILE * file, rtx addr)
 		}
 	      offset = XEXP (addr, 0);
 	    }
-	  else if (GET_CODE (XEXP (addr, 0)) == REG)
+	  else if (REG_P (XEXP (addr, 0)))
 	    {
 	      if (reg1)
 		ireg = reg1, breg = XEXP (addr, 0), reg1 = 0;
@@ -313,7 +313,7 @@ print_operand_address (FILE * file, rtx addr)
 	    }
 
 	  if (CONSTANT_ADDRESS_P (XEXP (addr, 1))
-	      || GET_CODE (XEXP (addr, 1)) == MEM)
+	      || MEM_P (XEXP (addr, 1)))
 	    {
 	      if (offset)
 		{
@@ -327,7 +327,7 @@ print_operand_address (FILE * file, rtx addr)
 		}
 	      offset = XEXP (addr, 1);
 	    }
-	  else if (GET_CODE (XEXP (addr, 1)) == REG)
+	  else if (REG_P (XEXP (addr, 1)))
 	    {
 	      if (reg1)
 		ireg = reg1, breg = XEXP (addr, 1), reg1 = 0;
@@ -345,7 +345,7 @@ print_operand_address (FILE * file, rtx addr)
       /* If REG1 is nonzero, figure out if it is a base or index register.  */
       if (reg1)
 	{
-	  if (breg != 0 || (offset && GET_CODE (offset) == MEM))
+	  if (breg != 0 || (offset && MEM_P (offset)))
 	    {
 	      gcc_assert (!ireg);
 	      ireg = reg1;
@@ -364,7 +364,7 @@ print_operand_address (FILE * file, rtx addr)
 	{
 	  if (GET_CODE (ireg) == MULT)
 	    ireg = XEXP (ireg, 0);
-	  gcc_assert (GET_CODE (ireg) == REG);
+	  gcc_assert (REG_P (ireg));
 	  fprintf (file, "[%s]", reg_names[REGNO (ireg)]);
 	}
       break;
@@ -523,7 +523,7 @@ vax_address_cost_1 (rtx addr)
 static int
 vax_address_cost (rtx x)
 {
-  return (1 + (GET_CODE (x) == REG ? 0 : vax_address_cost_1 (x)));
+  return (1 + (REG_P (x) ? 0 : vax_address_cost_1 (x)));
 }
 
 /* Cost of an expression on a VAX.  This version has costs tuned for the
@@ -725,7 +725,7 @@ vax_rtx_costs (rtx x, int code, int outer_code, int *total)
       else
 	*total = 3;		/* 4 on VAX 2 */
       x = XEXP (x, 0);
-      if (GET_CODE (x) != REG && GET_CODE (x) != POST_INC)
+      if (!REG_P (x) && GET_CODE (x) != POST_INC)
 	*total += vax_address_cost_1 (x);
       return true;
 
@@ -789,7 +789,7 @@ vax_rtx_costs (rtx x, int code, int outer_code, int *total)
 	  break;
 	case MEM:
 	  *total += 1;		/* 2 on VAX 2 */
-	  if (GET_CODE (XEXP (op, 0)) != REG)
+	  if (!REG_P (XEXP (op, 0)))
 	    *total += vax_address_cost_1 (XEXP (op, 0));
 	  break;
 	case REG:
@@ -888,13 +888,13 @@ vax_notice_update_cc (rtx exp, rtx insn ATTRIBUTE_UNUSED)
     }
   else
     CC_STATUS_INIT;
-  if (cc_status.value1 && GET_CODE (cc_status.value1) == REG
+  if (cc_status.value1 && REG_P (cc_status.value1)
       && cc_status.value2
       && reg_overlap_mentioned_p (cc_status.value1, cc_status.value2))
     cc_status.value2 = 0;
-  if (cc_status.value1 && GET_CODE (cc_status.value1) == MEM
+  if (cc_status.value1 && MEM_P (cc_status.value1)
       && cc_status.value2
-      && GET_CODE (cc_status.value2) == MEM)
+      && MEM_P (cc_status.value2))
     cc_status.value2 = 0;
   /* Actual condition, one line up, should be that value2's address
      depends on value1, but that is too much of a pain.  */
@@ -999,7 +999,7 @@ vax_output_int_add (rtx insn ATTRIBUTE_UNUSED, rtx *operands,
 	    return "subl2 $%n2,%0";
 	  if (GET_CODE (operands[2]) == CONST_INT
 	      && (unsigned) INTVAL (operands[2]) >= 64
-	      && GET_CODE (operands[1]) == REG
+	      && REG_P (operands[1])
 	      && ((INTVAL (operands[2]) < 32767 && INTVAL (operands[2]) > -32768)
 		   || REGNO (operands[1]) > 11))
 	    return "movab %c2(%1),%0";
@@ -1012,7 +1012,7 @@ vax_output_int_add (rtx insn ATTRIBUTE_UNUSED, rtx *operands,
       if (GET_CODE (operands[2]) == CONST_INT
 	  && INTVAL (operands[2]) < 32767
 	  && INTVAL (operands[2]) > -32768
-	  && GET_CODE (operands[1]) == REG
+	  && REG_P (operands[1])
 	  && push_operand (operands[0], SImode))
 	return "pushab %c2(%1)";
 
@@ -1022,7 +1022,7 @@ vax_output_int_add (rtx insn ATTRIBUTE_UNUSED, rtx *operands,
 
       if (GET_CODE (operands[2]) == CONST_INT
 	  && (unsigned) INTVAL (operands[2]) >= 64
-	  && GET_CODE (operands[1]) == REG
+	  && REG_P (operands[1])
 	  && ((INTVAL (operands[2]) < 32767 && INTVAL (operands[2]) > -32768)
 	       || REGNO (operands[1]) > 11))
 	return "movab %c2(%1),%0";
@@ -1121,12 +1121,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) \
-(GET_CODE (X) == REG && (!(STRICT) || REGNO_OK_FOR_INDEX_P (REGNO (X))))
+(REG_P (X) && (!(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) \
-(GET_CODE (X) == REG && (!(STRICT) || REGNO_OK_FOR_BASE_P (REGNO (X))))
+(REG_P (X) && (!(STRICT) || REGNO_OK_FOR_BASE_P (REGNO (X))))
 
 #ifdef NO_EXTERNAL_INDIRECT_ADDRESS
 
@@ -1179,7 +1179,7 @@ static int
 nonindexed_address_p (rtx x, int strict)
 {
   rtx xfoo0;
-  if (GET_CODE (x) == REG)
+  if (REG_P (x))
     {
       extern rtx *reg_equiv_mem;
       if (! reload_in_progress
@@ -1192,7 +1192,7 @@ nonindexed_address_p (rtx x, int strict)
   if (indirectable_address_p (x, strict))
     return 1;
   xfoo0 = XEXP (x, 0);
-  if (GET_CODE (x) == MEM && indirectable_address_p (xfoo0, strict))
+  if (MEM_P (x) && indirectable_address_p (xfoo0, strict))
     return 1;
   if ((GET_CODE (x) == PRE_DEC || GET_CODE (x) == POST_INC)
       && BASE_REGISTER_P (xfoo0, strict))
@@ -1314,9 +1314,9 @@ vax_mode_dependent_address_p (rtx x)
   xfoo0 = XEXP (x, 0);
   xfoo1 = XEXP (x, 1);
 
-  if (CONSTANT_ADDRESS_P (xfoo0) && GET_CODE (xfoo1) == REG)
+  if (CONSTANT_ADDRESS_P (xfoo0) && REG_P (xfoo1))
     return 0;
-  if (CONSTANT_ADDRESS_P (xfoo1) && GET_CODE (xfoo0) == REG)
+  if (CONSTANT_ADDRESS_P (xfoo1) && REG_P (xfoo0))
     return 0;
 
   return 1;
diff --git a/gcc/config/vax/vax.h b/gcc/config/vax/vax.h
index 787e321..dae115a 100644
--- a/gcc/config/vax/vax.h
+++ b/gcc/config/vax/vax.h
@@ -291,7 +291,7 @@ enum reg_class { NO_REGS, ALL_REGS, LIM_REG_CLASSES };
 
 #define EXTRA_CONSTRAINT(OP, C)						\
   ((C) == 'Q'								\
-   ? GET_CODE (OP) == MEM && ! mode_dependent_address_p (XEXP (OP, 0))	\
+   ? MEM_P (OP) && ! mode_dependent_address_p (XEXP (OP, 0))	\
    : 0)
 
 /* Given an rtx X being reloaded into a reg required to be
@@ -891,9 +891,9 @@ VAX operand formatting codes:
     fprintf (FILE, "$%d", (int) (0xff & - INTVAL (X)));			\
   else if (CODE == 'M' && GET_CODE (X) == CONST_INT)			\
     fprintf (FILE, "$%d", ~((1 << INTVAL (x)) - 1));			\
-  else if (GET_CODE (X) == REG)						\
+  else if (REG_P (X))							\
     fprintf (FILE, "%s", reg_names[REGNO (X)]);				\
-  else if (GET_CODE (X) == MEM)						\
+  else if (MEM_P (X))							\
     output_address (XEXP (X, 0));					\
   else if (GET_CODE (X) == CONST_DOUBLE && GET_MODE (X) == SFmode)	\
     { char dstr[30];							\
diff --git a/gcc/config/vax/vax.md b/gcc/config/vax/vax.md
index 73ee8fa..2e1a379 100644
--- a/gcc/config/vax/vax.md
+++ b/gcc/config/vax/vax.md
@@ -648,7 +648,7 @@
 {
   if (operands[2] == const1_rtx && rtx_equal_p (operands[0], operands[1]))
     return \"addl2 %0,%0\";
-  if (GET_CODE (operands[1]) == REG
+  if (REG_P (operands[1])
       && GET_CODE (operands[2]) == CONST_INT)
     {
       int i = INTVAL (operands[2]);
@@ -761,7 +761,7 @@
 	(match_operand:SI 3 "general_operand" "g"))]
    "(INTVAL (operands[1]) == 8 || INTVAL (operands[1]) == 16)
    && INTVAL (operands[2]) % INTVAL (operands[1]) == 0
-   && (GET_CODE (operands[0]) == REG
+   && (REG_P (operands[0])
        || ! mode_dependent_address_p (XEXP (operands[0], 0)))"
   "*
 {
@@ -789,7 +789,7 @@
 			 (match_operand:SI 3 "const_int_operand" "n")))]
   "(INTVAL (operands[2]) == 8 || INTVAL (operands[2]) == 16)
    && INTVAL (operands[3]) % INTVAL (operands[2]) == 0
-   && (GET_CODE (operands[1]) == REG
+   && (REG_P (operands[1])
        || ! mode_dependent_address_p (XEXP (operands[1], 0)))"
   "*
 {
@@ -816,7 +816,7 @@
 			 (match_operand:SI 3 "const_int_operand" "n")))]
   "(INTVAL (operands[2]) == 8 || INTVAL (operands[2]) == 16)
    && INTVAL (operands[3]) % INTVAL (operands[2]) == 0
-   && (GET_CODE (operands[1]) == REG
+   && (REG_P (operands[1])
        || ! mode_dependent_address_p (XEXP (operands[1], 0)))"
   "*
 {
@@ -872,7 +872,7 @@
   "*
 {
   if (GET_CODE (operands[3]) != CONST_INT || GET_CODE (operands[2]) != CONST_INT
-      || GET_CODE (operands[0]) != REG
+      || !REG_P (operands[0])
       || (INTVAL (operands[2]) != 8 && INTVAL (operands[2]) != 16))
     return \"extv %3,%2,%1,%0\";
   if (INTVAL (operands[2]) == 8)
@@ -889,7 +889,7 @@
   "*
 {
   if (GET_CODE (operands[3]) != CONST_INT || GET_CODE (operands[2]) != CONST_INT
-      || GET_CODE (operands[0]) != REG)
+      || !REG_P (operands[0]))
     return \"extzv %3,%2,%1,%0\";
   if (INTVAL (operands[2]) == 8)
     return \"rotl %R3,%1,%0\;movzbl %0,%0\";
@@ -934,12 +934,12 @@
   ""
   "*
 {
-  if (GET_CODE (operands[0]) != REG || GET_CODE (operands[2]) != CONST_INT
+  if (!REG_P (operands[0]) || GET_CODE (operands[2]) != CONST_INT
       || GET_CODE (operands[3]) != CONST_INT
       || (INTVAL (operands[2]) != 8 && INTVAL (operands[2]) != 16)
       || INTVAL (operands[2]) + INTVAL (operands[3]) > 32
       || side_effects_p (operands[1])
-      || (GET_CODE (operands[1]) == MEM
+      || (MEM_P (operands[1])
 	  && mode_dependent_address_p (XEXP (operands[1], 0))))
     return \"extv %3,%2,%1,%0\";
   if (INTVAL (operands[2]) == 8)
@@ -963,11 +963,11 @@
   ""
   "*
 {
-  if (GET_CODE (operands[0]) != REG || GET_CODE (operands[2]) != CONST_INT
+  if (! REG_P (operands[0]) || GET_CODE (operands[2]) != CONST_INT
       || GET_CODE (operands[3]) != CONST_INT
       || INTVAL (operands[2]) + INTVAL (operands[3]) > 32
       || side_effects_p (operands[1])
-      || (GET_CODE (operands[1]) == MEM
+      || (MEM_P (operands[1])
 	  && mode_dependent_address_p (XEXP (operands[1], 0))))
     return \"extzv %3,%2,%1,%0\";
   if (INTVAL (operands[2]) == 8)