Skip to content

R
riscv-gcc-1
Commit e6fcb60d by Kazu Hirata Committed by Jeff Law
Options

* loop.c: Fix formatting. 

From-SVN: r35526
parent 556273e0
Showing with 221 additions and 216 deletions
gcc/ChangeLog
2000-08-06 Kazu Hirata <kazu@hxi.com> 2000-08-06 Kazu Hirata <kazu@hxi.com>
* loop.c: Fix formatting.
* dwarf2out.c: Fix formatting. * dwarf2out.c: Fix formatting.
* tm.texi (FUNCTION_ARG_PARTIAL_NREGS): Fix a typo. * tm.texi (FUNCTION_ARG_PARTIAL_NREGS): Fix a typo.
......
gcc/loop.c
...@@ -19,10 +19,9 @@ along with GNU CC; see the file COPYING. If not, write to ...@@ -19,10 +19,9 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330, the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
/* This is the loop optimization pass of the compiler. /* This is the loop optimization pass of the compiler.
It finds invariant computations within loops and moves them It finds invariant computations within loops and moves them
to the beginning of the loop. Then it identifies basic and to the beginning of the loop. Then it identifies basic and
general induction variables. Strength reduction is applied to the general general induction variables. Strength reduction is applied to the general
induction variables, and induction variable elimination is applied to induction variables, and induction variable elimination is applied to
the basic induction variables. the basic induction variables.
...@@ -192,7 +191,7 @@ struct movable ...@@ -192,7 +191,7 @@ struct movable
rtx set_dest; /* The destination of this SET. */ rtx set_dest; /* The destination of this SET. */
rtx dependencies; /* When INSN is libcall, this is an EXPR_LIST rtx dependencies; /* When INSN is libcall, this is an EXPR_LIST
of any registers used within the LIBCALL. */ of any registers used within the LIBCALL. */
int consec; /* Number of consecutive following insns int consec; /* Number of consecutive following insns
that must be moved with this one. */ that must be moved with this one. */
unsigned int regno; /* The register it sets */ unsigned int regno; /* The register it sets */
short lifetime; /* lifetime of that register; short lifetime; /* lifetime of that register;
...@@ -208,7 +207,7 @@ struct movable ...@@ -208,7 +207,7 @@ struct movable
that the reg is live outside the range from where it is set that the reg is live outside the range from where it is set
to the following label. */ to the following label. */
unsigned int done : 1; /* 1 inhibits further processing of this */ unsigned int done : 1; /* 1 inhibits further processing of this */
unsigned int partial : 1; /* 1 means this reg is used for zero-extending. unsigned int partial : 1; /* 1 means this reg is used for zero-extending.
In particular, moving it does not make it In particular, moving it does not make it
invariant. */ invariant. */
...@@ -242,7 +241,7 @@ static int labels_in_range_p PARAMS ((rtx, int)); ...@@ -242,7 +241,7 @@ static int labels_in_range_p PARAMS ((rtx, int));
static void count_one_set PARAMS ((rtx, rtx, varray_type, rtx *)); static void count_one_set PARAMS ((rtx, rtx, varray_type, rtx *));
static void count_loop_regs_set PARAMS ((rtx, rtx, varray_type, varray_type, static void count_loop_regs_set PARAMS ((rtx, rtx, varray_type, varray_type,
int *, int)); int *, int));
static void note_addr_stored PARAMS ((rtx, rtx, void *)); static void note_addr_stored PARAMS ((rtx, rtx, void *));
static void note_set_pseudo_multiple_uses PARAMS ((rtx, rtx, void *)); static void note_set_pseudo_multiple_uses PARAMS ((rtx, rtx, void *));
static int loop_reg_used_before_p PARAMS ((const struct loop *, rtx, rtx)); static int loop_reg_used_before_p PARAMS ((const struct loop *, rtx, rtx));
...@@ -258,7 +257,7 @@ static void combine_movables PARAMS ((struct movable *, int)); ...@@ -258,7 +257,7 @@ static void combine_movables PARAMS ((struct movable *, int));
static int regs_match_p PARAMS ((rtx, rtx, struct movable *)); static int regs_match_p PARAMS ((rtx, rtx, struct movable *));
static int rtx_equal_for_loop_p PARAMS ((rtx, rtx, struct movable *)); static int rtx_equal_for_loop_p PARAMS ((rtx, rtx, struct movable *));
static void add_label_notes PARAMS ((rtx, rtx)); static void add_label_notes PARAMS ((rtx, rtx));
static void move_movables PARAMS ((struct loop *loop, struct movable *, static void move_movables PARAMS ((struct loop *loop, struct movable *,
int, int, int)); int, int, int));
static int count_nonfixed_reads PARAMS ((const struct loop *, rtx)); static int count_nonfixed_reads PARAMS ((const struct loop *, rtx));
static void strength_reduce PARAMS ((struct loop *, int, int)); static void strength_reduce PARAMS ((struct loop *, int, int));
...@@ -269,11 +268,11 @@ static void record_biv PARAMS ((struct induction *, rtx, rtx, rtx, rtx, rtx *, ...@@ -269,11 +268,11 @@ static void record_biv PARAMS ((struct induction *, rtx, rtx, rtx, rtx, rtx *,
int, int)); int, int));
static void check_final_value PARAMS ((const struct loop *, static void check_final_value PARAMS ((const struct loop *,
struct induction *)); struct induction *));
static void record_giv PARAMS ((const struct loop *, struct induction *, static void record_giv PARAMS ((const struct loop *, struct induction *,
rtx, rtx, rtx, rtx, rtx, int, enum g_types, rtx, rtx, rtx, rtx, rtx, int, enum g_types,
int, int, rtx *)); int, int, rtx *));
static void update_giv_derive PARAMS ((const struct loop *, rtx)); static void update_giv_derive PARAMS ((const struct loop *, rtx));
static int basic_induction_var PARAMS ((const struct loop *, rtx, static int basic_induction_var PARAMS ((const struct loop *, rtx,
enum machine_mode, rtx, rtx, enum machine_mode, rtx, rtx,
rtx *, rtx *, rtx **)); rtx *, rtx *, rtx **));
static rtx simplify_giv_expr PARAMS ((const struct loop *, rtx, int *)); static rtx simplify_giv_expr PARAMS ((const struct loop *, rtx, int *));
...@@ -293,7 +292,7 @@ static void recombine_givs PARAMS ((const struct loop *, struct iv_class *, ...@@ -293,7 +292,7 @@ static void recombine_givs PARAMS ((const struct loop *, struct iv_class *,
static int product_cheap_p PARAMS ((rtx, rtx)); static int product_cheap_p PARAMS ((rtx, rtx));
static int maybe_eliminate_biv PARAMS ((const struct loop *, struct iv_class *, static int maybe_eliminate_biv PARAMS ((const struct loop *, struct iv_class *,
int, int, int)); int, int, int));
static int maybe_eliminate_biv_1 PARAMS ((const struct loop *, rtx, rtx, static int maybe_eliminate_biv_1 PARAMS ((const struct loop *, rtx, rtx,
struct iv_class *, int, rtx)); struct iv_class *, int, rtx));
static int last_use_this_basic_block PARAMS ((rtx, rtx)); static int last_use_this_basic_block PARAMS ((rtx, rtx));
static void record_initial PARAMS ((rtx, rtx, void *)); static void record_initial PARAMS ((rtx, rtx, void *));
...@@ -352,7 +351,6 @@ static int copy_cost; ...@@ -352,7 +351,6 @@ static int copy_cost;
/* Cost of using a register, to normalize the benefits of a giv. */ /* Cost of using a register, to normalize the benefits of a giv. */
static int reg_address_cost; static int reg_address_cost;
void void
init_loop () init_loop ()
{ {
...@@ -455,7 +453,7 @@ loop_optimize (f, dumpfile, flags) ...@@ -455,7 +453,7 @@ loop_optimize (f, dumpfile, flags)
max_uid_for_loop = get_max_uid () + 1 + max_loop_num * 32; max_uid_for_loop = get_max_uid () + 1 + max_loop_num * 32;
uid_luid = (int *) xcalloc (max_uid_for_loop, sizeof (int)); uid_luid = (int *) xcalloc (max_uid_for_loop, sizeof (int));
uid_loop = (struct loop **) xcalloc (max_uid_for_loop, uid_loop = (struct loop **) xcalloc (max_uid_for_loop,
sizeof (struct loop *)); sizeof (struct loop *));
/* Allocate storage for array of loops. */ /* Allocate storage for array of loops. */
...@@ -634,7 +632,7 @@ scan_loop (loop, flags) ...@@ -634,7 +632,7 @@ scan_loop (loop, flags)
Note that if we mistakenly think that a loop is entered at the top Note that if we mistakenly think that a loop is entered at the top
when, in fact, it is entered at the exit test, the only effect will be when, in fact, it is entered at the exit test, the only effect will be
slightly poorer optimization. Making the opposite error can generate slightly poorer optimization. Making the opposite error can generate
incorrect code. Since very few loops now start with a jump to the incorrect code. Since very few loops now start with a jump to the
exit test, the code here to detect that case is very conservative. */ exit test, the code here to detect that case is very conservative. */
for (p = NEXT_INSN (loop_start); for (p = NEXT_INSN (loop_start);
...@@ -679,7 +677,7 @@ scan_loop (loop, flags) ...@@ -679,7 +677,7 @@ scan_loop (loop, flags)
/* If LOOP->SCAN_START was an insn created by loop, we don't know its luid /* If LOOP->SCAN_START was an insn created by loop, we don't know its luid
as required by loop_reg_used_before_p. So skip such loops. (This as required by loop_reg_used_before_p. So skip such loops. (This
test may never be true, but it's best to play it safe.) test may never be true, but it's best to play it safe.)
Also, skip loops where we do not start scanning at a label. This Also, skip loops where we do not start scanning at a label. This
test also rejects loops starting with a JUMP_INSN that failed the test also rejects loops starting with a JUMP_INSN that failed the
...@@ -697,7 +695,7 @@ scan_loop (loop, flags) ...@@ -697,7 +695,7 @@ scan_loop (loop, flags)
/* Count number of times each reg is set during this loop. /* Count number of times each reg is set during this loop.
Set VARRAY_CHAR (may_not_optimize, I) if it is not safe to move out Set VARRAY_CHAR (may_not_optimize, I) if it is not safe to move out
the setting of register I. Set VARRAY_RTX (reg_single_usage, I). */ the setting of register I. Set VARRAY_RTX (reg_single_usage, I). */
/* Allocate extra space for REGS that might be created by /* Allocate extra space for REGS that might be created by
load_mems. We allocate a little extra slop as well, in the hopes load_mems. We allocate a little extra slop as well, in the hopes
that even after the moving of movables creates some new registers that even after the moving of movables creates some new registers
...@@ -726,7 +724,7 @@ scan_loop (loop, flags) ...@@ -726,7 +724,7 @@ scan_loop (loop, flags)
VARRAY_CHAR (may_not_optimize, i) = 1; VARRAY_CHAR (may_not_optimize, i) = 1;
#endif #endif
bcopy ((char *) &set_in_loop->data, bcopy ((char *) &set_in_loop->data,
(char *) &n_times_set->data, nregs * sizeof (int)); (char *) &n_times_set->data, nregs * sizeof (int));
if (loop_dump_stream) if (loop_dump_stream)
...@@ -751,7 +749,7 @@ scan_loop (loop, flags) ...@@ -751,7 +749,7 @@ scan_loop (loop, flags)
When MAYBE_NEVER is 0, all insns will be executed at least once When MAYBE_NEVER is 0, all insns will be executed at least once
so that is not a problem. */ so that is not a problem. */
for (p = next_insn_in_loop (loop, loop->scan_start); for (p = next_insn_in_loop (loop, loop->scan_start);
p != NULL_RTX; p != NULL_RTX;
p = next_insn_in_loop (loop, p)) p = next_insn_in_loop (loop, p))
{ {
...@@ -782,7 +780,7 @@ scan_loop (loop, flags) ...@@ -782,7 +780,7 @@ scan_loop (loop, flags)
temp = find_reg_note (p, REG_EQUIV, NULL_RTX); temp = find_reg_note (p, REG_EQUIV, NULL_RTX);
if (temp) if (temp)
src = XEXP (temp, 0), move_insn = 1; src = XEXP (temp, 0), move_insn = 1;
else else
{ {
temp = find_reg_note (p, REG_EQUAL, NULL_RTX); temp = find_reg_note (p, REG_EQUAL, NULL_RTX);
if (temp && CONSTANT_P (XEXP (temp, 0))) if (temp && CONSTANT_P (XEXP (temp, 0)))
...@@ -809,7 +807,7 @@ scan_loop (loop, flags) ...@@ -809,7 +807,7 @@ scan_loop (loop, flags)
! reg_in_basic_block_p (p, SET_DEST (set)) ! reg_in_basic_block_p (p, SET_DEST (set))
/* And the set is not guaranteed to be executed one /* And the set is not guaranteed to be executed one
the loop starts, or the value before the set is the loop starts, or the value before the set is
needed before the set occurs... needed before the set occurs...
??? Note we have quadratic behaviour here, mitigated ??? Note we have quadratic behaviour here, mitigated
by the fact that the previous test will often fail for by the fact that the previous test will often fail for
...@@ -818,7 +816,7 @@ scan_loop (loop, flags) ...@@ -818,7 +816,7 @@ scan_loop (loop, flags)
of the register usage and use them here instead. */ of the register usage and use them here instead. */
&& (maybe_never && (maybe_never
|| loop_reg_used_before_p (loop, set, p))) || loop_reg_used_before_p (loop, set, p)))
/* It is unsafe to move the set. /* It is unsafe to move the set.
This code used to consider it OK to move a set of a variable This code used to consider it OK to move a set of a variable
which was not created by the user and not used in an exit test. which was not created by the user and not used in an exit test.
...@@ -827,10 +825,10 @@ scan_loop (loop, flags) ...@@ -827,10 +825,10 @@ scan_loop (loop, flags)
else if ((tem = loop_invariant_p (loop, src)) else if ((tem = loop_invariant_p (loop, src))
&& (dependencies == 0 && (dependencies == 0
|| (tem2 = loop_invariant_p (loop, dependencies)) != 0) || (tem2 = loop_invariant_p (loop, dependencies)) != 0)
&& (VARRAY_INT (set_in_loop, && (VARRAY_INT (set_in_loop,
REGNO (SET_DEST (set))) == 1 REGNO (SET_DEST (set))) == 1
|| (tem1 || (tem1
= consec_sets_invariant_p = consec_sets_invariant_p
(loop, SET_DEST (set), (loop, SET_DEST (set),
VARRAY_INT (set_in_loop, REGNO (SET_DEST (set))), VARRAY_INT (set_in_loop, REGNO (SET_DEST (set))),
p))) p)))
...@@ -849,12 +847,12 @@ scan_loop (loop, flags) ...@@ -849,12 +847,12 @@ scan_loop (loop, flags)
can be combined as long as they are both in the loop, but can be combined as long as they are both in the loop, but
we move one of them outside the loop. For large loops, we move one of them outside the loop. For large loops,
this can lose. The most common case of this is the address this can lose. The most common case of this is the address
of a function being called. of a function being called.
Therefore, if this register is marked as being used exactly Therefore, if this register is marked as being used exactly
once if we are in a loop with calls (a "large loop"), see if once if we are in a loop with calls (a "large loop"), see if
we can replace the usage of this register with the source we can replace the usage of this register with the source
of this SET. If we can, delete this insn. of this SET. If we can, delete this insn.
Don't do this if P has a REG_RETVAL note or if we have Don't do this if P has a REG_RETVAL note or if we have
SMALL_REGISTER_CLASSES and SET_SRC is a hard register. */ SMALL_REGISTER_CLASSES and SET_SRC is a hard register. */
...@@ -876,20 +874,20 @@ scan_loop (loop, flags) ...@@ -876,20 +874,20 @@ scan_loop (loop, flags)
might span a call. */ might span a call. */
&& ! modified_between_p (SET_SRC (set), p, && ! modified_between_p (SET_SRC (set), p,
VARRAY_RTX VARRAY_RTX
(reg_single_usage, regno)) (reg_single_usage, regno))
&& no_labels_between_p (p, VARRAY_RTX (reg_single_usage, regno)) && no_labels_between_p (p, VARRAY_RTX (reg_single_usage, regno))
&& validate_replace_rtx (SET_DEST (set), SET_SRC (set), && validate_replace_rtx (SET_DEST (set), SET_SRC (set),
VARRAY_RTX VARRAY_RTX
(reg_single_usage, regno))) (reg_single_usage, regno)))
{ {
/* Replace any usage in a REG_EQUAL note. Must copy the /* Replace any usage in a REG_EQUAL note. Must copy the
new source, so that we don't get rtx sharing between the new source, so that we don't get rtx sharing between the
SET_SOURCE and REG_NOTES of insn p. */ SET_SOURCE and REG_NOTES of insn p. */
REG_NOTES (VARRAY_RTX (reg_single_usage, regno)) REG_NOTES (VARRAY_RTX (reg_single_usage, regno))
= replace_rtx (REG_NOTES (VARRAY_RTX = replace_rtx (REG_NOTES (VARRAY_RTX
(reg_single_usage, regno)), (reg_single_usage, regno)),
SET_DEST (set), copy_rtx (SET_SRC (set))); SET_DEST (set), copy_rtx (SET_SRC (set)));
PUT_CODE (p, NOTE); PUT_CODE (p, NOTE);
NOTE_LINE_NUMBER (p) = NOTE_INSN_DELETED; NOTE_LINE_NUMBER (p) = NOTE_INSN_DELETED;
NOTE_SOURCE_FILE (p) = 0; NOTE_SOURCE_FILE (p) = 0;
...@@ -904,7 +902,7 @@ scan_loop (loop, flags) ...@@ -904,7 +902,7 @@ scan_loop (loop, flags)
m->dependencies = dependencies; m->dependencies = dependencies;
m->set_dest = SET_DEST (set); m->set_dest = SET_DEST (set);
m->force = 0; m->force = 0;
m->consec = VARRAY_INT (set_in_loop, m->consec = VARRAY_INT (set_in_loop,
REGNO (SET_DEST (set))) - 1; REGNO (SET_DEST (set))) - 1;
m->done = 0; m->done = 0;
m->forces = 0; m->forces = 0;
...@@ -918,7 +916,7 @@ scan_loop (loop, flags) ...@@ -918,7 +916,7 @@ scan_loop (loop, flags)
or consec_sets_invariant_p returned 2 or consec_sets_invariant_p returned 2
(only conditionally invariant). */ (only conditionally invariant). */
m->cond = ((tem | tem1 | tem2) > 1); m->cond = ((tem | tem1 | tem2) > 1);
m->global = (uid_luid[REGNO_LAST_UID (regno)] m->global = (uid_luid[REGNO_LAST_UID (regno)]
> INSN_LUID (loop_end) > INSN_LUID (loop_end)
|| uid_luid[REGNO_FIRST_UID (regno)] < INSN_LUID (loop_start)); || uid_luid[REGNO_FIRST_UID (regno)] < INSN_LUID (loop_start));
m->match = 0; m->match = 0;
...@@ -1099,7 +1097,7 @@ scan_loop (loop, flags) ...@@ -1099,7 +1097,7 @@ scan_loop (loop, flags)
all together as the priority of the first. */ all together as the priority of the first. */
combine_movables (movables, nregs); combine_movables (movables, nregs);
/* Now consider each movable insn to decide whether it is worth moving. /* Now consider each movable insn to decide whether it is worth moving.
Store 0 in set_in_loop for each reg that is moved. Store 0 in set_in_loop for each reg that is moved.
...@@ -1182,7 +1180,7 @@ record_excess_regs (in_this, not_in_this, output) ...@@ -1182,7 +1180,7 @@ record_excess_regs (in_this, not_in_this, output)
&& ! reg_mentioned_p (in_this, not_in_this)) && ! reg_mentioned_p (in_this, not_in_this))
*output = gen_rtx_EXPR_LIST (VOIDmode, in_this, *output); *output = gen_rtx_EXPR_LIST (VOIDmode, in_this, *output);
return; return;
default: default:
break; break;
} }
...@@ -1236,7 +1234,7 @@ libcall_other_reg (insn, equiv) ...@@ -1236,7 +1234,7 @@ libcall_other_reg (insn, equiv)
/* Return 1 if all uses of REG /* Return 1 if all uses of REG
are between INSN and the end of the basic block. */ are between INSN and the end of the basic block. */
static int static int
reg_in_basic_block_p (insn, reg) reg_in_basic_block_p (insn, reg)
rtx insn, reg; rtx insn, reg;
{ {
...@@ -1272,7 +1270,7 @@ reg_in_basic_block_p (insn, reg) ...@@ -1272,7 +1270,7 @@ reg_in_basic_block_p (insn, reg)
case BARRIER: case BARRIER:
/* It's the end of the basic block, so we lose. */ /* It's the end of the basic block, so we lose. */
return 0; return 0;
default: default:
break; break;
} }
...@@ -1324,13 +1322,14 @@ skip_consec_insns (insn, count) ...@@ -1324,13 +1322,14 @@ skip_consec_insns (insn, count)
rtx temp; rtx temp;
/* If first insn of libcall sequence, skip to end. */ /* If first insn of libcall sequence, skip to end. */
/* Do this at start of loop, since INSN is guaranteed to /* Do this at start of loop, since INSN is guaranteed to
be an insn here. */ be an insn here. */
if (GET_CODE (insn) != NOTE if (GET_CODE (insn) != NOTE
&& (temp = find_reg_note (insn, REG_LIBCALL, NULL_RTX))) && (temp = find_reg_note (insn, REG_LIBCALL, NULL_RTX)))
insn = XEXP (temp, 0); insn = XEXP (temp, 0);
do insn = NEXT_INSN (insn); do
insn = NEXT_INSN (insn);
while (GET_CODE (insn) == NOTE); while (GET_CODE (insn) == NOTE);
} }
...@@ -1367,7 +1366,7 @@ ignore_some_movables (movables) ...@@ -1367,7 +1366,7 @@ ignore_some_movables (movables)
m1->done = 1; m1->done = 1;
} }
} }
} }
/* For each movable insn, see if the reg that it loads /* For each movable insn, see if the reg that it loads
leads when it dies right into another conditionally movable insn. leads when it dies right into another conditionally movable insn.
...@@ -1427,7 +1426,8 @@ combine_movables (movables, nregs) ...@@ -1427,7 +1426,8 @@ combine_movables (movables, nregs)
/* Perhaps testing m->consec_sets would be more appropriate here? */ /* Perhaps testing m->consec_sets would be more appropriate here? */
for (m = movables; m; m = m->next) for (m = movables; m; m = m->next)
if (m->match == 0 && VARRAY_INT (n_times_set, m->regno) == 1 && !m->partial) if (m->match == 0 && VARRAY_INT (n_times_set, m->regno) == 1
&& !m->partial)
{ {
register struct movable *m1; register struct movable *m1;
int regno = m->regno; int regno = m->regno;
...@@ -1497,13 +1497,13 @@ combine_movables (movables, nregs) ...@@ -1497,13 +1497,13 @@ combine_movables (movables, nregs)
{ {
/* First one: don't check for overlap, just record it. */ /* First one: don't check for overlap, just record it. */
m0 = m; m0 = m;
continue; continue;
} }
/* Make sure they extend to the same mode. /* Make sure they extend to the same mode.
(Almost always true.) */ (Almost always true.) */
if (GET_MODE (m->set_dest) != GET_MODE (m0->set_dest)) if (GET_MODE (m->set_dest) != GET_MODE (m0->set_dest))
continue; continue;
/* We already have one: check for overlap with those /* We already have one: check for overlap with those
already combined together. */ already combined together. */
...@@ -1519,7 +1519,8 @@ combine_movables (movables, nregs) ...@@ -1519,7 +1519,8 @@ combine_movables (movables, nregs)
m->done = 1; m->done = 1;
m->match = m0; m->match = m0;
overlap: ; overlap:
;
} }
} }
...@@ -1914,7 +1915,7 @@ move_movables (loop, movables, threshold, insn_count, nregs) ...@@ -1914,7 +1915,7 @@ move_movables (loop, movables, threshold, insn_count, nregs)
rtx i1, temp; rtx i1, temp;
/* If first insn of libcall sequence, skip to end. */ /* If first insn of libcall sequence, skip to end. */
/* Do this at start of loop, since p is guaranteed to /* Do this at start of loop, since p is guaranteed to
be an insn here. */ be an insn here. */
if (GET_CODE (p) != NOTE if (GET_CODE (p) != NOTE
&& (temp = find_reg_note (p, REG_LIBCALL, NULL_RTX))) && (temp = find_reg_note (p, REG_LIBCALL, NULL_RTX)))
...@@ -1951,7 +1952,7 @@ move_movables (loop, movables, threshold, insn_count, nregs) ...@@ -1951,7 +1952,7 @@ move_movables (loop, movables, threshold, insn_count, nregs)
&& GET_CODE (PATTERN (next)) == USE) && GET_CODE (PATTERN (next)) == USE)
&& GET_CODE (next) != NOTE) && GET_CODE (next) != NOTE)
break; break;
/* If that is the call, this may be the insn /* If that is the call, this may be the insn
that loads the function address. that loads the function address.
...@@ -2015,7 +2016,7 @@ move_movables (loop, movables, threshold, insn_count, nregs) ...@@ -2015,7 +2016,7 @@ move_movables (loop, movables, threshold, insn_count, nregs)
rtx reg = m->set_dest; rtx reg = m->set_dest;
rtx sequence; rtx sequence;
rtx tem; rtx tem;
start_sequence (); start_sequence ();
tem = expand_binop tem = expand_binop
(GET_MODE (reg), and_optab, reg, (GET_MODE (reg), and_optab, reg,
...@@ -2071,7 +2072,7 @@ move_movables (loop, movables, threshold, insn_count, nregs) ...@@ -2071,7 +2072,7 @@ move_movables (loop, movables, threshold, insn_count, nregs)
may cause problems with later optimization passes. may cause problems with later optimization passes.
It is possible for cse to create such notes It is possible for cse to create such notes
like this as a result of record_jump_cond. */ like this as a result of record_jump_cond. */
if ((temp = find_reg_note (i1, REG_EQUAL, NULL_RTX)) if ((temp = find_reg_note (i1, REG_EQUAL, NULL_RTX))
&& ! loop_invariant_p (loop, XEXP (temp, 0))) && ! loop_invariant_p (loop, XEXP (temp, 0)))
remove_note (i1, temp); remove_note (i1, temp);
...@@ -2162,7 +2163,7 @@ move_movables (loop, movables, threshold, insn_count, nregs) ...@@ -2162,7 +2163,7 @@ move_movables (loop, movables, threshold, insn_count, nregs)
reg_map[m1->regno] reg_map[m1->regno]
= gen_lowpart_common (GET_MODE (m1->set_dest), = gen_lowpart_common (GET_MODE (m1->set_dest),
m->set_dest); m->set_dest);
/* Get rid of the matching insn /* Get rid of the matching insn
and prevent further processing of it. */ and prevent further processing of it. */
m1->done = 1; m1->done = 1;
...@@ -2261,7 +2262,7 @@ replace_call_address (x, reg, addr) ...@@ -2261,7 +2262,7 @@ replace_call_address (x, reg, addr)
abort (); abort ();
XEXP (x, 0) = addr; XEXP (x, 0) = addr;
return; return;
default: default:
break; break;
} }
...@@ -2313,7 +2314,7 @@ count_nonfixed_reads (loop, x) ...@@ -2313,7 +2314,7 @@ count_nonfixed_reads (loop, x)
case MEM: case MEM:
return ((loop_invariant_p (loop, XEXP (x, 0)) != 1) return ((loop_invariant_p (loop, XEXP (x, 0)) != 1)
+ count_nonfixed_reads (loop, XEXP (x, 0))); + count_nonfixed_reads (loop, XEXP (x, 0)));
default: default:
break; break;
} }
...@@ -2333,7 +2334,6 @@ count_nonfixed_reads (loop, x) ...@@ -2333,7 +2334,6 @@ count_nonfixed_reads (loop, x)
} }
return value; return value;
} }
#if 0 #if 0
/* P is an instruction that sets a register to the result of a ZERO_EXTEND. /* P is an instruction that sets a register to the result of a ZERO_EXTEND.
...@@ -2467,7 +2467,7 @@ prescan_loop (loop) ...@@ -2467,7 +2467,7 @@ prescan_loop (loop)
&& (GET_CODE (PATTERN (insn)) == ADDR_DIFF_VEC && (GET_CODE (PATTERN (insn)) == ADDR_DIFF_VEC
|| GET_CODE (PATTERN (insn)) == ADDR_VEC)) || GET_CODE (PATTERN (insn)) == ADDR_VEC))
loop_info->has_tablejump = 1; loop_info->has_tablejump = 1;
note_stores (PATTERN (insn), note_addr_stored, NULL); note_stores (PATTERN (insn), note_addr_stored, NULL);
if (! first_loop_store_insn && loop_store_mems) if (! first_loop_store_insn && loop_store_mems)
first_loop_store_insn = insn; first_loop_store_insn = insn;
...@@ -2487,27 +2487,29 @@ prescan_loop (loop) ...@@ -2487,27 +2487,29 @@ prescan_loop (loop)
label1 = SET_SRC (PATTERN (insn)); label1 = SET_SRC (PATTERN (insn));
} }
do { do
if (label1 && label1 != pc_rtx) {
{ if (label1 && label1 != pc_rtx)
if (GET_CODE (label1) != LABEL_REF) {
{ if (GET_CODE (label1) != LABEL_REF)
/* Something tricky. */ {
loop_info->has_multiple_exit_targets = 1; /* Something tricky. */
break; loop_info->has_multiple_exit_targets = 1;
} break;
else if (XEXP (label1, 0) != exit_target }
&& LABEL_OUTSIDE_LOOP_P (label1)) else if (XEXP (label1, 0) != exit_target
{ && LABEL_OUTSIDE_LOOP_P (label1))
/* A jump outside the current loop. */ {
loop_info->has_multiple_exit_targets = 1; /* A jump outside the current loop. */
break; loop_info->has_multiple_exit_targets = 1;
} break;
} }
}
label1 = label2; label1 = label2;
label2 = NULL_RTX; label2 = NULL_RTX;
} while (label1); }
while (label1);
} }
} }
else if (GET_CODE (insn) == RETURN) else if (GET_CODE (insn) == RETURN)
...@@ -2516,7 +2518,7 @@ prescan_loop (loop) ...@@ -2516,7 +2518,7 @@ prescan_loop (loop)
/* Now, rescan the loop, setting up the LOOP_MEMS array. */ /* Now, rescan the loop, setting up the LOOP_MEMS array. */
if (/* We can't tell what MEMs are aliased by what. */ if (/* We can't tell what MEMs are aliased by what. */
! unknown_address_altered ! unknown_address_altered
/* An exception thrown by a called function might land us /* An exception thrown by a called function might land us
anywhere. */ anywhere. */
&& ! loop_info->has_call && ! loop_info->has_call
...@@ -2729,7 +2731,7 @@ find_and_verify_loops (f, loops) ...@@ -2729,7 +2731,7 @@ find_and_verify_loops (f, loops)
anywhere. anywhere.
Also look for blocks of code ending in an unconditional branch that Also look for blocks of code ending in an unconditional branch that
exits the loop. If such a block is surrounded by a conditional exits the loop. If such a block is surrounded by a conditional
branch around the block, move the block elsewhere (see below) and branch around the block, move the block elsewhere (see below) and
invert the jump to point to the code block. This may eliminate a invert the jump to point to the code block. This may eliminate a
label in our loop and will simplify processing by both us and a label in our loop and will simplify processing by both us and a
...@@ -2821,7 +2823,7 @@ find_and_verify_loops (f, loops) ...@@ -2821,7 +2823,7 @@ find_and_verify_loops (f, loops)
&& next_real_insn (JUMP_LABEL (p)) == our_next && next_real_insn (JUMP_LABEL (p)) == our_next
/* If it's not safe to move the sequence, then we /* If it's not safe to move the sequence, then we
mustn't try. */ mustn't try. */
&& insns_safe_to_move_p (p, NEXT_INSN (insn), && insns_safe_to_move_p (p, NEXT_INSN (insn),
&last_insn_to_move)) &last_insn_to_move))
{ {
rtx target rtx target
...@@ -2891,12 +2893,12 @@ find_and_verify_loops (f, loops) ...@@ -2891,12 +2893,12 @@ find_and_verify_loops (f, loops)
/* Include the BARRIER after INSN and copy the /* Include the BARRIER after INSN and copy the
block after LOC. */ block after LOC. */
new_label = squeeze_notes (new_label, new_label = squeeze_notes (new_label,
last_insn_to_move); last_insn_to_move);
reorder_insns (new_label, last_insn_to_move, loc); reorder_insns (new_label, last_insn_to_move, loc);
/* All those insns are now in TARGET_LOOP. */ /* All those insns are now in TARGET_LOOP. */
for (q = new_label; for (q = new_label;
q != NEXT_INSN (last_insn_to_move); q != NEXT_INSN (last_insn_to_move);
q = NEXT_INSN (q)) q = NEXT_INSN (q))
uid_loop[INSN_UID (q)] = target_loop; uid_loop[INSN_UID (q)] = target_loop;
...@@ -3063,7 +3065,7 @@ mark_loop_jump (x, loop) ...@@ -3063,7 +3065,7 @@ mark_loop_jump (x, loop)
fprintf (loop_dump_stream, fprintf (loop_dump_stream,
"\nLoop at %d ignored due to multiple entry points.\n", "\nLoop at %d ignored due to multiple entry points.\n",
INSN_UID (dest_loop->start)); INSN_UID (dest_loop->start));
dest_loop->invalid = 1; dest_loop->invalid = 1;
} }
return; return;
...@@ -3269,7 +3271,7 @@ loop_invariant_p (loop, x) ...@@ -3269,7 +3271,7 @@ loop_invariant_p (loop, x)
/* If we had a subroutine call, any location in memory could /* If we had a subroutine call, any location in memory could
have been clobbered. We used to test here for volatile and have been clobbered. We used to test here for volatile and
readonly, but true_dependence knows how to do that better readonly, but true_dependence knows how to do that better
than we do. */ than we do. */
if (RTX_UNCHANGING_P (x) if (RTX_UNCHANGING_P (x)
? unknown_constant_address_altered : unknown_address_altered) ? unknown_constant_address_altered : unknown_address_altered)
return 0; return 0;
...@@ -3294,7 +3296,7 @@ loop_invariant_p (loop, x) ...@@ -3294,7 +3296,7 @@ loop_invariant_p (loop, x)
if (MEM_VOLATILE_P (x)) if (MEM_VOLATILE_P (x))
return 0; return 0;
break; break;
default: default:
break; break;
} }
...@@ -3327,7 +3329,6 @@ loop_invariant_p (loop, x) ...@@ -3327,7 +3329,6 @@ loop_invariant_p (loop, x)
return 1 + conditional; return 1 + conditional;
} }
/* Return nonzero if all the insns in the loop that set REG /* Return nonzero if all the insns in the loop that set REG
are INSN and the immediately following insns, are INSN and the immediately following insns,
...@@ -3456,7 +3457,7 @@ find_single_use_in_loop (insn, x, usage) ...@@ -3456,7 +3457,7 @@ find_single_use_in_loop (insn, x, usage)
if (code == REG) if (code == REG)
VARRAY_RTX (usage, REGNO (x)) VARRAY_RTX (usage, REGNO (x))
= (VARRAY_RTX (usage, REGNO (x)) != 0 = (VARRAY_RTX (usage, REGNO (x)) != 0
&& VARRAY_RTX (usage, REGNO (x)) != insn) && VARRAY_RTX (usage, REGNO (x)) != insn)
? const0_rtx : insn; ? const0_rtx : insn;
...@@ -3464,7 +3465,7 @@ find_single_use_in_loop (insn, x, usage) ...@@ -3464,7 +3465,7 @@ find_single_use_in_loop (insn, x, usage)
{ {
/* Don't count SET_DEST if it is a REG; otherwise count things /* Don't count SET_DEST if it is a REG; otherwise count things
in SET_DEST because if a register is partially modified, it won't in SET_DEST because if a register is partially modified, it won't
show up as a potential movable so we don't care how USAGE is set show up as a potential movable so we don't care how USAGE is set
for it. */ for it. */
if (GET_CODE (SET_DEST (x)) != REG) if (GET_CODE (SET_DEST (x)) != REG)
find_single_use_in_loop (insn, SET_DEST (x), usage); find_single_use_in_loop (insn, SET_DEST (x), usage);
...@@ -3510,7 +3511,7 @@ count_one_set (insn, x, may_not_move, last_set) ...@@ -3510,7 +3511,7 @@ count_one_set (insn, x, may_not_move, last_set)
in current basic block, and it was set before, in current basic block, and it was set before,
it must be set in two basic blocks, so it cannot it must be set in two basic blocks, so it cannot
be moved out of the loop. */ be moved out of the loop. */
if (VARRAY_INT (set_in_loop, regno) > 0 if (VARRAY_INT (set_in_loop, regno) > 0
&& last_set[regno] == 0) && last_set[regno] == 0)
VARRAY_CHAR (may_not_move, regno) = 1; VARRAY_CHAR (may_not_move, regno) = 1;
/* If this is not first setting in current basic block, /* If this is not first setting in current basic block,
...@@ -3693,7 +3694,7 @@ static rtx addr_placeholder; ...@@ -3693,7 +3694,7 @@ static rtx addr_placeholder;
/* Scan the loop body and call FNCALL for each insn. In the addition to the /* Scan the loop body and call FNCALL for each insn. In the addition to the
LOOP and INSN parameters pass MAYBE_MULTIPLE and NOT_EVERY_ITERATION to the LOOP and INSN parameters pass MAYBE_MULTIPLE and NOT_EVERY_ITERATION to the
callback. callback.
NOT_EVERY_ITERATION if current insn is not executed at least once for every NOT_EVERY_ITERATION if current insn is not executed at least once for every
loop iteration except for the last one. loop iteration except for the last one.
...@@ -3843,7 +3844,7 @@ for_each_insn_in_loop (loop, fncall) ...@@ -3843,7 +3844,7 @@ for_each_insn_in_loop (loop, fncall)
} }
} }
/* Perform strength reduction and induction variable elimination. /* Perform strength reduction and induction variable elimination.
Pseudo registers created during this function will be beyond the last Pseudo registers created during this function will be beyond the last
valid index in several tables including n_times_set and regno_last_uid. valid index in several tables including n_times_set and regno_last_uid.
...@@ -3889,9 +3890,9 @@ strength_reduce (loop, insn_count, flags) ...@@ -3889,9 +3890,9 @@ strength_reduce (loop, insn_count, flags)
/* Save insn immediately after the loop_end. Insns inserted after loop_end /* Save insn immediately after the loop_end. Insns inserted after loop_end
must be put before this insn, so that they will appear in the right must be put before this insn, so that they will appear in the right
order (i.e. loop order). order (i.e. loop order).
If loop_end is the end of the current function, then emit a If loop_end is the end of the current function, then emit a
NOTE_INSN_DELETED after loop_end and set end_insert_before to the NOTE_INSN_DELETED after loop_end and set end_insert_before to the
dummy note insn. */ dummy note insn. */
if (NEXT_INSN (loop_end) != 0) if (NEXT_INSN (loop_end) != 0)
...@@ -3920,7 +3921,7 @@ strength_reduce (loop, insn_count, flags) ...@@ -3920,7 +3921,7 @@ strength_reduce (loop, insn_count, flags)
? "not induction variable" ? "not induction variable"
: (! bl->incremented ? "never incremented" : (! bl->incremented ? "never incremented"
: "count error"))); : "count error")));
REG_IV_TYPE (bl->regno) = NOT_BASIC_INDUCT; REG_IV_TYPE (bl->regno) = NOT_BASIC_INDUCT;
*backbl = bl->next; *backbl = bl->next;
} }
...@@ -4053,7 +4054,7 @@ strength_reduce (loop, insn_count, flags) ...@@ -4053,7 +4054,7 @@ strength_reduce (loop, insn_count, flags)
if (bl2->regno == regno) if (bl2->regno == regno)
break; break;
} }
/* Now, can we transform this biv into a giv? */ /* Now, can we transform this biv into a giv? */
if (bl2 if (bl2
&& bl2->biv_count == 1 && bl2->biv_count == 1
...@@ -4099,7 +4100,7 @@ strength_reduce (loop, insn_count, flags) ...@@ -4099,7 +4100,7 @@ strength_reduce (loop, insn_count, flags)
rtx p; rtx p;
rtx next; rtx next;
for (next = NEXT_INSN (dominator); ; next = NEXT_INSN (next)) for (next = NEXT_INSN (dominator);; next = NEXT_INSN (next))
{ {
if (GET_CODE (next) == JUMP_INSN if (GET_CODE (next) == JUMP_INSN
|| (INSN_P (next) || (INSN_P (next)
...@@ -4116,7 +4117,7 @@ strength_reduce (loop, insn_count, flags) ...@@ -4116,7 +4117,7 @@ strength_reduce (loop, insn_count, flags)
/* Avoid problems with luids by actually moving the insn /* Avoid problems with luids by actually moving the insn
and adjusting all luids in the range. */ and adjusting all luids in the range. */
reorder_insns (giv_insn, giv_insn, dominator); reorder_insns (giv_insn, giv_insn, dominator);
for (p = dominator; INSN_UID (p) >= max_uid_for_loop; ) for (p = dominator; INSN_UID (p) >= max_uid_for_loop;)
p = PREV_INSN (p); p = PREV_INSN (p);
compute_luids (giv_insn, after_giv, INSN_LUID (p)); compute_luids (giv_insn, after_giv, INSN_LUID (p));
/* If the only purpose of the init insn is to initialize /* If the only purpose of the init insn is to initialize
...@@ -4230,7 +4231,7 @@ strength_reduce (loop, insn_count, flags) ...@@ -4230,7 +4231,7 @@ strength_reduce (loop, insn_count, flags)
add_val = plus_constant (next->add_val, offset); add_val = plus_constant (next->add_val, offset);
old_reg = v->dest_reg; old_reg = v->dest_reg;
dest_reg = gen_reg_rtx (v->mode); dest_reg = gen_reg_rtx (v->mode);
/* Unlike reg_iv_type / reg_iv_info, the other three arrays /* Unlike reg_iv_type / reg_iv_info, the other three arrays
have been allocated with some slop space, so we may not have been allocated with some slop space, so we may not
actually need to reallocate them. If we do, the following actually need to reallocate them. If we do, the following
...@@ -4243,7 +4244,7 @@ strength_reduce (loop, insn_count, flags) ...@@ -4243,7 +4244,7 @@ strength_reduce (loop, insn_count, flags)
VARRAY_GROW (may_not_optimize, nregs); VARRAY_GROW (may_not_optimize, nregs);
VARRAY_GROW (reg_single_usage, nregs); VARRAY_GROW (reg_single_usage, nregs);
} }
/* Some bivs are incremented with a multi-insn sequence. /* Some bivs are incremented with a multi-insn sequence.
The first insn contains the add. */ The first insn contains the add. */
next_loc_insn = next->insn; next_loc_insn = next->insn;
...@@ -4313,7 +4314,7 @@ strength_reduce (loop, insn_count, flags) ...@@ -4313,7 +4314,7 @@ strength_reduce (loop, insn_count, flags)
v->always_executed = 1; v->always_executed = 1;
v->replaceable = 1; v->replaceable = 1;
v->no_const_addval = 0; v->no_const_addval = 0;
old_regno = REGNO (old_reg); old_regno = REGNO (old_reg);
new_regno = REGNO (dest_reg); new_regno = REGNO (dest_reg);
VARRAY_INT (set_in_loop, old_regno)--; VARRAY_INT (set_in_loop, old_regno)--;
...@@ -4321,7 +4322,7 @@ strength_reduce (loop, insn_count, flags) ...@@ -4321,7 +4322,7 @@ strength_reduce (loop, insn_count, flags)
VARRAY_INT (n_times_set, old_regno)--; VARRAY_INT (n_times_set, old_regno)--;
VARRAY_INT (n_times_set, new_regno) = 1; VARRAY_INT (n_times_set, new_regno) = 1;
VARRAY_CHAR (may_not_optimize, new_regno) = 0; VARRAY_CHAR (may_not_optimize, new_regno) = 0;
REG_IV_TYPE (new_regno) = GENERAL_INDUCT; REG_IV_TYPE (new_regno) = GENERAL_INDUCT;
REG_IV_INFO (new_regno) = v; REG_IV_INFO (new_regno) = v;
...@@ -4340,7 +4341,7 @@ strength_reduce (loop, insn_count, flags) ...@@ -4340,7 +4341,7 @@ strength_reduce (loop, insn_count, flags)
bl->giv_count++; bl->giv_count++;
v->benefit = rtx_cost (SET_SRC (set), SET); v->benefit = rtx_cost (SET_SRC (set), SET);
bl->total_benefit += v->benefit; bl->total_benefit += v->benefit;
/* Now replace the biv with DEST_REG in all insns between /* Now replace the biv with DEST_REG in all insns between
the replaced increment and the next increment, and the replaced increment and the next increment, and
remember the last insn that needed a replacement. */ remember the last insn that needed a replacement. */
...@@ -4349,7 +4350,7 @@ strength_reduce (loop, insn_count, flags) ...@@ -4349,7 +4350,7 @@ strength_reduce (loop, insn_count, flags)
p = next_insn_in_loop (loop, p)) p = next_insn_in_loop (loop, p))
{ {
rtx note; rtx note;
if (! INSN_P (p)) if (! INSN_P (p))
continue; continue;
if (reg_mentioned_p (old_reg, PATTERN (p))) if (reg_mentioned_p (old_reg, PATTERN (p)))
...@@ -4365,7 +4366,7 @@ strength_reduce (loop, insn_count, flags) ...@@ -4365,7 +4366,7 @@ strength_reduce (loop, insn_count, flags)
= replace_rtx (XEXP (note, 0), old_reg, dest_reg); = replace_rtx (XEXP (note, 0), old_reg, dest_reg);
} }
} }
v->last_use = last_use_insn; v->last_use = last_use_insn;
v->lifetime = INSN_LUID (last_use_insn) - INSN_LUID (v->insn); v->lifetime = INSN_LUID (last_use_insn) - INSN_LUID (v->insn);
/* If the lifetime is zero, it means that this register is really /* If the lifetime is zero, it means that this register is really
...@@ -4459,7 +4460,7 @@ strength_reduce (loop, insn_count, flags) ...@@ -4459,7 +4460,7 @@ strength_reduce (loop, insn_count, flags)
&& ! bl->nonneg && ! bl->nonneg
#endif #endif
)) ))
bl->eliminable = maybe_eliminate_biv (loop, bl, 0, threshold, bl->eliminable = maybe_eliminate_biv (loop, bl, 0, threshold,
insn_count); insn_count);
else else
{ {
...@@ -4788,7 +4789,7 @@ strength_reduce (loop, insn_count, flags) ...@@ -4788,7 +4789,7 @@ strength_reduce (loop, insn_count, flags)
/* Rescan all givs. If a giv is the same as a giv not reduced, mark it /* Rescan all givs. If a giv is the same as a giv not reduced, mark it
as not reduced. as not reduced.
For each giv register that can be reduced now: if replaceable, For each giv register that can be reduced now: if replaceable,
substitute reduced reg wherever the old giv occurs; substitute reduced reg wherever the old giv occurs;
else add new move insn "giv_reg = reduced_reg". */ else add new move insn "giv_reg = reduced_reg". */
...@@ -4912,11 +4913,11 @@ strength_reduce (loop, insn_count, flags) ...@@ -4912,11 +4913,11 @@ strength_reduce (loop, insn_count, flags)
We have to be careful that we didn't initially think we could eliminate We have to be careful that we didn't initially think we could eliminate
this biv because of a giv that we now think may be dead and shouldn't this biv because of a giv that we now think may be dead and shouldn't
be used as a biv replacement. be used as a biv replacement.
Also, there is the possibility that we may have a giv that looks Also, there is the possibility that we may have a giv that looks
like it can be used to eliminate a biv, but the resulting insn like it can be used to eliminate a biv, but the resulting insn
isn't valid. This can happen, for example, on the 88k, where a isn't valid. This can happen, for example, on the 88k, where a
JUMP_INSN can compare a register only with zero. Attempts to JUMP_INSN can compare a register only with zero. Attempts to
replace it with a compare with a constant will fail. replace it with a compare with a constant will fail.
...@@ -4980,7 +4981,7 @@ strength_reduce (loop, insn_count, flags) ...@@ -4980,7 +4981,7 @@ strength_reduce (loop, insn_count, flags)
for (p = loop_start; p != loop_end; p = NEXT_INSN (p)) for (p = loop_start; p != loop_end; p = NEXT_INSN (p))
if (GET_CODE (p) == INSN || GET_CODE (p) == JUMP_INSN if (GET_CODE (p) == INSN || GET_CODE (p) == JUMP_INSN
|| GET_CODE (p) == CALL_INSN) || GET_CODE (p) == CALL_INSN)
{ {
replace_regs (PATTERN (p), reg_map, reg_map_size, 0); replace_regs (PATTERN (p), reg_map, reg_map_size, 0);
replace_regs (REG_NOTES (p), reg_map, reg_map_size, 0); replace_regs (REG_NOTES (p), reg_map, reg_map_size, 0);
...@@ -5013,7 +5014,7 @@ strength_reduce (loop, insn_count, flags) ...@@ -5013,7 +5014,7 @@ strength_reduce (loop, insn_count, flags)
if (unrolled_insn_copies < 0) if (unrolled_insn_copies < 0)
unrolled_insn_copies = 0; unrolled_insn_copies = 0;
} }
/* Unroll loops from within strength reduction so that we can use the /* Unroll loops from within strength reduction so that we can use the
induction variable information that strength_reduce has already induction variable information that strength_reduce has already
collected. Always unroll loops that would be as small or smaller collected. Always unroll loops that would be as small or smaller
...@@ -5071,7 +5072,7 @@ check_insn_for_bivs (loop, p, not_every_iteration, maybe_multiple) ...@@ -5071,7 +5072,7 @@ check_insn_for_bivs (loop, p, not_every_iteration, maybe_multiple)
Create and initialize an induction structure for it. */ Create and initialize an induction structure for it. */
struct induction *v struct induction *v
= (struct induction *) oballoc (sizeof (struct induction)); = (struct induction *) oballoc (sizeof (struct induction));
record_biv (v, p, dest_reg, inc_val, mult_val, location, record_biv (v, p, dest_reg, inc_val, mult_val, location,
not_every_iteration, maybe_multiple); not_every_iteration, maybe_multiple);
...@@ -5084,7 +5085,7 @@ check_insn_for_bivs (loop, p, not_every_iteration, maybe_multiple) ...@@ -5084,7 +5085,7 @@ check_insn_for_bivs (loop, p, not_every_iteration, maybe_multiple)
return p; return p;
} }
/* Record all givs calculated in the insn. /* Record all givs calculated in the insn.
A register is a giv if: it is only set once, it is a function of a A register is a giv if: it is only set once, it is a function of a
biv and a constant (or invariant), and it is not a biv. */ biv and a constant (or invariant), and it is not a biv. */
static rtx static rtx
...@@ -5164,7 +5165,7 @@ check_insn_for_givs (loop, p, not_every_iteration, maybe_multiple) ...@@ -5164,7 +5165,7 @@ check_insn_for_givs (loop, p, not_every_iteration, maybe_multiple)
/* Update the status of whether giv can derive other givs. This can /* Update the status of whether giv can derive other givs. This can
change when we pass a label or an insn that updates a biv. */ change when we pass a label or an insn that updates a biv. */
if (GET_CODE (p) == INSN || GET_CODE (p) == JUMP_INSN if (GET_CODE (p) == INSN || GET_CODE (p) == JUMP_INSN
|| GET_CODE (p) == CODE_LABEL) || GET_CODE (p) == CODE_LABEL)
update_giv_derive (loop, p); update_giv_derive (loop, p);
return p; return p;
} }
...@@ -5253,7 +5254,7 @@ find_mem_givs (loop, x, insn, not_every_iteration, maybe_multiple) ...@@ -5253,7 +5254,7 @@ find_mem_givs (loop, x, insn, not_every_iteration, maybe_multiple)
int benefit; int benefit;
/* This code used to disable creating GIVs with mult_val == 1 and /* This code used to disable creating GIVs with mult_val == 1 and
add_val == 0. However, this leads to lost optimizations when add_val == 0. However, this leads to lost optimizations when
it comes time to combine a set of related DEST_ADDR GIVs, since it comes time to combine a set of related DEST_ADDR GIVs, since
this one would not be seen. */ this one would not be seen. */
...@@ -5525,17 +5526,17 @@ record_giv (loop, v, insn, src_reg, dest_reg, mult_val, add_val, benefit, ...@@ -5525,17 +5526,17 @@ record_giv (loop, v, insn, src_reg, dest_reg, mult_val, add_val, benefit,
if (REGNO_FIRST_UID (REGNO (dest_reg)) == INSN_UID (insn) if (REGNO_FIRST_UID (REGNO (dest_reg)) == INSN_UID (insn)
/* Previous line always fails if INSN was moved by loop opt. */ /* Previous line always fails if INSN was moved by loop opt. */
&& uid_luid[REGNO_LAST_UID (REGNO (dest_reg))] && uid_luid[REGNO_LAST_UID (REGNO (dest_reg))]
< INSN_LUID (loop->end) < INSN_LUID (loop->end)
&& (! not_every_iteration && (! not_every_iteration
|| last_use_this_basic_block (dest_reg, insn))) || last_use_this_basic_block (dest_reg, insn)))
{ {
/* Now check that there are no assignments to the biv within the /* Now check that there are no assignments to the biv within the
giv's lifetime. This requires two separate checks. */ giv's lifetime. This requires two separate checks. */
/* Check each biv update, and fail if any are between the first /* Check each biv update, and fail if any are between the first
and last use of the giv. and last use of the giv.
If this loop contains an inner loop that was unrolled, then If this loop contains an inner loop that was unrolled, then
the insn modifying the biv may have been emitted by the loop the insn modifying the biv may have been emitted by the loop
unrolling code, and hence does not have a valid luid. Just unrolling code, and hence does not have a valid luid. Just
...@@ -5556,7 +5557,7 @@ record_giv (loop, v, insn, src_reg, dest_reg, mult_val, add_val, benefit, ...@@ -5556,7 +5557,7 @@ record_giv (loop, v, insn, src_reg, dest_reg, mult_val, add_val, benefit,
v->replaceable = 0; v->replaceable = 0;
v->not_replaceable = 1; v->not_replaceable = 1;
break; break;
} }
} }
/* If there are any backwards branches that go from after the /* If there are any backwards branches that go from after the
...@@ -5653,7 +5654,6 @@ record_giv (loop, v, insn, src_reg, dest_reg, mult_val, add_val, benefit, ...@@ -5653,7 +5654,6 @@ record_giv (loop, v, insn, src_reg, dest_reg, mult_val, add_val, benefit,
} }
/* All this does is determine whether a giv can be made replaceable because /* All this does is determine whether a giv can be made replaceable because
its final value can be calculated. This code can not be part of record_giv its final value can be calculated. This code can not be part of record_giv
above, because final_giv_value requires that the number of loop iterations above, because final_giv_value requires that the number of loop iterations
...@@ -5745,7 +5745,7 @@ check_final_value (loop, v) ...@@ -5745,7 +5745,7 @@ check_final_value (loop, v)
last_giv_use = p; last_giv_use = p;
} }
} }
/* Now that the lifetime of the giv is known, check for branches /* Now that the lifetime of the giv is known, check for branches
from within the lifetime to outside the lifetime if it is still from within the lifetime to outside the lifetime if it is still
replaceable. */ replaceable. */
...@@ -5803,7 +5803,7 @@ check_final_value (loop, v) ...@@ -5803,7 +5803,7 @@ check_final_value (loop, v)
static void static void
update_giv_derive (loop, p) update_giv_derive (loop, p)
const struct loop *loop; const struct loop *loop;
rtx p; rtx p;
{ {
struct iv_class *bl; struct iv_class *bl;
...@@ -5925,7 +5925,7 @@ update_giv_derive (loop, p) ...@@ -5925,7 +5925,7 @@ update_giv_derive (loop, p)
Note that treating the entire pseudo as a BIV will result in making Note that treating the entire pseudo as a BIV will result in making
simple increments to any GIVs based on it. However, if the variable simple increments to any GIVs based on it. However, if the variable
overflows in its declared mode but not its promoted mode, the result will overflows in its declared mode but not its promoted mode, the result will
be incorrect. This is acceptable if the variable is signed, since be incorrect. This is acceptable if the variable is signed, since
overflows in such cases are undefined, but not if it is unsigned, since overflows in such cases are undefined, but not if it is unsigned, since
those overflows are defined. So we only check for SIGN_EXTEND and those overflows are defined. So we only check for SIGN_EXTEND and
not ZERO_EXTEND. not ZERO_EXTEND.
...@@ -5967,7 +5967,7 @@ basic_induction_var (loop, x, mode, dest_reg, p, inc_val, mult_val, location) ...@@ -5967,7 +5967,7 @@ basic_induction_var (loop, x, mode, dest_reg, p, inc_val, mult_val, location)
argp = &XEXP (x, 0); argp = &XEXP (x, 0);
} }
else else
return 0; return 0;
arg = *argp; arg = *argp;
if (loop_invariant_p (loop, arg) != 1) if (loop_invariant_p (loop, arg) != 1)
...@@ -5999,12 +5999,14 @@ basic_induction_var (loop, x, mode, dest_reg, p, inc_val, mult_val, location) ...@@ -5999,12 +5999,14 @@ basic_induction_var (loop, x, mode, dest_reg, p, inc_val, mult_val, location)
insn = p; insn = p;
while (1) while (1)
{ {
do { do
insn = PREV_INSN (insn); {
} while (insn && GET_CODE (insn) == NOTE insn = PREV_INSN (insn);
&& NOTE_LINE_NUMBER (insn) != NOTE_INSN_LOOP_BEG); }
while (insn && GET_CODE (insn) == NOTE
&& NOTE_LINE_NUMBER (insn) != NOTE_INSN_LOOP_BEG);
if (!insn) if (!insn)
break; break;
set = single_set (insn); set = single_set (insn);
if (set == 0) if (set == 0)
...@@ -6046,11 +6048,11 @@ basic_induction_var (loop, x, mode, dest_reg, p, inc_val, mult_val, location) ...@@ -6046,11 +6048,11 @@ basic_induction_var (loop, x, mode, dest_reg, p, inc_val, mult_val, location)
{ {
/* Possible bug here? Perhaps we don't know the mode of X. */ /* Possible bug here? Perhaps we don't know the mode of X. */
*inc_val = convert_modes (GET_MODE (dest_reg), mode, x, 0); *inc_val = convert_modes (GET_MODE (dest_reg), mode, x, 0);
*mult_val = const0_rtx; *mult_val = const0_rtx;
return 1; return 1;
} }
else else
return 0; return 0;
case SIGN_EXTEND: case SIGN_EXTEND:
return basic_induction_var (loop, XEXP (x, 0), GET_MODE (XEXP (x, 0)), return basic_induction_var (loop, XEXP (x, 0), GET_MODE (XEXP (x, 0)),
...@@ -6187,9 +6189,9 @@ general_induction_var (loop, x, src_reg, add_val, mult_val, is_addr, ...@@ -6187,9 +6189,9 @@ general_induction_var (loop, x, src_reg, add_val, mult_val, is_addr,
*pbenefit += rtx_cost (orig_x, SET); *pbenefit += rtx_cost (orig_x, SET);
/* Always return true if this is a giv so it will be detected as such, /* Always return true if this is a giv so it will be detected as such,
even if the benefit is zero or negative. This allows elimination even if the benefit is zero or negative. This allows elimination
of bivs that might otherwise not be eliminated. */ of bivs that might otherwise not be eliminated. */
return 1; return 1;
} }
/* Given an expression, X, try to form it as a linear function of a biv. /* Given an expression, X, try to form it as a linear function of a biv.
...@@ -6208,7 +6210,7 @@ general_induction_var (loop, x, src_reg, add_val, mult_val, is_addr, ...@@ -6208,7 +6210,7 @@ general_induction_var (loop, x, src_reg, add_val, mult_val, is_addr,
returns 0. returns 0.
For a non-zero return, the result will have a code of CONST_INT, USE, For a non-zero return, the result will have a code of CONST_INT, USE,
REG (for a BIV), PLUS, or MULT. No other codes will occur. REG (for a BIV), PLUS, or MULT. No other codes will occur.
*BENEFIT will be incremented by the benefit of any sub-giv encountered. */ *BENEFIT will be incremented by the benefit of any sub-giv encountered. */
...@@ -6505,15 +6507,15 @@ simplify_giv_expr (loop, x, benefit) ...@@ -6505,15 +6507,15 @@ simplify_giv_expr (loop, x, benefit)
{ {
struct movable *m; struct movable *m;
for (m = the_movables; m ; m = m->next) for (m = the_movables; m; m = m->next)
if (rtx_equal_p (x, m->set_dest)) if (rtx_equal_p (x, m->set_dest))
{ {
/* Ok, we found a match. Substitute and simplify. */ /* Ok, we found a match. Substitute and simplify. */
/* If we match another movable, we must use that, as /* If we match another movable, we must use that, as
this one is going away. */ this one is going away. */
if (m->match) if (m->match)
return simplify_giv_expr (loop, m->match->set_dest, return simplify_giv_expr (loop, m->match->set_dest,
benefit); benefit);
/* If consec is non-zero, this is a member of a group of /* If consec is non-zero, this is a member of a group of
...@@ -6532,8 +6534,8 @@ simplify_giv_expr (loop, x, benefit) ...@@ -6532,8 +6534,8 @@ simplify_giv_expr (loop, x, benefit)
} }
else else
{ {
tem = single_set (m->insn); tem = single_set (m->insn);
if (tem) if (tem)
tem = SET_SRC (tem); tem = SET_SRC (tem);
} }
...@@ -6680,7 +6682,7 @@ consec_sets_giv (loop, first_benefit, p, src_reg, dest_reg, ...@@ -6680,7 +6682,7 @@ consec_sets_giv (loop, first_benefit, p, src_reg, dest_reg,
rtx set; rtx set;
/* Indicate that this is a giv so that we can update the value produced in /* Indicate that this is a giv so that we can update the value produced in
each insn of the multi-insn sequence. each insn of the multi-insn sequence.
This induction structure will be used only by the call to This induction structure will be used only by the call to
general_induction_var below, so we can allocate it on our stack. general_induction_var below, so we can allocate it on our stack.
...@@ -6752,7 +6754,7 @@ consec_sets_giv (loop, first_benefit, p, src_reg, dest_reg, ...@@ -6752,7 +6754,7 @@ consec_sets_giv (loop, first_benefit, p, src_reg, dest_reg,
/* Return an rtx, if any, that expresses giv G2 as a function of the register /* Return an rtx, if any, that expresses giv G2 as a function of the register
represented by G1. If no such expression can be found, or it is clear that represented by G1. If no such expression can be found, or it is clear that
it cannot possibly be a valid address, 0 is returned. it cannot possibly be a valid address, 0 is returned.
To perform the computation, we note that To perform the computation, we note that
G1 = x * v + a and G1 = x * v + a and
...@@ -6796,11 +6798,11 @@ express_from_1 (a, b, mult) ...@@ -6796,11 +6798,11 @@ express_from_1 (a, b, mult)
ra = XEXP (a, 0), oa = XEXP (a, 1); ra = XEXP (a, 0), oa = XEXP (a, 1);
if (GET_CODE (ra) == PLUS) if (GET_CODE (ra) == PLUS)
tmp = ra, ra = oa, oa = tmp; tmp = ra, ra = oa, oa = tmp;
rb = XEXP (b, 0), ob = XEXP (b, 1); rb = XEXP (b, 0), ob = XEXP (b, 1);
if (GET_CODE (rb) == PLUS) if (GET_CODE (rb) == PLUS)
tmp = rb, rb = ob, ob = tmp; tmp = rb, rb = ob, ob = tmp;
if (rtx_equal_p (ra, rb)) if (rtx_equal_p (ra, rb))
/* We matched: remove one reg completely. */ /* We matched: remove one reg completely. */
...@@ -6813,7 +6815,7 @@ express_from_1 (a, b, mult) ...@@ -6813,7 +6815,7 @@ express_from_1 (a, b, mult)
a = ra, b = ob; a = ra, b = ob;
else else
{ {
/* Indicates an extra register in B. Strip one level from B and /* Indicates an extra register in B. Strip one level from B and
recurse, hoping B was the higher order expression. */ recurse, hoping B was the higher order expression. */
ob = express_from_1 (a, ob, mult); ob = express_from_1 (a, ob, mult);
if (ob == NULL_RTX) if (ob == NULL_RTX)
...@@ -6876,8 +6878,8 @@ express_from (g1, g2) ...@@ -6876,8 +6878,8 @@ express_from (g1, g2)
&& GET_CODE (g2->mult_val) == CONST_INT) && GET_CODE (g2->mult_val) == CONST_INT)
{ {
if (g1->mult_val == const0_rtx if (g1->mult_val == const0_rtx
|| INTVAL (g2->mult_val) % INTVAL (g1->mult_val) != 0) || INTVAL (g2->mult_val) % INTVAL (g1->mult_val) != 0)
return NULL_RTX; return NULL_RTX;
mult = GEN_INT (INTVAL (g2->mult_val) / INTVAL (g1->mult_val)); mult = GEN_INT (INTVAL (g2->mult_val) / INTVAL (g1->mult_val));
} }
else if (rtx_equal_p (g1->mult_val, g2->mult_val)) else if (rtx_equal_p (g1->mult_val, g2->mult_val))
...@@ -6935,10 +6937,9 @@ express_from (g1, g2) ...@@ -6935,10 +6937,9 @@ express_from (g1, g2)
mult = gen_rtx_PLUS (g2->mode, mult, XEXP (add, 0)); mult = gen_rtx_PLUS (g2->mode, mult, XEXP (add, 0));
add = tem; add = tem;
} }
return gen_rtx_PLUS (g2->mode, mult, add); return gen_rtx_PLUS (g2->mode, mult, add);
} }
} }
/* Return an rtx, if any, that expresses giv G2 as a function of the register /* Return an rtx, if any, that expresses giv G2 as a function of the register
...@@ -7041,7 +7042,7 @@ combine_givs (bl) ...@@ -7041,7 +7042,7 @@ combine_givs (bl)
giv_array[i++] = g1; giv_array[i++] = g1;
stats = (struct combine_givs_stats *) xcalloc (giv_count, sizeof (*stats)); stats = (struct combine_givs_stats *) xcalloc (giv_count, sizeof (*stats));
can_combine = (rtx *) xcalloc (giv_count, giv_count * sizeof(rtx)); can_combine = (rtx *) xcalloc (giv_count, giv_count * sizeof (rtx));
for (i = 0; i < giv_count; i++) for (i = 0; i < giv_count; i++)
{ {
...@@ -7054,7 +7055,7 @@ combine_givs (bl) ...@@ -7054,7 +7055,7 @@ combine_givs (bl)
/* If a DEST_REG GIV is used only once, do not allow it to combine /* If a DEST_REG GIV is used only once, do not allow it to combine
with anything, for in doing so we will gain nothing that cannot with anything, for in doing so we will gain nothing that cannot
be had by simply letting the GIV with which we would have combined be had by simply letting the GIV with which we would have combined
to be reduced on its own. The losage shows up in particular with to be reduced on its own. The losage shows up in particular with
DEST_ADDR targets on hosts with reg+reg addressing, though it can DEST_ADDR targets on hosts with reg+reg addressing, though it can
be seen elsewhere as well. */ be seen elsewhere as well. */
if (g1->giv_type == DEST_REG if (g1->giv_type == DEST_REG
...@@ -7075,7 +7076,7 @@ combine_givs (bl) ...@@ -7075,7 +7076,7 @@ combine_givs (bl)
if (g1 != g2 if (g1 != g2
&& (this_combine = combine_givs_p (g1, g2)) != NULL_RTX) && (this_combine = combine_givs_p (g1, g2)) != NULL_RTX)
{ {
can_combine[i*giv_count + j] = this_combine; can_combine[i * giv_count + j] = this_combine;
this_benefit += g2->benefit + extra_benefit; this_benefit += g2->benefit + extra_benefit;
} }
} }
...@@ -7084,7 +7085,7 @@ combine_givs (bl) ...@@ -7084,7 +7085,7 @@ combine_givs (bl)
/* Iterate, combining until we can't. */ /* Iterate, combining until we can't. */
restart: restart:
qsort (stats, giv_count, sizeof(*stats), cmp_combine_givs_stats); qsort (stats, giv_count, sizeof (*stats), cmp_combine_givs_stats);
if (loop_dump_stream) if (loop_dump_stream)
{ {
...@@ -7093,7 +7094,7 @@ restart: ...@@ -7093,7 +7094,7 @@ restart:
{ {
g1 = giv_array[stats[k].giv_number]; g1 = giv_array[stats[k].giv_number];
if (!g1->combined_with && !g1->same) if (!g1->combined_with && !g1->same)
fprintf (loop_dump_stream, " {%d, %d}", fprintf (loop_dump_stream, " {%d, %d}",
INSN_UID (giv_array[stats[k].giv_number]->insn), INSN_UID (giv_array[stats[k].giv_number]->insn),
stats[k].total_benefit); stats[k].total_benefit);
} }
...@@ -7114,13 +7115,13 @@ restart: ...@@ -7114,13 +7115,13 @@ restart:
for (j = 0; j < giv_count; j++) for (j = 0; j < giv_count; j++)
{ {
g2 = giv_array[j]; g2 = giv_array[j];
if (g1 != g2 && can_combine[i*giv_count + j] if (g1 != g2 && can_combine[i * giv_count + j]
/* If it has already been combined, skip. */ /* If it has already been combined, skip. */
&& ! g2->same && ! g2->combined_with) && ! g2->same && ! g2->combined_with)
{ {
int l; int l;
g2->new_reg = can_combine[i*giv_count + j]; g2->new_reg = can_combine[i * giv_count + j];
g2->same = g1; g2->same = g1;
g1->combined_with++; g1->combined_with++;
g1->lifetime += g2->lifetime; g1->lifetime += g2->lifetime;
...@@ -7132,13 +7133,13 @@ restart: ...@@ -7132,13 +7133,13 @@ restart:
longer be necessary. */ longer be necessary. */
if (! g2->replaceable && REG_USERVAR_P (g2->dest_reg)) if (! g2->replaceable && REG_USERVAR_P (g2->dest_reg))
g1_add_benefit -= copy_cost; g1_add_benefit -= copy_cost;
/* To help optimize the next set of combinations, remove /* To help optimize the next set of combinations, remove
this giv from the benefits of other potential mates. */ this giv from the benefits of other potential mates. */
for (l = 0; l < giv_count; ++l) for (l = 0; l < giv_count; ++l)
{ {
int m = stats[l].giv_number; int m = stats[l].giv_number;
if (can_combine[m*giv_count + j]) if (can_combine[m * giv_count + j])
stats[l].total_benefit -= g2->benefit + extra_benefit; stats[l].total_benefit -= g2->benefit + extra_benefit;
} }
...@@ -7156,14 +7157,14 @@ restart: ...@@ -7156,14 +7157,14 @@ restart:
for (j = 0; j < giv_count; ++j) for (j = 0; j < giv_count; ++j)
{ {
int m = stats[j].giv_number; int m = stats[j].giv_number;
if (can_combine[m*giv_count + i]) if (can_combine[m * giv_count + i])
stats[j].total_benefit -= g1->benefit + extra_benefit; stats[j].total_benefit -= g1->benefit + extra_benefit;
} }
g1->benefit += g1_add_benefit; g1->benefit += g1_add_benefit;
/* We've finished with this giv, and everything it touched. /* We've finished with this giv, and everything it touched.
Restart the combination so that proper weights for the Restart the combination so that proper weights for the
rest of the givs are properly taken into account. */ rest of the givs are properly taken into account. */
/* ??? Ideally we would compact the arrays at this point, so /* ??? Ideally we would compact the arrays at this point, so
as to not cover old ground. But sanely compacting as to not cover old ground. But sanely compacting
...@@ -7284,7 +7285,7 @@ find_life_end (x, stats, insn, biv) ...@@ -7284,7 +7285,7 @@ find_life_end (x, stats, insn, biv)
retval += find_life_end (XEXP (x, i), stats, insn, biv); retval += find_life_end (XEXP (x, i), stats, insn, biv);
else if (fmt[i] == 'E') else if (fmt[i] == 'E')
for (j = XVECLEN (x, i) - 1; j >= 0; j--) for (j = XVECLEN (x, i) - 1; j >= 0; j--)
retval += find_life_end (XVECEXP (x, i, j), stats, insn, biv); retval += find_life_end (XVECEXP (x, i, j), stats, insn, biv);
} }
return retval; return retval;
...@@ -7333,7 +7334,7 @@ recombine_givs (loop, bl, unroll_p) ...@@ -7333,7 +7334,7 @@ recombine_givs (loop, bl, unroll_p)
i++; i++;
} }
qsort (stats, giv_count, sizeof(*stats), cmp_recombine_givs_stats); qsort (stats, giv_count, sizeof (*stats), cmp_recombine_givs_stats);
/* Set up the ix field for each giv in stats to name /* Set up the ix field for each giv in stats to name
the corresponding index into stats, and the corresponding index into stats, and
...@@ -7397,7 +7398,7 @@ recombine_givs (loop, bl, unroll_p) ...@@ -7397,7 +7398,7 @@ recombine_givs (loop, bl, unroll_p)
/* Loop unrolling of an inner loop can even create new DEST_REG /* Loop unrolling of an inner loop can even create new DEST_REG
givs. */ givs. */
rtx p; rtx p;
for (p = v->insn; INSN_UID (p) >= max_uid_for_loop; ) for (p = v->insn; INSN_UID (p) >= max_uid_for_loop;)
p = PREV_INSN (p); p = PREV_INSN (p);
stats[i].start_luid = stats[i].end_luid = INSN_LUID (p); stats[i].start_luid = stats[i].end_luid = INSN_LUID (p);
if (p != v->insn) if (p != v->insn)
...@@ -7438,7 +7439,7 @@ recombine_givs (loop, bl, unroll_p) ...@@ -7438,7 +7439,7 @@ recombine_givs (loop, bl, unroll_p)
{ {
p = prev_nonnote_insn (p); p = prev_nonnote_insn (p);
if (reg_set_p (v->dest_reg, p)) if (reg_set_p (v->dest_reg, p))
count--; count--;
} }
stats[i].start_luid = INSN_LUID (p); stats[i].start_luid = INSN_LUID (p);
...@@ -7510,7 +7511,7 @@ recombine_givs (loop, bl, unroll_p) ...@@ -7510,7 +7511,7 @@ recombine_givs (loop, bl, unroll_p)
} }
} }
qsort (stats, giv_count, sizeof(*stats), cmp_recombine_givs_stats); qsort (stats, giv_count, sizeof (*stats), cmp_recombine_givs_stats);
/* Try to derive DEST_REG givs from previous DEST_REG givs with the /* Try to derive DEST_REG givs from previous DEST_REG givs with the
same mult_val and non-overlapping lifetime. This reduces register same mult_val and non-overlapping lifetime. This reduces register
...@@ -7641,8 +7642,8 @@ emit_iv_add_mult (b, m, a, reg, insert_before) ...@@ -7641,8 +7642,8 @@ emit_iv_add_mult (b, m, a, reg, insert_before)
emit_insn_before (seq, insert_before); emit_insn_before (seq, insert_before);
/* It is entirely possible that the expansion created lots of new /* It is entirely possible that the expansion created lots of new
registers. Iterate over the sequence we just created and registers. Iterate over the sequence we just created and
record them all. */ record them all. */
if (GET_CODE (seq) == SEQUENCE) if (GET_CODE (seq) == SEQUENCE)
...@@ -7945,7 +7946,8 @@ check_dbra_loop (loop, insn_count) ...@@ -7945,7 +7946,8 @@ check_dbra_loop (loop, insn_count)
} }
if (no_use_except_counting) if (no_use_except_counting)
; /* no need to worry about MEMs. */ /* No need to worry about MEMs. */
;
else if (num_mem_sets <= 1) else if (num_mem_sets <= 1)
{ {
for (p = loop_start; p != loop_end; p = NEXT_INSN (p)) for (p = loop_start; p != loop_end; p = NEXT_INSN (p))
...@@ -7976,7 +7978,7 @@ check_dbra_loop (loop, insn_count) ...@@ -7976,7 +7978,7 @@ check_dbra_loop (loop, insn_count)
{ {
if (v->giv_type == DEST_REG if (v->giv_type == DEST_REG
&& reg_mentioned_p (v->dest_reg, && reg_mentioned_p (v->dest_reg,
PATTERN (first_loop_store_insn)) PATTERN (first_loop_store_insn))
&& loop_insn_first_p (first_loop_store_insn, v->insn)) && loop_insn_first_p (first_loop_store_insn, v->insn))
reversible_mem_store = 0; reversible_mem_store = 0;
} }
...@@ -8011,7 +8013,7 @@ check_dbra_loop (loop, insn_count) ...@@ -8011,7 +8013,7 @@ check_dbra_loop (loop, insn_count)
/* Now check other conditions: /* Now check other conditions:
The increment must be a constant, as must the initial value, The increment must be a constant, as must the initial value,
and the comparison code must be LT. and the comparison code must be LT.
This test can probably be improved since +/- 1 in the constant This test can probably be improved since +/- 1 in the constant
can be obtained by changing LT to LE and vice versa; this is can be obtained by changing LT to LE and vice versa; this is
...@@ -8041,7 +8043,7 @@ check_dbra_loop (loop, insn_count) ...@@ -8041,7 +8043,7 @@ check_dbra_loop (loop, insn_count)
if (comparison_const_width > HOST_BITS_PER_WIDE_INT) if (comparison_const_width > HOST_BITS_PER_WIDE_INT)
comparison_const_width = HOST_BITS_PER_WIDE_INT; comparison_const_width = HOST_BITS_PER_WIDE_INT;
comparison_sign_mask comparison_sign_mask
= (unsigned HOST_WIDE_INT)1 << (comparison_const_width - 1); = (unsigned HOST_WIDE_INT) 1 << (comparison_const_width - 1);
/* If the comparison value is not a loop invariant, then we /* If the comparison value is not a loop invariant, then we
can not reverse this loop. can not reverse this loop.
...@@ -8055,8 +8057,8 @@ check_dbra_loop (loop, insn_count) ...@@ -8055,8 +8057,8 @@ check_dbra_loop (loop, insn_count)
if (GET_CODE (comparison_value) == CONST_INT) if (GET_CODE (comparison_value) == CONST_INT)
comparison_val = INTVAL (comparison_value); comparison_val = INTVAL (comparison_value);
initial_value = bl->initial_value; initial_value = bl->initial_value;
/* Normalize the initial value if it is an integer and /* Normalize the initial value if it is an integer and
has no other use except as a counter. This will allow has no other use except as a counter. This will allow
a few more loops to be reversed. */ a few more loops to be reversed. */
if (no_use_except_counting if (no_use_except_counting
...@@ -8211,12 +8213,12 @@ check_dbra_loop (loop, insn_count) ...@@ -8211,12 +8213,12 @@ check_dbra_loop (loop, insn_count)
create a sequence to hold all the insns from expand_inc. */ create a sequence to hold all the insns from expand_inc. */
start_sequence (); start_sequence ();
expand_inc (reg, new_add_val); expand_inc (reg, new_add_val);
tem = gen_sequence (); tem = gen_sequence ();
end_sequence (); end_sequence ();
p = emit_insn_before (tem, bl->biv->insn); p = emit_insn_before (tem, bl->biv->insn);
delete_insn (bl->biv->insn); delete_insn (bl->biv->insn);
/* Update biv info to reflect its new status. */ /* Update biv info to reflect its new status. */
bl->biv->insn = p; bl->biv->insn = p;
bl->initial_value = start_value; bl->initial_value = start_value;
...@@ -8251,7 +8253,7 @@ check_dbra_loop (loop, insn_count) ...@@ -8251,7 +8253,7 @@ check_dbra_loop (loop, insn_count)
/* Add new compare/branch insn at end of loop. */ /* Add new compare/branch insn at end of loop. */
start_sequence (); start_sequence ();
emit_cmp_and_jump_insns (reg, const0_rtx, cmp_code, NULL_RTX, emit_cmp_and_jump_insns (reg, const0_rtx, cmp_code, NULL_RTX,
GET_MODE (reg), 0, 0, GET_MODE (reg), 0, 0,
XEXP (jump_label, 0)); XEXP (jump_label, 0));
tem = gen_sequence (); tem = gen_sequence ();
end_sequence (); end_sequence ();
...@@ -8418,7 +8420,7 @@ loop_insn_first_p (insn, reference) ...@@ -8418,7 +8420,7 @@ loop_insn_first_p (insn, reference)
{ {
rtx p, q; rtx p, q;
for (p = insn, q = reference; ;) for (p = insn, q = reference;;)
{ {
/* Start with test for not first so that INSN == REFERENCE yields not /* Start with test for not first so that INSN == REFERENCE yields not
first. */ first. */
...@@ -8573,7 +8575,8 @@ maybe_eliminate_biv_1 (loop, x, insn, bl, eliminate_p, where) ...@@ -8573,7 +8575,8 @@ maybe_eliminate_biv_1 (loop, x, insn, bl, eliminate_p, where)
overflow problem. */ overflow problem. */
for (v = bl->giv; v; v = v->next_iv) for (v = bl->giv; v; v = v->next_iv)
if (GET_CODE (v->mult_val) == CONST_INT && v->mult_val != const0_rtx if (GET_CODE (v->mult_val) == CONST_INT
&& v->mult_val != const0_rtx
&& ! v->ignore && ! v->maybe_dead && v->always_computable && ! v->ignore && ! v->maybe_dead && v->always_computable
&& v->mode == mode && v->mode == mode
&& (GET_CODE (v->add_val) == SYMBOL_REF && (GET_CODE (v->add_val) == SYMBOL_REF
...@@ -8610,7 +8613,7 @@ maybe_eliminate_biv_1 (loop, x, insn, bl, eliminate_p, where) ...@@ -8610,7 +8613,7 @@ maybe_eliminate_biv_1 (loop, x, insn, bl, eliminate_p, where)
where); where);
/* Substitute the new register for its invariant value in /* Substitute the new register for its invariant value in
the compare expression. */ the compare expression. */
XEXP (new, (INTVAL (v->mult_val) < 0) ? 0 : 1) = tem; XEXP (new, (INTVAL (v->mult_val) < 0) ? 0 : 1) = tem;
if (validate_change (insn, &SET_SRC (PATTERN (insn)), new, 0)) if (validate_change (insn, &SET_SRC (PATTERN (insn)), new, 0))
return 1; return 1;
...@@ -8638,7 +8641,8 @@ maybe_eliminate_biv_1 (loop, x, insn, bl, eliminate_p, where) ...@@ -8638,7 +8641,8 @@ maybe_eliminate_biv_1 (loop, x, insn, bl, eliminate_p, where)
negative mult_val, but it seems complex to do it in general. */ negative mult_val, but it seems complex to do it in general. */
for (v = bl->giv; v; v = v->next_iv) for (v = bl->giv; v; v = v->next_iv)
if (GET_CODE (v->mult_val) == CONST_INT && INTVAL (v->mult_val) > 0 if (GET_CODE (v->mult_val) == CONST_INT
&& INTVAL (v->mult_val) > 0
&& (GET_CODE (v->add_val) == SYMBOL_REF && (GET_CODE (v->add_val) == SYMBOL_REF
|| GET_CODE (v->add_val) == LABEL_REF || GET_CODE (v->add_val) == LABEL_REF
|| GET_CODE (v->add_val) == CONST || GET_CODE (v->add_val) == CONST
...@@ -8654,7 +8658,7 @@ maybe_eliminate_biv_1 (loop, x, insn, bl, eliminate_p, where) ...@@ -8654,7 +8658,7 @@ maybe_eliminate_biv_1 (loop, x, insn, bl, eliminate_p, where)
return 1; return 1;
/* Replace biv with the giv's reduced reg. */ /* Replace biv with the giv's reduced reg. */
validate_change (insn, &XEXP (x, 1-arg_operand), v->new_reg, 1); validate_change (insn, &XEXP (x, 1 - arg_operand), v->new_reg, 1);
/* If all constants are actually constant integers and /* If all constants are actually constant integers and
the derived constant can be directly placed in the COMPARE, the derived constant can be directly placed in the COMPARE,
...@@ -8665,8 +8669,8 @@ maybe_eliminate_biv_1 (loop, x, insn, bl, eliminate_p, where) ...@@ -8665,8 +8669,8 @@ maybe_eliminate_biv_1 (loop, x, insn, bl, eliminate_p, where)
{ {
validate_change (insn, &XEXP (x, arg_operand), validate_change (insn, &XEXP (x, arg_operand),
GEN_INT (INTVAL (arg) GEN_INT (INTVAL (arg)
* INTVAL (v->mult_val) * INTVAL (v->mult_val)
+ INTVAL (v->add_val)), 1); + INTVAL (v->add_val)), 1);
} }
else else
{ {
...@@ -8678,13 +8682,14 @@ maybe_eliminate_biv_1 (loop, x, insn, bl, eliminate_p, where) ...@@ -8678,13 +8682,14 @@ maybe_eliminate_biv_1 (loop, x, insn, bl, eliminate_p, where)
if (apply_change_group ()) if (apply_change_group ())
return 1; return 1;
} }
/* Look for giv with positive constant mult_val and nonconst add_val. /* Look for giv with positive constant mult_val and nonconst add_val.
Insert insns to calculate new compare value. Insert insns to calculate new compare value.
??? Turn this off due to possible overflow. */ ??? Turn this off due to possible overflow. */
for (v = bl->giv; v; v = v->next_iv) for (v = bl->giv; v; v = v->next_iv)
if (GET_CODE (v->mult_val) == CONST_INT && INTVAL (v->mult_val) > 0 if (GET_CODE (v->mult_val) == CONST_INT
&& INTVAL (v->mult_val) > 0
&& ! v->ignore && ! v->maybe_dead && v->always_computable && ! v->ignore && ! v->maybe_dead && v->always_computable
&& v->mode == mode && v->mode == mode
&& 0) && 0)
...@@ -8716,7 +8721,7 @@ maybe_eliminate_biv_1 (loop, x, insn, bl, eliminate_p, where) ...@@ -8716,7 +8721,7 @@ maybe_eliminate_biv_1 (loop, x, insn, bl, eliminate_p, where)
if (loop_invariant_p (loop, arg) == 1) if (loop_invariant_p (loop, arg) == 1)
{ {
/* Look for giv with constant positive mult_val and nonconst /* Look for giv with constant positive mult_val and nonconst
add_val. Insert insns to compute new compare value. add_val. Insert insns to compute new compare value.
??? Turn this off due to possible overflow. */ ??? Turn this off due to possible overflow. */
for (v = bl->giv; v; v = v->next_iv) for (v = bl->giv; v; v = v->next_iv)
...@@ -8788,7 +8793,7 @@ maybe_eliminate_biv_1 (loop, x, insn, bl, eliminate_p, where) ...@@ -8788,7 +8793,7 @@ maybe_eliminate_biv_1 (loop, x, insn, bl, eliminate_p, where)
return 1; return 1;
/* Replace biv with its giv's reduced reg. */ /* Replace biv with its giv's reduced reg. */
XEXP (x, 1-arg_operand) = v->new_reg; XEXP (x, 1 - arg_operand) = v->new_reg;
/* Replace other operand with the other giv's /* Replace other operand with the other giv's
reduced reg. */ reduced reg. */
XEXP (x, arg_operand) = tv->new_reg; XEXP (x, arg_operand) = tv->new_reg;
...@@ -8820,7 +8825,7 @@ maybe_eliminate_biv_1 (loop, x, insn, bl, eliminate_p, where) ...@@ -8820,7 +8825,7 @@ maybe_eliminate_biv_1 (loop, x, insn, bl, eliminate_p, where)
switch (fmt[i]) switch (fmt[i])
{ {
case 'e': case 'e':
if (! maybe_eliminate_biv_1 (loop, XEXP (x, i), insn, bl, if (! maybe_eliminate_biv_1 (loop, XEXP (x, i), insn, bl,
eliminate_p, where)) eliminate_p, where))
return 0; return 0;
break; break;
...@@ -8835,7 +8840,7 @@ maybe_eliminate_biv_1 (loop, x, insn, bl, eliminate_p, where) ...@@ -8835,7 +8840,7 @@ maybe_eliminate_biv_1 (loop, x, insn, bl, eliminate_p, where)
} }
return 1; return 1;
} }
/* Return nonzero if the last use of REG /* Return nonzero if the last use of REG
is in an insn following INSN in the same basic block. */ is in an insn following INSN in the same basic block. */
...@@ -9076,7 +9081,7 @@ canonicalize_condition (insn, cond, reverse, earliest, want_reg) ...@@ -9076,7 +9081,7 @@ canonicalize_condition (insn, cond, reverse, earliest, want_reg)
#endif #endif
)) ))
&& GET_RTX_CLASS (GET_CODE (SET_SRC (set))) == '<' && GET_RTX_CLASS (GET_CODE (SET_SRC (set))) == '<'
&& (((GET_MODE_CLASS (mode) == MODE_CC) && (((GET_MODE_CLASS (mode) == MODE_CC)
== (GET_MODE_CLASS (inner_mode) == MODE_CC)) == (GET_MODE_CLASS (inner_mode) == MODE_CC))
|| mode == VOIDmode || inner_mode == VOIDmode)) || mode == VOIDmode || inner_mode == VOIDmode))
...@@ -9141,7 +9146,7 @@ canonicalize_condition (insn, cond, reverse, earliest, want_reg) ...@@ -9141,7 +9146,7 @@ canonicalize_condition (insn, cond, reverse, earliest, want_reg)
{ {
case LE: case LE:
if ((unsigned HOST_WIDE_INT) const_val != max_val >> 1) if ((unsigned HOST_WIDE_INT) const_val != max_val >> 1)
code = LT, op1 = GEN_INT (const_val + 1); code = LT, op1 = GEN_INT (const_val + 1);
break; break;
/* When cross-compiling, const_val might be sign-extended from /* When cross-compiling, const_val might be sign-extended from
...@@ -9186,7 +9191,6 @@ canonicalize_condition (insn, cond, reverse, earliest, want_reg) ...@@ -9186,7 +9191,6 @@ canonicalize_condition (insn, cond, reverse, earliest, want_reg)
return gen_rtx_fmt_ee (code, VOIDmode, op0, op1); return gen_rtx_fmt_ee (code, VOIDmode, op0, op1);
} }
/* Given a jump insn JUMP, return the condition that will cause it to branch /* Given a jump insn JUMP, return the condition that will cause it to branch
to its JUMP_LABEL. If the condition cannot be understood, or is an to its JUMP_LABEL. If the condition cannot be understood, or is an
inequality floating-point comparison which needs to be reversed, 0 will inequality floating-point comparison which needs to be reversed, 0 will
...@@ -9242,7 +9246,6 @@ get_condition_for_loop (loop, x) ...@@ -9242,7 +9246,6 @@ get_condition_for_loop (loop, x)
XEXP (comparison, 1), XEXP (comparison, 0)); XEXP (comparison, 1), XEXP (comparison, 0));
} }
/* Scan the function and determine whether it has indirect (computed) jumps. /* Scan the function and determine whether it has indirect (computed) jumps.
This is taken mostly from flow.c; similar code exists elsewhere This is taken mostly from flow.c; similar code exists elsewhere
...@@ -9300,7 +9303,7 @@ insert_loop_mem (mem, data) ...@@ -9300,7 +9303,7 @@ insert_loop_mem (mem, data)
/* See if we've already seen this MEM. */ /* See if we've already seen this MEM. */
for (i = 0; i < loop_mems_idx; ++i) for (i = 0; i < loop_mems_idx; ++i)
if (rtx_equal_p (m, loop_mems[i].mem)) if (rtx_equal_p (m, loop_mems[i].mem))
{ {
if (GET_MODE (m) != GET_MODE (loop_mems[i].mem)) if (GET_MODE (m) != GET_MODE (loop_mems[i].mem))
/* The modes of the two memory accesses are different. If /* The modes of the two memory accesses are different. If
...@@ -9312,16 +9315,16 @@ insert_loop_mem (mem, data) ...@@ -9312,16 +9315,16 @@ insert_loop_mem (mem, data)
} }
/* Resize the array, if necessary. */ /* Resize the array, if necessary. */
if (loop_mems_idx == loop_mems_allocated) if (loop_mems_idx == loop_mems_allocated)
{ {
if (loop_mems_allocated != 0) if (loop_mems_allocated != 0)
loop_mems_allocated *= 2; loop_mems_allocated *= 2;
else else
loop_mems_allocated = 32; loop_mems_allocated = 32;
loop_mems = (loop_mem_info*) loop_mems = (loop_mem_info*)
xrealloc (loop_mems, xrealloc (loop_mems,
loop_mems_allocated * sizeof (loop_mem_info)); loop_mems_allocated * sizeof (loop_mem_info));
} }
/* Actually insert the MEM. */ /* Actually insert the MEM. */
...@@ -9349,7 +9352,7 @@ load_mems_and_recount_loop_regs_set (loop, insn_count) ...@@ -9349,7 +9352,7 @@ load_mems_and_recount_loop_regs_set (loop, insn_count)
int nregs = max_reg_num (); int nregs = max_reg_num ();
load_mems (loop); load_mems (loop);
/* Recalculate set_in_loop and friends since load_mems may have /* Recalculate set_in_loop and friends since load_mems may have
created new registers. */ created new registers. */
if (max_reg_num () > nregs) if (max_reg_num () > nregs)
...@@ -9375,14 +9378,14 @@ load_mems_and_recount_loop_regs_set (loop, insn_count) ...@@ -9375,14 +9378,14 @@ load_mems_and_recount_loop_regs_set (loop, insn_count)
count_loop_regs_set (loop->top ? loop->top : loop->start, loop->end, count_loop_regs_set (loop->top ? loop->top : loop->start, loop->end,
may_not_optimize, reg_single_usage, may_not_optimize, reg_single_usage,
insn_count, nregs); insn_count, nregs);
for (i = 0; i < FIRST_PSEUDO_REGISTER; i++) for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
{ {
VARRAY_CHAR (may_not_optimize, i) = 1; VARRAY_CHAR (may_not_optimize, i) = 1;
VARRAY_INT (set_in_loop, i) = 1; VARRAY_INT (set_in_loop, i) = 1;
} }
#ifdef AVOID_CCMODE_COPIES #ifdef AVOID_CCMODE_COPIES
/* Don't try to move insns which set CC registers if we should not /* Don't try to move insns which set CC registers if we should not
create CCmode register copies. */ create CCmode register copies. */
...@@ -9431,8 +9434,8 @@ load_mems (loop) ...@@ -9431,8 +9434,8 @@ load_mems (loop)
/* Check to see if it's possible that some instructions in the /* Check to see if it's possible that some instructions in the
loop are never executed. */ loop are never executed. */
for (p = next_insn_in_loop (loop, loop->scan_start); for (p = next_insn_in_loop (loop, loop->scan_start);
p != NULL_RTX && ! maybe_never; p != NULL_RTX && ! maybe_never;
p = next_insn_in_loop (loop, p)) p = next_insn_in_loop (loop, p))
{ {
if (GET_CODE (p) == CODE_LABEL) if (GET_CODE (p) == CODE_LABEL)
...@@ -9444,7 +9447,7 @@ load_mems (loop) ...@@ -9444,7 +9447,7 @@ load_mems (loop)
otherwise the code at the top of the loop might otherwise the code at the top of the loop might
never be executed. Unconditional jumps are never be executed. Unconditional jumps are
followed a by barrier then loop end. */ followed a by barrier then loop end. */
&& ! (GET_CODE (p) == JUMP_INSN && ! (GET_CODE (p) == JUMP_INSN
&& JUMP_LABEL (p) == loop->top && JUMP_LABEL (p) == loop->top
&& NEXT_INSN (NEXT_INSN (p)) == loop->end && NEXT_INSN (NEXT_INSN (p)) == loop->end
&& any_uncondjump_p (p))) && any_uncondjump_p (p)))
...@@ -9455,14 +9458,14 @@ load_mems (loop) ...@@ -9455,14 +9458,14 @@ load_mems (loop)
else else
/* If there are any more instructions in the loop, they /* If there are any more instructions in the loop, they
might not be reached. */ might not be reached. */
next_maybe_never = 1; next_maybe_never = 1;
} }
else if (next_maybe_never) else if (next_maybe_never)
maybe_never = 1; maybe_never = 1;
} }
/* Actually move the MEMs. */ /* Actually move the MEMs. */
for (i = 0; i < loop_mems_idx; ++i) for (i = 0; i < loop_mems_idx; ++i)
{ {
regset_head load_copies; regset_head load_copies;
regset_head store_copies; regset_head store_copies;
...@@ -9471,7 +9474,7 @@ load_mems (loop) ...@@ -9471,7 +9474,7 @@ load_mems (loop)
rtx mem = loop_mems[i].mem; rtx mem = loop_mems[i].mem;
rtx mem_list_entry; rtx mem_list_entry;
if (MEM_VOLATILE_P (mem) if (MEM_VOLATILE_P (mem)
|| loop_invariant_p (loop, XEXP (mem, 0)) != 1) || loop_invariant_p (loop, XEXP (mem, 0)) != 1)
/* There's no telling whether or not MEM is modified. */ /* There's no telling whether or not MEM is modified. */
loop_mems[i].optimize = 0; loop_mems[i].optimize = 0;
...@@ -9496,9 +9499,9 @@ load_mems (loop) ...@@ -9496,9 +9499,9 @@ load_mems (loop)
if (flag_float_store && written if (flag_float_store && written
&& GET_MODE_CLASS (GET_MODE (mem)) == MODE_FLOAT) && GET_MODE_CLASS (GET_MODE (mem)) == MODE_FLOAT)
loop_mems[i].optimize = 0; loop_mems[i].optimize = 0;
/* If this MEM is written to, we must be sure that there /* If this MEM is written to, we must be sure that there
are no reads from another MEM that aliases this one. */ are no reads from another MEM that aliases this one. */
if (loop_mems[i].optimize && written) if (loop_mems[i].optimize && written)
{ {
int j; int j;
...@@ -9525,7 +9528,7 @@ load_mems (loop) ...@@ -9525,7 +9528,7 @@ load_mems (loop)
/* We can't access the MEM outside the loop; it might /* We can't access the MEM outside the loop; it might
cause a trap that wouldn't have happened otherwise. */ cause a trap that wouldn't have happened otherwise. */
loop_mems[i].optimize = 0; loop_mems[i].optimize = 0;
if (!loop_mems[i].optimize) if (!loop_mems[i].optimize)
/* We thought we were going to lift this MEM out of the /* We thought we were going to lift this MEM out of the
loop, but later discovered that we could not. */ loop, but later discovered that we could not. */
...@@ -9664,7 +9667,7 @@ load_mems (loop) ...@@ -9664,7 +9667,7 @@ load_mems (loop)
/* Store the memory immediately after END, which is /* Store the memory immediately after END, which is
the NOTE_LOOP_END. */ the NOTE_LOOP_END. */
set = gen_move_insn (copy_rtx (mem), reg); set = gen_move_insn (copy_rtx (mem), reg);
emit_insn_after (set, label); emit_insn_after (set, label);
} }
...@@ -9699,7 +9702,7 @@ load_mems (loop) ...@@ -9699,7 +9702,7 @@ load_mems (loop)
{ {
/* Now, we need to replace all references to the previous exit /* Now, we need to replace all references to the previous exit
label with the new one. */ label with the new one. */
rtx_pair rr; rtx_pair rr;
rr.r1 = end_label; rr.r1 = end_label;
rr.r2 = label; rr.r2 = label;
...@@ -9735,7 +9738,7 @@ note_reg_stored (x, setter, arg) ...@@ -9735,7 +9738,7 @@ note_reg_stored (x, setter, arg)
rtx x, setter ATTRIBUTE_UNUSED; rtx x, setter ATTRIBUTE_UNUSED;
void *arg; void *arg;
{ {
struct note_reg_stored_arg *t = (struct note_reg_stored_arg *)arg; struct note_reg_stored_arg *t = (struct note_reg_stored_arg *) arg;
if (t->reg == x) if (t->reg == x)
t->set_seen = 1; t->set_seen = 1;
} }
...@@ -9789,7 +9792,7 @@ try_copy_prop (loop, replacement, regno) ...@@ -9789,7 +9792,7 @@ try_copy_prop (loop, replacement, regno)
/* Only substitute after seeing the initializing insn. */ /* Only substitute after seeing the initializing insn. */
if (init_insn && insn != init_insn) if (init_insn && insn != init_insn)
{ {
struct note_reg_stored_arg arg; struct note_reg_stored_arg arg;
rtx array[3]; rtx array[3];
array[0] = reg_rtx; array[0] = reg_rtx;
...@@ -9926,7 +9929,7 @@ replace_loop_mem (mem, data) ...@@ -9926,7 +9929,7 @@ replace_loop_mem (mem, data)
rtx *mem; rtx *mem;
void *data; void *data;
{ {
rtx_and_int *ri; rtx_and_int *ri;
rtx insn; rtx insn;
int i; int i;
rtx m = *mem; rtx m = *mem;
...@@ -9949,7 +9952,7 @@ replace_loop_mem (mem, data) ...@@ -9949,7 +9952,7 @@ replace_loop_mem (mem, data)
return 0; return 0;
} }
ri = (rtx_and_int*) data; ri = (rtx_and_int *) data;
i = ri->i; i = ri->i;
if (!rtx_equal_p (loop_mems[i].mem, m)) if (!rtx_equal_p (loop_mems[i].mem, m))
...@@ -9975,7 +9978,7 @@ replace_loop_reg (px, data) ...@@ -9975,7 +9978,7 @@ replace_loop_reg (px, data)
void *data; void *data;
{ {
rtx x = *px; rtx x = *px;
rtx *array = (rtx *)data; rtx *array = (rtx *) data;
if (x == NULL_RTX) if (x == NULL_RTX)
return 0; return 0;
...@@ -9996,8 +9999,8 @@ replace_label (x, data) ...@@ -9996,8 +9999,8 @@ replace_label (x, data)
void *data; void *data;
{ {
rtx l = *x; rtx l = *x;
rtx old_label = ((rtx_pair*) data)->r1; rtx old_label = ((rtx_pair *) data)->r1;
rtx new_label = ((rtx_pair*) data)->r2; rtx new_label = ((rtx_pair *) data)->r2;
if (l == NULL_RTX) if (l == NULL_RTX)
return 0; return 0;
...@@ -10007,7 +10010,7 @@ replace_label (x, data) ...@@ -10007,7 +10010,7 @@ replace_label (x, data)
if (XEXP (l, 0) != old_label) if (XEXP (l, 0) != old_label)
return 0; return 0;
XEXP (l, 0) = new_label; XEXP (l, 0) = new_label;
++LABEL_NUSES (new_label); ++LABEL_NUSES (new_label);
--LABEL_NUSES (old_label); --LABEL_NUSES (old_label);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment