convopt: fix potential bug with modulo shifts, improve cost calculation for optimizab...

[libfirm] / ir / be / beabi.c

diff --git a/ir/be/beabi.c b/ir/be/beabi.c
index be21836..5944a73 100644 (file)
--- a/ir/be/beabi.c
+++ b/ir/be/beabi.c
@@ -470,7 +470,8 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
 
                        /* Insert a store for primitive arguments. */
                        if (is_atomic_type(param_type)) {
-                               ir_node *mem_input = do_seq ? curr_mem : new_r_NoMem(irg);
+                               ir_node *nomem     = get_irg_no_mem(irg);
+                               ir_node *mem_input = do_seq ? curr_mem : nomem;
                                ir_node *store     = new_rd_Store(dbgi, bl, mem_input, addr, param, cons_none);
                                mem   = new_r_Proj(store, mode_M, pn_Store_M);
                        } else {
@@ -1509,6 +1510,7 @@ static void fix_address_of_parameter_access(be_abi_irg_t *env, ir_graph *irg,
                /* the new memory Proj gets the last Proj from store */
                set_Proj_pred(nmem, store);
                set_Proj_proj(nmem, pn_Store_M);
+               set_nodes_block(nmem, get_nodes_block(store));
 
                /* move all entities to the frame type */
                frame_tp = get_irg_frame_type(irg);
@@ -1555,7 +1557,7 @@ static void fix_start_block(ir_graph *irg)
 
        assert(is_Proj(initial_X));
        exchange(initial_X, jmp);
-       set_irg_initial_exec(irg, new_r_Bad(irg));
+       set_irg_initial_exec(irg, new_r_Bad(irg, mode_X));
 }
 
 /**
@@ -1861,8 +1863,9 @@ static void modify_irg(ir_graph *irg)
                                if (is_atomic_type(param_type) && get_irn_n_edges(args[i]) > 0) {
                                        ir_mode *mode      = get_type_mode(param_type);
                                        ir_mode *load_mode = arg->load_mode;
+                                       ir_node *nomem     = get_irg_no_mem(irg);
 
-                                       ir_node *load = new_r_Load(start_bl, new_r_NoMem(irg), addr, load_mode, cons_floats);
+                                       ir_node *load = new_r_Load(start_bl, nomem, addr, load_mode, cons_floats);
                                        repl = new_r_Proj(load, load_mode, pn_Load_res);
 
                                        if (mode != load_mode) {
@@ -1891,7 +1894,7 @@ static void modify_irg(ir_graph *irg)
        /* the arg proj is not needed anymore now and should be only used by the anchor */
        assert(get_irn_n_edges(arg_tuple) == 1);
        kill_node(arg_tuple);
-       set_irg_args(irg, new_r_Bad(irg));
+       set_irg_args(irg, new_r_Bad(irg, mode_T));
 
        /* All Return nodes hang on the End node, so look for them there. */
        end = get_irg_end_block(irg);
@@ -2096,7 +2099,7 @@ static void fix_pic_symconsts(ir_node *node, void *data)
                /* we need an extra indirection for global data outside our current
                   module. The loads are always safe and can therefore float
                   and need no memory input */
-               load     = new_r_Load(block, new_r_NoMem(irg), add, mode, cons_floats);
+               load     = new_r_Load(block, get_irg_no_mem(irg), add, mode, cons_floats);
                load_res = new_r_Proj(load, mode, pn_Load_res);
 
                set_irn_n(node, i, load_res);
@@ -2142,6 +2145,8 @@ void be_abi_introduce(ir_graph *irg)
        env->init_sp = dummy;
        env->calls   = NEW_ARR_F(ir_node*, 0);
 
+       edges_assure(irg);
+
        if (options->pic) {
                irg_walk_graph(irg, fix_pic_symconsts, NULL, env);
        }
@@ -2177,8 +2182,8 @@ void be_abi_free(ir_graph *irg)
 
        if (env->call != NULL)
                be_abi_call_free(env->call);
-       free(env);
        assert(env->regs == NULL);
+       free(env);
 
        be_set_irg_abi(irg, NULL);
 }
@@ -2223,7 +2228,7 @@ void be_set_allocatable_regs(const ir_graph *irg,
        }
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_abi);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_abi)
 void be_init_abi(void)
 {
        FIRM_DBG_REGISTER(dbg, "firm.be.abi");