avoid new_NoMem in favor or get_irg_no_mem

[libfirm] / ir / be / sparc / bearch_sparc.c

diff --git a/ir/be/sparc/bearch_sparc.c b/ir/be/sparc/bearch_sparc.c
index abce062..499c71f 100644 (file)
--- 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"
@@ -116,6 +117,8 @@ static int sparc_get_sp_bias(const ir_node *node)
                 * calculates that! */
                assert(attr->immediate_value <= -SPARC_MIN_STACKSIZE);
                return attr->immediate_value + SPARC_MIN_STACKSIZE;
+       } else if (is_sparc_RestoreZero(node)) {
+               return SP_BIAS_RESET;
        }
        return 0;
 }
@@ -168,8 +171,8 @@ static void transform_Reload(ir_node *node)
 {
        ir_node   *block  = get_nodes_block(node);
        dbg_info  *dbgi   = get_irn_dbg_info(node);
-       ir_node   *ptr    = get_irn_n(node, be_pos_Spill_frame);
-       ir_node   *mem    = get_irn_n(node, be_pos_Reload_mem);
+       ir_node   *ptr    = get_irn_n(node, n_be_Spill_frame);
+       ir_node   *mem    = get_irn_n(node, n_be_Reload_mem);
        ir_mode   *mode   = get_irn_mode(node);
        ir_entity *entity = be_get_frame_entity(node);
        const arch_register_t *reg;
@@ -197,10 +200,10 @@ static void transform_Spill(ir_node *node)
 {
        ir_node   *block  = get_nodes_block(node);
        dbg_info  *dbgi   = get_irn_dbg_info(node);
-       ir_node   *ptr    = get_irn_n(node, be_pos_Spill_frame);
+       ir_node   *ptr    = get_irn_n(node, n_be_Spill_frame);
        ir_graph  *irg    = get_irn_irg(node);
-       ir_node   *mem    = new_r_NoMem(irg);
-       ir_node   *val    = get_irn_n(node, be_pos_Spill_val);
+       ir_node   *mem    = get_irg_no_mem(irg);
+       ir_node   *val    = get_irn_n(node, n_be_Spill_val);
        ir_mode   *mode   = get_irn_mode(val);
        ir_entity *entity = be_get_frame_entity(node);
        ir_node   *sched_point;
@@ -280,10 +283,12 @@ static void sparc_set_frame_entity(ir_node *node, ir_entity *entity)
 
 static void sparc_after_ra(ir_graph *irg)
 {
-       be_fec_env_t *fec_env = be_new_frame_entity_coalescer(irg);
+       be_stack_layout_t *stack_layout = be_get_irg_stack_layout(irg);
+       bool               at_begin     = stack_layout->sp_relative ? true : false;
+       be_fec_env_t      *fec_env      = be_new_frame_entity_coalescer(irg);
 
        irg_walk_graph(irg, NULL, sparc_collect_frame_entity_nodes, fec_env);
-       be_assign_entities(fec_env, sparc_set_frame_entity);
+       be_assign_entities(fec_env, sparc_set_frame_entity, at_begin);
        be_free_frame_entity_coalescer(fec_env);
 
        irg_block_walk_graph(irg, NULL, sparc_after_ra_walker, NULL);
@@ -305,7 +310,6 @@ static sparc_isa_t sparc_isa_template = {
                &sparc_registers[REG_SP],           /* stack pointer register */
                &sparc_registers[REG_FRAME_POINTER],/* base pointer register */
                &sparc_reg_classes[CLASS_sparc_gp], /* link pointer register class */
-               -1,                                 /* stack direction */
                3,                                  /* power of two stack alignment
                                                       for calls */
                NULL,                               /* main environment */
@@ -343,9 +347,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 };
@@ -536,13 +540,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);
@@ -586,7 +598,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 */
@@ -620,6 +631,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,
@@ -637,7 +649,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,
 };