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

diff --git a/ir/be/bearch.c b/ir/be/bearch.c
index a71faf4d1..bf7598498 100644
--- a/ir/be/bearch.c
+++ b/ir/be/bearch.c
@@ -23,16 +23,14 @@
  * @author      Sebastian Hack
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <string.h>
 
 #include "bearch_t.h"
+#include "benode_t.h"
 #include "ircons_t.h"
 #include "irnode_t.h"
-#include "xmalloc.h"
 
 #include "bitset.h"
 #include "pset.h"
@@ -41,191 +39,112 @@
 #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_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)
-{
-	if(bs) {
-		int i, n;
-		for(i = 0, n = cls->n_regs; i < n; ++i)
-			bitset_set(bs, i);
-	}
-
-	return cls->n_regs;
+	arch_env_t *arch_env = isa_if->init(file_handle);
+	arch_env->main_env   = main_env;
+	return arch_env;
 }
 
 /**
  * Get the isa responsible for a node.
- * @param env The arch environment with the isa stack.
  * @param irn The node to get the responsible isa for.
  * @return The irn operations given by the responsible isa.
  */
-static INLINE const arch_irn_ops_t *
-get_irn_ops(const arch_env_t *env, const ir_node *irn)
+static inline const arch_irn_ops_t *get_irn_ops(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;
 
-		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;
 
-const arch_irn_ops_t *arch_get_irn_ops(const arch_env_t *env, const ir_node *irn) {
-	return get_irn_ops(env, irn);
+	assert(be_ops);
+	return be_ops;
 }
 
-const arch_register_req_t *arch_get_register_req(const arch_env_t *env,
-                                                 const ir_node *irn, int pos)
+const arch_register_req_t *arch_get_register_req(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);
+	const arch_irn_ops_t *ops = get_irn_ops(irn);
+	return ops->get_irn_reg_req(irn, pos);
 }
 
-void arch_set_frame_offset(const arch_env_t *env, ir_node *irn, int offset)
+void arch_set_frame_offset(ir_node *irn, int offset)
 {
-	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
-	ops->impl->set_frame_offset(ops, irn, offset);
+	const arch_irn_ops_t *ops = get_irn_ops(irn);
+	ops->set_frame_offset(irn, offset);
 }
 
-ir_entity *arch_get_frame_entity(const arch_env_t *env, const ir_node *irn)
+ir_entity *arch_get_frame_entity(const ir_node *irn)
 {
-	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
-	return ops->impl->get_frame_entity(ops, irn);
+	const arch_irn_ops_t *ops = get_irn_ops(irn);
+	return ops->get_frame_entity(irn);
 }
 
-void arch_set_frame_entity(const arch_env_t *env, ir_node *irn, ir_entity *ent)
+void arch_set_frame_entity(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);
+	const arch_irn_ops_t *ops = get_irn_ops(irn);
+	ops->set_frame_entity(irn, ent);
 }
 
-int arch_get_sp_bias(const arch_env_t *env, ir_node *irn)
+int arch_get_sp_bias(ir_node *irn)
 {
-	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
-	return ops->impl->get_sp_bias(ops, irn);
+	const arch_irn_ops_t *ops = get_irn_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)
+arch_inverse_t *arch_get_inverse(const ir_node *irn, int i, arch_inverse_t *inverse, struct obstack *obstack)
 {
-	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+	const arch_irn_ops_t *ops = get_irn_ops(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;
 	}
 }
 
-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);
+int arch_possible_memory_operand(const ir_node *irn, unsigned int i)
+{
+	const arch_irn_ops_t *ops = get_irn_ops(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;
 	}
 }
 
-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);
+void arch_perform_memory_operand(ir_node *irn, ir_node *spill, unsigned int i)
+{
+	const arch_irn_ops_t *ops = get_irn_ops(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;
 	}
 }
 
-int arch_get_op_estimated_cost(const arch_env_t *env, const ir_node *irn)
+int arch_get_op_estimated_cost(const ir_node *irn)
 {
-	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+	const arch_irn_ops_t *ops = get_irn_ops(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;
 	}
 }
 
-int arch_is_possible_memory_operand(const arch_env_t *env, const ir_node *irn, 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);
-	} else {
-		return 0;
-	}
-}
-
-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);
-
-	if(req->type == arch_register_req_type_none) {
-		bitset_clear_all(bs);
-		return 0;
-	}
-
-	if(arch_register_req_is(req, limited)) {
-		rbitset_copy_to_bitset(req->limited, bs);
-		return bitset_popcnt(bs);
-	}
-
-	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)
+void arch_put_non_ignore_regs(const arch_register_class_t *cls, bitset_t *bs)
 {
 	unsigned i;
-	(void) env;
 
 	for(i = 0; i < cls->n_regs; ++i) {
 		if(!arch_register_type_is(&cls->regs[i], ignore))
@@ -233,36 +152,9 @@ void arch_put_non_ignore_regs(const arch_env_t *env,
 	}
 }
 
-int arch_count_non_ignore_regs(const arch_env_t *env,
-                               const arch_register_class_t *cls)
+int arch_reg_is_allocatable(const ir_node *irn, int pos, const arch_register_t *reg)
 {
-	unsigned i;
-	int result = 0;
-	(void) env;
-
-	for(i = 0; i < cls->n_regs; ++i) {
-		if(!arch_register_type_is(&cls->regs[i], ignore))
-			result++;
-	}
-
-	return result;
-}
-
-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);
-
-	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_req_t *req;
-
-	req = arch_get_register_req(env, irn, pos);
+	const arch_register_req_t *req = arch_get_register_req(irn, pos);
 
 	if(req->type == arch_register_req_type_none)
 		return 0;
@@ -275,56 +167,37 @@ int arch_reg_is_allocatable(const arch_env_t *env, const ir_node *irn,
 	return req->cls == reg->reg_class;
 }
 
-const arch_register_class_t *
-arch_get_irn_reg_class(const arch_env_t *env, const ir_node *irn, int pos)
+const arch_register_class_t *arch_get_irn_reg_class(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 = arch_get_register_req(irn, pos);
 
 	assert(req->type != arch_register_req_type_none || req->cls == NULL);
 
 	return req->cls;
 }
 
-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);
-}
-
-extern void arch_set_irn_register(const arch_env_t *env,
-    ir_node *irn, const arch_register_t *reg)
+const arch_register_t *arch_get_irn_register(const ir_node *irn)
 {
-	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
-	ops->impl->set_irn_reg(ops, irn, reg);
+	const arch_irn_ops_t *ops = get_irn_ops(irn);
+	return ops->get_irn_reg(irn);
 }
 
-extern arch_irn_class_t arch_irn_classify(const arch_env_t *env, const ir_node *irn)
+void arch_set_irn_register(ir_node *irn, const arch_register_t *reg)
 {
-	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
-	return ops->impl->classify(ops, irn);
+	const arch_irn_ops_t *ops = get_irn_ops(irn);
+	ops->set_irn_reg(irn, reg);
 }
 
-extern arch_irn_flags_t arch_irn_get_flags(const arch_env_t *env, const ir_node *irn)
+arch_irn_class_t arch_irn_classify(const ir_node *irn)
 {
-	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
-	return ops->impl->get_flags(ops, irn);
+	const arch_irn_ops_t *ops = get_irn_ops(irn);
+	return ops->classify(irn);
 }
 
-extern const char *arch_irn_flag_str(arch_irn_flags_t fl)
+arch_irn_flags_t arch_irn_get_flags(const ir_node *irn)
 {
-	switch(fl) {
-#define XXX(x) case arch_irn_flags_ ## x: return #x;
-		XXX(dont_spill);
-		XXX(ignore);
-		XXX(rematerializable);
-		XXX(modify_sp);
-		XXX(modify_flags);
-		XXX(none);
-#undef XXX
-	}
-	return "n/a";
+	const arch_irn_ops_t *ops = get_irn_ops(irn);
+	return ops->get_flags(irn);
 }
 
 extern char *arch_register_req_format(char *buf, size_t len,
@@ -361,7 +234,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;