set names for ia32 default pns

[libfirm] / ir / be / belower.c

diff --git a/ir/be/belower.c b/ir/be/belower.c
index b0eaa47..3cbeec9 100644 (file)
--- a/ir/be/belower.c
+++ b/ir/be/belower.c
@@ -309,6 +309,7 @@ static void lower_perm_node(ir_node *irn, void *walk_env) {
                        should be ok.
        */
        sched_point = sched_prev(irn);
+       DBG((mod, LEVEL_1, "perm: %+F\n", irn));
        DBG((mod, LEVEL_1, "sched point is %+F\n", sched_point));
        assert(sched_point && "Perm is not scheduled or has no predecessor");
 
@@ -349,9 +350,6 @@ static void lower_perm_node(ir_node *irn, void *walk_env) {
                                set_Proj_proj(pairs[i].out_node, get_Proj_proj(pairs[i].in_node));
                        }
 
-                       /* remove the proj from the schedule */
-                       sched_remove(pairs[i].out_node);
-
                        /* reroute the edges from the proj to the argument */
                        exchange(pairs[i].out_node, pairs[i].in_node);
                        //edges_reroute(pairs[i].out_node, pairs[i].in_node, env->birg->irg);
@@ -463,20 +461,12 @@ static void lower_perm_node(ir_node *irn, void *walk_env) {
                                        /* set as in for next Perm */
                                        pairs[pidx].in_node = res1;
                                }
-                               else {
-                                       sched_remove(res1);
-                               }
-
-                               sched_remove(res2);
 
                                set_Proj_pred(res2, cpyxchg);
                                set_Proj_proj(res2, 0);
                                set_Proj_pred(res1, cpyxchg);
                                set_Proj_proj(res1, 1);
 
-                               sched_add_after(sched_point, res1);
-                               sched_add_after(sched_point, res2);
-
                                arch_set_irn_register(arch_env, res2, cycle->elems[i + 1]);
                                arch_set_irn_register(arch_env, res1, cycle->elems[i]);
 
@@ -496,9 +486,6 @@ static void lower_perm_node(ir_node *irn, void *walk_env) {
                                arch_set_irn_register(arch_env, cpyxchg, cycle->elems[i + 1]);
                                n_ops++;
 
-                               /* remove the proj from the schedule */
-                               sched_remove(res2);
-
                                /* exchange copy node and proj */
                                exchange(res2, cpyxchg);
 
@@ -997,9 +984,6 @@ found_front:
                        /* reroute all users of the proj to the moved node. */
                        edges_reroute(proj, move, irg);
 
-                       /* remove the proj from the schedule. */
-                       sched_remove(proj);
-
                        /* and like it to bad so it is no more in the use array of the perm */
                        set_Proj_pred(proj, get_irg_bad(irg));
 
@@ -1021,15 +1005,18 @@ found_front:
  * @param walk_env The walker environment
  */
 static void lower_nodes_after_ra_walker(ir_node *irn, void *walk_env) {
-       if (! is_Block(irn) && ! is_Proj(irn)) {
-               if (be_is_Perm(irn)) {
-                       int perm_stayed = push_through_perm(irn, walk_env);
-                       if (perm_stayed)
-                               lower_perm_node(irn, walk_env);
-               }
-       }
+       int perm_stayed;
 
-       return;
+       if (is_Block(irn) || is_Proj(irn))
+               return;
+       if (!be_is_Perm(irn))
+               return;
+
+       perm_stayed = push_through_perm(irn, walk_env);
+       if (!perm_stayed)
+               return;
+
+       lower_perm_node(irn, walk_env);
 }
 
 /**