X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbearch.c;h=1433d020a5e718874d9697a8e11bf6095b8ef7f3;hb=bb91a72fcb14e8323993b5aec46bcb15d040d367;hp=7d7cd0f17000d952e38ccfcd0a1b748fe165407c;hpb=b267d8d2e4100aa20cc3771b1b8558d9e0302ed1;p=libfirm

diff --git a/ir/be/bearch.c b/ir/be/bearch.c
index 7d7cd0f17..1433d020a 100644
--- a/ir/be/bearch.c
+++ b/ir/be/bearch.c
@@ -26,10 +26,10 @@
 #include "pset.h"
 #include "entity.h"
 
-arch_env_t *arch_env_init(arch_env_t *env, const arch_isa_if_t *isa)
+arch_env_t *arch_env_init(arch_env_t *env, const arch_isa_if_t *isa_if)
 {
   memset(env, 0, sizeof(*env));
-  env->isa = isa;
+  env->isa = isa_if->init();
   return env;
 }
 
@@ -91,6 +91,12 @@ int arch_get_allocatable_regs(const arch_env_t *env, const ir_node *irn,
   const arch_register_req_t *req = ops->get_irn_reg_req(ops, &local_req, irn, pos);
 
   switch(req->type) {
+	case arch_register_req_type_none:
+		bitset_clear_all(bs);
+		return 0;
+
+	case arch_register_req_type_should_be_different:
+	case arch_register_req_type_should_be_same:
     case arch_register_req_type_normal:
       arch_register_class_put(req->cls, bs);
       return req->cls->n_regs;
@@ -105,19 +111,13 @@ int arch_get_allocatable_regs(const arch_env_t *env, const ir_node *irn,
   return 0;
 }
 
-int arch_get_n_operands(const arch_env_t *env, const ir_node *irn, int in_out)
-{
-  const arch_irn_ops_t *ops = get_irn_ops(env, irn);
-	return ops->get_n_operands(ops, irn, in_out);
-}
-
 int arch_is_register_operand(const arch_env_t *env,
     const ir_node *irn, int pos)
 {
-  arch_register_req_t local_req;
-  const arch_irn_ops_t *ops = get_irn_ops(env, irn);
-  const arch_register_req_t *req = ops->get_irn_reg_req(ops, &local_req, irn, pos);
-  return req != NULL;
+	arch_register_req_t local_req;
+	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+	const arch_register_req_t *req = ops->get_irn_reg_req(ops, &local_req, irn, pos);
+	return req != NULL;
 }
 
 int arch_reg_is_allocatable(const arch_env_t *env, const ir_node *irn,
@@ -129,6 +129,8 @@ int arch_reg_is_allocatable(const arch_env_t *env, const ir_node *irn,
 	arch_get_register_req(env, &req, irn, pos);
 	switch(req.type) {
 		case arch_register_req_type_normal:
+		case arch_register_req_type_should_be_different:
+		case arch_register_req_type_should_be_same:
 			res = req.cls == reg->reg_class;
 			break;
 		case arch_register_req_type_limited:
@@ -137,6 +139,7 @@ int arch_reg_is_allocatable(const arch_env_t *env, const ir_node *irn,
 				req.data.limited(irn, pos, bs);
 				res = bitset_is_set(bs, arch_register_get_index(reg));
 			}
+			break;
 		default:
 			res = 0;
 	}
@@ -154,19 +157,17 @@ arch_get_irn_reg_class(const arch_env_t *env, const ir_node *irn, int pos)
 }
 
 extern const arch_register_t *
-arch_get_irn_register(const arch_env_t *env, const ir_node *irn, int idx)
+arch_get_irn_register(const arch_env_t *env, const ir_node *irn)
 {
   const arch_irn_ops_t *ops = get_irn_ops(env, irn);
-  assert(idx >= 0);
-  return ops->get_irn_reg(ops, irn, idx);
+  return ops->get_irn_reg(ops, irn);
 }
 
 extern void arch_set_irn_register(const arch_env_t *env,
-    ir_node *irn, int idx, const arch_register_t *reg)
+    ir_node *irn, const arch_register_t *reg)
 {
   const arch_irn_ops_t *ops = get_irn_ops(env, irn);
-  assert(idx >= 0);
-  ops->set_irn_reg(ops, irn, idx, reg);
+  ops->set_irn_reg(ops, irn, reg);
 }
 
 extern arch_irn_class_t arch_irn_classify(const arch_env_t *env, const ir_node *irn)