Changes API a little bit :-)

[libfirm] / ir / be / bearch.c

diff --git a/ir/be/bearch.c b/ir/be/bearch.c
index 137f852..6d8f38f 100644 (file)
--- 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, FILE *file_handle)
 {
   memset(env, 0, sizeof(*env));
-  env->isa = isa;
+  env->isa = isa_if->init(file_handle);
   return env;
 }
 
@@ -43,7 +43,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;
@@ -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;
@@ -108,21 +114,37 @@ int arch_get_allocatable_regs(const arch_env_t *env, const ir_node *irn,
 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)
 {
-  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_get_allocatable_regs(env, irn, pos, cls, bs);
-  return bitset_is_set(bs, arch_register_get_index(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:
+               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:
+                       {
+                               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));
+                       }
+                       break;
+               default:
+                       res = 0;
+       }
+
+       return res;
 }
 
 const arch_register_class_t *
@@ -135,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)
@@ -155,3 +175,9 @@ extern arch_irn_class_t arch_irn_classify(const arch_env_t *env, const ir_node *
   const arch_irn_ops_t *ops = get_irn_ops(env, irn);
   return ops->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);
+}