X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeinsn.c;h=609119afbdef70e3466cdfbd989a35714d21f58c;hb=921aa67bde2a1cbd73962480d6d8e2d19cce7f92;hp=849619edbd3a5c134ac64fc50ffe13b5470777da;hpb=7081067d3b4017a9171d997ee677e03804209965;p=libfirm

diff --git a/ir/be/beinsn.c b/ir/be/beinsn.c
index 849619edb..609119afb 100644
--- a/ir/be/beinsn.c
+++ b/ir/be/beinsn.c
@@ -32,7 +32,6 @@
 #include "bechordal_t.h"
 #include "besched.h"
 #include "beinsn_t.h"
-#include "beirg.h"
 #include "beabi.h"
 #include "raw_bitset.h"
 
@@ -41,10 +40,11 @@ be_insn_t *be_scan_insn(be_chordal_env_t const *const env, ir_node *const irn)
 	struct obstack *obst = env->obst;
 	be_operand_t o;
 	int i, n;
-	int pre_colored = 0;
 
 	be_insn_t *insn = OALLOCZ(obst, be_insn_t);
 
+	bool has_constraints = false;
+
 	insn->irn = irn;
 	if (get_irn_mode(irn) == mode_T) {
 		ir_node *p;
@@ -60,37 +60,37 @@ be_insn_t *be_scan_insn(be_chordal_env_t const *const env, ir_node *const irn)
 
 			if (arch_irn_consider_in_reg_alloc(env->cls, p)) {
 				/* found a def: create a new operand */
-				o.req             = arch_get_irn_register_req(p);
+				arch_register_req_t const *const req = arch_get_irn_register_req(p);
+				if (arch_register_req_is(req, limited)) {
+					o.regs          = req->limited;
+					has_constraints = true;
+				} else {
+					o.regs           = env->allocatable_regs->data;
+					has_constraints |= req->width > 1;
+				}
 				o.carrier         = p;
-				o.irn             = irn;
-				o.pos             = -(get_Proj_proj(p) + 1);
 				o.partner         = NULL;
-				o.has_constraints = arch_register_req_is(o.req, limited) | (o.req->width > 1);
 				obstack_grow(obst, &o, sizeof(o));
 				insn->n_ops++;
-				insn->has_constraints |= o.has_constraints;
-				pre_colored += arch_get_irn_register(p) != NULL;
 			}
 		}
 	} else if (arch_irn_consider_in_reg_alloc(env->cls, irn)) {
 		/* only one def, create one operand */
-		o.req     = arch_get_irn_register_req(irn);
+		arch_register_req_t const *const req = arch_get_irn_register_req(irn);
+		if (arch_register_req_is(req, limited)) {
+			o.regs          = req->limited;
+			has_constraints = true;
+		} else {
+			o.regs           = env->allocatable_regs->data;
+			has_constraints |= req->width > 1;
+		}
 		o.carrier = irn;
-		o.irn     = irn;
-		o.pos     = -1;
 		o.partner = NULL;
-		o.has_constraints = arch_register_req_is(o.req, limited) | (o.req->width > 1);
 		obstack_grow(obst, &o, sizeof(o));
 		insn->n_ops++;
-		insn->has_constraints |= o.has_constraints;
-		pre_colored += arch_get_irn_register(irn) != NULL;
 	}
 
-	if (pre_colored > 0) {
-		assert(pre_colored == insn->n_ops && "partly pre-colored nodes not supported");
-		insn->pre_colored = 1;
-	}
-	insn->use_start   = insn->n_ops;
+	insn->use_start = insn->n_ops;
 
 	/* now collect the uses for this node */
 	for (i = 0, n = get_irn_arity(irn); i < n; ++i) {
@@ -98,43 +98,23 @@ be_insn_t *be_scan_insn(be_chordal_env_t const *const env, ir_node *const irn)
 
 		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);
+			arch_register_req_t const *const req = arch_get_irn_register_req_in(irn, i);
+			if (arch_register_req_is(req, limited)) {
+				o.regs          = req->limited;
+				has_constraints = true;
+			} else {
+				o.regs = env->allocatable_regs->data;
+			}
 			o.carrier = op;
-			o.irn     = 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->has_constraints |= o.has_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);
-
-		if (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;
-		} else {
-			op->regs = env->allocatable_regs;
-		}
-	}
+	if (!has_constraints)
+		return NULL;
 
+	insn->ops = (be_operand_t*)obstack_finish(obst);
 	return insn;
 }