Revert accidential commits.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@192107 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/config/sh/sh.md b/gcc/config/sh/sh.md
index 6a61984..7a1c4d3 100644 (file)
--- a/gcc/config/sh/sh.md
+++ b/gcc/config/sh/sh.md
@@ -835,13 +835,9 @@
 
 (define_insn_and_split "*cmp_div0s_1"
   [(set (match_operand:SI 0 "arith_reg_dest" "")
-;;     (ge:SI (xor:SI (match_operand:SI 1 "arith_reg_operand" "")
-;;                    (match_operand:SI 2 "arith_reg_operand" ""))
-;;            (const_int 0)))
-       (xor:SI (lshiftrt:SI (match_operand:SI 1 "arith_reg_operand")
-                            (const_int 31))
-               (ge:SI (match_operand:SI 2 "arith_reg_operand")
-                      (const_int 0))))
+       (ge:SI (xor:SI (match_operand:SI 1 "arith_reg_operand" "")
+                      (match_operand:SI 2 "arith_reg_operand" ""))
+              (const_int 0)))
    (clobber (reg:SI T_REG))]
   "TARGET_SH1"
   "#"
@@ -857,13 +853,9 @@
 
 (define_insn_and_split "*cmp_div0s_1"
   [(set (reg:SI T_REG)
-;;     (ge:SI (xor:SI (match_operand:SI 0 "arith_reg_operand" "")
-;;                    (match_operand:SI 1 "arith_reg_operand" ""))
-;;            (const_int 0)))]
-       (eq:SI (lshiftrt:SI (match_operand:SI 0 "arith_reg_operand")
-                           (const_int 31))
-              (ge:SI (match_operand:SI 1 "arith_reg_operand")
-                     (const_int 0))))]
+       (ge:SI (xor:SI (match_operand:SI 0 "arith_reg_operand" "")
+                      (match_operand:SI 1 "arith_reg_operand" ""))
+              (const_int 0)))]
   "TARGET_SH1"
   "#"
   "&& can_create_pseudo_p ()"
@@ -1010,13 +1002,9 @@
 
 (define_insn_and_split "*cbranch_div0s"
   [(set (pc)
-;;     (if_then_else (ge (xor:SI (match_operand:SI 0 "arith_reg_operand" "")
-;;                               (match_operand:SI 1 "arith_reg_operand" ""))
-;;                       (const_int 0))
-       (if_then_else (eq (lshiftrt:SI (match_operand:SI 0 "arith_reg_operand")
-                                      (const_int 31))
-                         (ge:SI (match_operand:SI 1 "arith_reg_operand")
-                                (const_int 0)))
+       (if_then_else (ge (xor:SI (match_operand:SI 0 "arith_reg_operand" "")
+                                 (match_operand:SI 1 "arith_reg_operand" ""))
+                         (const_int 0))
                      (label_ref (match_operand 2))
                      (pc)))
    (clobber (reg:SI T_REG))]
@@ -10681,19 +10669,6 @@ label:
    DONE;
 })
 
-;; The *cstoresi pattern is for combine, so that it can apply some
-;; comparison canonicalization if it hasn't been done before.
-(define_insn_and_split "*cstoresi"
-  [(set (match_operand:SI 0 "arith_reg_dest")
-       (ge:SI (match_operand:SI 1 "arith_reg_operand")
-              (const_int 0)))
-   (clobber (reg:SI T_REG))]
-  "TARGET_SH1"
-  "#"
-  "&& 1"
-  [(set (reg:SI T_REG) (ge:SI (match_dup 1) (const_int 0)))
-   (set (match_dup 0) (reg:SI T_REG))])
-
 (define_expand "cstoredi4"
   [(set (match_operand:SI 0 "register_operand" "=r")
        (match_operator:SI 1 "comparison_operator"

diff --git a/gcc/testsuite/gcc.target/sh/pr52933-1.c b/gcc/testsuite/gcc.target/sh/pr52933-1.c
index 4f2dc98..037f916 100644 (file)
--- a/gcc/testsuite/gcc.target/sh/pr52933-1.c
+++ b/gcc/testsuite/gcc.target/sh/pr52933-1.c
@@ -8,7 +8,7 @@
 /* { dg-final { scan-assembler-times "div0s" 25 } } */
 /* { dg-final { scan-assembler-not "tst" } } */
 
-// typedef unsigned char bool;
+typedef unsigned char bool;
 
 int other_func_a (int, int);
 int other_func_b (int, int);