X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeinsn.c;h=1a52c36141cc058f4bc5156a3fb9618a832d4c31;hb=ae1da4394ecac110c79fdf1f07cbca598c1ef4be;hp=2f7a290098439a7d04aebbde3906346d27359cff;hpb=c2e55800e76ff59722d4774e212908cda1dae592;p=libfirm

diff --git a/ir/be/beinsn.c b/ir/be/beinsn.c
index 2f7a29009..1a52c3614 100644
--- a/ir/be/beinsn.c
+++ b/ir/be/beinsn.c
@@ -29,78 +29,41 @@
 #include "irnode_t.h"
 #include "iredges.h"
 
+#include "bechordal_t.h"
 #include "besched.h"
 #include "beinsn_t.h"
-#include "beirg.h"
 #include "beabi.h"
 #include "raw_bitset.h"
 
-/**
- * Create a be_insn_t for an IR node.
- *
- * @param env      the insn construction environment
- * @param irn      the irn for which the be_insn should be build
- *
- * @return the be_insn for the IR node
- */
-be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
+be_insn_t *be_scan_insn(be_chordal_env_t *const env, ir_node *const irn)
 {
-	struct obstack *obst = env->obst;
+	struct obstack *const obst = &env->obst;
 	be_operand_t o;
-	be_insn_t *insn;
 	int i, n;
-	int pre_colored = 0;
-
-	insn = OALLOCZ(obst, be_insn_t);
-
-	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
-		   by Proj's, find them. */
-		foreach_out_edge(irn, edge) {
-			p = get_edge_src_irn(edge);
+	be_insn_t *insn = OALLOCZ(obst, be_insn_t);
 
-			/* did not work if the result is a ProjT. This should NOT happen
-			   in the backend, but check it for now. */
-			assert(get_irn_mode(p) != mode_T);
+	bool has_constraints = false;
 
-			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);
-				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);
-				obstack_grow(obst, &o, sizeof(o));
-				insn->n_ops++;
-				insn->out_constraints |= o.has_constraints;
-				pre_colored += arch_get_irn_register(p) != NULL;
-			}
+	const arch_register_class_t *cls = env->cls;
+	insn->irn = irn;
+	be_foreach_definition(irn, cls, p,
+		/* found a def: create a new operand */
+		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;
 		}
-	} 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);
-		o.carrier = irn;
-		o.irn     = irn;
-		o.pos     = -1;
+		o.carrier = p;
 		o.partner = NULL;
-		o.has_constraints = arch_register_req_is(o.req, limited);
 		obstack_grow(obst, &o, sizeof(o));
 		insn->n_ops++;
-		insn->out_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) {
@@ -108,44 +71,23 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *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->in_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);
-
-		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;
 }