From 349f4ea14a4b563b86ef48a3f4dde6643ae91226 Mon Sep 17 00:00:00 2001 From: Andreas Krebbel Date: Thu, 16 Mar 2006 08:15:35 +0000 Subject: [PATCH] simplify-rtx.c (simplify_plus_minus): Simplify within CONST terms. 2006-03-16 Andreas Krebbel * simplify-rtx.c (simplify_plus_minus): Simplify within CONST terms. From-SVN: r112131 --- gcc/ChangeLog | 4 ++++ gcc/simplify-rtx.c | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 579f7a3c58f..b7870e32cdd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2006-03-16 Andreas Krebbel + + * simplify-rtx.c (simplify_plus_minus): Simplify within CONST terms. + 2006-03-16 Maxim Kuvyrkov * config/ia64/ia64.c (stops_p): Added explicit initialization. diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c index 754464d06f1..e00e9ccca10 100644 --- a/gcc/simplify-rtx.c +++ b/gcc/simplify-rtx.c @@ -3320,8 +3320,21 @@ simplify_plus_minus (enum rtx_code code, enum machine_mode mode, rtx op0, else if (swap_commutative_operands_p (lhs, rhs)) tem = lhs, lhs = rhs, rhs = tem; - tem = simplify_binary_operation (ncode, mode, lhs, rhs); + if ((GET_CODE (lhs) == CONST || GET_CODE (lhs) == CONST_INT) + && (GET_CODE (rhs) == CONST || GET_CODE (rhs) == CONST_INT)) + { + rtx tem_lhs, tem_rhs; + + tem_lhs = GET_CODE (lhs) == CONST ? XEXP (lhs, 0) : lhs; + tem_rhs = GET_CODE (rhs) == CONST ? XEXP (rhs, 0) : rhs; + tem = simplify_binary_operation (ncode, mode, tem_lhs, tem_rhs); + if (tem && !CONSTANT_P (tem)) + tem = gen_rtx_CONST (GET_MODE (tem), tem); + } + else + tem = simplify_binary_operation (ncode, mode, lhs, rhs); + /* Reject "simplifications" that just wrap the two arguments in a CONST. Failure to do so can result in infinite recursion with simplify_binary_operation -- 2.30.2