X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeinsn.c;h=e72fd8927d2e612f6f11150a97eb7da6e97e3971;hb=b35afc79238e7731b8b3beecc69468cb719735f5;hp=2d29b5099c341504cc4a06d41aa630e3fad333d7;hpb=aaccd82768a2bacca144fe49a1989dc7903ed55f;p=libfirm

diff --git a/ir/be/beinsn.c b/ir/be/beinsn.c
index 2d29b5099..e72fd8927 100644
--- a/ir/be/beinsn.c
+++ b/ir/be/beinsn.c
@@ -45,8 +45,7 @@ be_insn_t *be_scan_insn(be_chordal_env_t const *const env, ir_node *const irn)
 
 	be_insn_t *insn = OALLOCZ(obst, be_insn_t);
 
-	insn->irn       = irn;
-	insn->next_insn = sched_next(irn);
+	insn->irn = irn;
 	if (get_irn_mode(irn) == mode_T) {
 		ir_node *p;
 
@@ -69,7 +68,7 @@ be_insn_t *be_scan_insn(be_chordal_env_t const *const env, ir_node *const irn)
 				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;
+				insn->has_constraints |= o.has_constraints;
 				pre_colored += arch_get_irn_register(p) != NULL;
 			}
 		}
@@ -83,7 +82,7 @@ be_insn_t *be_scan_insn(be_chordal_env_t const *const env, ir_node *const irn)
 		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;
+		insn->has_constraints |= o.has_constraints;
 		pre_colored += arch_get_irn_register(irn) != NULL;
 	}
 
@@ -107,29 +106,19 @@ be_insn_t *be_scan_insn(be_chordal_env_t const *const env, ir_node *const irn)
 			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;
+			insn->has_constraints |= o.has_constraints;
 		}
 	}
 
-	insn->has_constraints = insn->in_constraints | insn->out_constraints;
 	insn->ops = (be_operand_t*)obstack_finish(obst);
 
 	/* Compute the admissible registers bitsets. */
 	for (i = 0; i < insn->n_ops; ++i) {
-		be_operand_t *op = &insn->ops[i];
-		const arch_register_req_t   *req = op->req;
-		const arch_register_class_t *cls = req->cls;
-		arch_register_req_type_t    type = req->type;
-
-		/* If there is no special requirement, we allow current class here */
-		if (cls == NULL && req->type == arch_register_req_type_none) {
-			cls  = env->cls;
-			type = arch_register_req_type_normal;
-		}
-
-		assert(cls == env->cls);
+		be_operand_t              *const op  = &insn->ops[i];
+		arch_register_req_t const *const req = op->req;
+		assert(req->cls == env->cls);
 
-		if (type & arch_register_req_type_limited) {
+		if (req->type & arch_register_req_type_limited) {
 			bitset_t *regs = bitset_obstack_alloc(obst, env->cls->n_regs);
 			rbitset_copy_to_bitset(req->limited, regs);
 			op->regs = regs;