diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/explow.c | 31 |
2 files changed, 27 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f75a603..6719ac7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +Tue Dec 8 22:33:18 1998 J"orn Rennecke <amylaar@cygnus.co.uk> + + * explow.c (plus_constant_wide): Don't immediately return with + result of recursive call. + Tue Dec 8 15:32:56 EST 1998 Andrew MacLeod <amacleod@cygnus.com> * eh-common.h (struct eh_context): Add table_index for rethrows. diff --git a/gcc/explow.c b/gcc/explow.c index e4ef27d..c11ec91 100644 --- a/gcc/explow.c +++ b/gcc/explow.c @@ -116,19 +116,32 @@ plus_constant_wide (x, c) integer. For a constant term that is not an explicit integer, we cannot really combine, but group them together anyway. - Use a recursive call in case the remaining operand is something - that we handle specially, such as a SYMBOL_REF. */ + Restart or use a recursive call in case the remaining operand is + something that we handle specially, such as a SYMBOL_REF. + + We may not immediately return from the recursive call here, lest + all_constant gets lost. */ if (GET_CODE (XEXP (x, 1)) == CONST_INT) - return plus_constant (XEXP (x, 0), c + INTVAL (XEXP (x, 1))); + { + c += INTVAL (XEXP (x, 1)); + x = XEXP (x, 0); + goto restart; + } else if (CONSTANT_P (XEXP (x, 0))) - return gen_rtx_PLUS (mode, - plus_constant (XEXP (x, 0), c), - XEXP (x, 1)); + { + x = gen_rtx_PLUS (mode, + plus_constant (XEXP (x, 0), c), + XEXP (x, 1)); + c = 0; + } else if (CONSTANT_P (XEXP (x, 1))) - return gen_rtx_PLUS (mode, - XEXP (x, 0), - plus_constant (XEXP (x, 1), c)); + { + x = gen_rtx_PLUS (mode, + XEXP (x, 0), + plus_constant (XEXP (x, 1), c)); + c = 0; + } break; default: |