summaryrefslogtreecommitdiff
path: root/gcc/explow.c
diff options
context:
space:
mode:
authorkenner <kenner@138bc75d-0d04-0410-961f-82ee72b054a4>1996-06-29 09:44:27 +0000
committerkenner <kenner@138bc75d-0d04-0410-961f-82ee72b054a4>1996-06-29 09:44:27 +0000
commit51418ce4313dcd7279ea94a4c4f7571b921625b0 (patch)
treede4a6aa487e6f4821282b0ee827ef5d181eee078 /gcc/explow.c
parent7786d7603f07a76e5a0e9d6112fc63709df63d0e (diff)
downloadgcc-51418ce4313dcd7279ea94a4c4f7571b921625b0.tar.gz
(convert_memory_address, case PLUS): Fix error in last change.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@12378 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/explow.c')
-rw-r--r--gcc/explow.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/gcc/explow.c b/gcc/explow.c
index b918294ec84..ce5128b756b 100644
--- a/gcc/explow.c
+++ b/gcc/explow.c
@@ -1,5 +1,5 @@
/* Subroutines for manipulating rtx's in semantically interesting ways.
- Copyright (C) 1987, 1991, 1994, 1995 Free Software Foundation, Inc.
+ Copyright (C) 1987, 1991, 1994, 1995, 1996 Free Software Foundation, Inc.
This file is part of GNU CC.
@@ -331,10 +331,12 @@ convert_memory_address (to_mode, x)
case MULT:
/* For addition the second operand is a small constant, we can safely
permute the converstion and addition operation. We can always safely
- permute them if we are making the address narrower. */
+ permute them if we are making the address narrower. In addition,
+ always permute the operations if this is a constant. */
if (GET_MODE_SIZE (to_mode) < GET_MODE_SIZE (from_mode)
|| (GET_CODE (x) == PLUS && GET_CODE (XEXP (x, 1)) == CONST_INT
- && INTVAL (x) + 20000 < 40000))
+ && (INTVAL (XEXP (x, 1)) + 20000 < 40000
+ || CONSTANT_P (XEXP (x, 0)))))
return gen_rtx (GET_CODE (x), to_mode,
convert_memory_address (to_mode, XEXP (x, 0)),
convert_memory_address (to_mode, XEXP (x, 1)));