X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbearch.c;h=575a98ec61336c1c92226466beb074a752736a43;hb=2c2c56e73d75124c542ec97fa6d0df75a43a6536;hp=0dfe27f786a9f83b8677e2e201fe5894078d0f36;hpb=641c8d10420714f80eb08b87a12355fdf96a7cf2;p=libfirm

diff --git a/ir/be/bearch.c b/ir/be/bearch.c
index 0dfe27f78..575a98ec6 100644
--- a/ir/be/bearch.c
+++ b/ir/be/bearch.c
@@ -23,9 +23,7 @@
  * @author      Sebastian Hack
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <string.h>
 
@@ -67,7 +65,7 @@ static int arch_register_class_put(const arch_register_class_t *cls, bitset_t *b
  * @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 ir_node *irn)
+static inline const arch_irn_ops_t *get_irn_ops(const ir_node *irn)
 {
 	const ir_op          *ops;
 	const arch_irn_ops_t *be_ops;
@@ -96,31 +94,27 @@ void arch_set_frame_offset(ir_node *irn, int offset)
 	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(irn);
-	(void)env; // TODO remove parameter
 	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(irn);
-	(void)env; // TODO remove parameter
 	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(irn);
-	(void)env; // TODO remove parameter
 	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(irn);
-	(void)env; // TODO remove parameter
 
 	if(ops->get_inverse) {
 		return ops->get_inverse(irn, i, inverse, obstack);
@@ -129,9 +123,9 @@ 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) {
+int arch_possible_memory_operand(const ir_node *irn, unsigned int i)
+{
 	const arch_irn_ops_t *ops = get_irn_ops(irn);
-	(void)env; // TODO remove parameter
 
 	if(ops->possible_memory_operand) {
 		return ops->possible_memory_operand(irn, i);
@@ -140,9 +134,9 @@ 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) {
+void arch_perform_memory_operand(ir_node *irn, ir_node *spill, unsigned int i)
+{
 	const arch_irn_ops_t *ops = get_irn_ops(irn);
-	(void)env; // TODO remove parameter
 
 	if(ops->perform_memory_operand) {
 		ops->perform_memory_operand(irn, spill, i);
@@ -151,10 +145,9 @@ void arch_perform_memory_operand(const arch_env_t *env, ir_node *irn, ir_node *s
 	}
 }
 
-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(irn);
-	(void)env; // TODO remove parameter
 
 	if(ops->get_op_estimated_cost) {
 		return ops->get_op_estimated_cost(irn);
@@ -163,38 +156,6 @@ int arch_get_op_estimated_cost(const arch_env_t *env, const ir_node *irn)
 	}
 }
 
-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(irn);
-	(void)env; // TODO remove parameter
-
-	if(ops->possible_memory_operand) {
-	   	return ops->possible_memory_operand(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(irn);
-	const arch_register_req_t *req = ops->get_irn_reg_req(irn, pos);
-	(void)env; // TODO remove parameter
-
-	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_register_class_t *cls, bitset_t *bs)
 {
 	unsigned i;
@@ -205,21 +166,9 @@ void arch_put_non_ignore_regs(const arch_register_class_t *cls, bitset_t *bs)
 	}
 }
 
-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(irn);
-	const arch_register_req_t *req = ops->get_irn_reg_req(irn, pos);
-	(void)env; // TODO remove parameter
-
-	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 arch_reg_is_allocatable(const ir_node *irn, int pos, const arch_register_t *reg)
 {
 	const arch_register_req_t *req = arch_get_register_req(irn, pos);
-	(void)env; // TODO remove parameter
 
 	if(req->type == arch_register_req_type_none)
 		return 0;
@@ -232,63 +181,39 @@ 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(irn);
-	const arch_register_req_t *req = ops->get_irn_reg_req(irn, pos);
-	(void)env; // TODO remove parameter
+	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_register_t *arch_get_irn_register(const ir_node *irn)
 {
 	const arch_irn_ops_t *ops = get_irn_ops(irn);
-	(void)env; // TODO remove parameter
 	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)
+void arch_set_irn_register(ir_node *irn, const arch_register_t *reg)
 {
 	const arch_irn_ops_t *ops = get_irn_ops(irn);
-	(void)env; // TODO remove parameter
 	ops->set_irn_reg(irn, reg);
 }
 
-extern arch_irn_class_t arch_irn_classify(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(irn);
-	(void)env; // TODO remove parameter
 	return ops->classify(irn);
 }
 
-extern arch_irn_flags_t arch_irn_get_flags(const arch_env_t *env, const ir_node *irn)
+arch_irn_flags_t arch_irn_get_flags(const ir_node *irn)
 {
 	const arch_irn_ops_t *ops = get_irn_ops(irn);
-	(void)env; // TODO remove parameter
 	return ops->get_flags(irn);
 }
 
-extern const char *arch_irn_flag_str(arch_irn_flags_t fl)
-{
-	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";
-}
-
 extern char *arch_register_req_format(char *buf, size_t len,
                                       const arch_register_req_t *req,
                                       const ir_node *node)