From 817b5d3a9ea337376df89500294a258fb4930b6e Mon Sep 17 00:00:00 2001 From: Segher Boessenkool Date: Wed, 7 Jun 2017 17:06:53 +0200 Subject: [PATCH] rs6000: Remove rs6000_cbranch_operator rs6000_cbranch_operator now is just comparison_operator, so just use that directly. * config/rs6000/predicated.md (rs6000_cbranch_operator): Delete. * config/rs6000/rs6000.md: Replace rs6000_cbranch_operator by comparison_operator. From-SVN: r248977 --- gcc/ChangeLog | 6 ++++++ gcc/config/rs6000/predicates.md | 4 ---- gcc/config/rs6000/rs6000.md | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 01c5e4c774a..bce2601bbc9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-06-07 Segher Boessenkool + + * config/rs6000/predicated.md (rs6000_cbranch_operator): Delete. + * config/rs6000/rs6000.md: Replace rs6000_cbranch_operator by + comparison_operator. + 2017-06-07 Segher Boessenkool * config/rs6000/rs6000.c: Remove everything related to -mfloat-gprs. diff --git a/gcc/config/rs6000/predicates.md b/gcc/config/rs6000/predicates.md index dd961a7e9ed..11aecbd1b89 100644 --- a/gcc/config/rs6000/predicates.md +++ b/gcc/config/rs6000/predicates.md @@ -1238,10 +1238,6 @@ GET_MODE (XEXP (op, 0))), 1")))) -;; Return 1 if OP is a valid comparison operator for "cbranch" instructions. -(define_predicate "rs6000_cbranch_operator" - (match_operand 0 "comparison_operator")) - ;; Return 1 if OP is an unsigned comparison operator. (define_predicate "unsigned_comparison_operator" (match_code "ltu,gtu,leu,geu")) diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md index efca26cfd76..108ad8fed4d 100644 --- a/gcc/config/rs6000/rs6000.md +++ b/gcc/config/rs6000/rs6000.md @@ -11430,7 +11430,7 @@ ;; insns, and branches. (define_expand "cbranch4" - [(use (match_operator 0 "rs6000_cbranch_operator" + [(use (match_operator 0 "comparison_operator" [(match_operand:GPR 1 "gpc_reg_operand" "") (match_operand:GPR 2 "reg_or_short_operand" "")])) (use (match_operand 3 ""))] @@ -11453,7 +11453,7 @@ }") (define_expand "cbranch4" - [(use (match_operator 0 "rs6000_cbranch_operator" + [(use (match_operator 0 "comparison_operator" [(match_operand:FP 1 "gpc_reg_operand" "") (match_operand:FP 2 "gpc_reg_operand" "")])) (use (match_operand 3 ""))] @@ -11683,7 +11683,7 @@ }) (define_expand "cstore4" - [(use (match_operator 1 "rs6000_cbranch_operator" + [(use (match_operator 1 "comparison_operator" [(match_operand:GPR 2 "gpc_reg_operand") (match_operand:GPR 3 "reg_or_short_operand")])) (clobber (match_operand:GPR 0 "gpc_reg_operand"))] @@ -11746,7 +11746,7 @@ }) (define_expand "cstore4" - [(use (match_operator 1 "rs6000_cbranch_operator" + [(use (match_operator 1 "comparison_operator" [(match_operand:FP 2 "gpc_reg_operand") (match_operand:FP 3 "gpc_reg_operand")])) (clobber (match_operand:SI 0 "gpc_reg_operand"))] -- 2.30.2