X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbearch.c;h=9b3303c626d4e384a72bd1fe3b74e287fe6c3f7b;hb=f804d333c7b5459c3c1a6bfc188ecdc54346be73;hp=137f852e042674c8a443b6da8b60196508c81df1;hpb=c4f6f664340b3d15b89cdbaa8f2c03d166b81782;p=libfirm

diff --git a/ir/be/bearch.c b/ir/be/bearch.c
index 137f852e0..9b3303c62 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;
 }
 
@@ -43,7 +44,7 @@ arch_env_t *arch_env_add_irn_handler(arch_env_t *env,
 
 static const arch_irn_ops_t *fallback_irn_ops = NULL;
 
-int arch_register_class_put(const arch_register_class_t *cls, struct _bitset_t *bs)
+int arch_register_class_put(const arch_register_class_t *cls, bitset_t *bs)
 {
   if(bs) {
     int i, n;
@@ -80,49 +81,56 @@ 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);
-  return ops->get_irn_reg_req(ops, req, irn, pos);
+  req->type = arch_register_req_type_none;
+  return ops->impl->get_irn_reg_req(ops, req, irn, pos);
 }
 
-int arch_get_allocatable_regs(const arch_env_t *env, const ir_node *irn,
-    int pos, const arch_register_class_t *cls, bitset_t *bs)
+int arch_get_allocatable_regs(const arch_env_t *env, const ir_node *irn, int pos, bitset_t *bs)
 {
   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);
-
-  switch(req->type) {
-    case arch_register_req_type_normal:
-      arch_register_class_put(req->cls, bs);
-      return req->cls->n_regs;
+  const arch_register_req_t *req = ops->impl->get_irn_reg_req(ops, &local_req, irn, pos);
 
-    case arch_register_req_type_limited:
-      return req->data.limited(irn, pos, bs);
+  if(req->type == arch_register_req_type_none) {
+	  bitset_clear_all(bs);
+	  return 0;
+  }
 
-    default:
-      assert(0 && "This register requirement case is not covered");
+  if(arch_register_req_is(req, limited)) {
+	  req->limited(req->limited_env, bs);
+	  return bitset_popcnt(bs);
   }
 
-  return 0;
+  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->impl->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)
 {
-  const arch_register_class_t *cls = arch_register_get_class(reg);
-  int n_regs = arch_register_class_n_regs(cls);
-  bitset_t *bs = bitset_alloca(n_regs);
+	arch_register_req_t req;
+
+	arch_get_register_req(env, &req, irn, pos);
 
-  arch_get_allocatable_regs(env, irn, pos, cls, bs);
-  return bitset_is_set(bs, arch_register_get_index(reg));
+	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(req.limited_env, bs);
+		return bitset_is_set(bs, arch_register_get_index(reg));
+	}
+
+	return req.cls == reg->reg_class;
 }
 
 const arch_register_class_t *
@@ -130,28 +138,32 @@ arch_get_irn_reg_class(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);
+  const arch_register_req_t *req = ops->impl->get_irn_reg_req(ops, &local_req, irn, pos);
   return req ? req->cls : NULL;
 }
 
 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->impl->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->impl->set_irn_reg(ops, irn, reg);
 }
 
 extern arch_irn_class_t arch_irn_classify(const arch_env_t *env, const ir_node *irn)
 {
   const arch_irn_ops_t *ops = get_irn_ops(env, irn);
-  return ops->classify(ops, irn);
+  return ops->impl->classify(ops, irn);
+}
+
+extern arch_irn_flags_t arch_irn_get_flags(const arch_env_t *env, const ir_node *irn)
+{
+  const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+  return ops->impl->get_flags(ops, irn);
 }