ms1.h (TARGET_MS1_64_001): New.

        * config/ms1/ms1.h (TARGET_MS1_64_001): New.
        (TARGET_MS1_16_002): New.
        (TARGET_MS1_16_003): New.

        * config/ms1/ms1.md ("decrement_and_branch_until_zero"): Rewrite.
        ("*decrement_and_branch_until_zero_no_clobber"): New.
        Add corresponding splitter for decrement_and_branch_until_zero
        instruction.
        Key all decrement_and_branch_until_zero patterns off of
        TARGET_MS1_16_003.

From-SVN: r105974

3 files changed, 73 insertions, 24 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a1d36b9..76ccffe 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+2005-10-28  Aldy Hernandez  <aldyh@redhat.com>
+
+        * config/ms1/ms1.h (TARGET_MS1_64_001): New.
+        (TARGET_MS1_16_002): New.
+        (TARGET_MS1_16_003): New.
+
+        * config/ms1/ms1.md ("decrement_and_branch_until_zero"): Rewrite.
+        ("*decrement_and_branch_until_zero_no_clobber"): New.
+        Add corresponding splitter for decrement_and_branch_until_zero
+        instruction.
+        Key all decrement_and_branch_until_zero patterns off of
+        TARGET_MS1_16_003.
+
 2005-10-28  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	PR middle-end/24362
diff --git a/gcc/config/ms1/ms1.h b/gcc/config/ms1/ms1.h
index 4183bb1..477c9cc 100644
--- a/gcc/config/ms1/ms1.h
+++ b/gcc/config/ms1/ms1.h
@@ -86,6 +86,10 @@ march=MS1-16-003:exit-16-003.o%s} \
     }						\
   while (0)
 
+#define TARGET_MS1_64_001 (ms1_cpu == PROCESSOR_MS1_64_001)
+#define TARGET_MS1_16_002 (ms1_cpu == PROCESSOR_MS1_16_002)
+#define TARGET_MS1_16_003 (ms1_cpu == PROCESSOR_MS1_16_003)
+
 #define TARGET_VERSION  fprintf (stderr, " (ms1)");
 
 #define OVERRIDE_OPTIONS ms1_override_options ()
diff --git a/gcc/config/ms1/ms1.md b/gcc/config/ms1/ms1.md
index 22c6b59..b96dfc0 100644
--- a/gcc/config/ms1/ms1.md
+++ b/gcc/config/ms1/ms1.md
@@ -68,34 +68,66 @@
 		 [(eq_attr "type" "arith") (nil) (nil)])
 
 
-;; Issue 64382
-;; This pattern implements the decrement and branch non-zero instruction
-;; which can be used by gcc loop optimizer under certain conditions.
-;; For an example of it being used try compiling the gcc test case
-;; gcc.c-torture/execute/921213-1.c with optimizations enabled.
-
-;; XXX - FIXME - TARGET_MUL is used as a condition since it is set when the
-;; target is the MS1-16-003, which is the only Morpho CPU which currently
-;; implements this instruction.  Strictly speaking we ought to define a
-;; new command line switch to enable/disable the DBNZ instruction or else
-;; change this pattern so that it explicitly checks for an MS1-16-003
-;; architecture.
-
 (define_insn "decrement_and_branch_until_zero"
-  [(parallel [(set (pc)
-	           (if_then_else
-	              (ne (match_operand:SI 0 "register_operand" "+r") (const_int 0))
-	              (label_ref (match_operand 1 "" ""))
-	              (pc)))
-              (set (match_dup 0)
-	           (plus:SI (match_dup 0) (const_int -1)))
-	     ])
-  ]
-  "TARGET_MUL"
+   [(set (pc)
+	 (if_then_else
+	  (ne (match_operand:SI 0 "nonimmediate_operand" "+r,*m")
+	      (const_int 0))
+	  (label_ref (match_operand 1 "" ""))
+	  (pc)))
+    (set (match_dup 0)
+	 (plus:SI (match_dup 0)
+		  (const_int -1)))
+    (clobber (match_scratch:SI 2 "=X,r"))]
+  "TARGET_MS1_16_003"
+  "@
+   dbnz\t%0, %l1%#
+   #"
+  [(set_attr "length" "4,16")]
+)
+
+;; Same as above, but without the clobber. The peephole below will
+;; match this pattern.
+(define_insn "*decrement_and_branch_until_zero_no_clobber"
+   [(set (pc)
+	 (if_then_else
+	  (ne (match_operand:SI 0 "register_operand" "+r")
+	      (const_int 0))
+	  (label_ref (match_operand 1 "" ""))
+	  (pc)))
+    (set (match_dup 0)
+	 (plus:SI (match_dup 0)
+		  (const_int -1)))]
+  "TARGET_MS1_16_003"
   "dbnz\t%0, %l1%#"
   [(set_attr "length" "4")]
 )
 
+;; Split the above to handle the case where operand 0 is in memory
+;; (a register that couldn't get a hard register).
+(define_split
+  [(set (pc)
+	(if_then_else
+	  (ne (match_operand:SI 0 "memory_operand" "")
+	      (const_int 0))
+	  (label_ref (match_operand 1 "" ""))
+	  (pc)))
+    (set (match_dup 0)
+	 (plus:SI (match_dup 0)
+		  (const_int -1)))
+    (clobber (match_scratch:SI 2 ""))]
+  "TARGET_MS1_16_003"
+  [(set (match_dup 2) (match_dup 0))
+   (set (match_dup 2) (plus:SI (match_dup 2) (const_int -1)))
+   (set (match_dup 0) (match_dup 2))
+   (set (pc)
+	(if_then_else
+	 (ne (match_dup 2)
+	     (const_int 0))
+	 (label_ref (match_dup 1))
+	 (pc)))]
+  "")
+
 ;; This peephole is defined in the vain hope that it might actually trigger one
 ;; day, although I have yet to find a test case that matches it.  The normal
 ;; problem is that GCC likes to move the loading of the constant value -1 out
@@ -111,7 +143,7 @@
 		(label_ref (match_operand 2 "" ""))
 		(pc)))
    ]
-  "TARGET_MUL"
+  "TARGET_MS1_16_003"
   [(parallel [(set (pc)
 	           (if_then_else
 	              (ne (match_dup 0) (const_int 0))