X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbearch.c;h=700115c4085cc685bdfb9469d299be640fb631b8;hb=2c6cb525849141ca24634f4bf3eab578fe6361d2;hp=f6b87fd8415e03ad7b963db077e47459e494861a;hpb=46d5d1c68e61602198a4e40f5fb061bdb3145b72;p=libfirm

diff --git a/ir/be/bearch.c b/ir/be/bearch.c
index f6b87fd84..700115c40 100644
--- a/ir/be/bearch.c
+++ b/ir/be/bearch.c
@@ -23,14 +23,13 @@
  * @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 "beinfo.h"
 #include "ircons_t.h"
 #include "irnode_t.h"
 
@@ -48,26 +47,12 @@ arch_env_t *arch_env_init(const arch_isa_if_t *isa_if, FILE *file_handle, be_mai
 	return arch_env;
 }
 
-/**
- * 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)
-{
-	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 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;
@@ -84,46 +69,39 @@ static INLINE const arch_irn_ops_t *get_irn_ops(const ir_node *irn)
 	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(irn);
-	(void)env; // TODO remove parameter
 	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(irn);
-	(void)env; // TODO remove parameter
 	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);
@@ -132,9 +110,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);
@@ -143,9 +121,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);
@@ -154,10 +132,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);
@@ -166,131 +143,112 @@ 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)
+void arch_put_non_ignore_regs(const arch_register_class_t *cls, bitset_t *bs)
 {
-	const arch_irn_ops_t *ops = get_irn_ops(irn);
-	(void)env; // TODO remove parameter
+	unsigned i;
 
-	if(ops->possible_memory_operand) {
-	   	return ops->possible_memory_operand(irn, i);
-	} else {
-		return 0;
+	for(i = 0; i < cls->n_regs; ++i) {
+		if(!arch_register_type_is(&cls->regs[i], ignore))
+			bitset_set(bs, i);
 	}
 }
 
-int arch_get_allocatable_regs(const arch_env_t *env, const ir_node *irn, int pos, bitset_t *bs)
+int arch_reg_is_allocatable(const ir_node *irn, int pos, const arch_register_t *reg)
 {
-	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);
 
-	if(req->type == arch_register_req_type_none) {
-		bitset_clear_all(bs);
+	if(req->type == arch_register_req_type_none)
 		return 0;
-	}
 
 	if(arch_register_req_is(req, limited)) {
-		rbitset_copy_to_bitset(req->limited, bs);
-		return bitset_popcnt(bs);
+		assert(arch_register_get_class(reg) == req->cls);
+		return rbitset_is_set(req->limited, arch_register_get_index(reg));
 	}
 
-	arch_register_class_put(req->cls, bs);
-	return req->cls->n_regs;
+	return req->cls == reg->reg_class;
 }
 
-void arch_put_non_ignore_regs(const arch_register_class_t *cls, bitset_t *bs)
+const arch_register_class_t *arch_get_irn_reg_class(const ir_node *irn, int pos)
 {
-	unsigned i;
-
-	for(i = 0; i < cls->n_regs; ++i) {
-		if(!arch_register_type_is(&cls->regs[i], ignore))
-			bitset_set(bs, i);
-	}
-}
+	const arch_register_req_t *req = arch_get_register_req(irn, pos);
 
-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
+	assert(req->type != arch_register_req_type_none || req->cls == NULL);
 
-	return req != NULL;
+	return req->cls;
 }
 
-int arch_reg_is_allocatable(const arch_env_t *env, const ir_node *irn,
-    int pos, const arch_register_t *reg)
+static inline reg_out_info_t *get_out_info(const ir_node *node)
 {
-	const arch_register_req_t *req;
+	int                   pos  = 0;
+	const backend_info_t *info;
 
-	req = arch_get_register_req(env, irn, pos);
+	assert(get_irn_mode(node) != mode_T);
+	if (is_Proj(node)) {
+		pos  = get_Proj_proj(node);
+		node = get_Proj_pred(node);
+	}
 
-	if(req->type == arch_register_req_type_none)
-		return 0;
+	info = be_get_info(node);
+	assert(pos >= 0 && pos < ARR_LEN(info->out_infos));
+	return &info->out_infos[pos];
+}
 
-	if(arch_register_req_is(req, limited)) {
-		assert(arch_register_get_class(reg) == req->cls);
-		return rbitset_is_set(req->limited, arch_register_get_index(reg));
-	}
 
-	return req->cls == reg->reg_class;
+static inline reg_out_info_t *get_out_info_n(const ir_node *node, int pos)
+{
+	const backend_info_t *info = be_get_info(node);
+	assert(!is_Proj(node));
+	assert(pos >= 0 && pos < ARR_LEN(info->out_infos));
+	return &info->out_infos[pos];
 }
 
-const arch_register_class_t *
-arch_get_irn_reg_class(const arch_env_t *env, const ir_node *irn, int pos)
+
+const arch_register_t *arch_get_irn_register(const ir_node *node)
 {
-	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 reg_out_info_t *out = get_out_info(node);
+	return out->reg;
+}
 
-	assert(req->type != arch_register_req_type_none || req->cls == NULL);
+const arch_register_t *arch_irn_get_register(const ir_node *node, int pos)
+{
+	const reg_out_info_t *out = get_out_info_n(node, pos);
+	return out->reg;
+}
 
-	return req->cls;
+void arch_irn_set_register(ir_node *node, int pos, const arch_register_t *reg)
+{
+	reg_out_info_t *out = get_out_info_n(node, pos);
+	out->reg            = reg;
 }
 
-extern const arch_register_t *
-arch_get_irn_register(const arch_env_t *env, const ir_node *irn)
+void arch_set_irn_register(ir_node *node, const arch_register_t *reg)
 {
-	const arch_irn_ops_t *ops = get_irn_ops(irn);
-	(void)env; // TODO remove parameter
-	return ops->get_irn_reg(irn);
+	reg_out_info_t *out = get_out_info(node);
+	out->reg = reg;
 }
 
-extern void arch_set_irn_register(const arch_env_t *env,
-    ir_node *irn, const arch_register_t *reg)
+arch_irn_class_t arch_irn_classify(const ir_node *node)
 {
-	const arch_irn_ops_t *ops = get_irn_ops(irn);
-	(void)env; // TODO remove parameter
-	ops->set_irn_reg(irn, reg);
+	const arch_irn_ops_t *ops = get_irn_ops(node);
+	return ops->classify(node);
 }
 
-extern arch_irn_class_t arch_irn_classify(const arch_env_t *env, const ir_node *irn)
+arch_irn_flags_t arch_irn_get_flags(const ir_node *node)
 {
-	const arch_irn_ops_t *ops = get_irn_ops(irn);
-	(void)env; // TODO remove parameter
-	return ops->classify(irn);
+	backend_info_t *info = be_get_info(node);
+	return info->flags;
 }
 
-extern arch_irn_flags_t arch_irn_get_flags(const arch_env_t *env, const ir_node *irn)
+void arch_irn_set_flags(ir_node *node, arch_irn_flags_t flags)
 {
-	const arch_irn_ops_t *ops = get_irn_ops(irn);
-	(void)env; // TODO remove parameter
-	return ops->get_flags(irn);
+	backend_info_t *info = be_get_info(node);
+	info->flags = flags;
 }
 
-extern const char *arch_irn_flag_str(arch_irn_flags_t fl)
+void arch_irn_add_flags(ir_node *node, arch_irn_flags_t flags)
 {
-	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";
+	backend_info_t *info = be_get_info(node);
+	info->flags |= flags;
 }
 
 extern char *arch_register_req_format(char *buf, size_t len,
@@ -340,6 +298,13 @@ extern char *arch_register_req_format(char *buf, size_t len,
 		}
 	}
 
+	if (arch_register_req_is(req, ignore)) {
+		strncat(buf, " ignore", len);
+	}
+	if (arch_register_req_is(req, produces_sp)) {
+		strncat(buf, " produces_sp", len);
+	}
+
 	return buf;
 }