From 0c5bb946c1e56134e703f32dafc09fe8ea6a6b7c Mon Sep 17 00:00:00 2001 From: Xinliang David Li Date: Thu, 29 Jul 2010 14:30:18 +0000 Subject: [PATCH] Revert change in revision 162652. 2010-07-29 Xinliang David Li PR bootstrap/45119 * tree-ssa-loop-ivopts.c (get_address_cost): Revert change in revision 162652. From-SVN: r162683 --- gcc/ChangeLog | 6 ++++++ gcc/tree-ssa-loop-ivopts.c | 16 +++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ebc081e04d4b..310f06ecf1bd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-07-29 Xinliang David Li + + PR bootstrap/45119 + * tree-ssa-loop-ivopts.c (get_address_cost): Revert change + in revision 162652. + 2010-07-29 Richard Guenther * timevar.def (TV_TREE_STORE_COPY_PROP): Remove. diff --git a/gcc/tree-ssa-loop-ivopts.c b/gcc/tree-ssa-loop-ivopts.c index 519f66e51d13..1d65b4aadfa0 100644 --- a/gcc/tree-ssa-loop-ivopts.c +++ b/gcc/tree-ssa-loop-ivopts.c @@ -3243,7 +3243,7 @@ get_address_cost (bool symbol_present, bool var_present, HOST_WIDE_INT i; HOST_WIDE_INT start = BIGGEST_ALIGNMENT / BITS_PER_UNIT; HOST_WIDE_INT rat, off; - int old_cse_not_expected, width; + int old_cse_not_expected; unsigned sym_p, var_p, off_p, rat_p, add_c; rtx seq, addr, base; rtx reg0, reg1; @@ -3252,10 +3252,8 @@ get_address_cost (bool symbol_present, bool var_present, reg1 = gen_raw_REG (address_mode, LAST_VIRTUAL_REGISTER + 1); - width = (GET_MODE_BITSIZE (address_mode) < HOST_BITS_PER_WIDE_INT - 2) - ? GET_MODE_BITSIZE (address_mode) : HOST_BITS_PER_WIDE_INT - 2; addr = gen_rtx_fmt_ee (PLUS, address_mode, reg1, NULL_RTX); - for (i = start; i <= 1ll << width; i <<= 1) + for (i = start; i <= 1 << 20; i <<= 1) { XEXP (addr, 1) = gen_int_mode (i, address_mode); if (!memory_address_addr_space_p (mem_mode, addr, as)) @@ -3264,7 +3262,7 @@ get_address_cost (bool symbol_present, bool var_present, data->max_offset = i == start ? 0 : i >> 1; off = data->max_offset; - for (i = start; i <= 1ll << width; i <<= 1) + for (i = start; i <= 1 << 20; i <<= 1) { XEXP (addr, 1) = gen_int_mode (-i, address_mode); if (!memory_address_addr_space_p (mem_mode, addr, as)) @@ -3275,12 +3273,12 @@ get_address_cost (bool symbol_present, bool var_present, if (dump_file && (dump_flags & TDF_DETAILS)) { fprintf (dump_file, "get_address_cost:\n"); - fprintf (dump_file, " min offset %s " HOST_WIDE_INT_PRINT_DEC "\n", + fprintf (dump_file, " min offset %s %d\n", GET_MODE_NAME (mem_mode), - data->min_offset); - fprintf (dump_file, " max offset %s " HOST_WIDE_INT_PRINT_DEC "\n", + (int) data->min_offset); + fprintf (dump_file, " max offset %s %d\n", GET_MODE_NAME (mem_mode), - data->max_offset); + (int) data->max_offset); } rat = 1; -- 2.47.2