From a53378d25f1661271ce304c86be04a250c9fcdeb Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Tue, 29 Sep 2015 10:32:45 -0600 Subject: [PATCH] [PATCH] Fix undefined behaviour in rx port [PATCH] Fix undefined behaviour in rx port * config/rx/constraints.md (Int08): Fix undefined left shift behaviour. (Sint08, Sint16, Sint24): Likewise. * config/rx/rx.c (rx_get_stack_layout): Likewise. From-SVN: r228254 --- gcc/ChangeLog | 5 +++++ gcc/config/rx/constraints.md | 8 ++++---- gcc/config/rx/rx.c | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bc95889d4e3..cce1ba50244 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -12,6 +12,11 @@ 2015-09-29 Jeff Law + * config/rx/constraints.md (Int08): Fix undefined left shift + behaviour. + (Sint08, Sint16, Sint24): Likewise. + * config/rx/rx.c (rx_get_stack_layout): Likewise. + * config/rl78/rl78-expand.md (movqi): Fix undefined left shift behaviour. diff --git a/gcc/config/rx/constraints.md b/gcc/config/rx/constraints.md index d46f9dac5ef..b41c232fff1 100644 --- a/gcc/config/rx/constraints.md +++ b/gcc/config/rx/constraints.md @@ -28,28 +28,28 @@ (define_constraint "Int08" "@internal A signed or unsigned 8-bit immediate value" (and (match_code "const_int") - (match_test "IN_RANGE (ival, (-1 << 8), (1 << 8) - 1)") + (match_test "IN_RANGE (ival, (HOST_WIDE_INT_M1U << 8), (1 << 8) - 1)") ) ) (define_constraint "Sint08" "@internal A signed 8-bit immediate value" (and (match_code "const_int") - (match_test "IN_RANGE (ival, (-1 << 7), (1 << 7) - 1)") + (match_test "IN_RANGE (ival, (HOST_WIDE_INT_M1U << 7), (1 << 7) - 1)") ) ) (define_constraint "Sint16" "@internal A signed 16-bit immediate value" (and (match_code "const_int") - (match_test "IN_RANGE (ival, (-1 << 15), (1 << 15) - 1)") + (match_test "IN_RANGE (ival, (HOST_WIDE_INT_M1U << 15), (1 << 15) - 1)") ) ) (define_constraint "Sint24" "@internal A signed 24-bit immediate value" (and (match_code "const_int") - (match_test "IN_RANGE (ival, (-1 << 23), (1 << 23) - 1)") + (match_test "IN_RANGE (ival, (HOST_WIDE_INT_M1U << 23), (1 << 23) - 1)") ) ) diff --git a/gcc/config/rx/rx.c b/gcc/config/rx/rx.c index c68f29ef6b6..6d911d2edb8 100644 --- a/gcc/config/rx/rx.c +++ b/gcc/config/rx/rx.c @@ -1561,7 +1561,7 @@ rx_get_stack_layout (unsigned int * lowest, PUSHM. FIXME: Is it worth improving this heuristic ? */ - pushed_mask = (-1 << low) & ~(-1 << (high + 1)); + pushed_mask = (HOST_WIDE_INT_M1U << low) & ~(HOST_WIDE_INT_M1U << (high + 1)); unneeded_pushes = (pushed_mask & (~ save_mask)) & pushed_mask; if ((fixed_reg && fixed_reg <= high) @@ -1667,7 +1667,7 @@ ok_for_max_constant (HOST_WIDE_INT val) /* rx_max_constant_size specifies the maximum number of bytes that can be used to hold a signed value. */ - return IN_RANGE (val, (-1 << (rx_max_constant_size * 8)), + return IN_RANGE (val, (HOST_WIDE_INT_M1U << (rx_max_constant_size * 8)), ( 1 << (rx_max_constant_size * 8))); } -- 2.30.2