From 17ab7c59ba7fbc508855b0b8db98fbad255587f6 Mon Sep 17 00:00:00 2001 From: Richard Kenner Date: Wed, 4 Jul 2001 02:29:46 +0000 Subject: [PATCH] * explow.c (plus_constant_wide): Reinitialize Y for restart. From-SVN: r43745 --- gcc/ChangeLog | 4 ++++ gcc/explow.c | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ef408b6f8dd..93cd67c32e8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +Tue Jul 3 22:33:15 2001 Richard Kenner + + * explow.c (plus_constant_wide): Reinitialize Y for restart. + 2001-07-03 Stan Shebs * darwin.h (SECTION_FUNCTION): Remove WAS_TEXT argument, remove diff --git a/gcc/explow.c b/gcc/explow.c index bf5eb89622a..778b9719bf6 100644 --- a/gcc/explow.c +++ b/gcc/explow.c @@ -78,7 +78,7 @@ plus_constant_wide (x, c) register HOST_WIDE_INT c; { register RTX_CODE code; - rtx y = x; + rtx y; register enum machine_mode mode; register rtx tem; int all_constant = 0; @@ -90,6 +90,8 @@ plus_constant_wide (x, c) code = GET_CODE (x); mode = GET_MODE (x); + y = x; + switch (code) { case CONST_INT: @@ -608,10 +610,12 @@ validize_mem (ref) { if (GET_CODE (ref) != MEM) return ref; - if (memory_address_p (GET_MODE (ref), XEXP (ref, 0))) + if (! (flag_force_addr && CONSTANT_ADDRESS_P (XEXP (ref, 0))) + || memory_address_p (GET_MODE (ref), XEXP (ref, 0))) return ref; + /* Don't alter REF itself, since that is probably a stack slot. */ - return change_address (ref, GET_MODE (ref), XEXP (ref, 0)); + return replace_equiv_address (ref, XEXP (ref, 0)); } /* Given REF, either a MEM or a REG, and T, either the type of X or -- 2.30.2