[PATCH, i386]: Use HOST_WIDE_INT_1{,U} some more

[PATCH, i386]: Use HOST_WIDE_INT_1{,U} some more

[Uros Bizjak]

[-- Attachment #1: Type: text/plain, Size: 359 bytes --]

Hello!

No functional changes.

2015-05-05  Uros Bizjak  <ubizjak@gmail.com>

    * 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.

Tested on x86_64-linux-gnu {,-m32} and committed to mainline SVN:

Uros.

[-- Attachment #2: p.diff.txt --]
[-- Type: text/plain, Size: 3070 bytes --]

Index: config/i386/i386.md
===================================================================
--- config/i386/i386.md	(revision 222796)
+++ config/i386/i386.md	(working copy)
@@ -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)]
Index: config/i386/winnt.c
===================================================================
--- config/i386/winnt.c	(revision 222796)
+++ config/i386/winnt.c	(working copy)
@@ -599,7 +599,7 @@ i386_pe_asm_output_aligned_decl_common (FILE *stre
   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
Index: config/i386/i386.c
===================================================================
--- config/i386/i386.c	(revision 222796)
+++ config/i386/i386.c	(working copy)
@@ -19366,7 +19366,7 @@ ix86_expand_adjust_ufix_to_sfix_si (rtx val, rtx *
 				 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 c
      }
 
   /* 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_per
   /* 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_per
       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_per
       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)