X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbearch.c;h=d8f498a13668b88d40fe71a39c8c258b2210330c;hb=fd96240794b2bc719ca2da1e2415ae9cef8d475a;hp=c028c9ca6508efcfdddc3aadf86b3ba57abaa2fd;hpb=270f2356557d43d3e7ea36dacac46cd1e54a902d;p=libfirm

diff --git a/ir/be/bearch.c b/ir/be/bearch.c
index c028c9ca6..d8f498a13 100644
--- a/ir/be/bearch.c
+++ b/ir/be/bearch.c
@@ -21,7 +21,6 @@
  * @file
  * @brief       Processor architecture specification.
  * @author      Sebastian Hack
- * @version     $Id$
  */
 #include "config.h"
 
@@ -40,10 +39,20 @@
 
 #include "irprintf.h"
 
+arch_register_req_t const arch_no_requirement = {
+	arch_register_req_type_none,
+	NULL,
+	NULL,
+	0,
+	0,
+	0
+};
+
 /* Initialize the architecture environment struct. */
-arch_env_t *arch_env_init(const arch_isa_if_t *isa_if, FILE *file_handle, be_main_env_t *main_env)
+arch_env_t *arch_env_begin_codegeneration(const arch_isa_if_t *isa_if,
+                                          be_main_env_t *main_env)
 {
-	arch_env_t *arch_env = isa_if->init(file_handle);
+	arch_env_t *arch_env = isa_if->begin_codegeneration(main_env);
 	arch_env->main_env   = main_env;
 	return arch_env;
 }
@@ -53,38 +62,19 @@ arch_env_t *arch_env_init(const arch_isa_if_t *isa_if, FILE *file_handle, be_mai
  * @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 const arch_irn_ops_t *get_irn_ops(const ir_node *irn)
 {
-	const ir_op          *ops;
-	const arch_irn_ops_t *be_ops;
-
 	if (is_Proj(irn)) {
 		irn = get_Proj_pred(irn);
 		assert(!is_Proj(irn));
 	}
 
-	ops    = get_irn_op(irn);
-	be_ops = get_op_ops(ops)->be_ops;
+	ir_op                *ops    = get_irn_op(irn);
+	const arch_irn_ops_t *be_ops = get_op_ops(ops)->be_ops;
 
 	return be_ops;
 }
 
-const arch_register_req_t *arch_get_register_req(const ir_node *irn, int pos)
-{
-	if (is_Proj(irn)) {
-		ir_node *pred = get_Proj_pred(irn);
-		long     pn   = get_Proj_proj(irn);
-		assert(pos == -1);
-		return arch_get_out_register_req(pred, pn);
-	}
-
-	if (pos < 0) {
-		return arch_get_out_register_req(irn, -pos-1);
-	} else {
-		return arch_get_in_register_req(irn, pos);
-	}
-}
-
 void arch_set_frame_offset(ir_node *irn, int offset)
 {
 	const arch_irn_ops_t *ops = get_irn_ops(irn);
@@ -147,37 +137,10 @@ int arch_get_op_estimated_cost(const ir_node *irn)
 	}
 }
 
-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);
-
-	if (req->type == arch_register_req_type_none)
-		return 0;
-
-	if (arch_register_req_is(req, limited)) {
-		if (arch_register_get_class(reg) != req->cls)
-			return 0;
-		return rbitset_is_set(req->limited, arch_register_get_index(reg));
-	}
-
-	return req->cls == reg->reg_class;
-}
-
-const arch_register_class_t *arch_get_irn_reg_class(const ir_node *irn, int pos)
+static reg_out_info_t *get_out_info(const ir_node *node)
 {
-	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;
-}
-
-static inline reg_out_info_t *get_out_info(const ir_node *node)
-{
-	size_t                pos  = 0;
+	size_t                pos = 0;
 	const backend_info_t *info;
-
 	assert(get_irn_mode(node) != mode_T);
 	if (is_Proj(node)) {
 		pos  = get_Proj_proj(node);
@@ -189,12 +152,11 @@ static inline reg_out_info_t *get_out_info(const ir_node *node)
 	return &info->out_infos[pos];
 }
 
-
-static inline reg_out_info_t *get_out_info_n(const ir_node *node, int pos)
+static reg_out_info_t *get_out_info_n(const ir_node *node, unsigned pos)
 {
 	const backend_info_t *info = be_get_info(node);
 	assert(!is_Proj(node));
-	assert(pos >= 0 && pos < (int)ARR_LEN(info->out_infos));
+	assert(pos < (unsigned)ARR_LEN(info->out_infos));
 	return &info->out_infos[pos];
 }
 
@@ -205,13 +167,21 @@ const arch_register_t *arch_get_irn_register(const ir_node *node)
 	return out->reg;
 }
 
-const arch_register_t *arch_irn_get_register(const ir_node *node, int pos)
+const arch_register_t *arch_get_irn_register_out(const ir_node *node,
+                                                 unsigned pos)
 {
 	const reg_out_info_t *out = get_out_info_n(node, pos);
 	return out->reg;
 }
 
-void arch_irn_set_register(ir_node *node, int pos, const arch_register_t *reg)
+const arch_register_t *arch_get_irn_register_in(const ir_node *node, int pos)
+{
+	ir_node *op = get_irn_n(node, pos);
+	return arch_get_irn_register(op);
+}
+
+void arch_set_irn_register_out(ir_node *node, unsigned pos,
+                               const arch_register_t *reg)
 {
 	reg_out_info_t *out = get_out_info_n(node, pos);
 	out->reg            = reg;
@@ -223,30 +193,57 @@ void arch_set_irn_register(ir_node *node, const arch_register_t *reg)
 	out->reg = reg;
 }
 
-arch_irn_class_t arch_irn_classify(const ir_node *node)
+const arch_register_req_t *arch_get_irn_register_req(const ir_node *node)
 {
-	const arch_irn_ops_t *ops = get_irn_ops(node);
-	return ops->classify(node);
+	reg_out_info_t *out = get_out_info(node);
+	return out->req;
 }
 
-arch_irn_flags_t arch_irn_get_flags(const ir_node *node)
+arch_irn_flags_t arch_get_irn_flags(const ir_node *node)
 {
-	backend_info_t *info = be_get_info(node);
+	backend_info_t *info;
+	if (is_Proj(node))
+		return arch_irn_flags_not_scheduled;
+
+	info = be_get_info(node);
 	return info->flags;
 }
 
-void arch_irn_set_flags(ir_node *node, arch_irn_flags_t flags)
+void arch_set_irn_flags(ir_node *node, arch_irn_flags_t flags)
 {
-	backend_info_t *info = be_get_info(node);
+	backend_info_t *info;
+
+	/* setting flags is only supported for instructions currently.
+	 * (mainly because we found no use for it yet and saved the space for
+	 * be_infos for them */
+	assert(!is_Proj(node));
+	info = be_get_info(node);
 	info->flags = flags;
 }
 
-void arch_irn_add_flags(ir_node *node, arch_irn_flags_t flags)
+void arch_add_irn_flags(ir_node *node, arch_irn_flags_t flags)
 {
-	backend_info_t *info = be_get_info(node);
+	backend_info_t *info;
+	assert(!is_Proj(node));
+	info = be_get_info(node);
 	info->flags |= flags;
 }
 
+bool arch_reg_is_allocatable(const arch_register_req_t *req,
+                             const arch_register_t *reg)
+{
+	if (reg->type & arch_register_type_joker)
+		return true;
+	if (req->type == arch_register_req_type_none)
+		return false;
+	if (req->type & arch_register_req_type_limited) {
+		if (reg->reg_class != req->cls)
+			return false;
+		return rbitset_is_set(req->limited, reg->index);
+	}
+	return req->cls == reg->reg_class;
+}
+
 void arch_dump_register_req(FILE *F, const arch_register_req_t *req,
                             const ir_node *node)
 {
@@ -295,7 +292,7 @@ void arch_dump_register_req(FILE *F, const arch_register_req_t *req,
 	}
 
 	if (req->width != 1) {
-		fprintf(F, " width:%u", req->width);
+		fprintf(F, " width:%d", req->width);
 	}
 	if (arch_register_req_is(req, aligned)) {
 		fprintf(F, " aligned");
@@ -310,32 +307,30 @@ void arch_dump_register_req(FILE *F, const arch_register_req_t *req,
 
 void arch_dump_reqs_and_registers(FILE *F, const ir_node *node)
 {
-	int              n_ins  = get_irn_arity(node);
-	int              n_outs = arch_irn_get_n_outs(node);
-	arch_irn_flags_t flags  = arch_irn_get_flags(node);
-	int              i;
-
-	for (i = 0; i < n_ins; ++i) {
-		const arch_register_req_t *req = arch_get_in_register_req(node, i);
+	int n_ins  = get_irn_arity(node);
+	for (int i = 0; i < n_ins; ++i) {
+		const arch_register_req_t *req = arch_get_irn_register_req_in(node, i);
 		fprintf(F, "inreq #%d = ", i);
 		arch_dump_register_req(F, req, node);
 		fputs("\n", F);
 	}
-	for (i = 0; i < n_outs; ++i) {
-		const arch_register_req_t *req = arch_get_out_register_req(node, i);
-		fprintf(F, "outreq #%d = ", i);
+	unsigned n_outs = arch_get_irn_n_outs(node);
+	for (unsigned o = 0; o < n_outs; ++o) {
+		const arch_register_req_t *req = arch_get_irn_register_req_out(node, o);
+		fprintf(F, "outreq #%u = ", o);
 		arch_dump_register_req(F, req, node);
 		fputs("\n", F);
 	}
-	for (i = 0; i < n_outs; ++i) {
-		const arch_register_t     *reg = arch_irn_get_register(node, i);
-		const arch_register_req_t *req = arch_get_out_register_req(node, i);
+	for (unsigned o = 0; o < n_outs; ++o) {
+		const arch_register_t     *reg = arch_get_irn_register_out(node, o);
+		const arch_register_req_t *req = arch_get_irn_register_req_out(node, o);
 		if (req->cls == NULL)
 			continue;
-		fprintf(F, "reg #%d = %s\n", i, reg != NULL ? reg->name : "n/a");
+		fprintf(F, "reg #%u = %s\n", o, reg != NULL ? reg->name : "n/a");
 	}
 
 	fprintf(F, "flags =");
+	arch_irn_flags_t flags = arch_get_irn_flags(node);
 	if (flags == arch_irn_flags_none) {
 		fprintf(F, " none");
 	} else {
@@ -348,16 +343,12 @@ void arch_dump_reqs_and_registers(FILE *F, const ir_node *node)
 		if (flags & arch_irn_flags_modify_flags) {
 			fprintf(F, " modify_flags");
 		}
+		if (flags & arch_irn_flags_simple_jump) {
+			fprintf(F, " simple_jump");
+		}
+		if (flags & arch_irn_flags_not_scheduled) {
+			fprintf(F, " not_scheduled");
+		}
 	}
-	fprintf(F, " (%d)\n", flags);
+	fprintf(F, " (0x%x)\n", (unsigned)flags);
 }
-
-static const arch_register_req_t no_requirement = {
-	arch_register_req_type_none,
-	NULL,
-	NULL,
-	0,
-	0,
-	0
-};
-const arch_register_req_t *arch_no_register_req = &no_requirement;