Formatting and typo fixes.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/wide-int@209691 138bc75d-0d04-0410-961f-82ee72b054a4

12 files changed, 26 insertions, 24 deletions

diff --git a/gcc/doc/rtl.texi b/gcc/doc/rtl.texi
index b521afefc5d..605a5a18734 100644
--- a/gcc/doc/rtl.texi
+++ b/gcc/doc/rtl.texi
@@ -1553,7 +1553,7 @@ neither inherently signed nor inherently unsigned; where necessary,
 signedness is determined by the rtl operation instead.
 
 On more modern ports, @code{CONST_DOUBLE} only represents floating
-point values.  New ports define to @code{TARGET_SUPPORTS_WIDE_INT} to
+point values.  New ports define @code{TARGET_SUPPORTS_WIDE_INT} to
 make this designation.
 
 @findex CONST_DOUBLE_LOW
@@ -1571,7 +1571,7 @@ the precise bit pattern used by the target machine, use the macro
 
 @findex CONST_WIDE_INT
 @item (const_wide_int:@var{m} @var{nunits} @var{elt0} @dots{})
-This contains an array of @code{HOST_WIDE_INTS} that is large enough
+This contains an array of @code{HOST_WIDE_INT}s that is large enough
 to hold any constant that can be represented on the target.  This form
 of rtl is only used on targets that define
 @code{TARGET_SUPPORTS_WIDE_INT} to be nonzero and then
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 20ee7ba8fa9..2b2ab5dd831 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -12911,14 +12911,13 @@ mem_loc_descriptor (rtx rtl, enum machine_mode mode,
 	  dw_die_ref type_die;
 
 	  /* Note that if TARGET_SUPPORTS_WIDE_INT == 0, a
-	     CONST_DOUBLE rtx could represent either an large integer
-	     or a floating-point constant.  If
-	     TARGET_SUPPORTS_WIDE_INT != 0, the value is always a
-	     floating point constant.
+	     CONST_DOUBLE rtx could represent either a large integer
+	     or a floating-point constant.  If TARGET_SUPPORTS_WIDE_INT != 0,
+	     the value is always a floating point constant.
 
 	     When it is an integer, a CONST_DOUBLE is used whenever
-	     the constant requires 2 HWIs to be adequately
-	     represented.  We output CONST_DOUBLEs as blocks.  */
+	     the constant requires 2 HWIs to be adequately represented.
+	     We output CONST_DOUBLEs as blocks.  */
 	  if (mode == VOIDmode
 	      || (GET_MODE (rtl) == VOIDmode
 		  && GET_MODE_BITSIZE (mode) != HOST_BITS_PER_DOUBLE_INT))
@@ -15147,9 +15146,9 @@ insert_wide_int (const wide_int &val, unsigned char *dest, int elt_size)
     }
 
   /* We'd have to extend this code to support odd sizes.  */
-  gcc_assert (elt_size % (HOST_BITS_PER_WIDE_INT/BITS_PER_UNIT) == 0);
+  gcc_assert (elt_size % (HOST_BITS_PER_WIDE_INT / BITS_PER_UNIT) == 0);
 
-  int n = elt_size / (HOST_BITS_PER_WIDE_INT/BITS_PER_UNIT);
+  int n = elt_size / (HOST_BITS_PER_WIDE_INT / BITS_PER_UNIT);
 
   if (WORDS_BIG_ENDIAN)
     for (i = n - 1; i >= 0; i--)
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index f98d4940495..92ab00347ef 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -213,8 +213,8 @@ static int
 const_wide_int_htab_eq (const void *x, const void *y)
 {
   int i;
-  const_rtx xr = (const_rtx)x;
-  const_rtx yr = (const_rtx)y;
+  const_rtx xr = (const_rtx) x;
+  const_rtx yr = (const_rtx) y;
   if (CONST_WIDE_INT_NUNITS (xr) != CONST_WIDE_INT_NUNITS (yr))
     return 0;
 
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 7ee0bce5a76..0bc82d481ab 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -1775,7 +1775,7 @@ fold_convert_const_fixed_from_int (tree type, const_tree arg1)
 
   di.low = TREE_INT_CST_ELT (arg1, 0);
   if (TREE_INT_CST_NUNITS (arg1) == 1)
-    di.high = (HOST_WIDE_INT)di.low < 0 ? (HOST_WIDE_INT)-1 : 0;
+    di.high = (HOST_WIDE_INT) di.low < 0 ? (HOST_WIDE_INT) -1 : 0;
   else
     di.high = TREE_INT_CST_ELT (arg1, 1);
 
diff --git a/gcc/rtl.c b/gcc/rtl.c
index e49a97758c0..d241c83885b 100644
--- a/gcc/rtl.c
+++ b/gcc/rtl.c
@@ -232,7 +232,7 @@ cwi_output_hex (FILE *outfile, const_rtx x)
 {
   int i = CWI_GET_NUM_ELEM (x);
   gcc_assert (i > 0);
-  if (CWI_ELT (x, i-1) == 0)
+  if (CWI_ELT (x, i - 1) == 0)
     /* The HOST_WIDE_INT_PRINT_HEX prepends a 0x only if the val is
        non zero.  We want all numbers to have a 0x prefix.  */
     fprintf (outfile, "0x");
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 05c6a2ef828..9b93add722f 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -348,7 +348,7 @@ struct GTY((chain_next ("RTX_NEXT (&%h)"),
 
   union {
     /* The final union field is aligned to 64 bits on LP64 hosts,
-       giving a 32-bit gap after the fields above. We optimize the
+       giving a 32-bit gap after the fields above.  We optimize the
        layout for that case and use the gap for extra code-specific
        information.  */
 
diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c
index fe8ddd08791..f7d3e79a28a 100644
--- a/gcc/simplify-rtx.c
+++ b/gcc/simplify-rtx.c
@@ -5384,7 +5384,8 @@ simplify_immed_subreg (enum machine_mode outermode, rtx op,
 		tmp[u] = buf;
 		base += HOST_BITS_PER_WIDE_INT;
 	      }
-	    gcc_assert (GET_MODE_PRECISION (outer_submode) <= MAX_BITSIZE_MODE_ANY_INT);
+	    gcc_assert (GET_MODE_PRECISION (outer_submode)
+			<= MAX_BITSIZE_MODE_ANY_INT);
 	    r = wide_int::from_array (tmp, units,
 				      GET_MODE_PRECISION (outer_submode));
 	    elems[elem] = immed_wide_int_const (r, outer_submode);
diff --git a/gcc/system.h b/gcc/system.h
index eb0cb6f1d52..8b5089a28d7 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -717,7 +717,7 @@ extern void fancy_abort (const char *, int, const char *) ATTRIBUTE_NORETURN;
 #define STATIC_CONSTANT_P(X) (false && (X))
 #endif
 
-/* Until we can use STATIC_ASSERT.  */
+/* Until we can use C++11's static_assert.  */
 #define STATIC_ASSERT(X) \
   typedef int assertion1[(X) ? 1 : -1] ATTRIBUTE_UNUSED
 
diff --git a/gcc/tree-dfa.c b/gcc/tree-dfa.c
index 5107ed971ed..312931babc4 100644
--- a/gcc/tree-dfa.c
+++ b/gcc/tree-dfa.c
@@ -407,7 +407,7 @@ get_ref_base_and_extent (tree exp, HOST_WIDE_INT *poffset,
       if (mode == BLKmode)
 	size_tree = TYPE_SIZE (TREE_TYPE (exp));
       else
-	bitsize = int(GET_MODE_BITSIZE (mode));
+	bitsize = int (GET_MODE_BITSIZE (mode));
     }
   if (size_tree != NULL_TREE
       && TREE_CODE (size_tree) == INTEGER_CST)
diff --git a/gcc/tree-switch-conversion.c b/gcc/tree-switch-conversion.c
index a6ced40441f..7757b1c7dbb 100644
--- a/gcc/tree-switch-conversion.c
+++ b/gcc/tree-switch-conversion.c
@@ -892,7 +892,8 @@ build_constructors (gimple swtch, struct switch_conv_info *info)
 	      info->constructors[k]->quick_push (elt);
 	    }
 
-	  pos = int_const_binop (PLUS_EXPR, pos, build_int_cst (TREE_TYPE (pos), 1));
+	  pos = int_const_binop (PLUS_EXPR, pos,
+				 build_int_cst (TREE_TYPE (pos), 1));
 	}
       gcc_assert (tree_int_cst_equal (pos, CASE_LOW (cs)));
 
@@ -917,7 +918,8 @@ build_constructors (gimple swtch, struct switch_conv_info *info)
 	      elt.value = unshare_expr_without_location (val);
 	      info->constructors[j]->quick_push (elt);
 
-	      pos = int_const_binop (PLUS_EXPR, pos, build_int_cst (TREE_TYPE (pos), 1));
+	      pos = int_const_binop (PLUS_EXPR, pos,
+				     build_int_cst (TREE_TYPE (pos), 1));
 	    } while (!tree_int_cst_lt (high, pos)
 		     && tree_int_cst_lt (low, pos));
 	  j++;
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index 50cbdd47833..2e2a27f874f 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -2008,9 +2008,9 @@ zero_nonzero_bits_from_vr (const tree expr_type,
       if (xor_mask != 0)
 	{
 	  wide_int mask = wi::mask (wi::floor_log2 (xor_mask), false,
-				    (*may_be_nonzero).get_precision ());
-	  *may_be_nonzero = (*may_be_nonzero) | mask;
-	  *must_be_nonzero = (*must_be_nonzero).and_not (mask);
+				    may_be_nonzero->get_precision ());
+	  *may_be_nonzero = *may_be_nonzero | mask;
+	  *must_be_nonzero = must_be_nonzero->and_not (mask);
 	}
     }
 
diff --git a/gcc/tree.h b/gcc/tree.h
index 6c4d2478e43..57c952802a8 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -3460,7 +3460,7 @@ extern tree build_case_label (tree, tree, tree);
 extern tree make_tree_binfo_stat (unsigned MEM_STAT_DECL);
 #define make_tree_binfo(t) make_tree_binfo_stat (t MEM_STAT_INFO)
 
-/* Make a INTEGER_CST.  */
+/* Make an INTEGER_CST.  */
 
 extern tree make_int_cst_stat (int, int MEM_STAT_DECL);
 #define make_int_cst(LEN, EXT_LEN) \