Make warning about registers assigned to Phi inputs more clear.

[libfirm] / ir / be / betranshlp.c

diff --git a/ir/be/betranshlp.c b/ir/be/betranshlp.c
index 134bc82..4da063b 100644 (file)
--- a/ir/be/betranshlp.c
+++ b/ir/be/betranshlp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -60,9 +60,17 @@ void be_set_transformed_node(ir_node *old_node, ir_node *new_node) {
        set_irn_link(old_node, new_node);
 }
 
+int be_is_transformed(const ir_node *node) {
+       return irn_visited(node);
+}
+
 static INLINE ir_node *be_get_transformed_node(ir_node *old_node) {
-       assert(irn_visited(old_node));
-       return (ir_node*) get_irn_link(old_node);
+       if (irn_visited(old_node)) {
+               ir_node *new_node = get_irn_link(old_node);
+               assert(new_node != NULL);
+               return new_node;
+       }
+       return NULL;
 }
 
 void be_duplicate_deps(ir_node *old_node, ir_node *new_node) {
@@ -118,14 +126,11 @@ ir_node *be_duplicate_node(ir_node *node) {
  * Calls transformation function for given node and marks it visited.
  */
 ir_node *be_transform_node(ir_node *node) {
-       ir_node *new_node;
        ir_op   *op;
+       ir_node *new_node = be_get_transformed_node(node);
 
-       if (irn_visited(node)) {
-               new_node = be_get_transformed_node(node);
-               assert(new_node != NULL);
+       if (new_node != NULL)
                return new_node;
-       }
 
        mark_irn_visited(node);
        DEBUG_ONLY(be_set_transformed_node(node, NULL));
@@ -165,6 +170,7 @@ void be_enqueue_preds(ir_node *node) {
  */
 static void fix_loops(ir_node *node) {
        int i, arity;
+       int changed;
 
        assert(node_is_in_irgs_storage(env.irg, node));
 
@@ -173,6 +179,7 @@ static void fix_loops(ir_node *node) {
 
        mark_irn_visited(node);
 
+       changed = 0;
        if (! is_Block(node)) {
                ir_node *block     = get_nodes_block(node);
                ir_node *new_block = get_irn_link(block);
@@ -180,6 +187,7 @@ static void fix_loops(ir_node *node) {
                if (new_block != NULL) {
                        set_nodes_block(node, new_block);
                        block = new_block;
+                       changed = 1;
                }
 
                fix_loops(block);
@@ -193,10 +201,16 @@ static void fix_loops(ir_node *node) {
                if (nw != NULL && nw != in) {
                        set_irn_n(node, i, nw);
                        in = nw;
+                       changed = 1;
                }
 
                fix_loops(in);
        }
+       /* fix proj block */
+       if(is_Proj(node)) {
+               set_nodes_block(node, get_nodes_block(get_Proj_pred(node)));
+               changed = 1;
+       }
 
        arity = get_irn_deps(node);
        for (i = 0; i < arity; ++i) {
@@ -206,10 +220,15 @@ static void fix_loops(ir_node *node) {
                if (nw != NULL && nw != in) {
                        set_irn_dep(node, i, nw);
                        in = nw;
+                       changed = 1;
                }
 
                fix_loops(in);
        }
+
+       if(changed) {
+               identify_remember(current_ir_graph->value_table, node);
+       }
 }
 
 ir_node *be_pre_transform_node(ir_node *place) {
@@ -231,6 +250,15 @@ static void pre_transform_anchor(int anchor)
        set_irg_anchor(current_ir_graph, anchor, transformed);
 }
 
+static void kill_unused_anchor(int anchor)
+{
+       ir_node *old_anchor_node = get_irn_n(env.old_anchor, anchor);
+       ir_node *old_bad         = get_irn_n(env.old_anchor, anchor_bad);
+       if(old_anchor_node != NULL && get_irn_n_edges(old_anchor_node) <= 1) {
+               set_irn_n(env.old_anchor, anchor, old_bad);
+       }
+}
+
 /**
  * Transforms all nodes. Deletes the old obstack and creates a new one.
  */
@@ -270,6 +298,7 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform,
        pre_transform_anchor(anchor_start_block);
        pre_transform_anchor(anchor_start);
        pre_transform_anchor(anchor_frame);
+       kill_unused_anchor(anchor_tls);
 
        if (pre_transform)
                (*pre_transform)(cg);
@@ -292,7 +321,7 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform,
                fix_loops(anchor);
                set_irn_n(new_anchor, i, anchor);
        }
-       set_irn_n(new_anchor, -1, get_irg_anchor(irg, anchor_end_block));
+       set_nodes_block(new_anchor, get_irg_anchor(irg, anchor_end_block));
 
        del_waitq(env.worklist);
        free_End(old_end);
@@ -306,6 +335,7 @@ static ir_node *gen_Block(ir_node *node) {
        ir_graph *irg             = current_ir_graph;
        dbg_info *dbgi            = get_irn_dbg_info(node);
        ir_node  *old_start_block = get_irn_n(env.old_anchor, anchor_start_block);
+       ir_node  *macroblock      = get_Block_MacroBlock(node);
        ir_node  *block;
 
        /*
@@ -321,10 +351,17 @@ static ir_node *gen_Block(ir_node *node) {
        block = new_ir_node(dbgi, irg, NULL, get_irn_op(node), get_irn_mode(node),
                            get_irn_arity(node), get_irn_in(node) + 1);
        copy_node_attr(node, block);
-
 #ifdef DEBUG_libfirm
        block->node_nr = node->node_nr;
 #endif
+       if (node == macroblock) {
+               /* this node is a macroblock header */
+               set_Block_MacroBlock(block, block);
+       } else {
+               macroblock = be_transform_node(macroblock);
+               set_Block_MacroBlock(block, macroblock);
+       }
+
        be_set_transformed_node(node, block);
 
        /* put the preds in the worklist */
@@ -364,22 +401,10 @@ void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func, void *cg)
 {
        ir_graph *irg = birg->irg;
        ir_graph *old_current_ir_graph = current_ir_graph;
-       int old_interprocedural_view = get_interprocedural_view();
        struct obstack *old_obst = NULL;
        struct obstack *new_obst = NULL;
 
        current_ir_graph = irg;
-       set_interprocedural_view(0);
-
-       /* most analysis info is wrong after transformation */
-       free_callee_info(irg);
-       free_irg_outs(irg);
-       free_trouts();
-       free_loop_information(irg);
-       set_irg_doms_inconsistent(irg);
-
-       be_liveness_invalidate(be_get_birg_liveness(birg));
-       be_invalidate_dom_front(birg);
 
        /* create a new obstack */
        old_obst = irg->obst;
@@ -399,16 +424,24 @@ void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func, void *cg)
        /* do the main transformation */
        transform_nodes(irg, func, cg);
 
-       /* we don't want the globals anchor anymore */
-       set_irg_globals(irg, new_r_Bad(irg));
-
        /* free the old obstack */
        obstack_free(old_obst, 0);
        xfree(old_obst);
 
        /* restore state */
        current_ir_graph = old_current_ir_graph;
-       set_interprocedural_view(old_interprocedural_view);
+
+       /* most analysis info is wrong after transformation */
+       free_callee_info(irg);
+       free_irg_outs(irg);
+       free_trouts();
+       free_loop_information(irg);
+       set_irg_doms_inconsistent(irg);
+
+       be_liveness_invalidate(be_get_birg_liveness(birg));
+       /* Hack for now, something is buggy with invalidate liveness... */
+       birg->lv = NULL;
+       be_invalidate_dom_front(birg);
 
        /* recalculate edges */
        edges_deactivate(irg);
@@ -416,6 +449,6 @@ void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func, void *cg)
 
        if (birg->lv) {
                be_liveness_free(birg->lv);
-               birg->lv = be_liveness(birg->irg);
+               birg->lv = be_liveness(birg);
        }
 }