X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeinsn.c;h=bbe72e92a1399230240f9d08e78effff34651b87;hb=fef8dc3eff6468d7d65485af8e1ac9884c504e1a;hp=34c239d74f7c15bce1e9f154922e75ebd5bbf227;hpb=44f25648d311cfdf958fa5d1ed20659b250e0eac;p=libfirm

diff --git a/ir/be/beinsn.c b/ir/be/beinsn.c
index 34c239d74..bbe72e92a 100644
--- a/ir/be/beinsn.c
+++ b/ir/be/beinsn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -21,195 +21,66 @@
  * @file
  * @brief       A data structure to treat nodes and node-proj collections uniformly.
  * @author      Sebastian Hack
- * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #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 "beirg_t.h"
 #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) {
-	const arch_env_t *arch_env = env->aenv;
-	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(arch_env, env->cls, op)) {
-			be_operand_t o;
-
-			/* found a register use, create an operand */
-			o.req     = arch_get_register_req(arch_env, 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.
- *
- * @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)
 {
-	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]));
 
-	insn->irn       = irn;
-	insn->next_insn = sched_next(irn);
-	if (get_irn_mode(irn) == mode_T) {
-		const ir_edge_t *edge;
-		ir_node *p;
+	be_insn_t *insn = OALLOCZ(obst, be_insn_t);
 
-		/* 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);
+	bool has_constraints = false;
 
-			/* 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);
-
-			if (arch_irn_consider_in_reg_alloc(arch_env, env->cls, p)) {
-				/* found a def: create a new operand */
-				o.req             = arch_get_register_req(arch_env, 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;
 		}
-
-#ifdef SCHEDULE_PROJS
-		/* When Proj's are scheduled, so we need to find the first
-		   non-Proj instruction in the schedule */
-		for (p = sched_next(irn); is_Proj(p); p = sched_next(p));
-		insn->next_insn = p;
-#endif
-
-	} else if (arch_irn_consider_in_reg_alloc(arch_env, env->cls, irn)) {
-		/* only one def, create one operand */
-		o.req     = arch_get_register_req(arch_env, 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;
-	}
+	);
 
-	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) {
-		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(arch_env, env->cls, op)) {
-			/* found a register use, create an operand */
-			o.req     = arch_get_register_req(arch_env, irn, i);
-			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];
-		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);
-
-		op->regs = bitset_obstack_alloc(obst, env->cls->n_regs);
-
-		if (type & arch_register_req_type_limited) {
-			rbitset_copy_to_bitset(req->limited, op->regs);
+	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 {
-			arch_put_non_ignore_regs(arch_env, env->cls, op->regs);
-			if (env->ignore_colors)
-				bitset_andnot(op->regs, env->ignore_colors);
+			o.regs = env->allocatable_regs->data;
 		}
-	}
-
-	return insn;
-}
+		o.carrier = op;
+		o.partner = NULL;
+		obstack_grow(obst, &o, sizeof(o));
+		insn->n_ops++;
+	);
 
-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 = be_get_birg_arch_env(birg);
-	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);
+	if (!has_constraints)
+		return NULL;
 
-	return ie;
+	insn->ops = (be_operand_t*)obstack_finish(obst);
+	return insn;
 }