fix handling of default pns in the backend (they don't need table entries)

[libfirm] / ir / be / betranshlp.c

diff --git a/ir/be/betranshlp.c b/ir/be/betranshlp.c
index 3ba3cdc..b7cb271 100644 (file)
--- a/ir/be/betranshlp.c
+++ b/ir/be/betranshlp.c
@@ -60,6 +60,10 @@ 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);
@@ -245,6 +249,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.
  */
@@ -284,6 +297,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);
@@ -320,6 +334,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;
 
        /*
@@ -335,10 +350,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_irn_n(block, -1, block);
+       } else {
+               macroblock = be_transform_node(macroblock);
+               set_irn_n(block, -1, macroblock);
+       }
+
        be_set_transformed_node(node, block);
 
        /* put the preds in the worklist */
@@ -378,22 +400,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;
@@ -422,7 +432,18 @@ void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func, void *cg)
 
        /* 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);