Fixed inconsistent uses of DEBUG_ONLY.
[libfirm] / ir / be / betranshlp.c
index 5401201..678f361 100644 (file)
@@ -40,6 +40,7 @@
 #include "debug.h"
 
 #include "beirg.h"
+#include "beabi.h"
 #include "betranshlp.h"
 #include "belive.h"
 #include "benode.h"
@@ -56,8 +57,11 @@ static be_transform_env_t env;
 
 void be_set_transformed_node(ir_node *old_node, ir_node *new_node)
 {
+       ir_graph *irg = get_irn_irg(old_node);
+
        set_irn_link(old_node, new_node);
        mark_irn_visited(old_node);
+       hook_dead_node_elim_subst(irg, old_node, new_node);
 }
 
 int be_is_transformed(const ir_node *node)
@@ -68,7 +72,7 @@ int be_is_transformed(const ir_node *node)
 static inline ir_node *be_get_transformed_node(ir_node *old_node)
 {
        if (irn_visited(old_node)) {
-               ir_node *new_node = get_irn_link(old_node);
+               ir_node *new_node = (ir_node*)get_irn_link(old_node);
                assert(new_node != NULL);
                return new_node;
        }
@@ -88,14 +92,6 @@ void be_duplicate_deps(ir_node *old_node, ir_node *new_node)
        }
 }
 
-void be_dep_on_frame(ir_node* node)
-{
-       ir_graph *const irg = current_ir_graph;
-
-       if (get_irg_start_block(irg) == get_nodes_block(node))
-               add_irn_dep(node, get_irg_frame(irg));
-}
-
 void be_set_transform_function(ir_op *op, be_transform_func func)
 {
        /* shouldn't be assigned twice (except for exchanging the default
@@ -105,23 +101,70 @@ void be_set_transform_function(ir_op *op, be_transform_func func)
        op->ops.generic = (op_func) func;
 }
 
+/**
+ * Transform helper for blocks.
+ */
+static ir_node *transform_block(ir_node *node)
+{
+       ir_graph *irg  = get_irn_irg(node);
+       dbg_info *dbgi = get_irn_dbg_info(node);
+       ir_node  *block;
+
+       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(irg, node, block);
+       block->node_nr = node->node_nr;
+
+       /* put the preds in the worklist */
+       be_enqueue_preds(node);
+
+       return block;
+}
+
+static ir_node *transform_end(ir_node *node)
+{
+       /* end has to be duplicated manually because we need a dynamic in array */
+       ir_graph *irg   = get_irn_irg(node);
+       dbg_info *dbgi  = get_irn_dbg_info(node);
+       ir_node  *block = be_transform_node(get_nodes_block(node));
+       int      i, arity;
+       ir_node  *new_end;
+
+       new_end = new_ir_node(dbgi, irg, block, op_End, mode_X, -1, NULL);
+       copy_node_attr(irg, node, new_end);
+       be_duplicate_deps(node, new_end);
+
+       set_irg_end(irg, new_end);
+
+       /* do not transform predecessors yet to keep the pre-transform
+        * phase from visiting all the graph */
+       arity = get_irn_arity(node);
+       for (i = 0; i < arity; ++i) {
+               ir_node *in = get_irn_n(node, i);
+               add_End_keepalive(new_end, in);
+       }
+       be_enqueue_preds(node);
+
+       return new_end;
+}
+
 void be_start_transform_setup(void)
 {
        clear_irp_opcodes_generic_func();
 
        be_set_transform_function(op_Bad,         be_duplicate_node);
-       be_set_transform_function(op_be_Barrier,  be_duplicate_node);
        be_set_transform_function(op_be_Copy,     be_duplicate_node);
        be_set_transform_function(op_be_CopyKeep, be_duplicate_node);
        be_set_transform_function(op_be_IncSP,    be_duplicate_node);
        be_set_transform_function(op_be_Keep,     be_duplicate_node);
        be_set_transform_function(op_be_Return,   be_duplicate_node);
        be_set_transform_function(op_be_Start,    be_duplicate_node);
+       be_set_transform_function(op_Block,       transform_block);
+       be_set_transform_function(op_End,         transform_end);
        be_set_transform_function(op_NoMem,       be_duplicate_node);
        be_set_transform_function(op_Pin,         be_duplicate_node);
        be_set_transform_function(op_Start,       be_duplicate_node);
        be_set_transform_function(op_Sync,        be_duplicate_node);
-       be_set_transform_function(op_Unreachable, be_duplicate_node);
 }
 
 ir_node *be_duplicate_node(ir_node *node)
@@ -168,7 +211,7 @@ ir_node *be_transform_node(ir_node *node)
        if (new_node != NULL)
                return new_node;
 
-       DEBUG_ONLY(be_set_transformed_node(node, NULL));
+       DEBUG_ONLY(be_set_transformed_node(node, NULL);)
 
        op = get_irn_op(node);
        if (op->ops.generic == NULL) {
@@ -180,7 +223,6 @@ ir_node *be_transform_node(ir_node *node)
        assert(new_node != NULL);
 
        be_set_transformed_node(node, new_node);
-       hook_dead_node_elim_subst(current_ir_graph, node, new_node);
        return new_node;
 }
 
@@ -212,7 +254,7 @@ static void fix_loops(ir_node *node)
        changed = 0;
        if (! is_Block(node)) {
                ir_node *block     = get_nodes_block(node);
-               ir_node *new_block = get_irn_link(block);
+               ir_node *new_block = (ir_node*)get_irn_link(block);
 
                if (new_block != NULL) {
                        set_nodes_block(node, new_block);
@@ -226,7 +268,7 @@ static void fix_loops(ir_node *node)
        arity = get_irn_arity(node);
        for (i = 0; i < arity; ++i) {
                ir_node *in = get_irn_n(node, i);
-               ir_node *nw = get_irn_link(in);
+               ir_node *nw = (ir_node*)get_irn_link(in);
 
                if (nw != NULL && nw != in) {
                        set_irn_n(node, i, nw);
@@ -245,7 +287,7 @@ static void fix_loops(ir_node *node)
        arity = get_irn_deps(node);
        for (i = 0; i < arity; ++i) {
                ir_node *in = get_irn_dep(node, i);
-               ir_node *nw = get_irn_link(in);
+               ir_node *nw = (ir_node*)get_irn_link(in);
 
                if (nw != NULL && nw != in) {
                        set_irn_dep(node, i, nw);
@@ -257,7 +299,7 @@ static void fix_loops(ir_node *node)
        }
 
        if (changed) {
-               identify_remember(current_ir_graph->value_table, node);
+               identify_remember(node);
        }
 }
 
@@ -269,37 +311,11 @@ ir_node *be_pre_transform_node(ir_node *place)
        return be_transform_node(place);
 }
 
-static void pre_transform_anchor(int anchor)
+static void pre_transform_anchor(ir_graph *irg, 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);
-}
-
-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);
-       }
-}
-
-static ir_node *new_be_Anchor(ir_graph *irg)
-{
-       struct obstack *obst = be_get_be_obst(irg);
-       backend_info_t *info;
-       ir_node        *new_anchor;
-
-       /* Hack: some places in the code ask the Anchor for its register
-          requirements */
-       new_anchor = new_Anchor(irg);
-       info = be_get_info(new_anchor);
-       info->out_infos = NEW_ARR_D(reg_out_info_t, obst, 1);
-       memset(info->out_infos, 0, 1 * sizeof(info->out_infos[0]));
-       info->out_infos[0].req = arch_no_register_req;
-
-       return new_anchor;
+       set_irg_anchor(irg, anchor, transformed);
 }
 
 /**
@@ -314,9 +330,9 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform)
 
        inc_irg_visited(irg);
 
-       env.irg         = irg;
-       env.worklist    = new_waitq();
-       env.old_anchor  = irg->anchor;
+       env.irg        = irg;
+       env.worklist   = new_waitq();
+       env.old_anchor = irg->anchor;
 
        old_end = get_irg_end(irg);
 
@@ -329,24 +345,24 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform)
                waitq_put(env.worklist, anchor);
        }
 
-       new_anchor  = new_be_Anchor(irg);
+       new_anchor  = new_r_Anchor(irg);
        irg->anchor = new_anchor;
 
        /* pre transform some anchors (so they are available in the other transform
         * functions) */
-       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);
-       kill_unused_anchor(anchor_tls);
+       pre_transform_anchor(irg, anchor_no_mem);
+       pre_transform_anchor(irg, anchor_end_block);
+       pre_transform_anchor(irg, anchor_end);
+       pre_transform_anchor(irg, anchor_start_block);
+       pre_transform_anchor(irg, anchor_start);
+       pre_transform_anchor(irg, anchor_frame);
 
        if (pre_transform)
                pre_transform();
 
        /* process worklist (this should transform all nodes in the graph) */
        while (! waitq_empty(env.worklist)) {
-               ir_node *node = waitq_get(env.worklist);
+               ir_node *node = (ir_node*)waitq_get(env.worklist);
                be_transform_node(node);
        }
 
@@ -358,73 +374,16 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform)
                if (anchor == NULL)
                        continue;
 
-               anchor = get_irn_link(anchor);
+               anchor = (ir_node*)get_irn_link(anchor);
                fix_loops(anchor);
                set_irn_n(new_anchor, i, anchor);
        }
-       set_nodes_block(new_anchor, get_irg_anchor(irg, anchor_end_block));
 
        del_waitq(env.worklist);
        free_End(old_end);
        hook_dead_node_elim(irg, 0);
 }
 
-/**
- * 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  *macroblock      = get_Block_MacroBlock(node);
-       ir_node  *block;
-
-       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(irg, node, block);
-       block->node_nr = node->node_nr;
-
-       if (node == macroblock) {
-               /* this node is a macroblock header */
-               set_Block_MacroBlock(block, block);
-       } else {
-               macroblock = be_transform_node(macroblock);
-               set_Block_MacroBlock(block, macroblock);
-       }
-
-       /* put the preds in the worklist */
-       be_enqueue_preds(node);
-
-       return block;
-}
-
-static ir_node *gen_End(ir_node *node)
-{
-       /* end has to be duplicated manually because we need a dynamic in array */
-       ir_graph *irg   = current_ir_graph;
-       dbg_info *dbgi  = get_irn_dbg_info(node);
-       ir_node  *block = be_transform_node(get_nodes_block(node));
-       int      i, arity;
-       ir_node  *new_end;
-
-       new_end = new_ir_node(dbgi, irg, block, op_End, mode_X, -1, NULL);
-       copy_node_attr(irg, node, new_end);
-       be_duplicate_deps(node, new_end);
-
-       set_irg_end(irg, new_end);
-
-       /* transform preds */
-       arity = get_irn_arity(node);
-       for (i = 0; i < arity; ++i) {
-               ir_node *in     = get_irn_n(node, i);
-               ir_node *new_in = be_transform_node(in);
-
-               add_End_keepalive(new_end, new_in);
-       }
-
-       return new_end;
-}
-
 void be_transform_graph(ir_graph *irg, arch_pretrans_nodes *func)
 {
        ir_graph *old_current_ir_graph = current_ir_graph;
@@ -446,12 +405,7 @@ void be_transform_graph(ir_graph *irg, arch_pretrans_nodes *func)
        irg_invalidate_phases(irg);
 
        /* create new value table for CSE */
-       del_identities(irg->value_table);
-       irg->value_table = new_identities();
-
-       /* enter special helper */
-       op_Block->ops.generic = (op_func)gen_Block;
-       op_End->ops.generic   = (op_func)gen_End;
+       new_identities(irg);
 
        /* do the main transformation */
        transform_nodes(irg, func);
@@ -468,7 +422,7 @@ void be_transform_graph(ir_graph *irg, arch_pretrans_nodes *func)
        free_irg_outs(irg);
        free_trouts();
        free_loop_information(irg);
-       set_irg_doms_inconsistent(irg);
+       clear_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE);
 
        be_liveness_invalidate(be_get_irg_liveness(irg));
        /* Hack for now, something is buggy with invalidate liveness... */