Added support for SymConst(ofs_ent)

[libfirm] / ir / be / bechordal.c

diff --git a/ir/be/bechordal.c b/ir/be/bechordal.c
index dc6ea1a..ad085ab 100644 (file)
--- a/ir/be/bechordal.c
+++ b/ir/be/bechordal.c
@@ -49,6 +49,7 @@
 #include "beirgmod.h"
 #include "beifg.h"
 #include "beinsn_t.h"
+#include "bestatevent.h"
 
 #include "bechordal_t.h"
 #include "bechordal_draw.h"
@@ -224,11 +225,31 @@ static ir_node *prepare_constr_insn(be_chordal_env_t *env, ir_node *irn)
        be_insn_t *insn      = chordal_scan_insn(env, irn);
        bitset_t *def_constr = bitset_alloca(env->cls->n_regs);
        bitset_t *tmp        = bitset_alloca(env->cls->n_regs);
-       int i;
+       ir_node *bl          = get_nodes_block(insn->irn);
+       int i, j;
 
        if(!insn->has_constraints)
                goto end;
 
+       /* insert copies for nodes that occur constrained more than once. */
+       for(i = insn->use_start; i < insn->n_ops; ++i) {
+               be_operand_t *op = &insn->ops[i];
+
+               if(op->has_constraints) {
+                       for(j = i + 1; j < insn->n_ops; ++j) {
+                               be_operand_t *a_op = &insn->ops[j];
+
+                               if(a_op->carrier == op->carrier && a_op->has_constraints) {
+                                       ir_node *copy = be_new_Copy(env->cls, env->irg, bl, op->carrier);
+
+                                       sched_add_before(insn->irn, copy);
+                                       set_irn_n(insn->irn, a_op->pos, copy);
+                                       DBG((env->dbg, LEVEL_3, "inserting multiple constr copy %+F for %+F pos %d\n", copy, insn->irn, a_op->pos));
+                               }
+                       }
+               }
+       }
+
        /* collect all registers occuring in out constraints. */
        for(i = 0; i < insn->use_start; ++i) {
                be_operand_t *op = &insn->ops[i];
@@ -253,8 +274,6 @@ static ir_node *prepare_constr_insn(be_chordal_env_t *env, ir_node *irn)
                        3) is constrained to a register occuring in out constraints.
                */
                if(op->has_constraints && values_interfere(env->lv, insn->irn, op->carrier) && bitset_popcnt(tmp) > 0) {
-                       ir_node *bl   = get_nodes_block(insn->irn);
-
                        /*
                                only create the copy if the operand is no copy.
                                this is necessary since the assure constraints phase inserts
@@ -406,6 +425,7 @@ static ir_node *pre_process_constraints(be_chordal_alloc_env_t *alloc_env, be_in
        if(perm) {
                const ir_edge_t *edge;
 
+               be_stat_ev("constr_perm", get_irn_arity(perm));
                foreach_out_edge(perm, edge) {
                        ir_node *proj = get_edge_src_irn(edge);
                        arch_set_irn_register(aenv, proj, NULL);
@@ -545,6 +565,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
 
                                        bitset_clear_all(bs);
                                        arch_put_non_ignore_regs(aenv, env->cls, bs);
+                                       bitset_andnot(bs, env->ignore_colors);
                                        bitset_foreach(bs, col)
                                                bipartite_add(bp, n_alloc, col);