big refactoring of arch_XXX functions

[libfirm] / ir / be / beirgmod.c

diff --git a/ir/be/beirgmod.c b/ir/be/beirgmod.c
index 93cc7de..972de5e 100644 (file)
--- a/ir/be/beirgmod.c
+++ b/ir/be/beirgmod.c
@@ -87,7 +87,7 @@ ir_node *insert_Perm_after(ir_graph *irg, const arch_register_class_t *cls,
        ir_nodeset_t          live;
        ir_nodeset_iterator_t iter;
 
-       ir_node *curr, *irn, *perm, **nodes;
+       ir_node *irn, *perm, **nodes;
        size_t i, n;
 
        DBG((dbg, LEVEL_1, "Insert Perm after: %+F\n", pos));
@@ -116,7 +116,6 @@ ir_node *insert_Perm_after(ir_graph *irg, const arch_register_class_t *cls,
        sched_add_after(pos, perm);
        free(nodes);
 
-       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(perm_op);
@@ -126,8 +125,6 @@ ir_node *insert_Perm_after(ir_graph *irg, const arch_register_class_t *cls,
                ir_node *proj = new_r_Proj(perm, mode, i);
                arch_set_irn_register(proj, reg);
 
-               curr = proj;
-
                be_ssa_construction_init(&senv, irg);
                be_ssa_construction_add_copy(&senv, perm_op);
                be_ssa_construction_add_copy(&senv, proj);
@@ -165,7 +162,7 @@ static void remove_empty_block(ir_node *block)
 
        sched_foreach(block, node) {
                if (! is_Jmp(node)
-                               && !(arch_irn_get_flags(node) & arch_irn_flags_simple_jump))
+                               && !(arch_get_irn_flags(node) & arch_irn_flags_simple_jump))
                        goto check_preds;
                if (jump != NULL) {
                        /* we should never have 2 jumps in a block */
@@ -227,7 +224,7 @@ static void remove_empty_block(ir_node *block)
                panic("Unexpected node %+F in block %+F with empty schedule", node, block);
        }
 
-       set_Block_cfgpred(block, 0, new_r_Bad(irg));
+       set_Block_cfgpred(block, 0, new_r_Bad(irg, mode_X));
        kill_node(jump);
        blocks_removed = 1;
 
@@ -268,13 +265,79 @@ int be_remove_empty_blocks(ir_graph *irg)
                /* 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;
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_irgmod);
+//---------------------------------------------------------------------------
+
+typedef struct remove_dead_nodes_env_t_ {
+       bitset_t *reachable;
+       ir_graph *irg;
+       be_lv_t  *lv;
+} remove_dead_nodes_env_t;
+
+/**
+ * Post-walker: remember all visited nodes in a bitset.
+ */
+static void mark_dead_nodes_walker(ir_node *node, void *data)
+{
+       remove_dead_nodes_env_t *env = (remove_dead_nodes_env_t*) data;
+       bitset_set(env->reachable, get_irn_idx(node));
+}
+
+/**
+ * Post-block-walker:
+ * Walk through the schedule of every block and remove all dead nodes from it.
+ */
+static void remove_dead_nodes_walker(ir_node *block, void *data)
+{
+       remove_dead_nodes_env_t *env = (remove_dead_nodes_env_t*) data;
+       ir_node                 *node, *next;
+
+       for (node = sched_first(block); ! sched_is_end(node); node = next) {
+               /* get next node now, as after calling sched_remove it will be invalid */
+               next = sched_next(node);
+
+               if (bitset_is_set(env->reachable, get_irn_idx(node)))
+                       continue;
+
+               if (env->lv != NULL)
+                       be_liveness_remove(env->lv, node);
+               sched_remove(node);
+
+               /* kill projs */
+               if (get_irn_mode(node) == mode_T) {
+                       const ir_edge_t *edge;
+                       const ir_edge_t *next_edge;
+                       foreach_out_edge_safe(node, edge, next_edge) {
+                               ir_node *proj = get_edge_src_irn(edge);
+                               if (!is_Proj(proj))
+                                       continue;
+                               if (env->lv != NULL)
+                                       be_liveness_remove(env->lv, proj);
+                               kill_node(proj);
+                       }
+               }
+               kill_node(node);
+       }
+}
+
+void be_remove_dead_nodes_from_schedule(ir_graph *irg)
+{
+       remove_dead_nodes_env_t env;
+       env.reachable = bitset_alloca(get_irg_last_idx(irg));
+       env.lv        = be_get_irg_liveness(irg);
+       env.irg       = irg;
+
+       // mark all reachable nodes
+       irg_walk_graph(irg, mark_dead_nodes_walker, NULL, &env);
+
+       // walk schedule and remove non-marked nodes
+       irg_block_walk_graph(irg, remove_dead_nodes_walker, NULL, &env);
+}
+
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_irgmod)
 void be_init_irgmod(void)
 {
        FIRM_DBG_REGISTER(dbg, "firm.be.irgmod");