sparc: Improve handling of MemPerm nodes.
[libfirm] / ir / be / sparc / sparc_finish.c
index 8cb6615..29dd75a 100644 (file)
@@ -159,135 +159,232 @@ void sparc_introduce_prolog_epilog(ir_graph *irg)
        }
 }
 
+/**
+ * Creates a constant from an immediate value.
+ */
+static ir_node *create_constant_from_immediate(ir_node *node, int offset)
+{
+       dbg_info *dbgi  = get_irn_dbg_info(node);
+       ir_node  *block = get_nodes_block(node);
+       ir_node  *high  = new_bd_sparc_SetHi(dbgi, block, NULL, offset);
+
+       sched_add_before(node, high);
+       arch_set_irn_register(high, &sparc_registers[REG_G4]);
+
+       if ((offset & 0x3ff) != 0) {
+               ir_node *low = new_bd_sparc_Or_imm(dbgi, block, high, NULL, offset & 0x3ff);
+
+               sched_add_before(node, low);
+               arch_set_irn_register(low, &sparc_registers[REG_G4]);
+
+               return low;
+       }
+
+       return high;
+}
+
 static void finish_sparc_Save(ir_node *node)
 {
        sparc_attr_t *attr = get_sparc_attr(node);
        int offset = attr->immediate_value;
-       ir_node  *schedpoint = node;
-       dbg_info *dbgi;
-       ir_node  *block;
-       ir_node  *new_save;
-       ir_node  *stack;
-       ir_entity *entity;
-
-       if (sparc_is_value_imm_encodeable(offset))
-               return;
 
-       /* uhh only works for the imm variant yet */
-       assert(get_irn_arity(node) == 1);
-
-       block = get_nodes_block(node);
-       dbgi = get_irn_dbg_info(node);
-       stack = get_irn_n(node, n_sparc_Save_stack);
-       entity = attr->immediate_value_entity;
-       new_save = new_bd_sparc_Save_imm(dbgi, block, stack, entity, 0);
-       arch_set_irn_register(new_save, &sparc_registers[REG_SP]);
-       stack = new_save;
-
-       sched_add_after(node, new_save);
-       schedpoint = new_save;
-       while (offset > SPARC_IMMEDIATE_MAX || offset < SPARC_IMMEDIATE_MIN) {
-               if (offset > 0) {
-                       stack = be_new_IncSP(&sparc_registers[REG_SP], block, stack,
-                                            SPARC_IMMEDIATE_MIN, 0);
-                       offset -= -SPARC_IMMEDIATE_MIN;
-               } else {
-                       stack = be_new_IncSP(&sparc_registers[REG_SP], block, stack,
-                                            -SPARC_IMMEDIATE_MIN, 0);
-                       offset -= SPARC_IMMEDIATE_MIN;
-               }
-               sched_add_after(schedpoint, stack);
-               schedpoint = stack;
+       if (! sparc_is_value_imm_encodeable(offset)) {
+               ir_node               *base     = get_irn_n(node, n_sparc_Save_stack);
+               dbg_info              *dbgi     = get_irn_dbg_info(node);
+               ir_node               *block    = get_nodes_block(node);
+               ir_node               *constant = create_constant_from_immediate(node, offset);
+               ir_node               *new_save = new_bd_sparc_Save_reg(dbgi, block, base, constant);
+               const arch_register_t *reg      = arch_get_irn_register(node);
+
+               /* we have a Save with immediate */
+               assert(get_irn_arity(node) == 1);
+
+               sched_add_before(node, new_save);
+               arch_set_irn_register(new_save, reg);
+               be_peephole_exchange(node, new_save);
        }
-       attr = get_sparc_attr(new_save);
-       attr->immediate_value = offset;
-       be_peephole_exchange(node, stack);
 }
 
 /**
- * sparc immediates are limited. Split IncSP with bigger immediates if
+ * SPARC immediates are limited. Split IncSP with bigger immediates if
  * necessary.
  */
 static void finish_be_IncSP(ir_node *node)
 {
-       int      sign   = 1;
-       int      offset = be_get_IncSP_offset(node);
-       ir_node *sp     = be_get_IncSP_pred(node);
-       ir_node *block;
-
-       /* we might have to break the IncSP apart if the constant has become too
-        * big */
-       if (offset < 0) {
-               offset = -offset;
-               sign   = -1;
+       int offset = be_get_IncSP_offset(node);
+
+       /* we might have to break the IncSP apart if the constant has become too big */
+       if (! sparc_is_value_imm_encodeable(offset) && ! sparc_is_value_imm_encodeable(-offset)) {
+               ir_node               *sp       = be_get_IncSP_pred(node);
+               dbg_info              *dbgi     = get_irn_dbg_info(node);
+               ir_node               *block    = get_nodes_block(node);
+               ir_node               *constant = create_constant_from_immediate(node, offset);
+               ir_node               *sub      = new_bd_sparc_Sub_reg(dbgi, block, sp, constant);
+
+               sched_add_before(node, sub);
+               arch_set_irn_register(sub, &sparc_registers[REG_SP]);
+               be_peephole_exchange(node, sub);
        }
-
-       if (sparc_is_value_imm_encodeable(-offset))
-               return;
-
-       /* split incsp into multiple instructions */
-       block = get_nodes_block(node);
-       while (offset > -SPARC_IMMEDIATE_MIN) {
-               sp = be_new_IncSP(&sparc_registers[REG_SP], block, sp,
-                                 sign * -SPARC_IMMEDIATE_MIN, 0);
-               sched_add_before(node, sp);
-               offset -= -SPARC_IMMEDIATE_MIN;
-       }
-
-       be_set_IncSP_pred(node, sp);
-       be_set_IncSP_offset(node, sign*offset);
 }
 
 /**
- * adjust sp-relative offsets. Split into multiple instructions if offset
- * exceeds sparc immediate range.
+ * Adjust sp-relative offsets.
+ *
+ * Split into multiple instructions if offset exceeds SPARC immediate range.
  */
 static void finish_sparc_FrameAddr(ir_node *node)
 {
-       /* adapt to sparc stack magic */
        sparc_attr_t *attr   = get_sparc_attr(node);
        int           offset = attr->immediate_value;
-       ir_node      *base   = get_irn_n(node, n_sparc_FrameAddr_base);
-       dbg_info     *dbgi   = get_irn_dbg_info(node);
-       ir_node      *block  = get_nodes_block(node);
-       int           sign   = 1;
-
-       if (offset < 0) {
-               sign   = -1;
-               offset = -offset;
-       }
 
-       if (offset > -SPARC_IMMEDIATE_MIN) {
-               ir_entity *entity = attr->immediate_value_entity;
-               ir_node   *new_frameaddr
-                       = new_bd_sparc_FrameAddr(dbgi, block, base, entity, 0);
-               ir_node   *schedpoint = node;
-               const arch_register_t *reg = arch_get_irn_register(node);
+       if (! sparc_is_value_imm_encodeable(offset)) {
+               ir_node               *base          = get_irn_n(node, n_sparc_FrameAddr_base);
+               dbg_info              *dbgi          = get_irn_dbg_info(node);
+               ir_node               *block         = get_nodes_block(node);
+               ir_node               *constant      = create_constant_from_immediate(node, offset);
+               ir_node               *new_frameaddr = new_bd_sparc_Add_reg(dbgi, block, base, constant);
+               const arch_register_t *reg           = arch_get_irn_register(node);
 
-               sched_add_after(schedpoint, new_frameaddr);
-               schedpoint = new_frameaddr;
+               sched_add_before(node, new_frameaddr);
                arch_set_irn_register(new_frameaddr, reg);
-               base = new_frameaddr;
-
-               while (offset > -SPARC_IMMEDIATE_MIN) {
-                       if (sign > 0) {
-                               base = new_bd_sparc_Sub_imm(dbgi, block, base, NULL,
-                                                                                       SPARC_IMMEDIATE_MIN);
-                       } else {
-                               base = new_bd_sparc_Add_imm(dbgi, block, base, NULL,
-                                                                                       SPARC_IMMEDIATE_MIN);
-                       }
-                       arch_set_irn_register(base, reg);
-                       sched_add_after(schedpoint, base);
-                       schedpoint = base;
-
-                       offset -= -SPARC_IMMEDIATE_MIN;
+               exchange(node, new_frameaddr);
+       }
+}
+
+static void finish_sparc_Ld(ir_node *node)
+{
+       sparc_attr_t                  *attr            = get_sparc_attr(node);
+       int                            offset          = attr->immediate_value;
+       const sparc_load_store_attr_t *load_store_attr = get_sparc_load_store_attr_const(node);
+
+       if (! load_store_attr->is_frame_entity)
+               return;
+
+       if (! sparc_is_value_imm_encodeable(offset)) {
+               ir_node                 *ptr             = get_irn_n(node, n_sparc_Ld_ptr);
+               dbg_info                *dbgi            = get_irn_dbg_info(node);
+               ir_node                 *block           = get_nodes_block(node);
+               ir_node                 *mem             = get_irn_n(node, n_sparc_Ld_mem);
+               ir_mode                 *load_store_mode = load_store_attr->load_store_mode;
+               ir_node                 *constant        = create_constant_from_immediate(node, offset);
+               ir_node                 *new_load        = new_bd_sparc_Ld_reg(dbgi, block, ptr, constant, mem, load_store_mode);
+               sparc_load_store_attr_t *new_load_attr   = get_sparc_load_store_attr(new_load);
+               unsigned                 n_outs          = arch_get_irn_n_outs(node);
+               unsigned                 i;
+
+               new_load_attr->is_frame_entity = load_store_attr->is_frame_entity;
+               new_load_attr->is_reg_reg      = load_store_attr->is_reg_reg;
+
+               sched_add_before(node, new_load);
+               for (i = 0; i < n_outs; i++) {
+                       arch_set_irn_register_out(new_load, i, arch_get_irn_register_out(node, i));
                }
+               exchange(node, new_load);
+       }
 
-               be_peephole_exchange(node, base);
-               attr = get_sparc_attr(new_frameaddr);
+}
+
+static void finish_sparc_Ldf(ir_node *node)
+{
+       sparc_attr_t                  *attr            = get_sparc_attr(node);
+       int                            offset          = attr->immediate_value;
+       const sparc_load_store_attr_t *load_store_attr = get_sparc_load_store_attr_const(node);
+
+       if (! load_store_attr->is_frame_entity)
+               return;
+
+       if (! sparc_is_value_imm_encodeable(offset)) {
+               ir_node                 *ptr             = get_irn_n(node, n_sparc_Ldf_ptr);
+               dbg_info                *dbgi            = get_irn_dbg_info(node);
+               ir_node                 *block           = get_nodes_block(node);
+               ir_node                 *mem             = get_irn_n(node, n_sparc_Ldf_mem);
+               ir_mode                 *load_store_mode = load_store_attr->load_store_mode;
+               ir_node                 *constant        = create_constant_from_immediate(node, offset);
+               ir_node                 *new_ptr         = new_bd_sparc_Add_reg(dbgi, block, ptr, constant);
+               ir_node                 *new_load        = new_bd_sparc_Ldf_s(dbgi, block, new_ptr, mem, load_store_mode, NULL, 0, true);
+               sparc_load_store_attr_t *new_load_attr   = get_sparc_load_store_attr(new_load);
+               unsigned                 n_outs          = arch_get_irn_n_outs(node);
+               unsigned                 i;
+
+               new_load_attr->is_frame_entity = load_store_attr->is_frame_entity;
+               new_load_attr->is_reg_reg      = load_store_attr->is_reg_reg;
+
+               sched_add_before(node, new_load);
+               for (i = 0; i < n_outs; i++) {
+                       arch_set_irn_register_out(new_load, i, arch_get_irn_register_out(node, i));
+               }
+               exchange(node, new_load);
        }
-       attr->immediate_value = sign*offset;
+
+}
+
+static void finish_sparc_St(ir_node *node)
+{
+       sparc_attr_t                  *attr            = get_sparc_attr(node);
+       int                            offset          = attr->immediate_value;
+       const sparc_load_store_attr_t *load_store_attr = get_sparc_load_store_attr_const(node);
+
+       if (! load_store_attr->is_frame_entity)
+               return;
+
+       if (! sparc_is_value_imm_encodeable(offset)) {
+               ir_node                 *ptr             = get_irn_n(node, n_sparc_St_ptr);
+               dbg_info                *dbgi            = get_irn_dbg_info(node);
+               ir_node                 *block           = get_nodes_block(node);
+               ir_node                 *mem             = get_irn_n(node, n_sparc_St_mem);
+               ir_node                 *value           = get_irn_n(node, n_sparc_St_val);
+               ir_mode                 *load_store_mode = load_store_attr->load_store_mode;
+               ir_node                 *constant        = create_constant_from_immediate(node, offset);
+               ir_node                 *new_load        = new_bd_sparc_St_reg(dbgi, block, value, ptr, constant, mem, load_store_mode);
+               sparc_load_store_attr_t *new_load_attr   = get_sparc_load_store_attr(new_load);
+               unsigned                 n_outs          = arch_get_irn_n_outs(node);
+               unsigned                 i;
+
+               new_load_attr->is_frame_entity = load_store_attr->is_frame_entity;
+               new_load_attr->is_reg_reg      = load_store_attr->is_reg_reg;
+
+               sched_add_before(node, new_load);
+               for (i = 0; i < n_outs; i++) {
+                       arch_set_irn_register_out(new_load, i, arch_get_irn_register_out(node, i));
+               }
+               exchange(node, new_load);
+       }
+
+}
+
+static void finish_sparc_Stf(ir_node *node)
+{
+       sparc_attr_t                  *attr            = get_sparc_attr(node);
+       int                            offset          = attr->immediate_value;
+       const sparc_load_store_attr_t *load_store_attr = get_sparc_load_store_attr_const(node);
+
+       if (! load_store_attr->is_frame_entity)
+               return;
+
+       if (! sparc_is_value_imm_encodeable(offset)) {
+               ir_node                 *ptr             = get_irn_n(node, n_sparc_Stf_ptr);
+               dbg_info                *dbgi            = get_irn_dbg_info(node);
+               ir_node                 *block           = get_nodes_block(node);
+               ir_node                 *mem             = get_irn_n(node, n_sparc_Stf_mem);
+               ir_node                 *value           = get_irn_n(node, n_sparc_Stf_val);
+               ir_mode                 *load_store_mode = load_store_attr->load_store_mode;
+               ir_node                 *constant        = create_constant_from_immediate(node, offset);
+               ir_node                 *new_ptr         = new_bd_sparc_Add_reg(dbgi, block, ptr, constant);
+               ir_node                 *new_load        = new_bd_sparc_Stf_s(dbgi, block, value, new_ptr, mem, load_store_mode, NULL, 0, true);
+               sparc_load_store_attr_t *new_load_attr   = get_sparc_load_store_attr(new_load);
+               unsigned                 n_outs          = arch_get_irn_n_outs(node);
+               unsigned                 i;
+
+               new_load_attr->is_frame_entity = load_store_attr->is_frame_entity;
+               new_load_attr->is_reg_reg      = load_store_attr->is_reg_reg;
+
+               sched_add_before(node, new_load);
+               for (i = 0; i < n_outs; i++) {
+                       arch_set_irn_register_out(new_load, i, arch_get_irn_register_out(node, i));
+               }
+               exchange(node, new_load);
+       }
+
 }
 
 static void peephole_be_IncSP(ir_node *node)
@@ -350,89 +447,6 @@ static void register_peephole_optimisation(ir_op *op, peephole_opt_func func)
        op->ops.generic = (op_func) func;
 }
 
-/**
- * transform reload node => load
- */
-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, 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;
-       ir_node   *proj;
-       ir_node   *load;
-
-       ir_node  *sched_point = sched_prev(node);
-
-       if (mode_is_float(mode)) {
-               load = create_ldf(dbgi, block, ptr, mem, mode, entity, 0, true);
-       } else {
-               load = new_bd_sparc_Ld_imm(dbgi, block, ptr, mem, mode, entity, 0,
-                                          true);
-       }
-       sched_add_after(sched_point, load);
-       sched_remove(node);
-
-       assert((long)pn_sparc_Ld_res == (long)pn_sparc_Ldf_res);
-       proj = new_rd_Proj(dbgi, load, mode, pn_sparc_Ld_res);
-
-       reg = arch_get_irn_register(node);
-       arch_set_irn_register(proj, reg);
-
-       exchange(node, proj);
-}
-
-/**
- * transform spill node => store
- */
-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, n_be_Spill_frame);
-       ir_graph  *irg    = get_irn_irg(node);
-       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;
-       ir_node   *store;
-
-       sched_point = sched_prev(node);
-       if (mode_is_float(mode)) {
-               store = create_stf(dbgi, block, val, ptr, mem, mode, entity, 0, true);
-       } else {
-               store = new_bd_sparc_St_imm(dbgi, block, val, ptr, mem, mode, entity, 0,
-                                           true);
-       }
-       sched_remove(node);
-       sched_add_after(sched_point, store);
-
-       exchange(node, store);
-}
-
-/**
- * walker to transform be_Spill and be_Reload nodes
- */
-static void sparc_after_ra_walker(ir_node *block, void *data)
-{
-       ir_node *node, *prev;
-       (void) data;
-
-       for (node = sched_last(block); !sched_is_begin(node); node = prev) {
-               prev = sched_prev(node);
-
-               if (be_is_Reload(node)) {
-                       transform_Reload(node);
-               } else if (be_is_Spill(node)) {
-                       transform_Spill(node);
-               }
-       }
-}
-
 static void sparc_collect_frame_entity_nodes(ir_node *node, void *data)
 {
        be_fec_env_t  *env = (be_fec_env_t*)data;
@@ -458,7 +472,7 @@ static void sparc_collect_frame_entity_nodes(ir_node *node, void *data)
                return;
        if (!attr->is_frame_entity)
                return;
-       if (arch_irn_get_flags(node) & sparc_arch_irn_flag_needs_64bit_spillslot)
+       if (arch_get_irn_flags(node) & sparc_arch_irn_flag_needs_64bit_spillslot)
                mode = mode_Lu;
        align  = get_mode_size_bytes(mode);
        be_node_needs_frame_entity(env, node, mode, align);
@@ -488,8 +502,6 @@ void sparc_finish(ir_graph *irg)
        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);
-
        sparc_introduce_prolog_epilog(irg);
 
        /* fix stack entity offsets */
@@ -506,8 +518,12 @@ void sparc_finish(ir_graph *irg)
        clear_irp_opcodes_generic_func();
        register_peephole_optimisation(op_be_IncSP,        finish_be_IncSP);
        register_peephole_optimisation(op_sparc_FrameAddr, finish_sparc_FrameAddr);
+       register_peephole_optimisation(op_sparc_Ld,        finish_sparc_Ld);
+       register_peephole_optimisation(op_sparc_Ldf,       finish_sparc_Ldf);
        register_peephole_optimisation(op_sparc_Return,    finish_sparc_Return);
        register_peephole_optimisation(op_sparc_Save,      finish_sparc_Save);
+       register_peephole_optimisation(op_sparc_St,        finish_sparc_St);
+       register_peephole_optimisation(op_sparc_Stf,       finish_sparc_Stf);
        be_peephole_opt(irg);
 
        be_remove_dead_nodes_from_schedule(irg);