fixed again

[libfirm] / ir / be / bearch.c

diff --git a/ir/be/bearch.c b/ir/be/bearch.c
index 8084dc9..c3dd537 100644 (file)
--- 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_if, FILE *file_handle)
+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_if->init(file_handle);
+  env->isa = isa_if->init();
   return env;
 }
 
@@ -80,29 +81,38 @@ 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;
+}
+
+void arch_put_non_ignore_regs(const arch_env_t *env, const arch_register_class_t *cls, bitset_t *bs)
+{
+       int i;
+
+       for(i = 0; i < cls->n_regs; ++i) {
+               if(!arch_register_type_is(&cls->regs[i], ignore))
+                       bitset_set(bs, i);
+       }
 }
 
 int arch_is_register_operand(const arch_env_t *env,
@@ -110,32 +120,27 @@ int arch_is_register_operand(const arch_env_t *env,
 {
        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 != 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(req.limited_env, bs);
+               return bitset_is_set(bs, arch_register_get_index(reg));
        }
 
-       return res;
+       return req.cls == reg->reg_class;
 }
 
 const arch_register_class_t *
@@ -143,7 +148,7 @@ 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;
 }
 
@@ -151,24 +156,24 @@ extern const arch_register_t *
 arch_get_irn_register(const arch_env_t *env, const ir_node *irn)
 {
   const arch_irn_ops_t *ops = get_irn_ops(env, irn);
-  return ops->get_irn_reg(ops, irn);
+  return ops->impl->get_irn_reg(ops, irn);
 }
 
 extern void arch_set_irn_register(const arch_env_t *env,
     ir_node *irn, const arch_register_t *reg)
 {
   const arch_irn_ops_t *ops = get_irn_ops(env, irn);
-  ops->set_irn_reg(ops, irn, 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->get_flags(ops, irn);
+  return ops->impl->get_flags(ops, irn);
 }