Use edges_reroute_except() instead of edges_reroute() + set_irn_n().
[libfirm] / ir / be / sparc / sparc_finish.c
index cfde1ff..4c34288 100644 (file)
@@ -21,7 +21,6 @@
  * @file
  * @brief    Peephole optimization and legalization of a sparc function
  * @author   Matthias Braun
- * @version  $Id$
  *
  * A note on sparc stackpointer (sp) behaviour:
  * The ABI expects SPARC_MIN_STACKSIZE bytes to be available at the
@@ -92,8 +91,10 @@ static void introduce_epilog(ir_node *ret)
 
        if (!layout->sp_relative) {
                const arch_register_t *fp_reg = &sparc_registers[REG_FRAME_POINTER];
+               const arch_register_t *sp_reg = &sparc_registers[REG_SP];
                ir_node *fp      = be_get_initial_reg_value(irg, fp_reg);
-               ir_node *restore = new_bd_sparc_RestoreZero(NULL, block, fp);
+               ir_node *sp      = be_get_initial_reg_value(irg, sp_reg);
+               ir_node *restore = new_bd_sparc_RestoreZero(NULL, block, sp, fp);
                sched_add_before(ret, restore);
                arch_set_irn_register(restore, sp_reg);
                set_irn_n(ret, sp_idx, restore);
@@ -113,7 +114,6 @@ void sparc_introduce_prolog_epilog(ir_graph *irg)
        be_stack_layout_t     *layout     = be_get_irg_stack_layout(irg);
        ir_node               *block      = get_nodes_block(start);
        ir_node               *initial_sp = be_get_initial_reg_value(irg, sp_reg);
-       ir_node               *sp         = initial_sp;
        ir_node               *schedpoint = start;
        ir_type               *frame_type = get_irg_frame_type(irg);
        unsigned               frame_size = get_type_size_bytes(frame_type);
@@ -135,14 +135,12 @@ void sparc_introduce_prolog_epilog(ir_graph *irg)
                schedpoint = sched_next(schedpoint);
 
        if (!layout->sp_relative) {
-               ir_node *save = new_bd_sparc_Save_imm(NULL, block, sp, NULL,
-                                                     -SPARC_MIN_STACKSIZE-frame_size);
+               ir_node *const save = new_bd_sparc_Save_imm(NULL, block, initial_sp, NULL, -(SPARC_MIN_STACKSIZE + frame_size));
                arch_set_irn_register(save, sp_reg);
                sched_add_after(schedpoint, save);
                schedpoint = save;
 
-               edges_reroute(initial_sp, save);
-               set_irn_n(save, n_sparc_Save_stack, initial_sp);
+               edges_reroute_except(initial_sp, save, save);
 
                /* we still need the Save even if noone is explicitely using the
                 * value. (TODO: this isn't 100% correct yet, something at the end of
@@ -155,9 +153,8 @@ void sparc_introduce_prolog_epilog(ir_graph *irg)
                        sched_add_after(schedpoint, keep);
                }
        } else {
-               ir_node *incsp = be_new_IncSP(sp_reg, block, sp, frame_size, 0);
-               edges_reroute(initial_sp, incsp);
-               be_set_IncSP_pred(incsp, sp);
+               ir_node *const incsp = be_new_IncSP(sp_reg, block, initial_sp, frame_size, 0);
+               edges_reroute_except(initial_sp, incsp, incsp);
                sched_add_after(schedpoint, incsp);
        }
 }
@@ -250,7 +247,7 @@ static void finish_sparc_FrameAddr(ir_node *node)
 
                sched_add_before(node, new_frameaddr);
                arch_set_irn_register(new_frameaddr, reg);
-               exchange(node, new_frameaddr);
+               be_peephole_exchange(node, new_frameaddr);
        }
 }
 
@@ -282,11 +279,41 @@ static void finish_sparc_Ld(ir_node *node)
                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, new_load);
        }
 
 }
 
+static void split_sparc_ldf(ir_node *node)
+{
+       sparc_load_store_attr_t *attr = get_sparc_load_store_attr(node);
+       unsigned                 bits = get_mode_size_bits(attr->load_store_mode);
+       /* split 128bit loads into 2 64bit loads */
+       if (bits == 128) {
+               dbg_info *dbgi  = get_irn_dbg_info(node);
+               ir_node  *block = get_nodes_block(node);
+               ir_node  *ptr   = get_irn_n(node, n_sparc_Ldf_ptr);
+               ir_node  *mem   = get_irn_n(node, n_sparc_Ldf_mem);
+               ir_node  *new_load
+                       = new_bd_sparc_Ldf_d(dbgi, block, ptr, mem, mode_D,
+                                            attr->base.immediate_value_entity,
+                                            attr->base.immediate_value + 8,
+                                            attr->is_frame_entity);
+               ir_node  *new_mem = new_r_Proj(new_load, mode_M, pn_sparc_Ldf_M);
+
+               const arch_register_t *reg
+                       = arch_get_irn_register_out(node, pn_sparc_Ldf_res);
+               unsigned reg_index = reg->global_index;
+
+               arch_set_irn_register_out(new_load, pn_sparc_Ldf_res,
+                                         &sparc_registers[reg_index+2]);
+
+               attr->load_store_mode = mode_D;
+               set_irn_n(node, n_sparc_Ldf_mem, new_mem);
+               sched_add_before(node, new_load);
+       }
+}
+
 static void finish_sparc_Ldf(ir_node *node)
 {
        sparc_attr_t                  *attr            = get_sparc_attr(node);
@@ -316,7 +343,7 @@ static void finish_sparc_Ldf(ir_node *node)
                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, new_load);
        }
 
 }
@@ -350,7 +377,7 @@ static void finish_sparc_St(ir_node *node)
                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, new_load);
        }
 
 }
@@ -385,7 +412,7 @@ static void finish_sparc_Stf(ir_node *node)
                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, new_load);
        }
 
 }
@@ -434,10 +461,12 @@ static void replace_with_restore_reg(ir_node *node, ir_node *replaced,
                                                                         ir_node *op0, ir_node *op1)
 {
        dbg_info *dbgi     = get_irn_dbg_info(node);
+       ir_node  *stack_in = get_irn_n(node, n_sparc_RestoreZero_stack);
        ir_node  *fp       = get_irn_n(node, n_sparc_RestoreZero_frame_pointer);
        ir_node  *block    = get_nodes_block(node);
        ir_mode  *mode     = get_irn_mode(node);
-       ir_node  *new_node = new_bd_sparc_Restore_reg(dbgi, block, fp, op0, op1);
+       ir_node  *new_node = new_bd_sparc_Restore_reg(dbgi, block, stack_in, fp,
+                                                     op0, op1);
        ir_node  *stack    = new_r_Proj(new_node, mode, pn_sparc_Restore_stack);
        ir_node  *res      = new_r_Proj(new_node, mode, pn_sparc_Restore_res);
        const arch_register_t *reg = arch_get_irn_register(replaced);
@@ -455,11 +484,12 @@ static void replace_with_restore_imm(ir_node *node, ir_node *replaced,
                                                                         int32_t immediate)
 {
        dbg_info *dbgi     = get_irn_dbg_info(node);
+       ir_node  *stack_in = get_irn_n(node, n_sparc_RestoreZero_stack);
        ir_node  *fp       = get_irn_n(node, n_sparc_RestoreZero_frame_pointer);
        ir_node  *block    = get_nodes_block(node);
        ir_mode  *mode     = get_irn_mode(node);
-       ir_node  *new_node
-               = new_bd_sparc_Restore_imm(dbgi, block, fp, op, imm_entity, immediate);
+       ir_node  *new_node = new_bd_sparc_Restore_imm(dbgi, block, stack_in, fp,
+                                                     op, imm_entity, immediate);
        ir_node  *stack    = new_r_Proj(new_node, mode, pn_sparc_Restore_stack);
        ir_node  *res      = new_r_Proj(new_node, mode, pn_sparc_Restore_res);
        const arch_register_t *reg = arch_get_irn_register(replaced);
@@ -508,13 +538,13 @@ static void peephole_sparc_RestoreZero(ir_node *node)
                if (!is_restorezeroopt_reg(reg))
                        continue;
 
-               if (be_is_Copy(schedpoint) && be_can_move_before(heights, schedpoint, node)) {
-                       ir_node *op = get_irn_n(schedpoint, n_be_Copy_op);
+               if (be_is_Copy(schedpoint) && be_can_move_down(heights, schedpoint, node)) {
+                       ir_node *const op = be_get_Copy_op(schedpoint);
                        replace_with_restore_imm(node, schedpoint, op, NULL, 0);
                } else if (is_sparc_Or(schedpoint) &&
                           arch_get_irn_flags(schedpoint) & ((arch_irn_flags_t)sparc_arch_irn_flag_immediate_form) &&
                           arch_get_irn_register_in(schedpoint, 0) == &sparc_registers[REG_G0] &&
-                          be_can_move_before(heights, schedpoint, node)) {
+                          be_can_move_down(heights, schedpoint, node)) {
                        /* it's a constant */
                        const sparc_attr_t *attr      = get_sparc_attr_const(schedpoint);
                        ir_entity          *entity    = attr->immediate_value_entity;
@@ -522,7 +552,7 @@ static void peephole_sparc_RestoreZero(ir_node *node)
                        ir_node            *g0        = get_irn_n(schedpoint, 0);
                        replace_with_restore_imm(node, schedpoint, g0, entity, immediate);
                } else if (is_sparc_Add(schedpoint) &&
-                          be_can_move_before(heights, schedpoint, node)) {
+                          be_can_move_down(heights, schedpoint, node)) {
                        if (arch_get_irn_flags(schedpoint) & ((arch_irn_flags_t)sparc_arch_irn_flag_immediate_form)) {
                                ir_node            *op     = get_irn_n(schedpoint, 0);
                                const sparc_attr_t *attr   = get_sparc_attr_const(schedpoint);
@@ -537,7 +567,7 @@ static void peephole_sparc_RestoreZero(ir_node *node)
                } else if (is_sparc_Sub(schedpoint) &&
                           arch_get_irn_flags(schedpoint) & ((arch_irn_flags_t)sparc_arch_irn_flag_immediate_form) &&
                           arch_get_irn_register_in(schedpoint, 0) == &sparc_registers[REG_G0] &&
-                          be_can_move_before(heights, schedpoint, node)) {
+                          be_can_move_down(heights, schedpoint, node)) {
                        /* it's a constant */
                        const sparc_attr_t *attr   = get_sparc_attr_const(schedpoint);
                        ir_entity          *entity = attr->immediate_value_entity;
@@ -629,7 +659,7 @@ static void sparc_set_frame_entity(ir_node *node, ir_entity *entity)
        }
 }
 
-void sparc_finish(ir_graph *irg)
+void sparc_finish_graph(ir_graph *irg)
 {
        be_stack_layout_t *stack_layout = be_get_irg_stack_layout(irg);
        bool               at_begin     = stack_layout->sp_relative ? true : false;
@@ -638,6 +668,7 @@ void sparc_finish(ir_graph *irg)
        irg_walk_graph(irg, NULL, sparc_collect_frame_entity_nodes, fec_env);
        be_assign_entities(fec_env, sparc_set_frame_entity, at_begin);
        be_free_frame_entity_coalescer(fec_env);
+       sparc_adjust_stack_entity_offsets(irg);
 
        sparc_introduce_prolog_epilog(irg);
 
@@ -648,15 +679,16 @@ void sparc_finish(ir_graph *irg)
        heights = heights_new(irg);
 
        /* perform peephole optimizations */
-       clear_irp_opcodes_generic_func();
+       ir_clear_opcodes_generic_func();
        register_peephole_optimisation(op_be_IncSP,        peephole_be_IncSP);
        register_peephole_optimisation(op_sparc_FrameAddr, peephole_sparc_FrameAddr);
        register_peephole_optimisation(op_sparc_RestoreZero,
                                       peephole_sparc_RestoreZero);
+       register_peephole_optimisation(op_sparc_Ldf, split_sparc_ldf);
        be_peephole_opt(irg);
 
        /* perform legalizations (mostly fix nodes with too big immediates) */
-       clear_irp_opcodes_generic_func();
+       ir_clear_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);