alpha.md (builtin_zap): Fix thinkos expanding mask.

        * config/alpha/alpha.md (builtin_zap): Fix thinkos expanding mask.
        (builtin_zapnot): Likewise.

From-SVN: r54454

gcc/ChangeLog

+2002-06-10  Richard Henderson  <rth@redhat.com>
+
+	* config/alpha/alpha.md (builtin_zap): Fix thinkos expanding mask.
+	(builtin_zapnot): Likewise.
+
+	* config/alpha/ev5.md: Don't combine shift and mvi insns in one
+	reservation.
+
 2002-06-10  Eric Christopher  <echristo@redhat.com>
 
 	* config/i386/i386.c (ix86_osf_output_function_prologue): Remove

gcc/config/alpha/alpha.md

@@ -7301,12 +7301,12 @@ fadd,fmul,fcpys,fdiv,fsqrt,misc,mvi,ftoi,itof,multi,none"
     {
       rtx mask = alpha_expand_zap_mask (INTVAL (operands[2]));
 
-      if (operands[1] == const0_rtx)
+      if (mask == const0_rtx)
 	{
 	  emit_move_insn (operands[0], const0_rtx);
 	  DONE;
 	}
-      if (operands[1] == constm1_rtx)
+      if (mask == constm1_rtx)
 	{
 	  emit_move_insn (operands[0], operands[1]);
 	  DONE;
@@ -7394,12 +7394,12 @@ fadd,fmul,fcpys,fdiv,fsqrt,misc,mvi,ftoi,itof,multi,none"
     {
       rtx mask = alpha_expand_zap_mask (~ INTVAL (operands[2]));
 
-      if (operands[1] == const0_rtx)
+      if (mask == const0_rtx)
 	{
 	  emit_move_insn (operands[0], const0_rtx);
 	  DONE;
 	}
-      if (operands[1] == constm1_rtx)
+      if (mask == constm1_rtx)
 	{
 	  emit_move_insn (operands[0], operands[1]);
 	  DONE;