From cee27373aa8ed5eb4870b3b51ba8fde4448bfabe Mon Sep 17 00:00:00 2001 From: "Dongkyun, Son" Date: Fri, 5 Jun 2015 22:03:43 +0900 Subject: [PATCH] Revert "2014-12-04 Yvan Roux " This reverts commit 39dc6fc8a16575d6cae19a71f6de0a605ad75083. Change-Id: I3db99f759e5471a9032cfe21b807fe2f3a0f2432 --- gcc/ChangeLog.linaro | 8 -------- gcc/ifcvt.c | 24 ++++-------------------- 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/gcc/ChangeLog.linaro b/gcc/ChangeLog.linaro index 85294aa..9ba5de6 100644 --- a/gcc/ChangeLog.linaro +++ b/gcc/ChangeLog.linaro @@ -593,14 +593,6 @@ 2014-12-04 Yvan Roux - Backport from trunk r217026. - 2014-11-03 Zhenqiang Chen - - * ifcvt.c (noce_emit_cmove, noce_get_alt_condition, noce_get_condition): - Allow CC mode if HAVE_cbranchcc4. - -2014-12-04 Yvan Roux - Backport from trunk r217014. 2014-11-02 Michael Collison diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c index 7cd85d1..2097de6 100644 --- a/gcc/ifcvt.c +++ b/gcc/ifcvt.c @@ -1432,17 +1432,10 @@ noce_emit_cmove (struct noce_if_info *if_info, rtx x, enum rtx_code code, end_sequence (); } - /* Don't even try if the comparison operands are weird - except that the target supports cbranchcc4. */ + /* Don't even try if the comparison operands are weird. */ if (! general_operand (cmp_a, GET_MODE (cmp_a)) || ! general_operand (cmp_b, GET_MODE (cmp_b))) - { -#if HAVE_cbranchcc4 - if (GET_MODE_CLASS (GET_MODE (cmp_a)) != MODE_CC - || cmp_b != const0_rtx) -#endif - return NULL_RTX; - } + return NULL_RTX; #if HAVE_conditional_move unsignedp = (code == LTU || code == GEU @@ -1760,11 +1753,6 @@ noce_get_alt_condition (struct noce_if_info *if_info, rtx target, { rtx cond, set, insn; int reverse; - int allow_cc_mode = false; -#if HAVE_cbranchcc4 - allow_cc_mode = true; -#endif - /* If target is already mentioned in the known condition, return it. */ if (reg_mentioned_p (target, if_info->cond)) @@ -1886,7 +1874,7 @@ noce_get_alt_condition (struct noce_if_info *if_info, rtx target, } cond = canonicalize_condition (if_info->jump, cond, reverse, - earliest, target, allow_cc_mode, true); + earliest, target, false, true); if (! cond || ! reg_mentioned_p (target, cond)) return NULL; @@ -2337,10 +2325,6 @@ noce_get_condition (rtx jump, rtx *earliest, bool then_else_reversed) { rtx cond, set, tmp; bool reverse; - int allow_cc_mode = false; -#if HAVE_cbranchcc4 - allow_cc_mode = true; -#endif if (! any_condjump_p (jump)) return NULL_RTX; @@ -2377,7 +2361,7 @@ noce_get_condition (rtx jump, rtx *earliest, bool then_else_reversed) /* Otherwise, fall back on canonicalize_condition to do the dirty work of manipulating MODE_CC values and COMPARE rtx codes. */ tmp = canonicalize_condition (jump, cond, reverse, earliest, - NULL_RTX, allow_cc_mode, true); + NULL_RTX, false, true); /* We don't handle side-effects in the condition, like handling REG_INC notes and making sure no duplicate conditions are emitted. */ -- 2.7.4