h8300.md (*addsi3_and_r_1): Put under plus:SI section of h8300.md

	* config/h8300/h8300.md (*addsi3_and_r_1): Put under plus:SI
	section of h8300.md
	(*addsi3_and_nor_r_1): Likewise.

From-SVN: r65008

gcc/ChangeLog

+2003-03-28  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* config/h8300/h8300.md (*addsi3_and_r_1): Put under plus:SI
+	section of h8300.md
+	(*addsi3_and_nor_r_1): Likewise.
+
 2003-03-29  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* config/s390/s390.c (s390_emit_prologoue): Make sure backchain is

gcc/config/h8300/h8300.md

@@ -2837,6 +2837,52 @@
   [(set_attr "cc" "clobber")
    (set_attr "length" "6")])
 
+(define_insn_and_split "*addsi3_and_r_1"
+  [(set (match_operand:SI 0 "register_operand" "=r")
+	(plus:SI (and:SI (match_operand:SI 1 "register_operand" "r")
+			 (const_int 1))
+		 (match_operand:SI 2 "register_operand" "0")))]
+  "(TARGET_H8300H || TARGET_H8300S)"
+  "#"
+  "&& reload_completed"
+  [(set (cc0)
+	(zero_extract:SI (match_dup 1)
+			 (const_int 1)
+			 (const_int 0)))
+   (set (pc)
+        (if_then_else (eq (cc0)
+			  (const_int 0))
+		      (label_ref (match_dup 3))
+		      (pc)))
+   (set (match_dup 2)
+        (plus:SI (match_dup 2)
+		 (const_int 1)))
+   (match_dup 3)]
+  "operands[3] = gen_label_rtx ();")
+
+(define_insn_and_split "*addsi3_and_not_r_1"
+  [(set (match_operand:SI 0 "register_operand" "=r")
+	(plus:SI (and:SI (not:SI (match_operand:SI 1 "register_operand" "r"))
+			 (const_int 1))
+		 (match_operand:SI 2 "register_operand" "0")))]
+  "(TARGET_H8300H || TARGET_H8300S)"
+  "#"
+  "&& reload_completed"
+  [(set (cc0)
+	(zero_extract:SI (match_dup 1)
+			 (const_int 1)
+			 (const_int 0)))
+   (set (pc)
+        (if_then_else (ne (cc0)
+			  (const_int 0))
+		      (label_ref (match_dup 3))
+		      (pc)))
+   (set (match_dup 2)
+        (plus:SI (match_dup 2)
+		 (const_int 1)))
+   (match_dup 3)]
+  "operands[3] = gen_label_rtx ();")
+
 ;; [ix]or:HI
 
 (define_insn "*ixorhi3_zext"
@@ -2893,52 +2939,6 @@
   [(set_attr "cc" "clobber")
    (set_attr "length" "2")])
 
-(define_insn_and_split "*addsi3_and_r_1"
-  [(set (match_operand:SI 0 "register_operand" "=r")
-	(plus:SI (and:SI (match_operand:SI 1 "register_operand" "r")
-			 (const_int 1))
-		 (match_operand:SI 2 "register_operand" "0")))]
-  "(TARGET_H8300H || TARGET_H8300S)"
-  "#"
-  "&& reload_completed"
-  [(set (cc0)
-	(zero_extract:SI (match_dup 1)
-			 (const_int 1)
-			 (const_int 0)))
-   (set (pc)
-        (if_then_else (eq (cc0)
-			  (const_int 0))
-		      (label_ref (match_dup 3))
-		      (pc)))
-   (set (match_dup 2)
-        (plus:SI (match_dup 2)
-		 (const_int 1)))
-   (match_dup 3)]
-  "operands[3] = gen_label_rtx ();")
-
-(define_insn_and_split "*addsi3_and_not_r_1"
-  [(set (match_operand:SI 0 "register_operand" "=r")
-	(plus:SI (and:SI (not:SI (match_operand:SI 1 "register_operand" "r"))
-			 (const_int 1))
-		 (match_operand:SI 2 "register_operand" "0")))]
-  "(TARGET_H8300H || TARGET_H8300S)"
-  "#"
-  "&& reload_completed"
-  [(set (cc0)
-	(zero_extract:SI (match_dup 1)
-			 (const_int 1)
-			 (const_int 0)))
-   (set (pc)
-        (if_then_else (ne (cc0)
-			  (const_int 0))
-		      (label_ref (match_dup 3))
-		      (pc)))
-   (set (match_dup 2)
-        (plus:SI (match_dup 2)
-		 (const_int 1)))
-   (match_dup 3)]
-  "operands[3] = gen_label_rtx ();")
-
 ;; ior:HI
 
 (define_insn "*iorhi3_ashift_8"