set names for ia32 default pns

[libfirm] / ir / be / betranshlp.c

diff --git a/ir/be/betranshlp.c b/ir/be/betranshlp.c
index 54777d0..42c4666 100644 (file)
--- a/ir/be/betranshlp.c
+++ b/ir/be/betranshlp.c
@@ -197,6 +197,10 @@ static void fix_loops(ir_node *node) {
 
                fix_loops(in);
        }
+       /* fix proj block */
+       if(is_Proj(node)) {
+               set_nodes_block(node, get_nodes_block(get_Proj_pred(node)));
+       }
 
        arity = get_irn_deps(node);
        for (i = 0; i < arity; ++i) {
@@ -219,11 +223,25 @@ ir_node *be_pre_transform_node(ir_node *place) {
        return be_transform_node(place);
 }
 
+ir_node *be_get_old_anchor(int anchor)
+{
+       return get_irn_n(env.old_anchor, anchor);
+}
+
+static void pre_transform_anchor(int anchor)
+{
+       ir_node *old_anchor_node = get_irn_n(env.old_anchor, anchor);
+       ir_node *transformed     = be_transform_node(old_anchor_node);
+       set_irg_anchor(current_ir_graph, anchor, transformed);
+}
+
 /**
  * Transforms all nodes. Deletes the old obstack and creates a new one.
  */
-static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform, void *cg) {
-       int      i;
+static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform,
+                            void *cg)
+{
+       int       i;
        ir_node  *old_end, *new_anchor;
 
        hook_dead_node_elim(irg, 1);
@@ -246,15 +264,16 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform, v
                waitq_put(env.worklist, anchor);
        }
 
-       new_anchor = new_Anchor(irg);
+       new_anchor  = new_Anchor(irg);
+       irg->anchor = new_anchor;
 
        /* pre transform some anchors (so they are available in the other transform
         * functions) */
-       set_irn_n(new_anchor, anchor_bad,         be_transform_node(get_irg_anchor(irg, anchor_bad)));
-       set_irn_n(new_anchor, anchor_no_mem,      be_transform_node(get_irg_anchor(irg, anchor_no_mem)));
-       set_irn_n(new_anchor, anchor_start_block, be_transform_node(get_irg_anchor(irg, anchor_start_block)));
-       set_irn_n(new_anchor, anchor_start,       be_transform_node(get_irg_anchor(irg, anchor_start)));
-       set_irn_n(new_anchor, anchor_frame,       be_transform_node(get_irg_anchor(irg, anchor_frame)));
+       pre_transform_anchor(anchor_bad);
+       pre_transform_anchor(anchor_no_mem);
+       pre_transform_anchor(anchor_start_block);
+       pre_transform_anchor(anchor_start);
+       pre_transform_anchor(anchor_frame);
 
        if (pre_transform)
                (*pre_transform)(cg);
@@ -268,7 +287,7 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform, v
        /* fix loops and set new anchors*/
        inc_irg_visited(irg);
        for (i = get_irg_n_anchors(irg) - 1; i >= 0; --i) {
-               ir_node *anchor = get_irg_anchor(irg, i);
+               ir_node *anchor = get_irn_n(env.old_anchor, i);
 
                if (anchor == NULL)
                        continue;
@@ -277,8 +296,7 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform, v
                fix_loops(anchor);
                set_irn_n(new_anchor, i, anchor);
        }
-       irg->anchor = new_anchor;
-       set_irn_n(new_anchor, -1, get_irn_intra_n(new_anchor, anchor_end_block));
+       set_irn_n(new_anchor, -1, get_irg_anchor(irg, anchor_end_block));
 
        del_waitq(env.worklist);
        free_End(old_end);
@@ -289,16 +307,16 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform, v
  * Transform helper for blocks.
  */
 static ir_node *gen_Block(ir_node *node) {
-       ir_graph *irg         = current_ir_graph;
-       dbg_info *dbgi        = get_irn_dbg_info(node);
-       ir_node  *start_block = get_irg_anchor(irg, anchor_start_block);
+       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  *block;
 
        /*
         * We replace the ProjX from the start node with a jump,
         * so the startblock has no preds anymore now
         */
-       if (node == start_block) {
+       if (node == old_start_block) {
                return new_rd_Block(dbgi, irg, 0, NULL);
        }
 
@@ -402,6 +420,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);
        }
 }