X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeinsn.c;h=f8e98ecf5b01a1ac8006fe2b3c5115a039683dac;hb=b36dd117b8e841f1a3c78588036aed050ffd94e4;hp=ac027f3093d3bb12905656cb02b7567b50322349;hpb=e243eb2e9e8a9f5e57e166950a1a0a8ab25e92a9;p=libfirm

diff --git a/ir/be/beinsn.c b/ir/be/beinsn.c
index ac027f309..f8e98ecf5 100644
--- a/ir/be/beinsn.c
+++ b/ir/be/beinsn.c
@@ -1,115 +1,72 @@
-#ifdef HAVE_CONFIG_H
+/*
+ * This file is part of libFirm.
+ * Copyright (C) 2012 University of Karlsruhe.
+ */
+
+/**
+ * @file
+ * @brief       A data structure to treat nodes and node-proj collections uniformly.
+ * @author      Sebastian Hack
+ */
 #include "config.h"
-#endif
 
 #include "irgraph_t.h"
 #include "irmode_t.h"
 #include "irnode_t.h"
+#include "iredges.h"
 
-#include "besched_t.h"
+#include "bechordal_t.h"
+#include "besched.h"
 #include "beinsn_t.h"
 #include "beabi.h"
+#include "raw_bitset.h"
 
-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)
 {
-	const arch_env_t *arch_env = env->aenv;
-	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 = obstack_alloc(obst, sizeof(insn[0]));
-	memset(insn, 0, sizeof(insn[0]));
+	be_insn_t *insn = OALLOCZ(obst, be_insn_t);
 
-	insn->irn       = irn;
-	insn->next_insn = sched_next(irn);
-	if(get_irn_mode(irn) == mode_T) {
-		ir_node *p;
+	bool has_constraints = false;
 
-		for(p = sched_next(irn); is_Proj(p); p = sched_next(p)) {
-			if(arch_irn_consider_in_reg_alloc(arch_env, env->cls, p)) {
-				arch_get_register_req(arch_env, &o.req, p, -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);
-				obstack_grow(obst, &o, sizeof(o));
-				insn->n_ops++;
-				insn->out_constraints |= o.has_constraints;
-				pre_colored += arch_get_irn_register(arch_env, p) != NULL;
-			}
+	const arch_register_class_t *cls = env->cls;
+	insn->irn = irn;
+	be_foreach_definition(irn, cls, p, req,
+		/* found a def: create a new operand */
+		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;
 		}
-
-		insn->next_insn = p;
-	}
-	else if(arch_irn_consider_in_reg_alloc(arch_env, env->cls, irn)) {
-		arch_get_register_req(arch_env, &o.req, irn, -1);
-		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(arch_env, irn) != NULL;
-	}
-
-	insn->pre_colored = pre_colored == insn->n_ops && insn->n_ops > 0;
-	insn->use_start   = insn->n_ops;
-
-	for(i = 0, n = get_irn_arity(irn); i < n; ++i) {
-		ir_node *op = get_irn_n(irn, i);
-
-		if(!arch_irn_consider_in_reg_alloc(arch_env, env->cls, op))
-			continue;
-
-		arch_get_register_req(arch_env, &o.req, irn, i);
+	);
+
+	insn->use_start = insn->n_ops;
+
+	/* now collect the uses for this node */
+	be_foreach_use(irn, cls, in_req, op, op_req,
+		/* found a register use, create an operand */
+		if (arch_register_req_is(in_req, limited)) {
+			o.regs          = in_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 = obstack_finish(obst);
-
-	/* Compute the admissible registers bitsets. */
-	for (i = 0; i < insn->n_ops; ++i) {
-		be_operand_t *op = &insn->ops[i];
-
-		if (op->req.cls == NULL && op->req.type == arch_register_req_type_none) {
-			op->req.cls  = env->cls;
-			op->req.type = arch_register_req_type_normal;
-		}
-
-		assert(op->req.cls == env->cls);
-		op->regs = bitset_obstack_alloc(obst, env->cls->n_regs);
-
-		if (arch_register_req_is(&op->req, limited))
-			op->req.limited(op->req.limited_env, op->regs);
-		else {
-			arch_put_non_ignore_regs(arch_env, env->cls, op->regs);
-			if (env->ignore_colors)
-				bitset_andnot(op->regs, env->ignore_colors);
-		}
-	}
+	if (!has_constraints)
+		return NULL;
 
+	insn->ops = (be_operand_t*)obstack_finish(obst);
 	return insn;
 }
-
-be_insn_env_t *be_insn_env_init(be_insn_env_t *ie, const be_irg_t *birg, const arch_register_class_t *cls, struct obstack *obst)
-{
-	ie->aenv = birg->main_env->arch_env;
-	ie->cls  = cls;
-	ie->obst = obst;
-	ie->ignore_colors = bitset_obstack_alloc(obst, cls->n_regs);
-	be_abi_put_ignore_regs(birg->abi, cls, ie->ignore_colors);
-	return ie;
-}