X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeinsn.c;h=9a5f97abf5d78d22457ee7f111769c849941c524;hb=3c3425a50a1d721b74a015c6812257e32feeac85;hp=d0183eab1faf0e51b2ecd24eb14b69377edb78d5;hpb=f8cc15664f571aa7ef89d6f6bc8d5bd2b8ca7d53;p=libfirm

diff --git a/ir/be/beinsn.c b/ir/be/beinsn.c
index d0183eab1..9a5f97abf 100644
--- a/ir/be/beinsn.c
+++ b/ir/be/beinsn.c
@@ -35,40 +35,6 @@
 #include "beabi.h"
 #include "raw_bitset.h"
 
-/**
- * Add machine operands to the instruction uses.
- *
- * @param env      the insn construction environment
- * @param insn     the be_insn that is build
- * @param mach_op  the machine operand for which uses are added
- */
-static void add_machine_operands(const be_insn_env_t *env, be_insn_t *insn, ir_node *mach_op)
-{
-	struct obstack *obst = env->obst;
-	int i, n;
-
-	for (i = 0, n = get_irn_arity(mach_op); i < n; ++i) {
-		ir_node *op = get_irn_n(mach_op, i);
-
-		if (is_irn_machine_operand(op)) {
-			add_machine_operands(env, insn, op);
-		} else if (arch_irn_consider_in_reg_alloc(env->cls, op)) {
-			be_operand_t o;
-
-			/* found a register use, create an operand */
-			o.req     = arch_get_irn_register_req_in(mach_op, i);
-			o.carrier = op;
-			o.irn     = insn->irn;
-			o.pos     = i;
-			o.partner = NULL;
-			o.has_constraints = arch_register_req_is(o.req, limited);
-			obstack_grow(obst, &o, sizeof(o));
-			insn->n_ops++;
-			insn->in_constraints |= o.has_constraints;
-		}
-	}
-}
-
 /**
  * Create a be_insn_t for an IR node.
  *
@@ -90,7 +56,6 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
 	insn->irn       = irn;
 	insn->next_insn = sched_next(irn);
 	if (get_irn_mode(irn) == mode_T) {
-		const ir_edge_t *edge;
 		ir_node *p;
 
 		/* This instruction might create more than one def. These are handled
@@ -109,7 +74,7 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
 				o.irn             = irn;
 				o.pos             = -(get_Proj_proj(p) + 1);
 				o.partner         = NULL;
-				o.has_constraints = arch_register_req_is(o.req, limited);
+				o.has_constraints = arch_register_req_is(o.req, limited) | (o.req->width > 1);
 				obstack_grow(obst, &o, sizeof(o));
 				insn->n_ops++;
 				insn->out_constraints |= o.has_constraints;
@@ -123,7 +88,7 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
 		o.irn     = irn;
 		o.pos     = -1;
 		o.partner = NULL;
-		o.has_constraints = arch_register_req_is(o.req, limited);
+		o.has_constraints = arch_register_req_is(o.req, limited) | (o.req->width > 1);
 		obstack_grow(obst, &o, sizeof(o));
 		insn->n_ops++;
 		insn->out_constraints |= o.has_constraints;
@@ -140,9 +105,7 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
 	for (i = 0, n = get_irn_arity(irn); i < n; ++i) {
 		ir_node *op = get_irn_n(irn, i);
 
-		if (is_irn_machine_operand(op)) {
-			add_machine_operands(env, insn, op);
-		} else if (arch_irn_consider_in_reg_alloc(env->cls, op)) {
+		if (arch_irn_consider_in_reg_alloc(env->cls, op)) {
 			/* found a register use, create an operand */
 			o.req     = arch_get_irn_register_req_in(irn, i);
 			o.carrier = op;