X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbearch.c;h=2bb7f2c2342f9ff3f11ea071c20f2c827548b8dc;hb=716f7f09ca90bb2f21801dea9826b921e6195f0d;hp=ce75db63072e1c33f2fdedc60f37ec4a7a323d8b;hpb=cf9c1673146d1f45d46ceb77eccfaf10fedff25d;p=libfirm

diff --git a/ir/be/bearch.c b/ir/be/bearch.c
index ce75db630..2bb7f2c23 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>
 
@@ -33,7 +31,6 @@
 #include "benode_t.h"
 #include "ircons_t.h"
 #include "irnode_t.h"
-#include "xmalloc.h"
 
 #include "bitset.h"
 #include "pset.h"
@@ -49,29 +46,29 @@ arch_env_t *arch_env_init(const arch_isa_if_t *isa_if, FILE *file_handle, be_mai
 	return arch_env;
 }
 
-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.
+ * @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);
-	}
-
-	return cls->n_regs;
+	int i, n = cls->n_regs;
+	for (i = n - 1; i >= 0; --i)
+		bitset_set(bs, i);
+	return n;
 }
 
 /**
  * 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)
 {
 	const ir_op          *ops;
 	const arch_irn_ops_t *be_ops;
-	(void) env;
 
 	if (is_Proj(irn)) {
 		irn = get_Proj_pred(irn);
@@ -85,44 +82,39 @@ get_irn_ops(const arch_env_t *env, const ir_node *irn)
 	return 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);
-}
-
-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);
+	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);
+	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);
+	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);
+	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);
+	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->get_inverse) {
 		return ops->get_inverse(irn, i, inverse, obstack);
@@ -131,8 +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) {
-	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->possible_memory_operand) {
 		return ops->possible_memory_operand(irn, i);
@@ -141,8 +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) {
-	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->perform_memory_operand) {
 		ops->perform_memory_operand(irn, spill, i);
@@ -151,9 +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(env, irn);
+	const arch_irn_ops_t *ops = get_irn_ops(irn);
 
 	if(ops->get_op_estimated_cost) {
 		return ops->get_op_estimated_cost(irn);
@@ -162,20 +156,9 @@ 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)
+int arch_get_allocatable_regs(const ir_node *irn, int pos, bitset_t *bs)
 {
-   	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
-
-	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(env, irn);
+	const arch_irn_ops_t *ops = get_irn_ops(irn);
 	const arch_register_req_t *req = ops->get_irn_reg_req(irn, pos);
 
 	if(req->type == arch_register_req_type_none) {
@@ -192,11 +175,9 @@ int arch_get_allocatable_regs(const arch_env_t *env, const ir_node *irn, int pos
 	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))
@@ -204,36 +185,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)
-{
-	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->get_irn_reg_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)
+int arch_reg_is_allocatable(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;
@@ -246,10 +200,9 @@ 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_irn_ops_t *ops = get_irn_ops(irn);
 	const arch_register_req_t *req = ops->get_irn_reg_req(irn, pos);
 
 	assert(req->type != arch_register_req_type_none || req->cls == NULL);
@@ -257,47 +210,30 @@ arch_get_irn_reg_class(const arch_env_t *env, const ir_node *irn, int pos)
 	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(env, irn);
+	const arch_irn_ops_t *ops = get_irn_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)
+void arch_set_irn_register(ir_node *irn, const arch_register_t *reg)
 {
-	const arch_irn_ops_t *ops = get_irn_ops(env, irn);
+	const arch_irn_ops_t *ops = get_irn_ops(irn);
 	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(env, irn);
+	const arch_irn_ops_t *ops = get_irn_ops(irn);
 	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(env, irn);
+	const arch_irn_ops_t *ops = get_irn_ops(irn);
 	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)
@@ -332,7 +268,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;