s390.c (s390_select_ccmode): Return CCAPmode for integer NEG and ABS.

	* config/s390/s390.c (s390_select_ccmode): Return CCAPmode for
	integer NEG and ABS.
	* config/s390/s390.md ("*negdi2_64"): Fix op_type attribute.
	("*negdi2_31"): Reimplement using a splitter.
	("*negdi2_cc", "*negdi2_cconly"): New insns.
	("*negdi2_sign", "*negdi2_sign_cc"): Likewise.
	("*negsi2_cc", "*negsi2_cconly"): Likewise.
	("*negdf2_cc", "*negdf2_cconly"): Likewise.
	("*negsf2_cc", "*negsf2_cconly"): Likewise.
	("*absdi2_cc", "*absdi2_cconly"): New insns.
	("*absdi2_sign", "*absdi2_sign_cc"): Likewise.
	("*abssi2_cc", "*abssi2_cconly"): Likewise.
	("*absdf2_cc", "*absdf2_cconly"): Likewise.
	("*abssf2_cc", "*abssf2_cconly"): Likewise.
	("*negabsdi2_cc", "*negabsdi2_cconly"): New insns.
	("*negabsdi2_sign", "*negabsdi2_sign_cc"): Likewise.
	("*negabssi2_cc", "*negabssi2_cconly"): Likewise.
	("*negabsdf2_cc", "*negabsdf2_cconly"): Likewise.
	("*negabssf2_cc", "*negabssf2_cconly"): Likewise.

From-SVN: r90347

gcc/ChangeLog

 2004-11-09  Ulrich Weigand  <uweigand@de.ibm.com>
 
+	* config/s390/s390.c (s390_select_ccmode): Return CCAPmode for
+	integer NEG and ABS.
+	* config/s390/s390.md ("*negdi2_64"): Fix op_type attribute.
+	("*negdi2_31"): Reimplement using a splitter.
+	("*negdi2_cc", "*negdi2_cconly"): New insns.
+	("*negdi2_sign", "*negdi2_sign_cc"): Likewise.
+	("*negsi2_cc", "*negsi2_cconly"): Likewise.
+	("*negdf2_cc", "*negdf2_cconly"): Likewise.
+	("*negsf2_cc", "*negsf2_cconly"): Likewise.
+	("*absdi2_cc", "*absdi2_cconly"): New insns.
+	("*absdi2_sign", "*absdi2_sign_cc"): Likewise.
+	("*abssi2_cc", "*abssi2_cconly"): Likewise.
+	("*absdf2_cc", "*absdf2_cconly"): Likewise.
+	("*abssf2_cc", "*abssf2_cconly"): Likewise.
+	("*negabsdi2_cc", "*negabsdi2_cconly"): New insns.
+	("*negabsdi2_sign", "*negabsdi2_sign_cc"): Likewise.
+	("*negabssi2_cc", "*negabssi2_cconly"): Likewise.
+	("*negabsdf2_cc", "*negabsdf2_cconly"): Likewise.
+	("*negabssf2_cc", "*negabssf2_cconly"): Likewise.
+
+2004-11-09  Ulrich Weigand  <uweigand@de.ibm.com>
+
 	* config/s390/s390.c (s390_canonicalize_comparison): Reverse condition
 	when eliminating an UNSPEC_CMPINT.
 	(s390_secondary_input_reload_class): Fix test for CC register reload.

gcc/config/s390/s390.c

@@ -446,6 +446,9 @@ s390_select_ccmode (enum rtx_code code, rtx op0, rtx op1)
     {
       case EQ:
       case NE:
+	if ((GET_CODE (op0) == NEG || GET_CODE (op0) == ABS)
+	    && GET_MODE_CLASS (GET_MODE (op0)) == MODE_INT)
+	  return CCAPmode;
 	if (GET_CODE (op0) == PLUS && GET_CODE (XEXP (op0, 1)) == CONST_INT
 	    && CONST_OK_FOR_CONSTRAINT_P (INTVAL (XEXP (op0, 1)), 'K', "K"))
 	  return CCAPmode;
@@ -482,14 +485,18 @@ s390_select_ccmode (enum rtx_code code, rtx op0, rtx op1)
       case LT:
       case GE:
       case GT:
-	  if (GET_CODE (op0) == PLUS && GET_CODE (XEXP (op0, 1)) == CONST_INT
-	      && CONST_OK_FOR_CONSTRAINT_P (INTVAL (XEXP (op0, 1)), 'K', "K"))
-            {
-	      if (INTVAL (XEXP((op0), 1)) < 0)
-	        return CCANmode;
-              else
-	        return CCAPmode;
-	    }
+	if ((GET_CODE (op0) == NEG || GET_CODE (op0) == ABS)
+	    && GET_MODE_CLASS (GET_MODE (op0)) == MODE_INT)
+	  return CCAPmode;
+	if (GET_CODE (op0) == PLUS && GET_CODE (XEXP (op0, 1)) == CONST_INT
+	    && CONST_OK_FOR_CONSTRAINT_P (INTVAL (XEXP (op0, 1)), 'K', "K"))
+	  {
+	    if (INTVAL (XEXP((op0), 1)) < 0)
+	      return CCANmode;
+	    else
+	      return CCAPmode;
+	  }
+	/* Fall through.  */
       case UNORDERED:
       case ORDERED:
       case UNEQ: