2012-05-04 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>

	* config/s390/s390.md (*movmem_short, *clrmem_short)
	(*cmpmem_short): Move the mode check from the insn condition to
	the match_scratch.

From-SVN: r187159

gcc/ChangeLog

+2012-05-04  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* config/s390/s390.md (*movmem_short, *clrmem_short)
+	(*cmpmem_short): Move the mode check from the insn condition to
+	the match_scratch.
+
 2012-05-04  Ulrich Weigand  <ulrich.weigand@linaro.org>
 
 	PR tree-optimization/52633

gcc/config/s390/s390.md

@@ -2658,9 +2658,8 @@
         (match_operand:BLK 1 "memory_operand" "Q,Q,Q,Q"))
    (use (match_operand 2 "nonmemory_operand" "n,a,a,a"))
    (use (match_operand 3 "immediate_operand" "X,R,X,X"))
-   (clobber (match_scratch 4 "=X,X,X,&a"))]
-  "(GET_MODE (operands[2]) == Pmode || GET_MODE (operands[2]) == VOIDmode)
-   && GET_MODE (operands[4]) == Pmode"
+   (clobber (match_scratch:P 4 "=X,X,X,&a"))]
+  "(GET_MODE (operands[2]) == Pmode || GET_MODE (operands[2]) == VOIDmode)"
   "#"
   [(set_attr "type"         "cs")
    (set_attr "cpu_facility" "*,*,z10,*")])
@@ -2867,10 +2866,9 @@
         (const_int 0))
    (use (match_operand 1 "nonmemory_operand" "n,a,a,a"))
    (use (match_operand 2 "immediate_operand" "X,R,X,X"))
-   (clobber (match_scratch 3 "=X,X,X,&a"))
+   (clobber (match_scratch:P 3 "=X,X,X,&a"))
    (clobber (reg:CC CC_REGNUM))]
-  "(GET_MODE (operands[1]) == Pmode || GET_MODE (operands[1]) == VOIDmode)
-   && GET_MODE (operands[3]) == Pmode"
+  "(GET_MODE (operands[1]) == Pmode || GET_MODE (operands[1]) == VOIDmode)"
   "#"
   [(set_attr "type" "cs")
    (set_attr "cpu_facility" "*,*,z10,*")])
@@ -3040,9 +3038,8 @@
                      (match_operand:BLK 1 "memory_operand" "Q,Q,Q,Q")))
    (use (match_operand 2 "nonmemory_operand" "n,a,a,a"))
    (use (match_operand 3 "immediate_operand" "X,R,X,X"))
-   (clobber (match_scratch 4 "=X,X,X,&a"))]
-  "(GET_MODE (operands[2]) == Pmode || GET_MODE (operands[2]) == VOIDmode)
-   && GET_MODE (operands[4]) == Pmode"
+   (clobber (match_scratch:P 4 "=X,X,X,&a"))]
+  "(GET_MODE (operands[2]) == Pmode || GET_MODE (operands[2]) == VOIDmode)"
   "#"
   [(set_attr "type" "cs")
    (set_attr "cpu_facility" "*,*,z10,*")])