From c04fc4f0c72ff62199e80a00754c787459a090d5 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Thu, 5 Aug 2010 22:18:33 +0000 Subject: rtlanal.c (nonzero_bits1): Use unsigned HOST_WIDE_INT in all mask computations. * rtlanal.c (nonzero_bits1): Use unsigned HOST_WIDE_INT in all mask computations. Fix formatting issues. (num_sign_bit_copies1): Likewise. (canonicalize_condition): Likewise. From-SVN: r162923 --- gcc/rtlanal.c | 114 +++++++++++++++++++++++++++++++--------------------------- 1 file changed, 61 insertions(+), 53 deletions(-) (limited to 'gcc/rtlanal.c') diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c index ac78633..f9e6871 100644 --- a/gcc/rtlanal.c +++ b/gcc/rtlanal.c @@ -3802,12 +3802,14 @@ nonzero_bits1 (const_rtx x, enum machine_mode mode, const_rtx known_x, case CONST_INT: #ifdef SHORT_IMMEDIATES_SIGN_EXTEND /* If X is negative in MODE, sign-extend the value. */ - if (INTVAL (x) > 0 && mode_width < BITS_PER_WORD - && 0 != (INTVAL (x) & ((HOST_WIDE_INT) 1 << (mode_width - 1)))) - return (INTVAL (x) | ((HOST_WIDE_INT) (-1) << mode_width)); + if (INTVAL (x) > 0 + && mode_width < BITS_PER_WORD + && (UINTVAL (x) & ((unsigned HOST_WIDE_INT) 1 << (mode_width - 1))) + != 0) + return UINTVAL (x) | ((unsigned HOST_WIDE_INT) (-1) << mode_width); #endif - return INTVAL (x); + return UINTVAL (x); case MEM: #ifdef LOAD_EXTEND_OP @@ -3884,7 +3886,7 @@ nonzero_bits1 (const_rtx x, enum machine_mode mode, const_rtx known_x, { inner_nz &= GET_MODE_MASK (GET_MODE (XEXP (x, 0))); if (inner_nz - & (((HOST_WIDE_INT) 1 + & (((unsigned HOST_WIDE_INT) 1 << (GET_MODE_BITSIZE (GET_MODE (XEXP (x, 0))) - 1)))) inner_nz |= (GET_MODE_MASK (mode) & ~GET_MODE_MASK (GET_MODE (XEXP (x, 0)))); @@ -3903,9 +3905,9 @@ nonzero_bits1 (const_rtx x, enum machine_mode mode, const_rtx known_x, case XOR: case IOR: case UMIN: case UMAX: case SMIN: case SMAX: { - unsigned HOST_WIDE_INT nonzero0 = - cached_nonzero_bits (XEXP (x, 0), mode, - known_x, known_mode, known_ret); + unsigned HOST_WIDE_INT nonzero0 + = cached_nonzero_bits (XEXP (x, 0), mode, + known_x, known_mode, known_ret); /* Don't call nonzero_bits for the second time if it cannot change anything. */ @@ -3925,21 +3927,21 @@ nonzero_bits1 (const_rtx x, enum machine_mode mode, const_rtx known_x, computing the width (position of the highest-order nonzero bit) and the number of low-order zero bits for each value. */ { - unsigned HOST_WIDE_INT nz0 = - cached_nonzero_bits (XEXP (x, 0), mode, - known_x, known_mode, known_ret); - unsigned HOST_WIDE_INT nz1 = - cached_nonzero_bits (XEXP (x, 1), mode, - known_x, known_mode, known_ret); + unsigned HOST_WIDE_INT nz0 + = cached_nonzero_bits (XEXP (x, 0), mode, + known_x, known_mode, known_ret); + unsigned HOST_WIDE_INT nz1 + = cached_nonzero_bits (XEXP (x, 1), mode, + known_x, known_mode, known_ret); int sign_index = GET_MODE_BITSIZE (GET_MODE (x)) - 1; int width0 = floor_log2 (nz0) + 1; int width1 = floor_log2 (nz1) + 1; int low0 = floor_log2 (nz0 & -nz0); int low1 = floor_log2 (nz1 & -nz1); - HOST_WIDE_INT op0_maybe_minusp - = (nz0 & ((HOST_WIDE_INT) 1 << sign_index)); - HOST_WIDE_INT op1_maybe_minusp - = (nz1 & ((HOST_WIDE_INT) 1 << sign_index)); + unsigned HOST_WIDE_INT op0_maybe_minusp + = nz0 & ((unsigned HOST_WIDE_INT) 1 << sign_index); + unsigned HOST_WIDE_INT op1_maybe_minusp + = nz1 & ((unsigned HOST_WIDE_INT) 1 << sign_index); unsigned int result_width = mode_width; int result_low = 0; @@ -3959,7 +3961,7 @@ nonzero_bits1 (const_rtx x, enum machine_mode mode, const_rtx known_x, case DIV: if (width1 == 0) break; - if (! op0_maybe_minusp && ! op1_maybe_minusp) + if (!op0_maybe_minusp && !op1_maybe_minusp) result_width = width0; break; case UDIV: @@ -3970,7 +3972,7 @@ nonzero_bits1 (const_rtx x, enum machine_mode mode, const_rtx known_x, case MOD: if (width1 == 0) break; - if (! op0_maybe_minusp && ! op1_maybe_minusp) + if (!op0_maybe_minusp && !op1_maybe_minusp) result_width = MIN (width0, width1); result_low = MIN (low0, low1); break; @@ -3985,10 +3987,10 @@ nonzero_bits1 (const_rtx x, enum machine_mode mode, const_rtx known_x, } if (result_width < mode_width) - nonzero &= ((HOST_WIDE_INT) 1 << result_width) - 1; + nonzero &= ((unsigned HOST_WIDE_INT) 1 << result_width) - 1; if (result_low > 0) - nonzero &= ~(((HOST_WIDE_INT) 1 << result_low) - 1); + nonzero &= ~(((unsigned HOST_WIDE_INT) 1 << result_low) - 1); #ifdef POINTERS_EXTEND_UNSIGNED /* If pointers extend unsigned and this is an addition or subtraction @@ -4009,7 +4011,7 @@ nonzero_bits1 (const_rtx x, enum machine_mode mode, const_rtx known_x, case ZERO_EXTRACT: if (CONST_INT_P (XEXP (x, 1)) && INTVAL (XEXP (x, 1)) < HOST_BITS_PER_WIDE_INT) - nonzero &= ((HOST_WIDE_INT) 1 << INTVAL (XEXP (x, 1))) - 1; + nonzero &= ((unsigned HOST_WIDE_INT) 1 << INTVAL (XEXP (x, 1))) - 1; break; case SUBREG: @@ -4074,9 +4076,9 @@ nonzero_bits1 (const_rtx x, enum machine_mode mode, const_rtx known_x, unsigned int width = GET_MODE_BITSIZE (inner_mode); int count = INTVAL (XEXP (x, 1)); unsigned HOST_WIDE_INT mode_mask = GET_MODE_MASK (inner_mode); - unsigned HOST_WIDE_INT op_nonzero = - cached_nonzero_bits (XEXP (x, 0), mode, - known_x, known_mode, known_ret); + unsigned HOST_WIDE_INT op_nonzero + = cached_nonzero_bits (XEXP (x, 0), mode, + known_x, known_mode, known_ret); unsigned HOST_WIDE_INT inner = op_nonzero & mode_mask; unsigned HOST_WIDE_INT outer = 0; @@ -4092,8 +4094,9 @@ nonzero_bits1 (const_rtx x, enum machine_mode mode, const_rtx known_x, /* If the sign bit may have been nonzero before the shift, we need to mark all the places it could have been copied to by the shift as possibly nonzero. */ - if (inner & ((HOST_WIDE_INT) 1 << (width - 1 - count))) - inner |= (((HOST_WIDE_INT) 1 << count) - 1) << (width - count); + if (inner & ((unsigned HOST_WIDE_INT) 1 << (width - 1 - count))) + inner |= (((unsigned HOST_WIDE_INT) 1 << count) - 1) + << (width - count); } else if (code == ASHIFT) inner <<= count; @@ -4108,14 +4111,15 @@ nonzero_bits1 (const_rtx x, enum machine_mode mode, const_rtx known_x, case FFS: case POPCOUNT: /* This is at most the number of bits in the mode. */ - nonzero = ((HOST_WIDE_INT) 2 << (floor_log2 (mode_width))) - 1; + nonzero = ((unsigned HOST_WIDE_INT) 2 << (floor_log2 (mode_width))) - 1; break; case CLZ: /* If CLZ has a known value at zero, then the nonzero bits are that value, plus the number of bits in the mode minus one. */ if (CLZ_DEFINED_VALUE_AT_ZERO (mode, nonzero)) - nonzero |= ((HOST_WIDE_INT) 1 << (floor_log2 (mode_width))) - 1; + nonzero + |= ((unsigned HOST_WIDE_INT) 1 << (floor_log2 (mode_width))) - 1; else nonzero = -1; break; @@ -4124,7 +4128,8 @@ nonzero_bits1 (const_rtx x, enum machine_mode mode, const_rtx known_x, /* If CTZ has a known value at zero, then the nonzero bits are that value, plus the number of bits in the mode minus one. */ if (CTZ_DEFINED_VALUE_AT_ZERO (mode, nonzero)) - nonzero |= ((HOST_WIDE_INT) 1 << (floor_log2 (mode_width))) - 1; + nonzero + |= ((unsigned HOST_WIDE_INT) 1 << (floor_log2 (mode_width))) - 1; else nonzero = -1; break; @@ -4135,9 +4140,9 @@ nonzero_bits1 (const_rtx x, enum machine_mode mode, const_rtx known_x, case IF_THEN_ELSE: { - unsigned HOST_WIDE_INT nonzero_true = - cached_nonzero_bits (XEXP (x, 1), mode, - known_x, known_mode, known_ret); + unsigned HOST_WIDE_INT nonzero_true + = cached_nonzero_bits (XEXP (x, 1), mode, + known_x, known_mode, known_ret); /* Don't call nonzero_bits for the second time if it cannot change anything. */ @@ -4310,9 +4315,9 @@ num_sign_bit_copies1 (const_rtx x, enum machine_mode mode, const_rtx known_x, case CONST_INT: /* If the constant is negative, take its 1's complement and remask. Then see how many zero bits we have. */ - nonzero = INTVAL (x) & GET_MODE_MASK (mode); + nonzero = UINTVAL (x) & GET_MODE_MASK (mode); if (bitwidth <= HOST_BITS_PER_WIDE_INT - && (nonzero & ((HOST_WIDE_INT) 1 << (bitwidth - 1))) != 0) + && (nonzero & ((unsigned HOST_WIDE_INT) 1 << (bitwidth - 1))) != 0) nonzero = (~nonzero) & GET_MODE_MASK (mode); return (nonzero == 0 ? bitwidth : bitwidth - floor_log2 (nonzero) - 1); @@ -4414,7 +4419,7 @@ num_sign_bit_copies1 (const_rtx x, enum machine_mode mode, const_rtx known_x, return bitwidth; if (num0 > 1 - && (((HOST_WIDE_INT) 1 << (bitwidth - 1)) & nonzero)) + && (((unsigned HOST_WIDE_INT) 1 << (bitwidth - 1)) & nonzero)) num0--; return num0; @@ -4435,7 +4440,8 @@ num_sign_bit_copies1 (const_rtx x, enum machine_mode mode, const_rtx known_x, && num1 > 1 && bitwidth <= HOST_BITS_PER_WIDE_INT && CONST_INT_P (XEXP (x, 1)) - && !(INTVAL (XEXP (x, 1)) & ((HOST_WIDE_INT) 1 << (bitwidth - 1)))) + && (UINTVAL (XEXP (x, 1)) + & ((unsigned HOST_WIDE_INT) 1 << (bitwidth - 1))) == 0) return num1; /* Similarly for IOR when setting high-order bits. */ @@ -4443,7 +4449,8 @@ num_sign_bit_copies1 (const_rtx x, enum machine_mode mode, const_rtx known_x, && num1 > 1 && bitwidth <= HOST_BITS_PER_WIDE_INT && CONST_INT_P (XEXP (x, 1)) - && (INTVAL (XEXP (x, 1)) & ((HOST_WIDE_INT) 1 << (bitwidth - 1)))) + && (UINTVAL (XEXP (x, 1)) + & ((unsigned HOST_WIDE_INT) 1 << (bitwidth - 1))) != 0) return num1; return MIN (num0, num1); @@ -4458,7 +4465,7 @@ num_sign_bit_copies1 (const_rtx x, enum machine_mode mode, const_rtx known_x, && bitwidth <= HOST_BITS_PER_WIDE_INT) { nonzero = nonzero_bits (XEXP (x, 0), mode); - if ((((HOST_WIDE_INT) 1 << (bitwidth - 1)) & nonzero) == 0) + if ((((unsigned HOST_WIDE_INT) 1 << (bitwidth - 1)) & nonzero) == 0) return (nonzero == 1 || nonzero == 0 ? bitwidth : bitwidth - floor_log2 (nonzero) - 1); } @@ -4501,9 +4508,10 @@ num_sign_bit_copies1 (const_rtx x, enum machine_mode mode, const_rtx known_x, if (result > 0 && (bitwidth > HOST_BITS_PER_WIDE_INT || (((nonzero_bits (XEXP (x, 0), mode) - & ((HOST_WIDE_INT) 1 << (bitwidth - 1))) != 0) + & ((unsigned HOST_WIDE_INT) 1 << (bitwidth - 1))) != 0) && ((nonzero_bits (XEXP (x, 1), mode) - & ((HOST_WIDE_INT) 1 << (bitwidth - 1))) != 0)))) + & ((unsigned HOST_WIDE_INT) 1 << (bitwidth - 1))) + != 0)))) result--; return MAX (1, result); @@ -4515,7 +4523,7 @@ num_sign_bit_copies1 (const_rtx x, enum machine_mode mode, const_rtx known_x, if (bitwidth > HOST_BITS_PER_WIDE_INT) return 1; else if ((nonzero_bits (XEXP (x, 0), mode) - & ((HOST_WIDE_INT) 1 << (bitwidth - 1))) != 0) + & ((unsigned HOST_WIDE_INT) 1 << (bitwidth - 1))) != 0) return 1; else return cached_num_sign_bit_copies (XEXP (x, 0), mode, @@ -4528,7 +4536,7 @@ num_sign_bit_copies1 (const_rtx x, enum machine_mode mode, const_rtx known_x, if (bitwidth > HOST_BITS_PER_WIDE_INT) return 1; else if ((nonzero_bits (XEXP (x, 1), mode) - & ((HOST_WIDE_INT) 1 << (bitwidth - 1))) != 0) + & ((unsigned HOST_WIDE_INT) 1 << (bitwidth - 1))) != 0) return 1; else return cached_num_sign_bit_copies (XEXP (x, 1), mode, @@ -4543,7 +4551,7 @@ num_sign_bit_copies1 (const_rtx x, enum machine_mode mode, const_rtx known_x, if (result > 1 && (bitwidth > HOST_BITS_PER_WIDE_INT || (nonzero_bits (XEXP (x, 1), mode) - & ((HOST_WIDE_INT) 1 << (bitwidth - 1))) != 0)) + & ((unsigned HOST_WIDE_INT) 1 << (bitwidth - 1))) != 0)) result--; return result; @@ -4554,7 +4562,7 @@ num_sign_bit_copies1 (const_rtx x, enum machine_mode mode, const_rtx known_x, if (result > 1 && (bitwidth > HOST_BITS_PER_WIDE_INT || (nonzero_bits (XEXP (x, 1), mode) - & ((HOST_WIDE_INT) 1 << (bitwidth - 1))) != 0)) + & ((unsigned HOST_WIDE_INT) 1 << (bitwidth - 1))) != 0)) result--; return result; @@ -4598,7 +4606,7 @@ num_sign_bit_copies1 (const_rtx x, enum machine_mode mode, const_rtx known_x, Then see how many zero bits we have. */ nonzero = STORE_FLAG_VALUE; if (bitwidth <= HOST_BITS_PER_WIDE_INT - && (nonzero & ((HOST_WIDE_INT) 1 << (bitwidth - 1))) != 0) + && (nonzero & ((unsigned HOST_WIDE_INT) 1 << (bitwidth - 1))) != 0) nonzero = (~nonzero) & GET_MODE_MASK (mode); return (nonzero == 0 ? bitwidth : bitwidth - floor_log2 (nonzero) - 1); @@ -4617,7 +4625,7 @@ num_sign_bit_copies1 (const_rtx x, enum machine_mode mode, const_rtx known_x, return 1; nonzero = nonzero_bits (x, mode); - return nonzero & ((HOST_WIDE_INT) 1 << (bitwidth - 1)) + return nonzero & ((unsigned HOST_WIDE_INT) 1 << (bitwidth - 1)) ? 1 : bitwidth - floor_log2 (nonzero) - 1; } @@ -4803,7 +4811,7 @@ canonicalize_condition (rtx insn, rtx cond, int reverse, rtx *earliest, && (GET_MODE_BITSIZE (inner_mode) <= HOST_BITS_PER_WIDE_INT) && (STORE_FLAG_VALUE - & ((HOST_WIDE_INT) 1 + & ((unsigned HOST_WIDE_INT) 1 << (GET_MODE_BITSIZE (inner_mode) - 1)))) #ifdef FLOAT_STORE_FLAG_VALUE || (code == LT @@ -4823,7 +4831,7 @@ canonicalize_condition (rtx insn, rtx cond, int reverse, rtx *earliest, <= HOST_BITS_PER_WIDE_INT) && GET_MODE_CLASS (inner_mode) == MODE_INT && (STORE_FLAG_VALUE - & ((HOST_WIDE_INT) 1 + & ((unsigned HOST_WIDE_INT) 1 << (GET_MODE_BITSIZE (inner_mode) - 1)))) #ifdef FLOAT_STORE_FLAG_VALUE || (code == GE @@ -4906,9 +4914,9 @@ canonicalize_condition (rtx insn, rtx cond, int reverse, rtx *earliest, /* When cross-compiling, const_val might be sign-extended from BITS_PER_WORD to HOST_BITS_PER_WIDE_INT */ case GE: - if ((HOST_WIDE_INT) (const_val & max_val) - != (((HOST_WIDE_INT) 1 - << (GET_MODE_BITSIZE (GET_MODE (op0)) - 1)))) + if ((const_val & max_val) + != ((unsigned HOST_WIDE_INT) 1 + << (GET_MODE_BITSIZE (GET_MODE (op0)) - 1))) code = GT, op1 = gen_int_mode (const_val - 1, GET_MODE (op0)); break; -- cgit v1.1