some bugifxes for alloca handling

[libfirm] / ir / be / beabi.c

diff --git a/ir/be/beabi.c b/ir/be/beabi.c
index 96d777c..f48a543 100644 (file)
--- a/ir/be/beabi.c
+++ b/ir/be/beabi.c
@@ -25,6 +25,9 @@
 #include "irprintf_t.h"
 #include "irgopt.h"
 #include "irbitset.h"
+#include "height.h"
+#include "pdeq.h"
+#include "irtools.h"
 
 #include "be.h"
 #include "beabi.h"
@@ -33,9 +36,6 @@
 #include "belive_t.h"
 #include "besched_t.h"
 
-#define MAX(x, y) ((x) > (y) ? (x) : (y))
-#define MIN(x, y) ((x) < (y) ? (x) : (y))
-
 typedef struct _be_abi_call_arg_t {
        unsigned is_res   : 1;  /**< 1: the call argument is a return value. 0: it's a call parameter. */
        unsigned in_reg   : 1;  /**< 1: this argument is transmitted in registers. */
@@ -115,6 +115,7 @@ struct _be_abi_irg_t {
 /* Forward, since be need it in be_abi_introduce(). */
 static const arch_irn_ops_if_t abi_irn_ops;
 static const arch_irn_handler_t abi_irn_handler;
+static heights_t *ir_heights;
 
 /* Flag: if set, try to omit the frame pointer if called by the backend */
 int be_omit_fp = 1;
@@ -217,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;
@@ -745,17 +746,22 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp
                env->call->flags.bits.try_omit_fp = 0;
                new_alloc = be_new_AddSP(env->isa->sp, irg, bl, curr_sp, get_Alloc_size(alloc));
 
-               exchange(alloc_res, env->isa->stack_dir < 0 ? new_alloc : curr_sp);
+               exchange(alloc, env->isa->stack_dir < 0 ? new_alloc : curr_sp);
 
                if(alloc_mem != NULL)
                        exchange(alloc_mem, new_r_NoMem(irg));
 
-               curr_sp = new_alloc;
+               /* fix projnum of alloca res */
+               set_Proj_proj(alloc_res, 1);
+
+               curr_sp = alloc_res;
        }
 
        return curr_sp;
 }
 
+/* the following function is replaced by the usage of the heights module */
+#if 0
 /**
  * Walker for dependent_on().
  * This function searches a node tgt recursively from a given node
@@ -775,13 +781,14 @@ static int check_dependence(ir_node *curr, ir_node *tgt, ir_node *bl)
        /* Phi functions stop the recursion inside a basic block */
        if (! is_Phi(curr)) {
                for(i = 0, n = get_irn_arity(curr); i < n; ++i) {
-                       if(check_dependence(get_irn_n(curr, i), tgt, bl, visited_nr))
+                       if (check_dependence(get_irn_n(curr, i), tgt, bl))
                                return 1;
                }
        }
 
        return 0;
 }
+#endif /* if 0 */
 
 /**
  * Check if a node is somehow data dependent on another one.
@@ -793,10 +800,11 @@ 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));
-       return check_dependence(n1, n2, bl);
+
+       return heights_reachable_in_block(ir_heights, n1, n2);
+       //return check_dependence(n1, n2, bl);
 }
 
 static int cmp_call_dependecy(const void *c1, const void *c2)
@@ -824,12 +832,13 @@ static int cmp_call_dependecy(const void *c1, const void *c2)
  */
 static void link_calls_in_block_walker(ir_node *irn, void *data)
 {
-       if(is_Call(irn)) {
+       if(is_Call(irn) || (get_irn_opcode(irn) == iro_Alloc && get_Alloc_where(irn) == stack_alloc)) {
                be_abi_irg_t *env = data;
                ir_node *bl       = get_nodes_block(irn);
                void *save        = get_irn_link(bl);
 
-               env->call->flags.bits.irg_is_leaf = 0;
+               if (is_Call(irn))
+                       env->call->flags.bits.irg_is_leaf = 0;
 
                set_irn_link(irn, save);
                set_irn_link(bl, irn);
@@ -900,7 +909,10 @@ static void process_calls(be_abi_irg_t *env)
 
        env->call->flags.bits.irg_is_leaf = 1;
        irg_walk_graph(irg, firm_clear_link, link_calls_in_block_walker, env);
+
+       ir_heights = heights_new(env->birg->irg);
        irg_block_walk_graph(irg, NULL, process_calls_in_block, env);
+       heights_free(ir_heights);
 }
 
 static void collect_return_walker(ir_node *irn, void *data)
@@ -1260,7 +1272,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);
@@ -1719,7 +1730,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;
 }
 
@@ -1770,7 +1780,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);
@@ -1783,12 +1793,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);
 }