mn10300.md: Revert 2003-09-17's patch.

* config/mn10300/mn10300.md: Revert 2003-09-17's patch.
(andsi3): Set attr cc to set_zn when using shifts or adds.

From-SVN: r71663

gcc/ChangeLog

+2003-09-22  Alexandre Oliva  <aoliva@redhat.com>
+
+	* config/mn10300/mn10300.md: Revert 2003-09-17's patch.
+	(andsi3): Set attr cc to set_zn when using shifts or adds.
+
 2003-09-22  Bernardo Innocenti <bernie@develer.com>
 
 	* doc/contrib.texi: Add Peter Barada, Paul Dale and myself.

gcc/config/mn10300/mn10300.md

@@ -1224,7 +1224,22 @@
     return \"and %1,%0\";
   return \"and %2,%0\";
 }"
-  [(set_attr "cc" "none_0hit,set_zn,set_zn")])
+  [(set (attr "cc")
+	(cond
+	 [
+	 (eq (symbol_ref "which_alternative") (const_int 0)
+	     ) (const_string "none_0hit")
+	 (ne (symbol_ref "GET_CODE (operands[2]) == CONST_INT
+			  && (INTVAL (operands[2]) == 0x7fffffff
+			      || INTVAL (operands[2]) == 0x3fffffff
+			      || INTVAL (operands[2]) == 0x1fffffff
+			      || INTVAL (operands[2]) == 0x0fffffff
+			      || INTVAL (operands[2]) == 0x0ffffffe
+			      || INTVAL (operands[2]) == 0xfffffffc
+			      || INTVAL (operands[2]) == 0xfffffff8
+			      || INTVAL (operands[2]) == 0xfffffff0)")
+	     (const_int 0)) (const_string "set_zn")
+	  ] (const_string "set_znv")))])
 
 (define_insn ""
   [(set (match_operand:SI 0 "register_operand" "=dx,dx")
@@ -1255,7 +1270,27 @@
     return \"lsr 4,%0\;asl2 %0\;asl2 %0\";
   return \"and %2,%0\";
 }"
-  [(set_attr "cc" "none_0hit,set_zn")])
+  [(set (attr "cc")
+	(cond
+	 [
+	 (eq (symbol_ref "which_alternative") (const_int 0)
+	     ) (const_string "none_0hit")
+	 ;; Shifts don't set the V flag, but bitwise operations clear
+	 ;; it (which correctly reflects the absence of overflow in a
+	 ;; compare-with-zero that might follow).  As for the
+	 ;; 0xfffffffe case, the add may overflow, so we can't use the
+	 ;; V flag.
+	 (ne (symbol_ref "GET_CODE (operands[2]) == CONST_INT
+			  && (INTVAL (operands[2]) == 0x7fffffff
+			      || INTVAL (operands[2]) == 0x3fffffff
+			      || INTVAL (operands[2]) == 0x1fffffff
+			      || INTVAL (operands[2]) == 0x0fffffff
+			      || INTVAL (operands[2]) == 0x0ffffffe
+			      || INTVAL (operands[2]) == 0xfffffffc
+			      || INTVAL (operands[2]) == 0xfffffff8
+			      || INTVAL (operands[2]) == 0xfffffff0)")
+	     (const_int 0)) (const_string "set_zn")
+	  ] (const_string "set_znv")))])
 
 ;; ----------------------------------------------------------------------
 ;; OR INSTRUCTIONS
@@ -1291,7 +1326,7 @@
     return \"or %1,%0\";
   return \"or %2,%0\";
 }"
-  [(set_attr "cc" "set_zn")])
+  [(set_attr "cc" "set_znv")])
 
 (define_insn ""
   [(set (match_operand:SI 0 "register_operand" "=dx")
@@ -1299,7 +1334,7 @@
 		(match_operand:SI 2 "nonmemory_operand" "dxi")))]
   ""
   "or %2,%0"
-  [(set_attr "cc" "set_zn")])
+  [(set_attr "cc" "set_znv")])
 
 ;; ----------------------------------------------------------------------
 ;; XOR INSTRUCTIONS
@@ -1335,7 +1370,7 @@
     return \"xor %1,%0\";
   return \"xor %2,%0\";
 }"
-  [(set_attr "cc" "set_zn")])
+  [(set_attr "cc" "set_znv")])
 
 (define_insn ""
   [(set (match_operand:SI 0 "register_operand" "=dx")
@@ -1343,7 +1378,7 @@
 		(match_operand:SI 2 "nonmemory_operand" "dxi")))]
   ""
   "xor %2,%0"
-  [(set_attr "cc" "set_zn")])
+  [(set_attr "cc" "set_znv")])
 
 ;; ----------------------------------------------------------------------
 ;; NOT INSTRUCTIONS
@@ -1360,14 +1395,14 @@
 	(not:SI (match_operand:SI 1 "register_operand" "0,0")))]
   "TARGET_AM33"
   "not %0"
-  [(set_attr "cc" "set_zn")])
+  [(set_attr "cc" "set_znv")])
 
 (define_insn ""
   [(set (match_operand:SI 0 "register_operand" "=dx")
 	(not:SI (match_operand:SI 1 "register_operand" "0")))]
   ""
   "not %0"
-  [(set_attr "cc" "set_zn")])
+  [(set_attr "cc" "set_znv")])
 
 ;; -----------------------------------------------------------------
 ;; BIT FIELDS
@@ -1404,7 +1439,7 @@
   "@
   bclr %N1,%A0
   and %1,%0"
-  [(set_attr "cc" "clobber,set_zn")])
+  [(set_attr "cc" "clobber,set_znv")])
 
 (define_insn ""
   [(set (match_operand:QI 0 "memory_operand" "=R,T")
@@ -1426,7 +1461,7 @@
   "@
   bset %U1,%A0
   or %1,%0"
-  [(set_attr "cc" "clobber,set_zn")])
+  [(set_attr "cc" "clobber,set_znv")])
 
 (define_expand "iorqi3"
   [(set (match_operand:QI 0 "nonimmediate_operand" "")
@@ -1449,7 +1484,7 @@
   bset %U2,%A0
   bset %2,%0
   or %2,%0"
-  [(set_attr "cc" "clobber,clobber,set_zn")])
+  [(set_attr "cc" "clobber,clobber,set_znv")])
 
 (define_insn ""
   [(set (match_operand:QI 0 "nonimmediate_operand" "=R,T,d")
@@ -1464,7 +1499,7 @@
   bset %U2,%A0
   bset %2,%0
   or %2,%0"
-  [(set_attr "cc" "clobber,clobber,set_zn")])
+  [(set_attr "cc" "clobber,clobber,set_znv")])
 
 (define_insn ""
   [(set (cc0)