From a1443cff0d845ddcb1d114f0864e29c89e37f260 Mon Sep 17 00:00:00 2001 From: Oleg Endo Date: Tue, 31 May 2016 15:27:54 +0000 Subject: [PATCH] Simplify SH DImode add, sub, neg patterns. * config/sh/sh.md (adddi3, subdi3, negdi2, abs2): Remove define_expand patterns. (adddi3_compact): Rename to adddi3. (subdi3_compact): Rename to subdi3. (*negdi2): Rename to negdi2. (*abs2): Rename to abs2. From-SVN: r236927 --- gcc/ChangeLog | 9 +++++++++ gcc/config/sh/sh.md | 44 +++++--------------------------------------- 2 files changed, 14 insertions(+), 39 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bdc3d172c4e..dca3e9cfbc2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2016-05-31 Oleg Endo + + * config/sh/sh.md (adddi3, subdi3, negdi2, abs2): Remove + define_expand patterns. + (adddi3_compact): Rename to adddi3. + (subdi3_compact): Rename to subdi3. + (*negdi2): Rename to negdi2. + (*abs2): Rename to abs2. + 2016-05-31 Oleg Endo * config/rx/rx.md (FETCHOP_NO_MINUS): New code iterator. diff --git a/gcc/config/sh/sh.md b/gcc/config/sh/sh.md index 406721dc736..30948ca7c8a 100644 --- a/gcc/config/sh/sh.md +++ b/gcc/config/sh/sh.md @@ -1535,18 +1535,7 @@ ;; Addition instructions ;; ------------------------------------------------------------------------- -(define_expand "adddi3" - [(set (match_operand:DI 0 "arith_reg_operand") - (plus:DI (match_operand:DI 1 "arith_reg_operand") - (match_operand:DI 2 "arith_operand")))] - "" -{ - operands[2] = force_reg (DImode, operands[2]); - emit_insn (gen_adddi3_compact (operands[0], operands[1], operands[2])); - DONE; -}) - -(define_insn_and_split "adddi3_compact" +(define_insn_and_split "adddi3" [(set (match_operand:DI 0 "arith_reg_dest") (plus:DI (match_operand:DI 1 "arith_reg_operand") (match_operand:DI 2 "arith_reg_operand"))) @@ -1938,21 +1927,10 @@ ;; Subtraction instructions ;; ------------------------------------------------------------------------- -(define_expand "subdi3" - [(set (match_operand:DI 0 "arith_reg_operand" "") - (minus:DI (match_operand:DI 1 "arith_reg_or_0_operand" "") - (match_operand:DI 2 "arith_reg_operand" "")))] - "" -{ - operands[1] = force_reg (DImode, operands[1]); - emit_insn (gen_subdi3_compact (operands[0], operands[1], operands[2])); - DONE; -}) - -(define_insn_and_split "subdi3_compact" +(define_insn_and_split "subdi3" [(set (match_operand:DI 0 "arith_reg_dest") (minus:DI (match_operand:DI 1 "arith_reg_operand") - (match_operand:DI 2 "arith_reg_operand"))) + (match_operand:DI 2 "arith_reg_operand"))) (clobber (reg:SI T_REG))] "TARGET_SH1" "#" @@ -4393,13 +4371,7 @@ ;; Don't split into individual negc insns immediately so that neg:DI (abs:DI) ;; can be combined. -(define_expand "negdi2" - [(parallel [(set (match_operand:DI 0 "arith_reg_dest") - (neg:DI (match_operand:DI 1 "arith_reg_operand"))) - (clobber (reg:SI T_REG))])] - "TARGET_SH1") - -(define_insn_and_split "*negdi2" +(define_insn_and_split "negdi2" [(set (match_operand:DI 0 "arith_reg_dest") (neg:DI (match_operand:DI 1 "arith_reg_operand"))) (clobber (reg:SI T_REG))] @@ -4480,13 +4452,7 @@ } [(set_attr "type" "arith")]) -(define_expand "abs2" - [(parallel [(set (match_operand:SIDI 0 "arith_reg_dest") - (abs:SIDI (match_operand:SIDI 1 "arith_reg_operand"))) - (clobber (reg:SI T_REG))])] - "TARGET_SH1") - -(define_insn_and_split "*abs2" +(define_insn_and_split "abs2" [(set (match_operand:SIDI 0 "arith_reg_dest") (abs:SIDI (match_operand:SIDI 1 "arith_reg_operand"))) (clobber (reg:SI T_REG))] -- 2.30.2