ignore last scheduled node on reordering after a perm if it is not colorable

[libfirm] / ir / be / betranshlp.c

diff --git a/ir/be/betranshlp.c b/ir/be/betranshlp.c
index 5c4fc52..b79d3fa 100644 (file)
--- a/ir/be/betranshlp.c
+++ b/ir/be/betranshlp.c
@@ -59,11 +59,13 @@ void be_set_transformed_node(ir_node *old_node, ir_node *new_node)
        mark_irn_visited(old_node);
 }
 
-int be_is_transformed(const ir_node *node) {
+int be_is_transformed(const ir_node *node)
+{
        return irn_visited(node);
 }
 
-static inline ir_node *be_get_transformed_node(ir_node *old_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);
                assert(new_node != NULL);
@@ -72,7 +74,8 @@ static inline ir_node *be_get_transformed_node(ir_node *old_node) {
        return NULL;
 }
 
-void be_duplicate_deps(ir_node *old_node, ir_node *new_node) {
+void be_duplicate_deps(ir_node *old_node, ir_node *new_node)
+{
        int i;
        int deps = get_irn_deps(old_node);
 
@@ -92,7 +95,8 @@ void be_dep_on_frame(ir_node* node)
                add_irn_dep(node, get_irg_frame(irg));
 }
 
-ir_node *be_duplicate_node(ir_node *node) {
+ir_node *be_duplicate_node(ir_node *node)
+{
        ir_node  *block = be_transform_node(get_nodes_block(node));
        ir_graph *irg   = env.irg;
        dbg_info *dbgi  = get_irn_dbg_info(node);
@@ -119,17 +123,15 @@ ir_node *be_duplicate_node(ir_node *node) {
                new_node = new_ir_node(dbgi, irg, block, op, mode, arity, ins);
        }
 
-       copy_node_attr(node, new_node);
+       copy_node_attr(irg, node, new_node);
        be_duplicate_deps(node, new_node);
 
        new_node->node_nr = node->node_nr;
        return new_node;
 }
 
-/**
- * Calls transformation function for given node and marks it visited.
- */
-ir_node *be_transform_node(ir_node *node) {
+ir_node *be_transform_node(ir_node *node)
+{
        ir_op   *op;
        ir_node *new_node = be_get_transformed_node(node);
 
@@ -153,10 +155,8 @@ ir_node *be_transform_node(ir_node *node) {
        return new_node;
 }
 
-/**
- * enqueue all inputs into the transform queue.
- */
-void be_enqueue_preds(ir_node *node) {
+void be_enqueue_preds(ir_node *node)
+{
        int i, arity;
 
        /* put the preds in the worklist */
@@ -170,7 +170,8 @@ void be_enqueue_preds(ir_node *node) {
 /**
  * Rewire nodes which are potential loops (like Phis) to avoid endless loops.
  */
-static void fix_loops(ir_node *node) {
+static void fix_loops(ir_node *node)
+{
        int i, arity;
        int changed;
 
@@ -207,7 +208,7 @@ static void fix_loops(ir_node *node) {
                fix_loops(in);
        }
        /* fix proj block */
-       if(is_Proj(node)) {
+       if (is_Proj(node)) {
                set_nodes_block(node, get_nodes_block(get_Proj_pred(node)));
                changed = 1;
        }
@@ -226,12 +227,13 @@ static void fix_loops(ir_node *node) {
                fix_loops(in);
        }
 
-       if(changed) {
+       if (changed) {
                identify_remember(current_ir_graph->value_table, node);
        }
 }
 
-ir_node *be_pre_transform_node(ir_node *place) {
+ir_node *be_pre_transform_node(ir_node *place)
+{
        if (place == NULL)
                return NULL;
 
@@ -249,11 +251,28 @@ 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) {
+       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_birg_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;
+}
+
 /**
  * Transforms all nodes. Deletes the old obstack and creates a new one.
  */
@@ -281,7 +300,7 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform)
                waitq_put(env.worklist, anchor);
        }
 
-       new_anchor  = new_Anchor(irg);
+       new_anchor  = new_be_Anchor(irg);
        irg->anchor = new_anchor;
 
        /* pre transform some anchors (so they are available in the other transform
@@ -324,17 +343,16 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform)
 /**
  * Transform helper for blocks.
  */
-static ir_node *gen_Block(ir_node *node) {
+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;
 
-       /* we use the old blocks for now, because jumps allow cycles in the graph
-        * we have to fix this later */
        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(node, block);
+       copy_node_attr(irg, node, block);
        block->node_nr = node->node_nr;
 
        if (node == macroblock) {
@@ -351,7 +369,8 @@ static ir_node *gen_Block(ir_node *node) {
        return block;
 }
 
-static ir_node *gen_End(ir_node *node) {
+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);
@@ -360,7 +379,7 @@ static ir_node *gen_End(ir_node *node) {
        ir_node  *new_end;
 
        new_end = new_ir_node(dbgi, irg, block, op_End, mode_X, -1, NULL);
-       copy_node_attr(node, new_end);
+       copy_node_attr(irg, node, new_end);
        be_duplicate_deps(node, new_end);
 
        set_irg_end(irg, new_end);
@@ -377,12 +396,12 @@ static ir_node *gen_End(ir_node *node) {
        return new_end;
 }
 
-void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func)
+void be_transform_graph(ir_graph *irg, arch_pretrans_nodes *func)
 {
-       ir_graph *irg = birg->irg;
        ir_graph *old_current_ir_graph = current_ir_graph;
        struct obstack *old_obst = NULL;
        struct obstack *new_obst = NULL;
+       be_irg_t       *birg     = be_birg_from_irg(irg);
 
        current_ir_graph = irg;
 
@@ -393,6 +412,11 @@ void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func)
        irg->obst = new_obst;
        irg->last_node_idx = 0;
 
+       /* invalidate phase info as (at least vrp info) is used inside the
+        * equivalent/compute_value functions and might replace our newly
+        * created nodes with middleend nodes */
+       irg_invalidate_phases(irg);
+
        /* create new value table for CSE */
        del_identities(irg->value_table);
        irg->value_table = new_identities();