X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbearch.c;h=88c8482ff7a91fb751f2124e6057f624f7512c83;hb=1872920c09708b361d06c0dc9f4c1fd0a03544f5;hp=a71faf4d11cb21353eca6e31e191172febe46fec;hpb=fdef2b39113f0615d0e715a884be2833f05b8ee5;p=libfirm

diff --git a/ir/be/bearch.c b/ir/be/bearch.c
index a71faf4d1..88c8482ff 100644
--- a/ir/be/bearch.c
+++ b/ir/be/bearch.c
@@ -30,6 +30,7 @@
 #include <string.h>
 
 #include "bearch_t.h"
+#include "benode_t.h"
 #include "ircons_t.h"
 #include "irnode_t.h"
 #include "xmalloc.h"
@@ -41,38 +42,24 @@
 #include "irprintf.h"
 
 /* Initialize the architecture environment struct. */
-arch_env_t *arch_env_init(arch_env_t *env, const arch_isa_if_t *isa_if, FILE *file_handle, be_main_env_t *main_env)
+arch_env_t *arch_env_init(const arch_isa_if_t *isa_if, FILE *file_handle, be_main_env_t *main_env)
 {
-	memset(env, 0, sizeof(*env));
-	env->isa                  = isa_if->init(file_handle);
-	env->isa->main_env        = main_env;
-	return env;
+	arch_env_t *arch_env = isa_if->init(file_handle);
+	arch_env->main_env   = main_env;
+	return arch_env;
 }
 
-arch_env_t *arch_env_push_irn_handler(arch_env_t *env,
-                                      arch_get_irn_ops_t *handler)
-{
-	assert(env->handlers_tos < ARCH_MAX_HANDLERS);
-	env->handlers[env->handlers_tos++] = handler;
-	return env;
-}
-
-arch_get_irn_ops_t *arch_env_pop_irn_handler(arch_env_t *env)
-{
-   	assert(env->handlers_tos > 0 && env->handlers_tos <= ARCH_MAX_HANDLERS);
-	return env->handlers[--env->handlers_tos];
-}
-
-static const arch_irn_ops_t *fallback_irn_ops = NULL;
-
-int arch_register_class_put(const arch_register_class_t *cls, bitset_t *bs)
+/**
+ * Put all registers in a class into a bitset.
+ * @param cls The class.
+ * @param bs The bitset. May be NULL.
+ * @return The number of registers in the class.
+ */
+static int arch_register_class_put(const arch_register_class_t *cls, bitset_t *bs)
 {
-	if(bs) {
-		int i, n;
-		for(i = 0, n = cls->n_regs; i < n; ++i)
-			bitset_set(bs, i);
-	}
-
+	int i, n;
+	for(i = 0, n = cls->n_regs; i < n; ++i)
+		bitset_set(bs, i);
 	return cls->n_regs;
 }
 
@@ -85,33 +72,20 @@ int arch_register_class_put(const arch_register_class_t *cls, bitset_t *bs)
 static INLINE const arch_irn_ops_t *
 get_irn_ops(const arch_env_t *env, const ir_node *irn)
 {
-#if 1
-	int i;
-
-	for(i = env->handlers_tos - 1; i >= 0; --i) {
-		arch_get_irn_ops_t *get_irn_ops = env->handlers[i];
-		const arch_irn_ops_t *ops = get_irn_ops(irn);
+	const ir_op          *ops;
+	const arch_irn_ops_t *be_ops;
+	(void) env;
 
-		if(ops)
-			return ops;
-	}
-#else
-	if (is_Phi(irn) && !mode_is_datab(get_irn_mode(irn))) {
-		const phi_handler_t *h;
-		return &h->irn_ops;
-	}
 	if (is_Proj(irn)) {
 		irn = get_Proj_pred(irn);
-		if (is_Proj(irn)) {
-			assert(get_irn_mode(irn) == mode_T);
-			irn = get_Proj_pred(irn);
-		}
+		assert(!is_Proj(irn));
 	}
-	if (is_be_node(irn))
-		return &be_node_irn_ops;
 
-#endif
-	return fallback_irn_ops;
+	ops    = get_irn_op(irn);
+	be_ops = get_op_ops(ops)->be_ops;
+
+	assert(be_ops);
+	return be_ops;
 }
 
 const arch_irn_ops_t *arch_get_irn_ops(const arch_env_t *env, const ir_node *irn) {
@@ -122,39 +96,39 @@ const arch_register_req_t *arch_get_register_req(const arch_env_t *env,
                                                  const ir_node *irn, int pos)
 {
 	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
-	return ops->impl->get_irn_reg_req(ops, irn, pos);
+	return ops->get_irn_reg_req(irn, pos);
 }
 
 void arch_set_frame_offset(const arch_env_t *env, ir_node *irn, int offset)
 {
 	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
-	ops->impl->set_frame_offset(ops, irn, offset);
+	ops->set_frame_offset(irn, offset);
 }
 
 ir_entity *arch_get_frame_entity(const arch_env_t *env, const ir_node *irn)
 {
 	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
-	return ops->impl->get_frame_entity(ops, irn);
+	return ops->get_frame_entity(irn);
 }
 
 void arch_set_frame_entity(const arch_env_t *env, ir_node *irn, ir_entity *ent)
 {
 	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
-	ops->impl->set_frame_entity(ops, irn, ent);
+	ops->set_frame_entity(irn, ent);
 }
 
 int arch_get_sp_bias(const arch_env_t *env, ir_node *irn)
 {
 	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
-	return ops->impl->get_sp_bias(ops, irn);
+	return ops->get_sp_bias(irn);
 }
 
 arch_inverse_t *arch_get_inverse(const arch_env_t *env, const ir_node *irn, int i, arch_inverse_t *inverse, struct obstack *obstack)
 {
 	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
 
-	if(ops->impl->get_inverse) {
-		return ops->impl->get_inverse(ops, irn, i, inverse, obstack);
+	if(ops->get_inverse) {
+		return ops->get_inverse(irn, i, inverse, obstack);
 	} else {
 		return NULL;
 	}
@@ -163,8 +137,8 @@ arch_inverse_t *arch_get_inverse(const arch_env_t *env, const ir_node *irn, int
 int arch_possible_memory_operand(const arch_env_t *env, const ir_node *irn, unsigned int i) {
 	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
 
-	if(ops->impl->possible_memory_operand) {
-		return ops->impl->possible_memory_operand(ops, irn, i);
+	if(ops->possible_memory_operand) {
+		return ops->possible_memory_operand(irn, i);
 	} else {
 		return 0;
 	}
@@ -173,8 +147,8 @@ int arch_possible_memory_operand(const arch_env_t *env, const ir_node *irn, unsi
 void arch_perform_memory_operand(const arch_env_t *env, ir_node *irn, ir_node *spill, unsigned int i) {
 	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
 
-	if(ops->impl->perform_memory_operand) {
-		ops->impl->perform_memory_operand(ops, irn, spill, i);
+	if(ops->perform_memory_operand) {
+		ops->perform_memory_operand(irn, spill, i);
 	} else {
 		return;
 	}
@@ -184,8 +158,8 @@ int arch_get_op_estimated_cost(const arch_env_t *env, const ir_node *irn)
 {
 	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
 
-	if(ops->impl->get_op_estimated_cost) {
-		return ops->impl->get_op_estimated_cost(ops, irn);
+	if(ops->get_op_estimated_cost) {
+		return ops->get_op_estimated_cost(irn);
 	} else {
 		return 1;
 	}
@@ -195,8 +169,8 @@ int arch_is_possible_memory_operand(const arch_env_t *env, const ir_node *irn, i
 {
    	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
 
-	if(ops->impl->possible_memory_operand) {
-	   	return ops->impl->possible_memory_operand(ops, irn, i);
+	if(ops->possible_memory_operand) {
+	   	return ops->possible_memory_operand(irn, i);
 	} else {
 		return 0;
 	}
@@ -205,7 +179,7 @@ int arch_is_possible_memory_operand(const arch_env_t *env, const ir_node *irn, i
 int arch_get_allocatable_regs(const arch_env_t *env, const ir_node *irn, int pos, bitset_t *bs)
 {
 	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
-	const arch_register_req_t *req = ops->impl->get_irn_reg_req(ops, irn, pos);
+	const arch_register_req_t *req = ops->get_irn_reg_req(irn, pos);
 
 	if(req->type == arch_register_req_type_none) {
 		bitset_clear_all(bs);
@@ -252,7 +226,7 @@ int arch_is_register_operand(const arch_env_t *env,
     const ir_node *irn, int pos)
 {
 	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
-	const arch_register_req_t *req = ops->impl->get_irn_reg_req(ops, irn, pos);
+	const arch_register_req_t *req = ops->get_irn_reg_req(irn, pos);
 
 	return req != NULL;
 }
@@ -279,7 +253,7 @@ const arch_register_class_t *
 arch_get_irn_reg_class(const arch_env_t *env, const ir_node *irn, int pos)
 {
 	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
-	const arch_register_req_t *req = ops->impl->get_irn_reg_req(ops, irn, pos);
+	const arch_register_req_t *req = ops->get_irn_reg_req(irn, pos);
 
 	assert(req->type != arch_register_req_type_none || req->cls == NULL);
 
@@ -290,26 +264,26 @@ 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->impl->get_irn_reg(ops, irn);
+	return ops->get_irn_reg(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->impl->set_irn_reg(ops, irn, reg);
+	ops->set_irn_reg(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->impl->classify(ops, irn);
+	return ops->classify(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);
+	return ops->get_flags(irn);
 }
 
 extern const char *arch_irn_flag_str(arch_irn_flags_t fl)
@@ -361,7 +335,7 @@ extern char *arch_register_req_format(char *buf, size_t len,
 		}
 	}
 
-	if(arch_register_req_is(req, should_be_different)) {
+	if (arch_register_req_is(req, must_be_different)) {
 		const unsigned other = req->other_different;
 		int i;