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

diff --git a/ir/be/bearch.c b/ir/be/bearch.c
index 0cffa7038..9b3303c62 100644
--- a/ir/be/bearch.c
+++ b/ir/be/bearch.c
@@ -82,23 +82,24 @@ const arch_register_req_t *arch_get_register_req(const arch_env_t *env,
 {
   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);
+  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);
+  const arch_register_req_t *req = ops->impl->get_irn_reg_req(ops, &local_req, irn, pos);
 
   if(req->type == arch_register_req_type_none) {
 	  bitset_clear_all(bs);
 	  return 0;
   }
 
-  if(arch_register_req_is(req, limited))
-	  return req->limited(irn, pos, bs);
+  if(arch_register_req_is(req, limited)) {
+	  req->limited(req->limited_env, bs);
+	  return bitset_popcnt(bs);
+  }
 
   arch_register_class_put(req->cls, bs);
   return req->cls->n_regs;
@@ -109,7 +110,7 @@ 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;
 }
 
@@ -125,7 +126,7 @@ int arch_reg_is_allocatable(const arch_env_t *env, const ir_node *irn,
 
 	if(arch_register_req_is(&req, limited)) {
 		bitset_t *bs = bitset_alloca(req.cls->n_regs);
-		req.limited(irn, pos, bs);
+		req.limited(req.limited_env, bs);
 		return bitset_is_set(bs, arch_register_get_index(reg));
 	}
 
@@ -137,7 +138,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;
 }
 
@@ -145,24 +146,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);
 }