mips.c (mips_zero_if_equal): Only use XORs if the second operand is an uns_arith_operand...

	* config/mips/mips.c (mips_zero_if_equal): Only use XORs if the second
	operand is an uns_arith_operand; use subtraction otherwise.
	* config/mips/mips.md (cmpsi, cmpdi): Allow any nonmemory_operand,
	not just arith_operands.

From-SVN: r84809

gcc/ChangeLog

 2004-07-16  Richard Sandiford  <rsandifo@redhat.com>
 
+	* config/mips/mips.c (mips_zero_if_equal): Only use XORs if the second
+	operand is an uns_arith_operand; use subtraction otherwise.
+	* config/mips/mips.md (cmpsi, cmpdi): Allow any nonmemory_operand,
+	not just arith_operands.
+
+2004-07-16  Richard Sandiford  <rsandifo@redhat.com>
+
 	* config/mips/mips-protos.h (gen_int_relational): Delete.
 	(mips_emit_scc): Declare.
 	* config/mips/mips.c (internal_test): Delete.

gcc/config/mips/mips.c

@@ -2776,7 +2776,11 @@ mips_zero_if_equal (rtx cmp0, rtx cmp1)
   if (cmp1 == const0_rtx)
     return cmp0;
 
-  return expand_binop (GET_MODE (cmp0), xor_optab,
+  if (uns_arith_operand (cmp1, VOIDmode))
+    return expand_binop (GET_MODE (cmp0), xor_optab,
+			 cmp0, cmp1, 0, 0, OPTAB_DIRECT);
+
+  return expand_binop (GET_MODE (cmp0), sub_optab,
 		       cmp0, cmp1, 0, 0, OPTAB_DIRECT);
 }
 

gcc/config/mips/mips.md

@@ -5472,7 +5472,7 @@ dsrl\t%3,%3,1\n\
 (define_expand "cmpsi"
   [(set (cc0)
 	(compare:CC (match_operand:SI 0 "register_operand")
-		    (match_operand:SI 1 "arith_operand")))]
+		    (match_operand:SI 1 "nonmemory_operand")))]
   ""
 {
   cmp_operands[0] = operands[0];
@@ -5483,7 +5483,7 @@ dsrl\t%3,%3,1\n\
 (define_expand "cmpdi"
   [(set (cc0)
 	(compare:CC (match_operand:DI 0 "register_operand")
-		    (match_operand:DI 1 "arith_operand")))]
+		    (match_operand:DI 1 "nonmemory_operand")))]
   "TARGET_64BIT"
 {
   cmp_operands[0] = operands[0];