From 07e96250aeacec28d95f13b453c40485fd185fb7 Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Wed, 20 Jul 2016 23:59:44 +0200 Subject: [PATCH] hwint.h (HOST_WIDE_INT_0): New define. * hwint.h (HOST_WIDE_INT_0): New define. (HOST_WIDE_INT_0U): Ditto. * double-int.c: Use HOST_WIDE_INT_0 instead of (HOST_WIDE_INT) 0. * dse.c: Use HOST_WIDE_INT_0U instead of (unsigned HOST_WIDE_INT) 0. * simplify-rtx.c: Ditto. * tree-object-size.c: Ditto. From-SVN: r238545 --- gcc/ChangeLog | 9 +++++++++ gcc/double-int.c | 4 ++-- gcc/dse.c | 5 ++--- gcc/hwint.h | 2 ++ gcc/simplify-rtx.c | 2 +- gcc/tree-object-size.c | 2 +- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8016ac1f631..676268c3347 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2016-07-20 Uros Bizjak + + * hwint.h (HOST_WIDE_INT_0): New define. + (HOST_WIDE_INT_0U): Ditto. + * double-int.c: Use HOST_WIDE_INT_0 instead of (HOST_WIDE_INT) 0. + * dse.c: Use HOST_WIDE_INT_0U instead of (unsigned HOST_WIDE_INT) 0. + * simplify-rtx.c: Ditto. + * tree-object-size.c: Ditto. + 2016-07-20 Andreas Krebbel * config/s390/s390.c (s390_encode_section_info): Remove mode size diff --git a/gcc/double-int.c b/gcc/double-int.c index 8a273907a6f..2d692f94b6a 100644 --- a/gcc/double-int.c +++ b/gcc/double-int.c @@ -557,7 +557,7 @@ div_and_round_double (unsigned code, int uns, case CEIL_MOD_EXPR: /* round toward positive infinity */ if (!quo_neg && (*lrem != 0 || *hrem != 0)) /* ratio > 0 && rem != 0 */ { - add_double (*lquo, *hquo, HOST_WIDE_INT_1, (HOST_WIDE_INT) 0, + add_double (*lquo, *hquo, HOST_WIDE_INT_1, HOST_WIDE_INT_0, lquo, hquo); } else @@ -593,7 +593,7 @@ div_and_round_double (unsigned code, int uns, HOST_WIDE_INT_M1, HOST_WIDE_INT_M1, lquo, hquo); else /* quo = quo + 1; */ - add_double (*lquo, *hquo, HOST_WIDE_INT_1, (HOST_WIDE_INT) 0, + add_double (*lquo, *hquo, HOST_WIDE_INT_1, HOST_WIDE_INT_0, lquo, hquo); } else diff --git a/gcc/dse.c b/gcc/dse.c index 89c3f94d0f0..05a288643af 100644 --- a/gcc/dse.c +++ b/gcc/dse.c @@ -1217,7 +1217,7 @@ set_all_positions_unneeded (store_info *s_info) s_info->positions_needed.large.count = end; } else - s_info->positions_needed.small_bitmask = (unsigned HOST_WIDE_INT) 0; + s_info->positions_needed.small_bitmask = HOST_WIDE_INT_0U; } /* Return TRUE if any bytes from S_INFO store are needed. */ @@ -1229,8 +1229,7 @@ any_positions_needed_p (store_info *s_info) return (s_info->positions_needed.large.count < s_info->end - s_info->begin); else - return (s_info->positions_needed.small_bitmask - != (unsigned HOST_WIDE_INT) 0); + return (s_info->positions_needed.small_bitmask != HOST_WIDE_INT_0U); } /* Return TRUE if all bytes START through START+WIDTH-1 from S_INFO diff --git a/gcc/hwint.h b/gcc/hwint.h index c816ed40f7b..6b4d53737a2 100644 --- a/gcc/hwint.h +++ b/gcc/hwint.h @@ -63,6 +63,8 @@ extern char sizeof_long_long_must_be_8[sizeof (long long) == 8 ? 1 : -1]; #endif #define HOST_WIDE_INT_UC(X) HOST_WIDE_INT_C (X ## U) +#define HOST_WIDE_INT_0 HOST_WIDE_INT_C (0) +#define HOST_WIDE_INT_0U HOST_WIDE_INT_UC (0) #define HOST_WIDE_INT_1 HOST_WIDE_INT_C (1) #define HOST_WIDE_INT_1U HOST_WIDE_INT_UC (1) #define HOST_WIDE_INT_M1 HOST_WIDE_INT_C (-1) diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c index 4354b5bcd33..c34f2f55623 100644 --- a/gcc/simplify-rtx.c +++ b/gcc/simplify-rtx.c @@ -40,7 +40,7 @@ along with GCC; see the file COPYING3. If not see occasionally need to sign extend from low to high as if low were a signed wide int. */ #define HWI_SIGN_EXTEND(low) \ - ((((HOST_WIDE_INT) low) < 0) ? HOST_WIDE_INT_M1 : ((HOST_WIDE_INT) 0)) + ((((HOST_WIDE_INT) low) < 0) ? HOST_WIDE_INT_M1 : HOST_WIDE_INT_0) static rtx neg_const_int (machine_mode, const_rtx); static bool plus_minus_operand_p (const_rtx); diff --git a/gcc/tree-object-size.c b/gcc/tree-object-size.c index 07455cc05d2..5e8ced63a2e 100644 --- a/gcc/tree-object-size.c +++ b/gcc/tree-object-size.c @@ -738,7 +738,7 @@ merge_object_sizes (struct object_size_info *osi, tree dest, tree orig, orig_bytes = object_sizes[object_size_type][SSA_NAME_VERSION (orig)]; if (orig_bytes != unknown[object_size_type]) orig_bytes = (offset > orig_bytes) - ? (unsigned HOST_WIDE_INT) 0 : orig_bytes - offset; + ? HOST_WIDE_INT_0U : orig_bytes - offset; if ((object_size_type & 2) == 0) { -- 2.30.2