X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal.c;h=bd368226f43f73e1ce3ba39c2e15ed31e9cce9f7;hb=4ed245f5007168dab7850942a7ee6b6b29a19817;hp=097c01155855f9e4c46bb205edb758a210836978;hpb=c5603c15033e1b7788012ac8cc4ddcf134f5428d;p=libfirm

diff --git a/ir/be/bechordal.c b/ir/be/bechordal.c
index 097c01155..bd368226f 100644
--- a/ir/be/bechordal.c
+++ b/ir/be/bechordal.c
@@ -77,6 +77,7 @@ typedef struct _be_chordal_alloc_env_t {
 /* Make a fourcc for border checking. */
 #define BORDER_FOURCC				FOURCC('B', 'O', 'R', 'D')
 
+#if 0
 static void check_border_list(struct list_head *head)
 {
   border_t *x;
@@ -93,7 +94,7 @@ static void check_heads(be_chordal_env_t *env)
     check_border_list(ent->value);
   }
 }
-
+#endif
 
 /**
  * Add an interval border to the list of a block's list
@@ -220,24 +221,72 @@ static be_insn_t *chordal_scan_insn(be_chordal_env_t *env, ir_node *irn)
 
 static ir_node *prepare_constr_insn(be_chordal_env_t *env, ir_node *irn)
 {
-	be_insn_t *insn = chordal_scan_insn(env, irn);
-	int n_uses      = be_insn_n_uses(insn);
-	int n_defs      = be_insn_n_defs(insn);
-	int i;
+	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);
+	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 && values_interfere(env->lv, insn->irn, op->carrier)) {
-			ir_node *bl   = get_nodes_block(insn->irn);
-			ir_node *copy = be_new_Copy(env->cls, env->irg, bl, op->carrier);
-
-			sched_add_before(insn->irn, copy);
-			set_irn_n(insn->irn, op->pos, copy);
-			DBG((env->dbg, LEVEL_3, "inserting constr copy %+F for %+F pos %d\n", copy, insn->irn, op->pos));
-			be_liveness_update(env->lv, op->carrier);
+
+		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];
+		if(op->has_constraints)
+			bitset_or(def_constr, op->regs);
+	}
+
+	/*
+		insert copies for all constrained arguments living through the node
+		and being constrained to a register which also occurs in out constraints.
+	*/
+	for(i = insn->use_start; i < insn->n_ops; ++i) {
+		be_operand_t *op = &insn->ops[i];
+
+		bitset_copy(tmp, op->regs);
+		bitset_and(tmp, def_constr);
+
+		/*
+			Check, if
+			1) the operand is constrained.
+			2) lives through the node.
+			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) {
+			/*
+				only create the copy if the operand is no copy.
+				this is necessary since the assure constraints phase inserts
+				Copies and Keeps for operands which must be different from the results.
+				Additional copies here would destroy this.
+			*/
+			if(!be_is_Copy(op->carrier)) {
+				ir_node *copy = be_new_Copy(env->cls, env->irg, bl, op->carrier);
+
+				sched_add_before(insn->irn, copy);
+				set_irn_n(insn->irn, op->pos, copy);
+				DBG((env->dbg, LEVEL_3, "inserting constr copy %+F for %+F pos %d\n", copy, insn->irn, op->pos));
+				be_liveness_update(env->lv, op->carrier);
+			}
 		}
 	}
 
@@ -338,6 +387,10 @@ static ir_node *pre_process_constraints(be_chordal_alloc_env_t *alloc_env, be_in
 		Now, figure out which input operand must be copied since it has input
 		constraints which are also output constraints.
 	*/
+	(void) bl;
+	(void) copy;
+	(void) bs;
+	(void) dbg;
 #if 0
 	for(i = insn->use_start; i < insn->n_ops; ++i) {
 		be_operand_t *op = &insn->ops[i];