X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeinsn.c;h=9a5f97abf5d78d22457ee7f111769c849941c524;hb=3c3425a50a1d721b74a015c6812257e32feeac85;hp=477bed599c786c7aa74725abeb07f39f61c7f9b0;hpb=d4bbab11371a9c68aa2a716eaa7589b82a28691e;p=libfirm

diff --git a/ir/be/beinsn.c b/ir/be/beinsn.c
index 477bed599..9a5f97abf 100644
--- a/ir/be/beinsn.c
+++ b/ir/be/beinsn.c
@@ -21,57 +21,20 @@
  * @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 "besched.h"
 #include "beinsn_t.h"
-#include "beirg_t.h"
+#include "beirg.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(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.
  *
@@ -82,20 +45,17 @@ static void add_machine_operands(const be_insn_env_t *env, be_insn_t *insn, ir_n
  */
 be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
 {
-	const arch_env_t *arch_env = env->aenv;
-	struct obstack *obst       = env->obst;
+	struct obstack *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 = 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
@@ -107,28 +67,28 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
 			   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)) {
+			if (arch_irn_consider_in_reg_alloc(env->cls, p)) {
 				/* found a def: create a new operand */
-				o.req             = arch_get_register_req(p, -1);
+				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);
+				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;
 				pre_colored += arch_get_irn_register(p) != NULL;
 			}
 		}
-	} else if (arch_irn_consider_in_reg_alloc(arch_env, env->cls, irn)) {
+	} else if (arch_irn_consider_in_reg_alloc(env->cls, irn)) {
 		/* only one def, create one operand */
-		o.req     = arch_get_register_req(irn, -1);
+		o.req     = arch_get_irn_register_req(irn);
 		o.carrier = irn;
 		o.irn     = irn;
 		o.pos     = -1;
 		o.partner = NULL;
-		o.has_constraints = arch_register_req_is(o.req, limited);
+		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;
@@ -145,11 +105,9 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
 	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)) {
+		if (arch_irn_consider_in_reg_alloc(env->cls, op)) {
 			/* found a register use, create an operand */
-			o.req     = arch_get_register_req(irn, i);
+			o.req     = arch_get_irn_register_req_in(irn, i);
 			o.carrier = op;
 			o.irn     = irn;
 			o.pos     = i;
@@ -162,7 +120,7 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
 	}
 
 	insn->has_constraints = insn->in_constraints | insn->out_constraints;
-	insn->ops = obstack_finish(obst);
+	insn->ops = (be_operand_t*)obstack_finish(obst);
 
 	/* Compute the admissible registers bitsets. */
 	for (i = 0; i < insn->n_ops; ++i) {
@@ -179,29 +137,14 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
 
 		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);
+			bitset_t *regs = bitset_obstack_alloc(obst, env->cls->n_regs);
+			rbitset_copy_to_bitset(req->limited, regs);
+			op->regs = regs;
 		} else {
-			arch_put_non_ignore_regs(env->cls, op->regs);
-			if (env->ignore_colors)
-				bitset_andnot(op->regs, env->ignore_colors);
+			op->regs = env->allocatable_regs;
 		}
 	}
 
 	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 = 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);
-
-	return ie;
-}