make transformations before checking 2 addresscode constraints

[libfirm] / ir / be / beabi.c

diff --git a/ir/be/beabi.c b/ir/be/beabi.c
index 2365911..5dcb8dd 100644 (file)
--- a/ir/be/beabi.c
+++ b/ir/be/beabi.c
@@ -218,7 +218,7 @@ be_abi_call_flags_t be_abi_call_get_flags(const be_abi_call_t *call)
  *
  * @return the new ABI call object
  */
-static be_abi_call_t *be_abi_call_new()
+static be_abi_call_t *be_abi_call_new(void)
 {
        be_abi_call_t *call = xmalloc(sizeof(call[0]));
        call->flags.val  = 0;
@@ -797,7 +797,6 @@ static int check_dependence(ir_node *curr, ir_node *tgt, ir_node *bl)
 static int dependent_on(ir_node *n1, ir_node *n2)
 {
        ir_node *bl   = get_nodes_block(n1);
-       ir_graph *irg = get_irn_irg(bl);
 
        assert(bl == get_nodes_block(n2));
 
@@ -1269,7 +1268,6 @@ static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl, i
        /* clear SP entry, since it has already been grown. */
        pmap_insert(reg_map, (void *) isa->sp, NULL);
        for(i = 0; i < n_res; ++i) {
-               ir_node *res           = get_Return_res(irn, i);
                be_abi_call_arg_t *arg = get_call_arg(call, 1, i);
 
                in[n]     = be_abi_reg_map_get(reg_map, arg->reg);
@@ -1728,7 +1726,6 @@ be_abi_irg_t *be_abi_introduce(be_irg_t *birg)
        arch_env_push_irn_handler(env->birg->main_env->arch_env, &env->irn_handler);
 
        env->call->cb->done(env->cb);
-       be_liveness(irg);
        return env;
 }
 
@@ -1779,7 +1776,7 @@ static void collect_stack_nodes_walker(ir_node *irn, void *data)
                pset_insert_ptr(info->nodes, irn);
 }
 
-void be_abi_fix_stack_nodes(be_abi_irg_t *env)
+void be_abi_fix_stack_nodes(be_abi_irg_t *env, be_lv_t *lv)
 {
        dom_front_info_t *df;
        pset *stack_nodes = pset_new_ptr(16);
@@ -1792,12 +1789,9 @@ void be_abi_fix_stack_nodes(be_abi_irg_t *env)
        df = be_compute_dominance_frontiers(env->birg->irg);
        irg_walk_graph(env->birg->irg, collect_stack_nodes_walker, NULL, &info);
        pset_insert_ptr(stack_nodes, env->init_sp);
-       be_ssa_constr_set_phis(df, stack_nodes, env->stack_phis);
+       be_ssa_constr_set_phis(df, lv, stack_nodes, env->stack_phis);
        del_pset(stack_nodes);
 
-       /* Liveness could have changed due to Phi nodes. */
-       be_liveness(env->birg->irg);
-
        /* free these dominance frontiers */
        be_free_dominance_frontiers(df);
 }