On Tue, Apr 22, 2014 at 10:14 PM, Richard Sandiford
<rdsandif...@googlemail.com> wrote:
> Almost obvious, but just in case...
>
> The first mem_loc_descriptor hunk just reflows the text so that the
> line breaks are less awkward.
>
> Tested on x86_64-linux-gnu. OK to install?
Ok.
Thanks,
Richard.
> Thanks,
> Richard
>
>
> Index: gcc/doc/rtl.texi
> ===================================================================
> --- gcc/doc/rtl.texi 2014-04-22 21:08:26.002367845 +0100
> +++ gcc/doc/rtl.texi 2014-04-22 21:13:54.343668582 +0100
> @@ -1553,7 +1553,7 @@ neither inherently signed nor inherently
> 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 targ
>
> @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
> Index: gcc/dwarf2out.c
> ===================================================================
> --- gcc/dwarf2out.c 2014-04-22 21:13:54.297668148 +0100
> +++ gcc/dwarf2out.c 2014-04-22 21:13:54.337668526 +0100
> @@ -12911,14 +12911,13 @@ mem_loc_descriptor (rtx rtl, enum machin
> 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, un
> }
>
> /* 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--)
> Index: gcc/emit-rtl.c
> ===================================================================
> --- gcc/emit-rtl.c 2014-04-22 21:08:26.002367845 +0100
> +++ gcc/emit-rtl.c 2014-04-22 21:13:54.338668535 +0100
> @@ -213,8 +213,8 @@ const_wide_int_htab_hash (const void *x)
> 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;
>
> Index: gcc/fold-const.c
> ===================================================================
> --- gcc/fold-const.c 2014-04-22 21:13:54.308668252 +0100
> +++ gcc/fold-const.c 2014-04-22 21:13:54.340668554 +0100
> @@ -1775,7 +1775,7 @@ fold_convert_const_fixed_from_int (tree
>
> 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);
>
> Index: gcc/rtl.c
> ===================================================================
> --- gcc/rtl.c 2014-04-22 21:08:26.002367845 +0100
> +++ gcc/rtl.c 2014-04-22 21:13:54.341668564 +0100
> @@ -232,7 +232,7 @@ cwi_output_hex (FILE *outfile, const_rtx
> {
> 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");
> Index: gcc/rtl.h
> ===================================================================
> --- gcc/rtl.h 2014-04-22 21:08:26.002367845 +0100
> +++ gcc/rtl.h 2014-04-22 21:13:54.341668564 +0100
> @@ -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. */
>
> Index: gcc/simplify-rtx.c
> ===================================================================
> --- gcc/simplify-rtx.c 2014-04-22 21:13:54.279667979 +0100
> +++ gcc/simplify-rtx.c 2014-04-22 21:13:54.338668535 +0100
> @@ -5384,7 +5384,8 @@ simplify_immed_subreg (enum machine_mode
> 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);
> Index: gcc/system.h
> ===================================================================
> --- gcc/system.h 2014-04-22 21:08:26.002367845 +0100
> +++ gcc/system.h 2014-04-22 21:13:54.343668582 +0100
> @@ -717,7 +717,7 @@ #define STATIC_CONSTANT_P(X) (__builtin_
> #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
>
> Index: gcc/tree-dfa.c
> ===================================================================
> --- gcc/tree-dfa.c 2014-04-22 21:13:54.319668356 +0100
> +++ gcc/tree-dfa.c 2014-04-22 21:14:14.070853794 +0100
> @@ -407,7 +407,7 @@ get_ref_base_and_extent (tree exp, HOST_
> 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)
> Index: gcc/tree-switch-conversion.c
> ===================================================================
> --- gcc/tree-switch-conversion.c 2014-04-22 21:08:26.002367845 +0100
> +++ gcc/tree-switch-conversion.c 2014-04-22 21:13:54.341668564 +0100
> @@ -892,7 +892,8 @@ build_constructors (gimple swtch, struct
> 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
> 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++;
> Index: gcc/tree-vrp.c
> ===================================================================
> --- gcc/tree-vrp.c 2014-04-22 21:13:54.327668431 +0100
> +++ gcc/tree-vrp.c 2014-04-22 21:13:54.343668582 +0100
> @@ -2008,9 +2008,9 @@ zero_nonzero_bits_from_vr (const tree ex
> 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);
> }
> }
>
> Index: gcc/tree.h
> ===================================================================
> --- gcc/tree.h 2014-04-22 21:08:26.002367845 +0100
> +++ gcc/tree.h 2014-04-22 21:13:54.344668592 +0100
> @@ -3460,7 +3460,7 @@ extern tree build_case_label (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) \
