h8300.c (notice_update_cc): Use CC_SET_ZN and CC_SET_ZNV.

        * h8300.c (notice_update_cc): Use CC_SET_ZN and CC_SET_ZNV.
        (shift_one, shift_two): Set CC_NO_CARRY as needed.  Remove
        references to CC_OVERFLOW_0.
        (emit_a_shift): Similarly.
        * h8300.h (CC_OVERFLOW_0): Remove.
        * h8300.md: Use set_zn and set_znv for cc0 tracking.
        (bCC): Restore the comparison is CC_OVERFLOW_UNUSABLE is set and
        the comparison needs the overflow bits.

From-SVN: r14020

gcc/config/h8300/h8300.c

@@ -1597,15 +1597,7 @@ notice_update_cc (body, insn)
 	cc_status.value1 = 0;
       break;
 
-    case CC_SET:
-      /* Insn sets the Z,N,V flags of CC to recog_operand[0].
-	 C may or may not be set to 0 but that's ok
-	 because alter_cond will change tests to use EQ/NE.  */
-      CC_STATUS_INIT;
-      cc_status.value1 = recog_operand[0];
-      break;
-
-    case CC_SET_ZN_C0:
+    case CC_SET_ZN:
       /* Insn sets the Z,N flags of CC to recog_operand[0].
 	 The V flag is unusable.  The C flag may or may not be known but
 	 that's ok because alter_cond will change tests to use EQ/NE.  */
@@ -1614,6 +1606,15 @@ notice_update_cc (body, insn)
       cc_status.value1 = recog_operand[0];
       break;
 
+    case CC_SET_ZNV:
+      /* Insn sets the Z,N,V flags of CC to recog_operand[0].
+	 The C flag may or may not be known but that's ok because
+	 alter_cond will change tests to use EQ/NE.  */
+      CC_STATUS_INIT;
+      cc_status.flags |= CC_NO_CARRY;
+      cc_status.value1 = recog_operand[0];
+      break;
+
     case CC_COMPARE:
       /* The insn is a compare instruction.  */
       CC_STATUS_INIT;
@@ -1907,13 +1908,13 @@ static const struct shift_insn shift_one[2][3][3] =
   {
 /* SHIFT_ASHIFT */
     {
-      { "shll\t%X0", CC_OVERFLOW_0 | CC_NO_CARRY },
+      { "shll\t%X0", CC_NO_CARRY },
       { "add.w\t%T0,%T0", CC_OVERFLOW_UNUSABLE | CC_NO_CARRY },
       { "add.w\t%f0,%f0\n\taddx\t%y0,%y0\n\taddx\t%z0,%z0", 0 }
     },
 /* SHIFT_LSHIFTRT */
     {
-      { "shlr\t%X0", CC_OVERFLOW_0 | CC_NO_CARRY },
+      { "shlr\t%X0", CC_NO_CARRY },
       { "shlr\t%t0\n\trotxr\t%s0", 0 },
       { "shlr\t%z0\n\trotxr\t%y0\n\trotxr\t%x0\n\trotxr\t%w0", 0 }
     },
@@ -1928,15 +1929,15 @@ static const struct shift_insn shift_one[2][3][3] =
   {
 /* SHIFT_ASHIFT */
     {
-      { "shll.b\t%X0", CC_OVERFLOW_0 | CC_NO_CARRY },
-      { "shll.w\t%T0", CC_OVERFLOW_0 | CC_NO_CARRY },
-      { "shll.l\t%S0", CC_OVERFLOW_0 | CC_NO_CARRY }
+      { "shll.b\t%X0", CC_NO_CARRY },
+      { "shll.w\t%T0", CC_NO_CARRY },
+      { "shll.l\t%S0", CC_NO_CARRY }
     },
 /* SHIFT_LSHIFTRT */
     {
-      { "shlr.b\t%X0", CC_OVERFLOW_0 | CC_NO_CARRY },
-      { "shlr.w\t%T0", CC_OVERFLOW_0 | CC_NO_CARRY },
-      { "shlr.l\t%S0", CC_OVERFLOW_0 | CC_NO_CARRY }
+      { "shlr.b\t%X0", CC_NO_CARRY },
+      { "shlr.w\t%T0", CC_NO_CARRY },
+      { "shlr.l\t%S0", CC_NO_CARRY }
     },
 /* SHIFT_ASHIFTRT */
     {
@@ -1951,15 +1952,15 @@ static const struct shift_insn shift_two[3][3] =
 {
 /* SHIFT_ASHIFT */
     {
-      { "shll.b\t#2,%X0", CC_OVERFLOW_0 | CC_NO_CARRY },
-      { "shll.w\t#2,%T0", CC_OVERFLOW_0 | CC_NO_CARRY },
-      { "shll.l\t#2,%S0", CC_OVERFLOW_0 | CC_NO_CARRY }
+      { "shll.b\t#2,%X0", CC_NO_CARRY },
+      { "shll.w\t#2,%T0", CC_NO_CARRY },
+      { "shll.l\t#2,%S0", CC_NO_CARRY }
     },
 /* SHIFT_LSHIFTRT */
     {
-      { "shlr.b\t#2,%X0", CC_OVERFLOW_0 | CC_NO_CARRY },
-      { "shlr.w\t#2,%T0", CC_OVERFLOW_0 | CC_NO_CARRY },
-      { "shlr.l\t#2,%S0", CC_OVERFLOW_0 | CC_NO_CARRY }
+      { "shlr.b\t#2,%X0", CC_NO_CARRY },
+      { "shlr.w\t#2,%T0", CC_NO_CARRY },
+      { "shlr.l\t#2,%S0", CC_NO_CARRY }
     },
 /* SHIFT_ASHIFTRT */
     {
@@ -2658,7 +2659,7 @@ emit_a_shift (insn, operands)
 		    sprintf (insn_buf, "and #%d,%%X0",
 			     mask, n);
 		    cc_status.value1 = operands[0];
-		    cc_status.flags |= CC_OVERFLOW_0 | CC_NO_CARRY;
+		    cc_status.flags |= CC_NO_CARRY;
 		    break;
 		  case HImode:
 		    sprintf (insn_buf, "and #%d,%%s0\n\tand #%d,%%t0",
@@ -2674,7 +2675,7 @@ emit_a_shift (insn, operands)
 			 "bwl"[shift_mode], mask,
 			 mode == QImode ? 'X' : mode == HImode ? 'T' : 'S');
 		cc_status.value1 = operands[0];
-		cc_status.flags |= CC_OVERFLOW_0 | CC_NO_CARRY;
+		cc_status.flags |= CC_NO_CARRY;
 	      }
 	    output_asm_insn (insn_buf, operands);
 	    return "";

gcc/config/h8300/h8300.h

@@ -999,8 +999,6 @@ h8300_valid_machine_decl_attribute (DECL, ATTRIBUTES, IDENTIFIER, ARGS)
 
 #define NOTICE_UPDATE_CC(EXP, INSN) notice_update_cc(EXP, INSN)
 
-/* The mov,and,or,xor insns always set V to 0.  */
-#define CC_OVERFLOW_0 0400
 /* The add insns don't set overflow in a usable way.  */
 #define CC_OVERFLOW_UNUSABLE 01000
 /* The mov,and,or,xor insns don't set carry.  That's ok though as the
@@ -1009,7 +1007,6 @@ h8300_valid_machine_decl_attribute (DECL, ATTRIBUTES, IDENTIFIER, ARGS)
    CC_NO_OVERFLOW defined for this purpose.  Rename it to something more
    understandable.  */
 #define CC_NO_CARRY CC_NO_OVERFLOW
-/* ??? Use CC_Z_IN_NOT_C for bld insns?  */
 
 /* Control the assembler format that we output.  */