From 6987c38487443ef2055c40d2859682ec2a0cd4de Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Tue, 5 May 2015 13:02:49 +0200 Subject: [PATCH] i386.c: Use HOST_WIDE_INT_1 instead of (HOST_WIDE_INT) 1 and HOST_WIDE_INT_1U instead... * config/i386/i386.c: Use HOST_WIDE_INT_1 instead of (HOST_WIDE_INT) 1 and HOST_WIDE_INT_1U instead of (unsigned HOST_WIDE_INT) 1. * config/i386/i386.md: Ditto. * config/i386/winnt.c: Ditto. From-SVN: r222804 --- gcc/ChangeLog | 7 +++++++ gcc/config/i386/i386.c | 10 +++++----- gcc/config/i386/i386.md | 2 +- gcc/config/i386/winnt.c | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1ae9a1c2136..f31aebb0762 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2015-05-05 Uros Bizjak + + * config/i386/i386.c: Use HOST_WIDE_INT_1 instead of (HOST_WIDE_INT) 1 + and HOST_WIDE_INT_1U instead of (unsigned HOST_WIDE_INT) 1. + * config/i386/i386.md: Ditto. + * config/i386/winnt.c: Ditto. + 2015-05-05 Matthew Wahab * doc/extend.texi (__atomic Builtins): Move implementation details diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 607cfcab2ed..eeef3d42f8d 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -19366,7 +19366,7 @@ ix86_expand_adjust_ufix_to_sfix_si (rtx val, rtx *xorp) OPTAB_DIRECT); else { - rtx two31 = GEN_INT ((unsigned HOST_WIDE_INT) 1 << 31); + rtx two31 = GEN_INT (HOST_WIDE_INT_1U << 31); two31 = ix86_build_const_vector (intmode, 1, two31); *xorp = expand_simple_binop (intmode, AND, gen_lowpart (intmode, tmp[0]), @@ -24772,7 +24772,7 @@ ix86_expand_set_or_movmem (rtx dst, rtx src, rtx count_exp, rtx val_exp, } /* Make sure we don't need to care about overflow later on. */ - if (count > ((unsigned HOST_WIDE_INT) 1 << 30)) + if (count > (HOST_WIDE_INT_1U << 30)) return false; /* Step 0: Decide on preferred algorithm, desired alignment and @@ -47734,7 +47734,7 @@ expand_vec_perm_interleave2 (struct expand_vec_perm_d *d) /* Examine from whence the elements come. */ contents = 0; for (i = 0; i < nelt; ++i) - contents |= ((unsigned HOST_WIDE_INT) 1) << d->perm[i]; + contents |= HOST_WIDE_INT_1U << d->perm[i]; memset (remap, 0xff, sizeof (remap)); dremap = *d; @@ -47744,7 +47744,7 @@ expand_vec_perm_interleave2 (struct expand_vec_perm_d *d) unsigned HOST_WIDE_INT h1, h2, h3, h4; /* Split the two input vectors into 4 halves. */ - h1 = (((unsigned HOST_WIDE_INT) 1) << nelt2) - 1; + h1 = (HOST_WIDE_INT_1U << nelt2) - 1; h2 = h1 << nelt2; h3 = h2 << nelt2; h4 = h3 << nelt2; @@ -47826,7 +47826,7 @@ expand_vec_perm_interleave2 (struct expand_vec_perm_d *d) unsigned int nonzero_halves[4]; /* Split the two input vectors into 8 quarters. */ - q[0] = (((unsigned HOST_WIDE_INT) 1) << nelt4) - 1; + q[0] = (HOST_WIDE_INT_1U << nelt4) - 1; for (i = 1; i < 8; ++i) q[i] = q[0] << (nelt4 * i); for (i = 0; i < 4; ++i) diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md index 3ce8f411c0a..0e941b6be66 100644 --- a/gcc/config/i386/i386.md +++ b/gcc/config/i386/i386.md @@ -6087,7 +6087,7 @@ && GET_MODE (operands[0]) == GET_MODE (operands[1]) && ((unsigned HOST_WIDE_INT) INTVAL (operands[2])) - 1 < 3 && ((unsigned HOST_WIDE_INT) INTVAL (operands[3]) - < ((unsigned HOST_WIDE_INT) 1 << INTVAL (operands[2])))" + < (HOST_WIDE_INT_1U << INTVAL (operands[2])))" "#" "&& reload_completed" [(const_int 0)] diff --git a/gcc/config/i386/winnt.c b/gcc/config/i386/winnt.c index f61412f7153..e698cd5df98 100644 --- a/gcc/config/i386/winnt.c +++ b/gcc/config/i386/winnt.c @@ -599,7 +599,7 @@ i386_pe_asm_output_aligned_decl_common (FILE *stream, tree decl, assemble_name (stream, name); if (use_pe_aligned_common) fprintf (stream, ", " HOST_WIDE_INT_PRINT_DEC ", %d\n", - size ? size : (HOST_WIDE_INT) 1, + size ? size : HOST_WIDE_INT_1, exact_log2 (align) - exact_log2 (CHAR_BIT)); else fprintf (stream, ", " HOST_WIDE_INT_PRINT_DEC "\t" ASM_COMMENT_START -- 2.30.2