added additional source (new copymin heuristic)

[libfirm] / ir / be / bechordal.c

diff --git a/ir/be/bechordal.c b/ir/be/bechordal.c
index d172253..1ac2f80 100644 (file)
--- a/ir/be/bechordal.c
+++ b/ir/be/bechordal.c
@@ -317,9 +317,10 @@ static ir_node *pre_process_constraints(be_chordal_alloc_env_t *alloc_env, be_in
                                which also occur as output constraints, so insert a copy.
                        */
                        if(bitset_popcnt(bs) > 0) {
-                               copy                 = be_new_Copy(op->req.cls, env->irg, bl, op->carrier);
-                               insn->ops[i].carrier = copy;
+                               copy        = be_new_Copy(op->req.cls, env->irg, bl, op->carrier);
+                               op->carrier = copy;
                                sched_add_before(insn->irn, copy);
+                               set_irn_n(insn->irn, op->pos, op->carrier);
 
                                DBG((dbg, LEVEL_2, "adding copy for interfering and constrained op %+F\n", op->carrier));
                        }
@@ -620,7 +621,7 @@ static void pressure(ir_node *block, void *env_ptr)
         * Make final uses of all values live out of the block.
         * They are necessary to build up real intervals.
         */
-       for(irn = pset_first(live_end); irn; irn = pset_next(live_end)) {
+       foreach_pset(live_end, irn) {
                if(has_reg_class(env, irn)) {
                        DBG((dbg, LEVEL_3, "\tMaking live: %+F/%d\n", irn, get_irn_graph_nr(irn)));
                        bitset_set(live, get_irn_graph_nr(irn));
@@ -673,7 +674,7 @@ static void pressure(ir_node *block, void *env_ptr)
        /*
         * Add initial defs for all values live in.
         */
-       for(irn = pset_first(live_in); irn; irn = pset_next(live_in)) {
+       foreach_pset(live_in, irn) {
                if(has_reg_class(env, irn)) {
 
                        /* Mark the value live in. */
@@ -684,9 +685,8 @@ static void pressure(ir_node *block, void *env_ptr)
                }
        }
 
-
-  del_pset(live_in);
-  del_pset(live_end);
+       del_pset(live_in);
+       del_pset(live_end);
 }
 
 static void assign(ir_node *block, void *env_ptr)
@@ -720,7 +720,7 @@ static void assign(ir_node *block, void *env_ptr)
         * Since their colors have already been assigned (The dominators were
         * allocated before), we have to mark their colors as used also.
         */
-       for(irn = pset_first(live_in); irn; irn = pset_next(live_in)) {
+       foreach_pset(live_in, irn) {
                if(has_reg_class(env, irn)) {
                        const arch_register_t *reg = arch_get_irn_register(arch_env, irn);
                        int col;
@@ -772,7 +772,7 @@ static void assign(ir_node *block, void *env_ptr)
                        arch_set_irn_register(arch_env, irn, reg);
 
                        DBG((dbg, LEVEL_1, "\tassigning register %s(%d) to %+F\n",
-            arch_register_get_name(reg), col, irn));
+                       arch_register_get_name(reg), col, irn));
 
                        assert(!bitset_is_set(live, nr) && "Value's definition must not have been encountered");
                        bitset_set(live, nr);
@@ -837,11 +837,11 @@ void be_ra_chordal_color(be_chordal_env_t *chordal_env)
        be_numbering_done(irg);
 
        if(chordal_env->opts->dump_flags & BE_CH_DUMP_TREE_INTV) {
-       plotter_t *plotter;
+               plotter_t *plotter;
                ir_snprintf(buf, sizeof(buf), "ifg_%s_%F.eps", chordal_env->cls->name, irg);
-       plotter = new_plotter_ps(buf);
-       draw_interval_tree(&draw_chordal_def_opts, chordal_env, plotter);
-       plotter_free(plotter);
+               plotter = new_plotter_ps(buf);
+               draw_interval_tree(&draw_chordal_def_opts, chordal_env, plotter);
+               plotter_free(plotter);
        }
 
        del_pset(env.pre_colored);