X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fsparc%2Fbearch_sparc.c;h=b5a16a1f16408b4f4f754a0efc87b5f2c5aa5da3;hb=011ba04f46ea5a34c7d3c88401b488a50c2cdd00;hp=6467a44591f8e4a69fd1def2ac5a2b216b3438c4;hpb=199fcc3a56d1ce5f18819aef4a6fb91adf490694;p=libfirm

diff --git a/ir/be/sparc/bearch_sparc.c b/ir/be/sparc/bearch_sparc.c
index 6467a4459..b5a16a1f1 100644
--- a/ir/be/sparc/bearch_sparc.c
+++ b/ir/be/sparc/bearch_sparc.c
@@ -20,6 +20,7 @@
 /**
  * @file
  * @brief    The main sparc backend driver file.
+ * @author   Hannes Rapp, Matthias Braun
  * @version  $Id$
  */
 #include "config.h"
@@ -69,7 +70,7 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 static arch_irn_class_t sparc_classify(const ir_node *node)
 {
 	(void) node;
-	return 0;
+	return arch_irn_class_none;
 }
 
 static ir_entity *sparc_get_frame_entity(const ir_node *node)
@@ -235,7 +236,7 @@ static void sparc_after_ra_walker(ir_node *block, void *data)
 
 static void sparc_collect_frame_entity_nodes(ir_node *node, void *data)
 {
-	be_fec_env_t  *env = data;
+	be_fec_env_t  *env = (be_fec_env_t*)data;
 	const ir_mode *mode;
 	int            align;
 	ir_entity     *entity;
@@ -294,7 +295,7 @@ static void sparc_init_graph(ir_graph *irg)
 	(void) irg;
 }
 
-const arch_isa_if_t sparc_isa_if;
+extern const arch_isa_if_t sparc_isa_if;
 static sparc_isa_t sparc_isa_template = {
 	{
 		&sparc_isa_if,                      /* isa interface implementation */
@@ -343,9 +344,9 @@ static void rewrite_unsigned_float_Conv(ir_node *node)
 		ir_node   *signed_x    = new_rd_Conv(dbgi, block, unsigned_x, mode_s);
 		ir_node   *res         = new_rd_Conv(dbgi, block, signed_x, mode_d);
 		ir_node   *zero        = new_r_Const(irg, get_mode_null(mode_s));
-		ir_node   *cmp         = new_rd_Cmp(dbgi, block, signed_x, zero);
-		ir_node   *proj_lt     = new_r_Proj(cmp, mode_b, pn_Cmp_Lt);
-		ir_node   *cond        = new_rd_Cond(dbgi, block, proj_lt);
+		ir_node   *cmp         = new_rd_Cmp(dbgi, block, signed_x, zero,
+		                                    ir_relation_less);
+		ir_node   *cond        = new_rd_Cond(dbgi, block, cmp);
 		ir_node   *proj_true   = new_r_Proj(cond, mode_X, pn_Cond_true);
 		ir_node   *proj_false  = new_r_Proj(cond, mode_X, pn_Cond_false);
 		ir_node   *in_true[1]  = { proj_true };
@@ -477,14 +478,7 @@ static void sparc_handle_intrinsics(void)
  */
 static arch_env_t *sparc_init(FILE *outfile)
 {
-	static int run_once = 0;
-	sparc_isa_t *isa;
-
-	if (run_once)
-		return NULL;
-	run_once = 1;
-
-	isa = XMALLOC(sparc_isa_t);
+	sparc_isa_t *isa = XMALLOC(sparc_isa_t);
 	memcpy(isa, &sparc_isa_template, sizeof(*isa));
 	isa->constants = pmap_create();
 
@@ -502,7 +496,7 @@ static arch_env_t *sparc_init(FILE *outfile)
  */
 static void sparc_done(void *self)
 {
-	sparc_isa_t *isa = self;
+	sparc_isa_t *isa = (sparc_isa_t*)self;
 
 	/* emit now all global declarations */
 	be_gas_emit_decls(isa->base.main_env);
@@ -543,13 +537,21 @@ static ir_node *sparc_create_set(ir_node *cond)
 
 static void sparc_lower_for_target(void)
 {
-	int i;
-	int n_irgs = get_irp_n_irgs();
+	size_t i, n_irgs = get_irp_n_irgs();
 	lower_mode_b_config_t lower_mode_b_config = {
 		mode_Iu,
 		sparc_create_set,
 		0,
 	};
+	lower_params_t params = {
+		4,                                     /* def_ptr_alignment */
+		LF_COMPOUND_RETURN | LF_RETURN_HIDDEN, /* flags */
+		ADD_HIDDEN_ALWAYS_IN_FRONT,            /* hidden_params */
+		NULL,                                  /* find pointer type */
+		NULL,                                  /* ret_compound_in_regs */
+	};
+
+	lower_calls_with_compounds(&params);
 
 	for (i = 0; i < n_irgs; ++i) {
 		ir_graph *irg = get_irp_irg(i);
@@ -593,7 +595,6 @@ static const backend_params *sparc_get_backend_params(void)
 		0,     /* no inline assembly */
 		0,     /* no support for RotL nodes */
 		1,     /* big endian */
-		sparc_lower_for_target, /* lowering callback */
 		&arch_dep,              /* will be set later */
 		sparc_is_mux_allowed,   /* parameter for if conversion */
 		NULL,  /* float arithmetic mode */
@@ -627,6 +628,7 @@ static int sparc_is_valid_clobber(const char *clobber)
 
 const arch_isa_if_t sparc_isa_if = {
 	sparc_init,
+	sparc_lower_for_target,
 	sparc_done,
 	NULL,                /* handle intrinsics */
 	sparc_get_reg_class_for_mode,
@@ -644,7 +646,7 @@ const arch_isa_if_t sparc_isa_if = {
 	sparc_prepare_graph,
 	sparc_before_ra,
 	sparc_after_ra,
-	NULL, /* finish */
+	sparc_finish,
 	sparc_emit_routine,
 };