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

diff --git a/ir/be/bearch.c b/ir/be/bearch.c
index 7d7cd0f17..0cffa7038 100644
--- a/ir/be/bearch.c
+++ b/ir/be/bearch.c
@@ -13,6 +13,7 @@
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
+
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
 #endif
@@ -26,10 +27,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;
 }
 
@@ -80,6 +81,7 @@ const arch_register_req_t *arch_get_register_req(const arch_env_t *env,
     arch_register_req_t *req, const ir_node *irn, int pos)
 {
   const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+  req->type = arch_register_req_type_none;
   return ops->get_irn_reg_req(ops, req, irn, pos);
 }
 
@@ -90,58 +92,44 @@ int arch_get_allocatable_regs(const arch_env_t *env, const ir_node *irn,
   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);
 
-  switch(req->type) {
-    case arch_register_req_type_normal:
-      arch_register_class_put(req->cls, bs);
-      return req->cls->n_regs;
-
-    case arch_register_req_type_limited:
-      return req->data.limited(irn, pos, bs);
-
-    default:
-      assert(0 && "This register requirement case is not covered");
+  if(req->type == arch_register_req_type_none) {
+	  bitset_clear_all(bs);
+	  return 0;
   }
 
-  return 0;
-}
+  if(arch_register_req_is(req, limited))
+	  return req->limited(irn, pos, bs);
 
-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);
+  arch_register_class_put(req->cls, bs);
+  return req->cls->n_regs;
 }
 
 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,
     int pos, const arch_register_t *reg)
 {
-	int res = 0;
 	arch_register_req_t req;
 
 	arch_get_register_req(env, &req, irn, pos);
-	switch(req.type) {
-		case arch_register_req_type_normal:
-			res = req.cls == reg->reg_class;
-			break;
-		case arch_register_req_type_limited:
-			{
-				bitset_t *bs = bitset_alloca(req.cls->n_regs);
-				req.data.limited(irn, pos, bs);
-				res = bitset_is_set(bs, arch_register_get_index(reg));
-			}
-		default:
-			res = 0;
+
+	if(req.type == arch_register_req_type_none)
+		return 0;
+
+	if(arch_register_req_is(&req, limited)) {
+		bitset_t *bs = bitset_alloca(req.cls->n_regs);
+		req.limited(irn, pos, bs);
+		return bitset_is_set(bs, arch_register_get_index(reg));
 	}
 
-	return res;
+	return req.cls == reg->reg_class;
 }
 
 const arch_register_class_t *
@@ -154,19 +142,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)