Remove the unused parameter const arch_env_t *arch_env from be_liveness_nodes_live_at().

[libfirm] / ir / be / beirgmod.c

diff --git a/ir/be/beirgmod.c b/ir/be/beirgmod.c
index 70bd642..0ac481c 100644 (file)
--- a/ir/be/beirgmod.c
+++ b/ir/be/beirgmod.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.
  *
@@ -53,6 +53,7 @@
 #include "iredges_t.h"
 #include "irgraph_t.h"
 #include "irgopt.h"
+#include "irgmod.h"
 #include "irprintf_t.h"
 #include "irgwalk.h"
 
@@ -84,7 +85,6 @@ ir_node *insert_Perm_after(be_irg_t *birg,
                                                   const arch_register_class_t *cls,
                                                   ir_node *pos)
 {
-       const arch_env_t *arch_env = birg->main_env->arch_env;
        be_lv_t *lv     = birg->lv;
        ir_node *bl     = is_Block(pos) ? pos : get_nodes_block(pos);
        ir_graph *irg   = get_irn_irg(bl);
@@ -97,7 +97,7 @@ ir_node *insert_Perm_after(be_irg_t *birg,
        DBG((dbg, LEVEL_1, "Insert Perm after: %+F\n", pos));
 
        ir_nodeset_init(&live);
-       be_liveness_nodes_live_at(lv, arch_env, cls, pos, &live);
+       be_liveness_nodes_live_at(lv, cls, pos, &live);
 
        n = ir_nodeset_size(&live);
        if(n == 0) {
@@ -105,7 +105,7 @@ ir_node *insert_Perm_after(be_irg_t *birg,
                return NULL;
        }
 
-       nodes = xmalloc(n * sizeof(nodes[0]));
+       nodes = XMALLOCN(ir_node*, n);
 
        DBG((dbg, LEVEL_1, "live:\n"));
        i = 0;
@@ -123,12 +123,12 @@ ir_node *insert_Perm_after(be_irg_t *birg,
        curr = perm;
        for (i = 0; i < n; ++i) {
                ir_node *perm_op = get_irn_n(perm, i);
-               const arch_register_t *reg = arch_get_irn_register(arch_env, perm_op);
+               const arch_register_t *reg = arch_get_irn_register(perm_op);
                be_ssa_construction_env_t senv;
 
                ir_mode *mode = get_irn_mode(perm_op);
                ir_node *proj = new_r_Proj(irg, bl, perm, mode, i);
-               arch_set_irn_register(arch_env, proj, reg);
+               arch_set_irn_register(proj, reg);
 
                curr = proj;
 
@@ -160,10 +160,9 @@ static void remove_empty_block(ir_node *block)
        ir_node *succ_block;
        ir_node *jump = NULL;
 
-       if (irn_visited(block))
+       if (irn_visited_else_mark(block))
                return;
 
-       mark_irn_visited(block);
        if (get_Block_n_cfgpreds(block) != 1)
                goto check_preds;
 
@@ -192,7 +191,7 @@ static void remove_empty_block(ir_node *block)
        }
 
        /* there can be some non-scheduled Pin nodes left in the block, move them
-        * to the succ block */
+        * to the succ block (Pin) or pred block (Sync) */
        foreach_out_edge_safe(block, edge, next) {
                node = get_edge_src_irn(edge);
 
@@ -208,11 +207,20 @@ static void remove_empty_block(ir_node *block)
                        set_nodes_block(node, succ_block);
                        continue;
                }
+               if (is_Sync(node)) {
+                       set_nodes_block(node, get_nodes_block(pred));
+                       continue;
+               }
+               if (is_End(node)) { /* End-keep, reroute it to the successor */
+                       int pos = get_edge_src_pos(edge);
+                       set_irn_n(node, pos, succ_block);
+                       continue;
+               }
                panic("Unexpected node %+F in block %+F with empty schedule", node, block);
        }
 
        set_Block_cfgpred(block, 0, new_Bad());
-       be_kill_node(jump);
+       kill_node(jump);
        blocks_removed = 1;
 
        /* check predecessor */
@@ -235,7 +243,7 @@ int be_remove_empty_blocks(ir_graph *irg)
 
        blocks_removed = 0;
 
-       set_using_visited(irg);
+       ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
        inc_irg_visited(irg);
        remove_empty_block(get_irg_end_block(irg));
        end   = get_irg_end(irg);
@@ -246,13 +254,14 @@ int be_remove_empty_blocks(ir_graph *irg)
                        continue;
                remove_empty_block(pred);
        }
-       clear_using_visited(irg);
+       ir_free_resources(irg, IR_RESOURCE_IRN_VISITED);
 
        if (blocks_removed) {
                /* invalidate analysis info */
                set_irg_doms_inconsistent(irg);
                set_irg_extblk_inconsistent(irg);
                set_irg_outs_inconsistent(irg);
+               set_irg_loopinfo_inconsistent(irg);
        }
        return blocks_removed;
 }