From d002220017cb43fdf23884e019bcecf047f75587 Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Sat, 24 Jan 2004 06:47:03 +0000 Subject: [PATCH] h8300-protos.h: Provide prototypes for h8300_legitimate_constant_p and h8300_legitimate_address_p. * config/h8300/h8300-protos.h: Provide prototypes for h8300_legitimate_constant_p and h8300_legitimate_address_p. * config/h8300/h8300.c (h8300_legitimate_constant_p): New. (h8300_rtx_ok_for_base_p): Likewise. (h8300_legitimate_address_p): Likewise. * config/h8300/h8300.h (LEGITIMATE_CONSTANT_P): Use h8300_legitimate_constant_p. (RTX_OK_FOR_BASE_P): Remove. (GO_IF_LEGITIMATE_ADDRESS): Use h8300_legitimate_address_p. From-SVN: r76484 --- gcc/ChangeLog | 12 +++++++++ gcc/config/h8300/h8300-protos.h | 3 +++ gcc/config/h8300/h8300.c | 45 +++++++++++++++++++++++++++++++++ gcc/config/h8300/h8300.h | 44 +++++++++++++------------------- 4 files changed, 78 insertions(+), 26 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3272aa4361f..13b5c10c5b1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,15 @@ +2004-01-24 Kazu Hirata + + * config/h8300/h8300-protos.h: Provide prototypes for + h8300_legitimate_constant_p and h8300_legitimate_address_p. + * config/h8300/h8300.c (h8300_legitimate_constant_p): New. + (h8300_rtx_ok_for_base_p): Likewise. + (h8300_legitimate_address_p): Likewise. + * config/h8300/h8300.h (LEGITIMATE_CONSTANT_P): Use + h8300_legitimate_constant_p. + (RTX_OK_FOR_BASE_P): Remove. + (GO_IF_LEGITIMATE_ADDRESS): Use h8300_legitimate_address_p. + 2004-01-24 Kazu Hirata * config/h8300/h8300.h (REG_OK_FOR_INDEX_NONSTRICT_P): New. diff --git a/gcc/config/h8300/h8300-protos.h b/gcc/config/h8300/h8300-protos.h index 7607b9b8256..df78dacb049 100644 --- a/gcc/config/h8300/h8300-protos.h +++ b/gcc/config/h8300/h8300-protos.h @@ -81,6 +81,9 @@ extern int byte_accesses_mergeable_p (rtx, rtx); extern int same_cmp_preceding_p (rtx); extern int same_cmp_following_p (rtx); +extern int h8300_legitimate_constant_p (rtx); +extern int h8300_legitimate_address_p (rtx, int); + /* Used in builtins.c */ extern rtx h8300_return_addr_rtx (int, rtx); #endif /* RTX_CODE */ diff --git a/gcc/config/h8300/h8300.c b/gcc/config/h8300/h8300.c index f1dcca037d8..3c503a9393d 100644 --- a/gcc/config/h8300/h8300.c +++ b/gcc/config/h8300/h8300.c @@ -4552,6 +4552,51 @@ h8300_hard_regno_rename_ok (unsigned int old_reg ATTRIBUTE_UNUSED, return 1; } + +/* Return nonzero if X is a legitimate constant. */ + +int +h8300_legitimate_constant_p (rtx x ATTRIBUTE_UNUSED) +{ + return 1; +} + +/* Return nonzero if X is a REG or SUBREG suitable as a base register. */ + +static int +h8300_rtx_ok_for_base_p (rtx x, int strict) +{ + /* Strip off SUBREG if any. */ + if (GET_CODE (x) == SUBREG) + x = SUBREG_REG (x); + + return (REG_P (x) + && (strict + ? REG_OK_FOR_BASE_STRICT_P (x) + : REG_OK_FOR_BASE_NONSTRICT_P (x))); +} + +/* Return nozero if X is a legitimate address. On the H8/300, a + legitimate address has the form REG, REG+CONSTANT_ADDRESS or + CONSTANT_ADDRESS. */ + +int +h8300_legitimate_address_p (rtx x, int strict) +{ + /* The register indirect addresses like @er0 is always valid. */ + if (h8300_rtx_ok_for_base_p (x, strict)) + return 1; + + if (CONSTANT_ADDRESS_P (x)) + return 1; + + if (GET_CODE (x) == PLUS + && CONSTANT_ADDRESS_P (XEXP (x, 1)) + && h8300_rtx_ok_for_base_p (XEXP (x, 0), strict)) + return 1; + + return 0; +} /* Perform target dependent optabs initialization. */ static void diff --git a/gcc/config/h8300/h8300.h b/gcc/config/h8300/h8300.h index af61d0f8891..3967d676525 100644 --- a/gcc/config/h8300/h8300.h +++ b/gcc/config/h8300/h8300.h @@ -796,7 +796,7 @@ struct cum_arg /* Nonzero if the constant value X is a legitimate general operand. It is given that X satisfies CONSTANT_P or is a CONST_DOUBLE. */ -#define LEGITIMATE_CONSTANT_P(X) (1) +#define LEGITIMATE_CONSTANT_P(X) (h8300_legitimate_constant_p (X)) /* The macros REG_OK_FOR..._P assume that the arg is a REG rtx and check its validity for a certain class. @@ -879,31 +879,23 @@ struct cum_arg (C) == 'U' ? OK_FOR_U (OP) : \ 0) -/* GO_IF_LEGITIMATE_ADDRESS recognizes an RTL expression - that is a valid memory address for an instruction. - The MODE argument is the machine mode for the MEM expression - that wants to use this address. - - The other macros defined here are used only in GO_IF_LEGITIMATE_ADDRESS, - except for CONSTANT_ADDRESS_P which is actually - machine-independent. - - On the H8/300, a legitimate address has the form - REG, REG+CONSTANT_ADDRESS or CONSTANT_ADDRESS. */ - -/* Accept either REG or SUBREG where a register is valid. */ - -#define RTX_OK_FOR_BASE_P(X) \ - ((REG_P (X) && REG_OK_FOR_BASE_P (X)) \ - || (GET_CODE (X) == SUBREG && REG_P (SUBREG_REG (X)) \ - && REG_OK_FOR_BASE_P (SUBREG_REG (X)))) - -#define GO_IF_LEGITIMATE_ADDRESS(MODE, X, ADDR) \ - if (RTX_OK_FOR_BASE_P (X)) goto ADDR; \ - if (CONSTANT_ADDRESS_P (X)) goto ADDR; \ - if (GET_CODE (X) == PLUS \ - && CONSTANT_ADDRESS_P (XEXP (X, 1)) \ - && RTX_OK_FOR_BASE_P (XEXP (X, 0))) goto ADDR; +#ifndef REG_OK_STRICT +#define GO_IF_LEGITIMATE_ADDRESS(MODE, X, ADDR) \ + do \ + { \ + if (h8300_legitimate_address_p ((X), 0)) \ + goto ADDR; \ + } \ + while (0) +#else +#define GO_IF_LEGITIMATE_ADDRESS(MODE, X, ADDR) \ + do \ + { \ + if (h8300_legitimate_address_p ((X), 1)) \ + goto ADDR; \ + } \ + while (0) +#endif /* Try machine-dependent ways of modifying an illegitimate address to be legitimate. If we find one, return the new, valid address. -- 2.30.2