+2000-04-08 Alex Samuel <samuel@codesourcery.com>
+
+ * ssa.c (convert_to_ssa): Eliminate dead code when calling
+ life_analysis.
+ (convert_from_ssa): Call compute_bb_for_insn before life_analysis.
+ (for_each_successor_phi): Change parameter to basic_block.
+ (coalesce_regs_in_successor_phi_nodes): Likewise.
+ (coalesce_regs_in_copies): Likewise.
+ (compute_coalesced_reg_partition): Use basic_block instead of index.
+ * rtl.h (convert_to_ssa): Delete.
+ (convert_from_ssa): Likewise.
+ (successor_phi_fn): Likewise.
+ (for_each_successor_phi): Likewise.
+ (in_ssa_form): Likewise.
+ * basic-block.h (convert_to_ssa): Moved from rtl.h.
+ (convert_from_ssa): Likewise.
+ (successor_phi_fn): Likewise.
+ (in_ssa_form): Likewise.
+ (for_each_successor_phi): Likewise. Change parameter to basic_block.
+ * flow.c (calculate_global_regs_live): Pass a basic_block to
+ for_each_successor_phi.
+
2000-04-08 Richard Henderson <rth@cygnus.com>
* flow.c (mark_used_reg): Use reg_set_p to determine if a register
static int coalesce_if_unconflicting
PARAMS ((partition p, conflict_graph conflicts, int reg1, int reg2));
static int coalesce_regs_in_copies
- PARAMS ((int bb, partition p, conflict_graph conflicts));
+ PARAMS ((basic_block bb, partition p, conflict_graph conflicts));
static int coalesce_reg_in_phi
PARAMS ((rtx, int dest_regno, int src_regno, void *data));
static int coalesce_regs_in_successor_phi_nodes
- PARAMS ((int bb, partition p, conflict_graph conflicts));
+ PARAMS ((basic_block bb, partition p, conflict_graph conflicts));
static partition compute_coalesced_reg_partition
PARAMS (());
static int mark_reg_in_phi
if (in_ssa_form)
abort ();
- /* Don't eliminate dead code here. The CFG we computed above must
- remain unchanged until we are finished emerging from SSA form --
- the phi node representation depends on it. */
- life_analysis (get_insns (), max_reg_num (), NULL, 0);
+ life_analysis (get_insns (), max_reg_num (), NULL, 1);
/* Compute dominators. */
dominators = sbitmap_vector_alloc (n_basic_blocks, n_basic_blocks);
static int
coalesce_regs_in_copies (bb, p, conflicts)
- int bb;
+ basic_block bb;
partition p;
conflict_graph conflicts;
{
int changed = 0;
rtx insn;
- rtx end = BLOCK_END (bb);
+ rtx end = bb->end;
/* Scan the instruction stream of the block. */
- for (insn = BLOCK_HEAD (bb); insn != end; insn = NEXT_INSN (insn))
+ for (insn = bb->head; insn != end; insn = NEXT_INSN (insn))
{
rtx pattern;
rtx src;
static int
coalesce_regs_in_successor_phi_nodes (bb, p, conflicts)
- int bb;
+ basic_block bb;
partition p;
conflict_graph conflicts;
{
order will generate correct, if non-optimal, results. */
for (bb = n_basic_blocks; --bb >= 0; )
{
- changed += coalesce_regs_in_copies (bb, p, conflicts);
- changed += coalesce_regs_in_successor_phi_nodes (bb, p, conflicts);
+ basic_block block = BASIC_BLOCK (bb);
+ changed += coalesce_regs_in_copies (block, p, conflicts);
+ changed +=
+ coalesce_regs_in_successor_phi_nodes (block, p, conflicts);
}
conflict_graph_delete (conflicts);
rtx insns = get_insns ();
/* We need up-to-date life information. */
+ compute_bb_for_insn (get_max_uid ());
life_analysis (insns, max_reg_num (), NULL, 0);
/* Figure out which regs in copies and phi nodes don't conflict and
int
for_each_successor_phi (bb, fn, data)
- int bb;
+ basic_block bb;
successor_phi_fn fn;
void *data;
{
- basic_block block;
edge e;
- if (bb == EXIT_BLOCK)
+ if (bb == EXIT_BLOCK_PTR)
return 0;
- else if (bb == ENTRY_BLOCK)
- block = ENTRY_BLOCK_PTR;
- else
- block = BASIC_BLOCK (bb);
/* Scan outgoing edges. */
- for (e = block->succ; e != NULL; e = e->succ_next)
+ for (e = bb->succ; e != NULL; e = e->succ_next)
{
rtx insn;
basic_block successor = e->dest;
- if (successor->index == ENTRY_BLOCK
- || successor->index == EXIT_BLOCK)
+ if (successor == ENTRY_BLOCK_PTR
+ || successor == EXIT_BLOCK_PTR)
continue;
/* Advance to the first non-label insn of the successor block. */
{
int result;
rtx phi_set = PATTERN (insn);
- rtx *alternative = phi_alternative (phi_set, block->index);
+ rtx *alternative = phi_alternative (phi_set, bb->index);
rtx phi_src;
/* This phi function may not have an alternative