static int try_auto_increment (rtx, rtx, rtx, rtx, HOST_WIDE_INT, int);
static int find_matches (rtx, struct match *);
static void replace_in_call_usage (rtx *, unsigned int, rtx, rtx);
-static int fixup_match_1 (rtx, rtx, rtx, rtx, rtx, int, int, int, FILE *);
-static int reg_is_remote_constant_p (rtx, rtx, rtx);
+static int fixup_match_1 (rtx, rtx, rtx, rtx, rtx, int, int, int);
static int stable_and_no_regs_but_for_p (rtx, rtx, rtx);
static int regclass_compatible_p (int, int);
static int replacement_quality (rtx);
-static int fixup_match_2 (rtx, rtx, rtx, rtx, FILE *);
+static int fixup_match_2 (rtx, rtx, rtx, rtx);
/* Return nonzero if registers with CLASS1 and CLASS2 can be merged without
causing too much register allocation problems. */
}
}
+/* reg_set_in_bb[REGNO] points to basic block iff the register is set
+ only once in the given block and has REG_EQUAL note. */
+
+basic_block *reg_set_in_bb;
+
+/* Size of reg_set_in_bb array. */
+static unsigned int max_reg_computed;
+
\f
/* Return whether REG is set in only one location, and is set to a
constant, but is set in a different basic block from INSN (an
is used in a different basic block as well as this one?). FIRST is
the first insn in the function. */
-static int
-reg_is_remote_constant_p (rtx reg, rtx insn, rtx first)
+static bool
+reg_is_remote_constant_p (rtx reg, rtx insn)
{
+ basic_block bb;
rtx p;
+ int max;
- if (REG_N_SETS (REGNO (reg)) != 1)
- return 0;
-
- /* Look for the set. */
- for (p = LOG_LINKS (insn); p; p = XEXP (p, 1))
+ if (!reg_set_in_bb)
{
- rtx s;
+ max_reg_computed = max = max_reg_num ();
+ reg_set_in_bb = xcalloc (max, sizeof (*reg_set_in_bb));
- if (REG_NOTE_KIND (p) != 0)
- continue;
- s = single_set (XEXP (p, 0));
- if (s != 0
- && REG_P (SET_DEST (s))
- && REGNO (SET_DEST (s)) == REGNO (reg))
+ FOR_EACH_BB (bb)
+ for (p = BB_HEAD (bb); p != NEXT_INSN (BB_END (bb));
+ p = NEXT_INSN (p))
{
- /* The register is set in the same basic block. */
- return 0;
+ rtx s;
+
+ if (!INSN_P (p))
+ continue;
+ s = single_set (p);
+ /* This is the instruction which sets REG. If there is a
+ REG_EQUAL note, then REG is equivalent to a constant. */
+ if (s != 0
+ && REG_P (SET_DEST (s))
+ && REG_N_SETS (REGNO (SET_DEST (s))) == 1
+ && find_reg_note (p, REG_EQUAL, NULL_RTX))
+ reg_set_in_bb[REGNO (SET_DEST (s))] = bb;
}
}
-
- for (p = first; p && p != insn; p = NEXT_INSN (p))
+ gcc_assert (REGNO (reg) < max_reg_computed);
+ if (reg_set_in_bb[REGNO (reg)] == NULL)
+ return false;
+ if (reg_set_in_bb[REGNO (reg)] != BLOCK_FOR_INSN (insn))
+ return true;
+ /* Look for the set. */
+ for (p = BB_HEAD (BLOCK_FOR_INSN (insn)); p != insn; p = NEXT_INSN (p))
{
rtx s;
- if (! INSN_P (p))
+ if (!INSN_P (p))
continue;
s = single_set (p);
if (s != 0
- && REG_P (SET_DEST (s))
- && REGNO (SET_DEST (s)) == REGNO (reg))
+ && REG_P (SET_DEST (s)) && REGNO (SET_DEST (s)) == REGNO (reg))
{
- /* This is the instruction which sets REG. If there is a
- REG_EQUAL note, then REG is equivalent to a constant. */
- if (find_reg_note (p, REG_EQUAL, NULL_RTX))
- return 1;
- return 0;
+ /* The register is set in the same basic block. */
+ return false;
}
}
-
- return 0;
+ return true;
}
/* INSN is adding a CONST_INT to a REG. We search backwards looking for
hard register as ultimate source, like the frame pointer. */
static int
-fixup_match_2 (rtx insn, rtx dst, rtx src, rtx offset, FILE *regmove_dump_file)
+fixup_match_2 (rtx insn, rtx dst, rtx src, rtx offset)
{
rtx p, dst_death = 0;
int length, num_calls = 0;
REG_N_CALLS_CROSSED (REGNO (dst)) += num_calls;
}
- if (regmove_dump_file)
- fprintf (regmove_dump_file,
+ if (dump_file)
+ fprintf (dump_file,
"Fixed operand of insn %d.\n",
INSN_UID (insn));
REGMOVE_DUMP_FILE is a stream for output of a trace of actions taken
(or 0 if none should be output). */
-void
-regmove_optimize (rtx f, int nregs, FILE *regmove_dump_file)
+static void
+regmove_optimize (rtx f, int nregs)
{
int old_max_uid = get_max_uid ();
rtx insn;
can suppress some optimizations in those zones. */
mark_flags_life_zones (discover_flags_reg ());
- regno_src_regno = xmalloc (sizeof *regno_src_regno * nregs);
+ regno_src_regno = XNEWVEC (int, nregs);
for (i = nregs; --i >= 0; ) regno_src_regno[i] = -1;
- regmove_bb_head = xmalloc (sizeof (int) * (old_max_uid + 1));
+ regmove_bb_head = XNEWVEC (int, old_max_uid + 1);
for (i = old_max_uid; i >= 0; i--) regmove_bb_head[i] = -1;
FOR_EACH_BB (bb)
regmove_bb_head[INSN_UID (BB_HEAD (bb))] = bb->index;
if (! flag_regmove && pass >= flag_expensive_optimizations)
goto done;
- if (regmove_dump_file)
- fprintf (regmove_dump_file, "Starting %s pass...\n",
+ if (dump_file)
+ fprintf (dump_file, "Starting %s pass...\n",
pass ? "backward" : "forward");
for (insn = pass ? get_last_insn () : f; insn;
continue;
if (fixup_match_1 (insn, set, src, src_subreg, dst, pass,
- op_no, match_no,
- regmove_dump_file))
+ op_no, match_no))
break;
}
}
/* A backward pass. Replace input operands with output operands. */
- if (regmove_dump_file)
- fprintf (regmove_dump_file, "Starting backward pass...\n");
+ if (dump_file)
+ fprintf (dump_file, "Starting backward pass...\n");
for (insn = get_last_insn (); insn; insn = PREV_INSN (insn))
{
&& GET_CODE (XEXP (SET_SRC (set), 1)) == CONST_INT
&& XEXP (SET_SRC (set), 0) == src
&& fixup_match_2 (insn, dst, src,
- XEXP (SET_SRC (set), 1),
- regmove_dump_file))
+ XEXP (SET_SRC (set), 1)))
break;
continue;
}
it for this optimization, as this would make it
no longer equivalent to a constant. */
- if (reg_is_remote_constant_p (src, insn, f))
+ if (reg_is_remote_constant_p (src, insn))
{
if (!copy_src)
{
}
- if (regmove_dump_file)
- fprintf (regmove_dump_file,
+ if (dump_file)
+ fprintf (dump_file,
"Could fix operand %d of insn %d matching operand %d.\n",
op_no, INSN_UID (insn), match_no);
REG_LIVE_LENGTH (srcno) = 2;
}
- if (regmove_dump_file)
- fprintf (regmove_dump_file,
+ if (dump_file)
+ fprintf (dump_file,
"Fixed operand %d of insn %d matching operand %d.\n",
op_no, INSN_UID (insn), match_no);
/* Clean up. */
free (regno_src_regno);
free (regmove_bb_head);
+ if (reg_set_in_bb)
+ {
+ free (reg_set_in_bb);
+ reg_set_in_bb = NULL;
+ }
}
/* Returns nonzero if INSN's pattern has matching constraints for any operand.
static int
fixup_match_1 (rtx insn, rtx set, rtx src, rtx src_subreg, rtx dst,
- int backward, int operand_number, int match_number,
- FILE *regmove_dump_file)
+ int backward, int operand_number, int match_number)
{
rtx p;
rtx post_inc = 0, post_inc_set = 0, search_end = 0;
code = NOTE;
}
- if (regmove_dump_file)
- fprintf (regmove_dump_file,
+ if (dump_file)
+ fprintf (dump_file,
"Could fix operand %d of insn %d matching operand %d.\n",
operand_number, INSN_UID (insn), match_number);
then do not use it for this optimization. We want the equivalence
so that if we have to reload this register, we can reload the
constant, rather than extending the lifespan of the register. */
- if (reg_is_remote_constant_p (src, insn, get_insns ()))
+ if (reg_is_remote_constant_p (src, insn))
return 0;
/* Scan forward to find the next instruction that
{
rtx notes = REG_NOTES (insn);
- emit_insn_after_with_line_notes (pat, PREV_INSN (p), insn);
+ p = emit_insn_after_setloc (pat, PREV_INSN (p), INSN_LOCATOR (insn));
delete_insn (insn);
- /* emit_insn_after_with_line_notes has no
- return value, so search for the new insn. */
- insn = p;
- while (! INSN_P (insn) || PATTERN (insn) != pat)
- insn = PREV_INSN (insn);
-
- REG_NOTES (insn) = notes;
+ REG_NOTES (p) = notes;
}
}
/* Sometimes we'd generate src = const; src += n;
if (REG_LIVE_LENGTH (REGNO (dst)) < 2)
REG_LIVE_LENGTH (REGNO (dst)) = 2;
}
- if (regmove_dump_file)
- fprintf (regmove_dump_file,
+ if (dump_file)
+ fprintf (dump_file,
"Fixed operand %d of insn %d matching operand %d.\n",
operand_number, INSN_UID (insn), match_number);
return 1;
/* Main entry point for stack adjustment combination. */
-void
+static void
combine_stack_adjustments (void)
{
basic_block bb;
{
struct csa_memlist *ml;
- ml = xmalloc (sizeof (*ml));
+ ml = XNEW (struct csa_memlist);
if (XEXP (*mem, 0) == stack_pointer_rtx)
ml->sp_offset = 0;
/* Register allocation pre-pass, to reduce number of moves necessary
for two-address machines. */
-static void
+static unsigned int
rest_of_handle_regmove (void)
{
- regmove_optimize (get_insns (), max_reg_num (), dump_file);
+ regmove_optimize (get_insns (), max_reg_num ());
cleanup_cfg (CLEANUP_EXPENSIVE | CLEANUP_UPDATE_LIFE);
+ return 0;
}
struct tree_opt_pass pass_regmove =
return (optimize > 0);
}
-static void
+static unsigned int
rest_of_handle_stack_adjustments (void)
{
- life_analysis (dump_file, PROP_POSTRELOAD);
+ life_analysis (PROP_POSTRELOAD);
cleanup_cfg (CLEANUP_EXPENSIVE | CLEANUP_UPDATE_LIFE
| (flag_crossjumping ? CLEANUP_CROSSJUMP : 0));
if (!ACCUMULATE_OUTGOING_ARGS)
#endif
combine_stack_adjustments ();
+ return 0;
}
struct tree_opt_pass pass_stack_adjustments =
OSDN Git Service
