diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dbd4e8aec3c80f65ed759ebb039ce6f04beacd0c..ca6a05fa5858e2670e6740a8affe5d4cd87de2b2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,41 @@
+2006-12-08 Mark Shinwell <shinwell@codesourcery.com>
+
+ * recog.c (mode_dependent_address_p): Identify pre-increment,
+ pre-decrement, post-increment and post-decrement addressing as always
+ being mode-dependent.
+ * config/m32c/m32c.c (m32c_mode_dependent_address): Delete.
+ * config/m32c/m32c.h (GO_IF_MODE_DEPENDENT_ADDRESS): Change to no-op.
+ * config/m32c/m32c-protos.h (m32c_mode_dependent_address): Delete.
+ * config/m32r/m32r.h (GO_IF_MODE_DEPENDENT_ADDRESS): Delete PRE_DEC,
+ PRE_INC and POST_INC checks.
+ * config/i386/i386.h (GO_IF_MODE_DEPENDENT_ADDRESS): Change to no-op.
+ * config/sh/sh.h (GO_IF_MODE_DEPENDENT_ADDRESS): Change to no-op.
+ * config/pdp11/pdp11.h (GO_IF_MODE_DEPENDENT_ADDRESS): Change to no-op.
+ * config/avr/avr.h (GO_IF_MODE_DEPENDENT_ADDRESS): Change to no-op.
+ * config/c4x/c4x.h (GO_IF_MODE_DEPENDENT_ADDRESS): Delete PRE_DEC,
+ PRE_INC, POST_DEC and POST_INC cases.
+ * config/stormy16/stormy16.c (xstormy16_mode_dependent_address_p):
+ Delete POST_INC and PRE_DEC cases.
+ * config/m68hc11/m68hc11.h (GO_IF_MODE_DEPENDENT_ADDRESS): Change to
+ no-op.
+ * config/cris/cris.h (GO_IF_MODE_DEPENDENT_ADDRESS): Change to no-op.
+ * config/mn10300/mn10300.h (GO_IF_MODE_DEPENDENT_ADDRESS): Change to
+ no-op.
+ * config/ia64/ia64.h (GO_IF_MODE_DEPENDENT_ADDRESS): Change to no-op.
+ * config/m68k/m68k.h (GO_IF_MODE_DEPENDENT_ADDRESS): Change to no-op.
+ * config/rs6000/rs6000.c (rs6000_mode_dependent_address): Delete
+ PRE_INC and PRE_DEC cases.
+ * config/arc/arc.h (GO_IF_MODE_DEPENDENT_ADDRESS): Change to no-op.
+ * config/mcore/mcore.h (GO_IF_MODE_DEPENDENT_ADDRESS): Change to no-op.
+ * config/arm/arm.h (ARM_GO_IF_MODE_DEPENDENT_ADDRESS): Delete.
+ (GO_IF_MODE_DEPENDENT_ADDRESS): Change to no-op.
+ * config/pa/pa.h (GO_IF_MODE_DEPENDENT_ADDRESS): Change to no-op.
+ * config/vax/vax.c (vax_mode_dependent_address_p): Delete
+ auto-increment cases.
+ * config/h8300/h8300.h (GO_IF_MODE_DEPENDENT_ADDRESS): Delete
+ auto-increment cases.
+ * config/bfin/bfin.h (GO_IF_MODE_DEPENDENT_ADDRESS): Change to no-op.
+
2006-12-08 Andrew MacLeod <amacleod@redhat.com>
* Makefile.in: Add new file tree-ssa-ter.c.
diff --git a/gcc/config/arc/arc.h b/gcc/config/arc/arc.h
index c7253b1146f6b1eb3a38a06f8cade1be0e49c601..9b9f2d6eec6530a9448a2da5ece4bc92f4ca8a75 100644
--- a/gcc/config/arc/arc.h
+++ b/gcc/config/arc/arc.h
@@ -799,12 +799,7 @@ do { \
/* Go to LABEL if ADDR (a legitimate address expression)
has an effect that depends on the machine mode it is used for. */
-#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR, LABEL) \
-{ if (GET_CODE (ADDR) == PRE_DEC) \
- goto LABEL; \
- if (GET_CODE (ADDR) == PRE_INC) \
- goto LABEL; \
-}
+#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR, LABEL)
/* Given a comparison code (EQ, NE, etc.) and the first operand of a COMPARE,
return the mode to be used for the comparison. */
diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h
index 48a59335ed45929d544a94063b460f03cff59f8c..724a213be32f2da5567ac70ae2023d286c2df984 100644
--- a/gcc/config/avr/avr.h
+++ b/gcc/config/avr/avr.h
@@ -423,9 +423,7 @@ do { \
} \
} while(0)
-#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR,LABEL) \
- if (GET_CODE (ADDR) == POST_INC || GET_CODE (ADDR) == PRE_DEC) \
- goto LABEL
+#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR,LABEL)
#define LEGITIMATE_CONSTANT_P(X) 1
diff --git a/gcc/config/bfin/bfin.h b/gcc/config/bfin/bfin.h
index bbf3adeb9455f4100dc8a902c47a77fc43f6183c..9b9b78aa119f53946295d8c184dfcf1c7cead5dc 100644
--- a/gcc/config/bfin/bfin.h
+++ b/gcc/config/bfin/bfin.h
@@ -827,13 +827,7 @@ do { \
You may assume that ADDR is a valid address for the machine.
*/
-#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR,LABEL) \
-do { \
- if (GET_CODE (ADDR) == POST_INC \
- || GET_CODE (ADDR) == POST_DEC \
- || GET_CODE (ADDR) == PRE_DEC) \
- goto LABEL; \
-} while (0)
+#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR,LABEL)
#define NOTICE_UPDATE_CC(EXPR, INSN) 0
diff --git a/gcc/config/c4x/c4x.h b/gcc/config/c4x/c4x.h
index 22904e1dc466e4ad0319bbbde32da384cacd4a81..6df7ac8fba16353ea1f2f9a857e80ca87aebeb3b 100644
--- a/gcc/config/c4x/c4x.h
+++ b/gcc/config/c4x/c4x.h
@@ -1156,13 +1156,8 @@ CUMULATIVE_ARGS;
}
/* No mode-dependent addresses on the C4x are autoincrements. */
-
#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR, LABEL) \
- if (GET_CODE (ADDR) == PRE_DEC \
- || GET_CODE (ADDR) == POST_DEC \
- || GET_CODE (ADDR) == PRE_INC \
- || GET_CODE (ADDR) == POST_INC \
- || GET_CODE (ADDR) == POST_MODIFY \
+ if (GET_CODE (ADDR) == POST_MODIFY \
|| GET_CODE (ADDR) == PRE_MODIFY) \
goto LABEL
diff --git a/gcc/config/cris/cris.h b/gcc/config/cris/cris.h
index 10a17dc4be1c1a87671a538658cbc822294af1ec..88bc3e1e53a864626f586c6bcc0de0b7d3ad9296 100644
--- a/gcc/config/cris/cris.h
+++ b/gcc/config/cris/cris.h
@@ -1065,14 +1065,9 @@ struct cum_args {int regs;};
while (0)
/* In CRIS, only the postincrement address mode depends thus,
- since the increment depends on the size of the operand. */
-#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR, LABEL) \
- do \
- { \
- if (GET_CODE (ADDR) == POST_INC) \
- goto LABEL; \
- } \
- while (0)
+ since the increment depends on the size of the operand. This is now
+ treated generically within recog.c. */
+#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR, LABEL)
#define LEGITIMATE_CONSTANT_P(X) 1
diff --git a/gcc/config/crx/crx.h b/gcc/config/crx/crx.h
index 9277a28d8919662e4b1961570974e0f22a21d790..d482bb31be790dab5580c54fc11328f42c530664 100644
--- a/gcc/config/crx/crx.h
+++ b/gcc/config/crx/crx.h
@@ -405,11 +405,7 @@ struct cumulative_args
}
#endif /* REG_OK_STRICT */
-#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR, LABEL) \
-{ \
- if (GET_CODE (ADDR) == POST_INC || GET_CODE (ADDR) == POST_DEC) \
- goto LABEL; \
-}
+#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR, LABEL)
#define LEGITIMATE_CONSTANT_P(X) 1
diff --git a/gcc/config/h8300/h8300.h b/gcc/config/h8300/h8300.h
index cf64b09d2ae64de52a34e64b98c3a02534359fb5..7c9a2414bdf5952dee8040bf7a3e2fecccee8a12 100644
--- a/gcc/config/h8300/h8300.h
+++ b/gcc/config/h8300/h8300.h
@@ -939,11 +939,6 @@ struct cum_arg
(the amount of decrement or increment being the length of the operand). */
#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR, LABEL) \
- if (GET_CODE (ADDR) == POST_INC \
- || GET_CODE (ADDR) == POST_DEC \
- || GET_CODE (ADDR) == PRE_INC \
- || GET_CODE (ADDR) == PRE_DEC) \
- goto LABEL; \
if (GET_CODE (ADDR) == PLUS \
&& h8300_get_index (XEXP (ADDR, 0), VOIDmode, 0) != XEXP (ADDR, 0)) \
goto LABEL;
diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index 78b963b7ab26da77f1b1ee427af2aa73f960951f..dc15a2b808a52ca9460dd045a5361138b6ec63cb 100644
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -1767,13 +1767,9 @@ do { \
/* Go to LABEL if ADDR (a legitimate address expression)
has an effect that depends on the machine mode it is used for.
On the 80386, only postdecrement and postincrement address depend thus
- (the amount of decrement or increment being the length of the operand). */
-#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR, LABEL) \
-do { \
- if (GET_CODE (ADDR) == POST_INC \
- || GET_CODE (ADDR) == POST_DEC) \
- goto LABEL; \
-} while (0)
+ (the amount of decrement or increment being the length of the operand).
+ These are now caught in recog.c. */
+#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR, LABEL)
/* Max number of args passed in registers. If this is more than 3, we will
have problems with ebx (register #4), since it is a caller save register and
diff --git a/gcc/config/ia64/ia64.h b/gcc/config/ia64/ia64.h
index 327a31365db4efaabaa7b9e444e78a9fee511fcf..c6d2c0df6f27eef829bf7a969987c126bd50234f 100644
--- a/gcc/config/ia64/ia64.h
+++ b/gcc/config/ia64/ia64.h
@@ -1406,9 +1406,7 @@ do { \
on the machine mode of the memory reference it is used for or if the address
is valid for some modes but not others. */
-#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR, LABEL) \
- if (GET_CODE (ADDR) == POST_DEC || GET_CODE (ADDR) == POST_INC) \
- goto LABEL;
+#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR, LABEL)
/* A C expression that is nonzero if X is a legitimate constant for an
immediate operand on the target machine. */
diff --git a/gcc/config/m32c/m32c-protos.h b/gcc/config/m32c/m32c-protos.h
index 06bd0070ac33900397b36d625903a1899b95e71f..4b3ead37c3ed870ba5a580130765f84ebdd5dc4f 100644
--- a/gcc/config/m32c/m32c-protos.h
+++ b/gcc/config/m32c/m32c-protos.h
@@ -84,7 +84,6 @@ int m32c_legitimize_reload_address (rtx *, MM, int, int, int);
rtx m32c_libcall_value (MM);
int m32c_limit_reload_class (MM, int);
int m32c_memory_move_cost (MM, int, int);
-int m32c_mode_dependent_address (rtx);
int m32c_modes_tieable_p (MM, MM);
bool m32c_mov_ok (rtx *, MM);
char * m32c_output_compare (rtx, rtx *);
diff --git a/gcc/config/m32c/m32c.c b/gcc/config/m32c/m32c.c
index dcfbe6ebafc0d08ad2bd91f1516dc041d88b2019..de5f22aa6db99240685912effad1b794aec5eab9 100644
--- a/gcc/config/m32c/m32c.c
+++ b/gcc/config/m32c/m32c.c
@@ -2018,15 +2018,6 @@ m32c_legitimize_reload_address (rtx * x,
return 0;
}
-/* Used in GO_IF_MODE_DEPENDENT_ADDRESS. */
-int
-m32c_mode_dependent_address (rtx addr)
-{
- if (GET_CODE (addr) == POST_INC || GET_CODE (addr) == PRE_DEC)
- return 1;
- return 0;
-}
-
/* Implements LEGITIMATE_CONSTANT_P. We split large constants anyway,
so we can allow anything. */
int
diff --git a/gcc/config/m32c/m32c.h b/gcc/config/m32c/m32c.h
index 1b1d357c2b78f7b95ba2b380de7964941b531e19..1055464406736b73949a58d8adce488155d539cd 100644
--- a/gcc/config/m32c/m32c.h
+++ b/gcc/config/m32c/m32c.h
@@ -568,9 +568,7 @@ typedef struct m32c_cumulative_args
if (m32c_legitimize_reload_address(&(X),MODE,OPNUM,TYPE,IND_LEVELS)) \
goto win;
-#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR,LABEL) \
- if (m32c_mode_dependent_address (ADDR)) \
- goto LABEL;
+#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR,LABEL)
#define LEGITIMATE_CONSTANT_P(X) m32c_legitimate_constant_p (X)
diff --git a/gcc/config/m32r/m32r.h b/gcc/config/m32r/m32r.h
index beef7c9d395b2b99e84763a52c6951d2d8be27a5..b4c9ae6f4b9decc1cf34ecfc4731134ad938d4f1 100644
--- a/gcc/config/m32r/m32r.h
+++ b/gcc/config/m32r/m32r.h
@@ -1267,10 +1267,7 @@ L2: .word STATIC
#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR, LABEL) \
do \
{ \
- if ( GET_CODE (ADDR) == PRE_DEC \
- || GET_CODE (ADDR) == PRE_INC \
- || GET_CODE (ADDR) == POST_INC \
- || GET_CODE (ADDR) == LO_SUM) \
+ if (GET_CODE (ADDR) == LO_SUM) \
goto LABEL; \
} \
while (0)
diff --git a/gcc/config/m68hc11/m68hc11.h b/gcc/config/m68hc11/m68hc11.h
index 008887bacddf485963c38b7e92fbf7c48a717c94..a1dc509f11cdcd66697f1aae716b2d6922d2c419 100644
--- a/gcc/config/m68hc11/m68hc11.h
+++ b/gcc/config/m68hc11/m68hc11.h
@@ -1239,12 +1239,7 @@ extern unsigned char m68hc11_reg_valid_for_index[FIRST_PSEUDO_REGISTER];
/* Go to LABEL if ADDR (a legitimate address expression)
has an effect that depends on the machine mode it is used for. */
-#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR,LABEL) \
-{ \
- if (GET_CODE (ADDR) == PRE_DEC || GET_CODE (ADDR) == POST_DEC \
- || GET_CODE (ADDR) == PRE_INC || GET_CODE (ADDR) == POST_INC) \
- goto LABEL; \
-}
+#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR,LABEL)
/* Nonzero if the constant value X is a legitimate general operand.
It is given that X satisfies CONSTANT_P or is a CONST_DOUBLE. */
diff --git a/gcc/config/m68k/m68k.h b/gcc/config/m68k/m68k.h
index e4d92576f3d85f72ea892c38dd73ea542791f548..0a04beb20b991684abf319b14767cf2f51060b3a 100644
--- a/gcc/config/m68k/m68k.h
+++ b/gcc/config/m68k/m68k.h
@@ -845,9 +845,9 @@ __transfer_from_trampoline () \
goto WIN; }}}
/* On the 68000, only predecrement and postincrement address depend thus
- (the amount of decrement or increment being the length of the operand). */
-#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR,LABEL) \
- if (GET_CODE (ADDR) == POST_INC || GET_CODE (ADDR) == PRE_DEC) goto LABEL
+ (the amount of decrement or increment being the length of the operand).
+ These are now treated generically in recog.c. */
+#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR,LABEL)
#define CASE_VECTOR_MODE HImode
#define CASE_VECTOR_PC_RELATIVE 1
diff --git a/gcc/config/mcore/mcore.h b/gcc/config/mcore/mcore.h
index fd1ba70389bebbd2e0c24f09481910e5810ab1be..5e2d8ca4c9cd51ce96b17c4d123d9091a294a965 100644
--- a/gcc/config/mcore/mcore.h
+++ b/gcc/config/mcore/mcore.h
@@ -786,12 +786,7 @@ extern const enum reg_class reg_class_from_letter[];
/* Go to LABEL if ADDR (a legitimate address expression)
has an effect that depends on the machine mode it is used for. */
-#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR,LABEL) \
-{ \
- if ( GET_CODE (ADDR) == PRE_DEC || GET_CODE (ADDR) == POST_DEC \
- || GET_CODE (ADDR) == PRE_INC || GET_CODE (ADDR) == POST_INC) \
- goto LABEL; \
-}
+#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR,LABEL)
/* Specify the machine mode that this machine uses
for the index in the tablejump instruction. */
diff --git a/gcc/config/mn10300/mn10300.h b/gcc/config/mn10300/mn10300.h
index ef153e7f5852b072f5b59bfd669ac23ec8732bee..6c51152248d071172031f52d48f8e594ce351242 100644
--- a/gcc/config/mn10300/mn10300.h
+++ b/gcc/config/mn10300/mn10300.h
@@ -779,9 +779,7 @@ while (0)
/* Go to LABEL if ADDR (a legitimate address expression)
has an effect that depends on the machine mode it is used for. */
-#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR,LABEL) \
- if (GET_CODE (ADDR) == POST_INC) \
- goto LABEL
+#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR,LABEL)
/* Nonzero if the constant value X is a legitimate general operand.
It is given that X satisfies CONSTANT_P or is a CONST_DOUBLE. */
diff --git a/gcc/config/pa/pa.h b/gcc/config/pa/pa.h
index 1f576507210277f3b4a0ddf3e620bc331fb9b053..f463fafe3b818f2f8d569e03baaa9ce939cf329a 100644
--- a/gcc/config/pa/pa.h
+++ b/gcc/config/pa/pa.h
@@ -1560,12 +1560,7 @@ do { \
/* Go to LABEL if ADDR (a legitimate address expression)
has an effect that depends on the machine mode it is used for. */
-#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR,LABEL) \
- if (GET_CODE (ADDR) == PRE_DEC \
- || GET_CODE (ADDR) == POST_DEC \
- || GET_CODE (ADDR) == PRE_INC \
- || GET_CODE (ADDR) == POST_INC) \
- goto LABEL
+#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR,LABEL)
#define TARGET_ASM_SELECT_SECTION pa_select_section
diff --git a/gcc/config/pdp11/pdp11.h b/gcc/config/pdp11/pdp11.h
index 09de325b7a9ee720fa890688408205bbf7a9c42a..2850fc2a53a207818f56b08b2dad8079a1a1f5df 100644
--- a/gcc/config/pdp11/pdp11.h
+++ b/gcc/config/pdp11/pdp11.h
@@ -760,12 +760,10 @@ extern int may_call_alloca;
/* Go to LABEL if ADDR (a legitimate address expression)
has an effect that depends on the machine mode it is used for.
- On the pdp this is for predec/postinc */
+ On the pdp this is for predec/postinc, and this is now treated
+ generically in recog.c. */
-#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR,LABEL) \
- { if (GET_CODE (ADDR) == POST_INC || GET_CODE (ADDR) == PRE_DEC) \
- goto LABEL; \
- }
+#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR,LABEL)
/* Specify the machine mode that this machine uses
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 08b3d01a50e1066ea9c6fdf4fc342880f1bec607..a7734839eabf9000c66a689368b1c2b85f1cd639 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -3766,9 +3766,7 @@ rs6000_mode_dependent_address (rtx addr)
case LO_SUM:
return true;
- case PRE_INC:
- case PRE_DEC:
- return TARGET_UPDATE;
+ /* Auto-increment cases are now treated generically in recog.c. */
default:
break;
diff --git a/gcc/config/sh/sh.h b/gcc/config/sh/sh.h
index 5f8412fb935389c5bcd584fa19e70cd1d2e1d9dc..ae9d8f9ca1aa88c2528170a3c21aa6fba9c786a2 100644
--- a/gcc/config/sh/sh.h
+++ b/gcc/config/sh/sh.h
@@ -2802,13 +2802,11 @@ struct sh_args {
??? Strictly speaking, we should also include all indexed addressing,
because the index scale factor is the length of the operand.
However, the impact of GO_IF_MODE_DEPENDENT_ADDRESS would be to
- high if we did that. So we rely on reload to fix things up. */
+ high if we did that. So we rely on reload to fix things up.
-#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR,LABEL) \
-{ \
- if (GET_CODE(ADDR) == PRE_DEC || GET_CODE(ADDR) == POST_INC) \
- goto LABEL; \
-}
+ Auto-increment addressing is now treated in recog.c. */
+
+#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR,LABEL)
/* Specify the machine mode that this machine uses
for the index in the tablejump instruction. */
diff --git a/gcc/config/stormy16/stormy16.c b/gcc/config/stormy16/stormy16.c
index 00b6e643760f3ed5ba2732252eb2535227004724..5f8be4302bfa9ef3e5366f23655d48e11ee3c91c 100644
--- a/gcc/config/stormy16/stormy16.c
+++ b/gcc/config/stormy16/stormy16.c
@@ -707,9 +707,7 @@ xstormy16_mode_dependent_address_p (rtx x)
if (GET_CODE (x) == PLUS)
x = XEXP (x, 0);
- if (GET_CODE (x) == POST_INC
- || GET_CODE (x) == PRE_DEC)
- return 1;
+ /* Auto-increment addresses are now treated generically in recog.c. */
return 0;
}
diff --git a/gcc/config/vax/vax.c b/gcc/config/vax/vax.c
index f005a2a4c0d4d02f0f429c5b866aca949de0b9c3..5ce9ad370abe5a2edc149441ad59198fdd799127 100644
--- a/gcc/config/vax/vax.c
+++ b/gcc/config/vax/vax.c
@@ -1306,8 +1306,8 @@ vax_mode_dependent_address_p (rtx x)
{
rtx xfoo0, xfoo1;
- if (GET_CODE (x) == POST_INC || GET_CODE (x) == PRE_DEC)
- return 1;
+ /* Auto-increment cases are now dealt with generically in recog.c. */
+
if (GET_CODE (x) != PLUS)
return 0;
diff --git a/gcc/recog.c b/gcc/recog.c
index 18ad72f2d4e61233d1de835d8a7d2a90d2b3ffb4..a7dc869e7ee1d478061a2200f0ec5d52d5919188 100644
--- a/gcc/recog.c
+++ b/gcc/recog.c
@@ -1983,8 +1983,17 @@ offsettable_address_p (int strictp, enum machine_mode mode, rtx y)
because the amount of the increment depends on the mode. */
int
-mode_dependent_address_p (rtx addr ATTRIBUTE_UNUSED /* Maybe used in GO_IF_MODE_DEPENDENT_ADDRESS. */)
-{
+mode_dependent_address_p (rtx addr)
+{
+ /* Auto-increment addressing with anything other than post_modify
+ or pre_modify always introduces a mode dependency. Catch such
+ cases now instead of deferring to the target. */
+ if (GET_CODE (addr) == PRE_INC
+ || GET_CODE (addr) == POST_INC
+ || GET_CODE (addr) == PRE_DEC
+ || GET_CODE (addr) == POST_DEC)
+ return 1;
+
GO_IF_MODE_DEPENDENT_ADDRESS (addr, win);
return 0;
/* Label `win' might (not) be used via GO_IF_MODE_DEPENDENT_ADDRESS. */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fbeef252fbaf5bc3d8fb61c569c5baa80137602f..c86dcd2704d01997ec637cb58c01358edd1a0cc4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-08 Mark Shinwell <shinwell@codesourcery.com>
+
+ * gcc.c-torture/execute/mode-dependent-address.c: New test.
+
2006-12-08 Tobias Burnus <burnus@net-b.de>
PR fortran/27546
diff --git a/gcc/testsuite/gcc.c-torture/execute/mode-dependent-address.c b/gcc/testsuite/gcc.c-torture/execute/mode-dependent-address.c
new file mode 100644
index 0000000000000000000000000000000000000000..5bf840cf27c21370cf46f9ea4e88280b389c6c96
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/mode-dependent-address.c
@@ -0,0 +1,49 @@
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+
+void f883b (int8_t * result,
+ int16_t * __restrict arg1,
+ uint32_t * __restrict arg2,
+ uint64_t * __restrict arg3,
+ uint8_t * __restrict arg4)
+{
+ int idx;
+ for (idx=0;idx<96;idx += 1) {
+ result[idx] = (((((((((((-27 + 2+1)>>1) || arg4[idx]) < arg1[idx])
+ ? (((-27 + 2+1)>>1) || arg4[idx])
+ : arg1[idx])
+ >> (arg2[idx] & 31)) ^ 1) - -32)>>7) | -5) & arg3[idx]);
+ }
+}
+
+int8_t result[96];
+int16_t arg1[96];
+uint32_t arg2[96];
+uint64_t arg3[96];
+uint8_t arg4[96];
+
+int main (void)
+{
+ int i;
+ int correct[] = {0x0,0x1,0x2,0x3,0x0,0x1,0x2,0x3,0x8,0x9,0xa,0xb,0x8,0x9,
+ 0xa,0xb,0x10,0x11,0x12,0x13,0x10,0x11,0x12,0x13,
+ 0x18,0x19,0x1a,0x1b,0x18,0x19,0x1a,0x1b,0x20,0x21,0x22,
+ 0x23,0x20,0x21,0x22,0x23,0x28,0x29,0x2a,
+ 0x2b,0x28,0x29,0x2a,0x2b,0x30,0x31,0x32,0x33,
+ 0x30,0x31,0x32,0x33,0x38,0x39,0x3a,0x3b,0x38,0x39,0x3a,
+ 0x3b,0x40,0x41,0x42,0x43,0x40,0x41,0x42,0x43,0x48,0x49,
+ 0x4a,0x4b,0x48,0x49,0x4a,0x4b,0x50,0x51,
+ 0x52,0x53,0x50,0x51,0x52,0x53,0x58,0x59,0x5a,0x5b,
+ 0x58,0x59,0x5a,0x5b};
+
+ for (i=0; i < 96; i++)
+ arg3[i] = arg2[i] = arg1[i] = arg4[i] = i;
+
+ f883b(result, arg1, arg2, arg3, arg4);
+
+ for (i=0; i < 96; i++)
+ if (result[i] != correct[i]) abort();
+
+ return 0;
+}