diff options
| author | Steve Ellcey <sje@cup.hp.com> | 2002-07-23 14:58:04 +0000 |
|---|---|---|
| committer | Steve Ellcey <sje@gcc.gnu.org> | 2002-07-23 14:58:04 +0000 |
| commit | aa0f70e672f6723e56d2a88be36060d7825fe179 (patch) | |
| tree | ba228b73246416a6497ea772591933f9c542e10f /gcc/explow.c | |
| parent | fa72b06489d3674c61ce6156ac72cd12572d5fc0 (diff) | |
| download | gcc-aa0f70e672f6723e56d2a88be36060d7825fe179.zip gcc-aa0f70e672f6723e56d2a88be36060d7825fe179.tar.gz gcc-aa0f70e672f6723e56d2a88be36060d7825fe179.tar.bz2 | |
explow.c (convert_memory_address): Fix conversion of CONSTs.
* gcc/explow.c (convert_memory_address): Fix conversion of CONSTs.
Fix permutation of conversion and plus/mult.
* gcc/builtins.c (expand_builtin_memcpy) Ensure return pointer is
ptr_mode and not Pmode when POINTERS_EXTEND_UNSIGNED is defined.
(expand_builtin_strncpy) Ditto.
(expand_builtin_memset) Ditto.
From-SVN: r55679
Diffstat (limited to 'gcc/explow.c')
| -rw-r--r-- | gcc/explow.c | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/gcc/explow.c b/gcc/explow.c index 13a7b82..3cda410 100644 --- a/gcc/explow.c +++ b/gcc/explow.c @@ -353,6 +353,7 @@ convert_memory_address (to_mode, x) { enum machine_mode from_mode = to_mode == ptr_mode ? Pmode : ptr_mode; rtx temp; + enum rtx_code code; /* Here we handle some special cases. If none of them apply, fall through to the default case. */ @@ -360,7 +361,18 @@ convert_memory_address (to_mode, x) { case CONST_INT: case CONST_DOUBLE: - return x; + if (GET_MODE_SIZE (to_mode) < GET_MODE_SIZE (from_mode)) + code = TRUNCATE; + else if (POINTERS_EXTEND_UNSIGNED < 0) + break; + else if (POINTERS_EXTEND_UNSIGNED > 0) + code = ZERO_EXTEND; + else + code = SIGN_EXTEND; + temp = simplify_unary_operation (code, to_mode, x, from_mode); + if (temp) + return temp; + break; case SUBREG: if ((SUBREG_PROMOTED_VAR_P (x) || REG_POINTER (SUBREG_REG (x))) @@ -389,17 +401,17 @@ convert_memory_address (to_mode, x) case PLUS: case MULT: - /* For addition the second operand is a small constant, we can safely - permute the conversion and addition operation. We can always safely - 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 (XEXP (x, 1)) + 20000 < 40000 - || CONSTANT_P (XEXP (x, 0)))))) + /* For addition we can safely permute the conversion and addition + operation if one operand is a constant and converting the constant + does not change it. We can always safely permute them if we are + making the address narrower. */ + if (GET_MODE_SIZE (to_mode) < GET_MODE_SIZE (from_mode) + || (GET_CODE (x) == PLUS + && GET_CODE (XEXP (x, 1)) == CONST_INT + && XEXP (x, 1) == convert_memory_address (to_mode, XEXP (x, 1)))) return gen_rtx_fmt_ee (GET_CODE (x), to_mode, convert_memory_address (to_mode, XEXP (x, 0)), - convert_memory_address (to_mode, XEXP (x, 1))); + XEXP (x, 1)); break; default: |