X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeinsn.c;h=5f50b28e77feefebf5df74aeb4320da33223cc88;hb=1db02a4692443f95545ede1cabff8c828e33442b;hp=ebe4f4acbc9133ea2bc9d50bff44b9a4bcb5b337;hpb=6a4b9102668449bea6e3c0905df74f7ffff2768b;p=libfirm

diff --git a/ir/be/beinsn.c b/ir/be/beinsn.c
index ebe4f4acb..5f50b28e7 100644
--- a/ir/be/beinsn.c
+++ b/ir/be/beinsn.c
@@ -43,7 +43,8 @@
  * @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) {
+static void add_machine_operands(const be_insn_env_t *env, be_insn_t *insn, ir_node *mach_op)
+{
 	struct obstack *obst = env->obst;
 	int i, n;
 
@@ -56,7 +57,7 @@ static void add_machine_operands(const be_insn_env_t *env, be_insn_t *insn, ir_n
 			be_operand_t o;
 
 			/* found a register use, create an operand */
-			o.req     = arch_get_register_req(mach_op, i);
+			o.req     = arch_get_irn_register_req_in(mach_op, i);
 			o.carrier = op;
 			o.irn     = insn->irn;
 			o.pos     = i;
@@ -104,7 +105,7 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
 
 			if (arch_irn_consider_in_reg_alloc(env->cls, p)) {
 				/* found a def: create a new operand */
-				o.req             = arch_get_register_req_out(p);
+				o.req             = arch_get_irn_register_req(p);
 				o.carrier         = p;
 				o.irn             = irn;
 				o.pos             = -(get_Proj_proj(p) + 1);
@@ -118,7 +119,7 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
 		}
 	} else if (arch_irn_consider_in_reg_alloc(env->cls, irn)) {
 		/* only one def, create one operand */
-		o.req     = arch_get_register_req_out(irn);
+		o.req     = arch_get_irn_register_req(irn);
 		o.carrier = irn;
 		o.irn     = irn;
 		o.pos     = -1;
@@ -144,7 +145,7 @@ be_insn_t *be_scan_insn(const be_insn_env_t *env, ir_node *irn)
 			add_machine_operands(env, insn, op);
 		} else 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;
@@ -157,7 +158,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) {
@@ -174,28 +175,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->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;
-}