summaryrefslogtreecommitdiff
path: root/gcc/reload.c
diff options
context:
space:
mode:
authorbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2011-02-07 12:06:26 +0000
committerbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2011-02-07 12:06:26 +0000
commitf169838ac346df666209dc62686101b3eb34c37a (patch)
tree18cf2a273c175c85d0c89d3ab4047148ae70b05f /gcc/reload.c
parent7bbe35d80a621c1cf198e59e464b486f95634c00 (diff)
downloadgcc-f169838ac346df666209dc62686101b3eb34c37a.tar.gz
2011-02-02 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged as suggest by Andread Schwab http://gcc.gnu.org/ml/gcc/2011-02/msg00099.html git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@169879 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/reload.c')
-rw-r--r--gcc/reload.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/gcc/reload.c b/gcc/reload.c
index aa9e68e59b6..714355c3201 100644
--- a/gcc/reload.c
+++ b/gcc/reload.c
@@ -5066,8 +5066,13 @@ find_reloads_address (enum machine_mode mode, rtx *memrefloc, rtx ad,
&& REG_P (XEXP (ad, 0))
&& REGNO (XEXP (ad, 0)) < FIRST_PSEUDO_REGISTER
&& CONST_INT_P (XEXP (ad, 1))
- && regno_ok_for_base_p (REGNO (XEXP (ad, 0)), mode, PLUS,
- CONST_INT))
+ && (regno_ok_for_base_p (REGNO (XEXP (ad, 0)), mode, PLUS,
+ CONST_INT)
+ /* Similarly, if we were to reload the base register and the
+ mem+offset address is still invalid, then we want to reload
+ the whole address, not just the base register. */
+ || ! maybe_memory_address_addr_space_p
+ (mode, ad, as, &(XEXP (ad, 0)))))
{
/* Unshare the MEM rtx so we can safely alter it. */
@@ -5079,7 +5084,9 @@ find_reloads_address (enum machine_mode mode, rtx *memrefloc, rtx ad,
loc = &XEXP (*loc, 0);
}
- if (double_reg_address_ok)
+ if (double_reg_address_ok
+ && regno_ok_for_base_p (REGNO (XEXP (ad, 0)), mode,
+ PLUS, CONST_INT))
{
/* Unshare the sum as well. */
*loc = ad = copy_rtx (ad);