changed ir_printf call into DBG output

[libfirm] / ir / be / beabi.c

diff --git a/ir/be/beabi.c b/ir/be/beabi.c
index 8cdbb90..2365911 100644 (file)
--- a/ir/be/beabi.c
+++ b/ir/be/beabi.c
@@ -24,6 +24,10 @@
 #include "irgwalk.h"
 #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"
@@ -32,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. */
@@ -114,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;
@@ -617,6 +619,8 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
        */
        be_node_set_reg_class(low_call, be_pos_Call_ptr, sp->reg_class);
 
+       DBG((env->dbg, LEVEL_3, "\tcreated backend call %+F\n", low_call));
+
        /* Set the register classes and constraints of the Call parameters. */
        for(i = 0; i < n_low_args; ++i) {
                int index = low_args[i];
@@ -753,36 +757,35 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp
        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
  * but is restricted to the given block.
  * @return 1 if tgt was reachable from curr, 0 if not.
  */
-static int check_dependence(ir_node *curr, ir_node *tgt, ir_node *bl, unsigned long visited_nr)
+static int check_dependence(ir_node *curr, ir_node *tgt, ir_node *bl)
 {
        int n, i;
 
-       if(get_irn_visited(curr) >= visited_nr)
+       if (get_nodes_block(curr) != bl)
                return 0;
 
-       set_irn_visited(curr, visited_nr);
-       if(get_nodes_block(curr) != bl)
-               return 0;
-
-       if(curr == tgt)
+       if (curr == tgt)
                return 1;
 
        /* Phi functions stop the recursion inside a basic block */
-       if(!is_Phi(curr)) {
+       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.
@@ -795,11 +798,11 @@ static int dependent_on(ir_node *n1, ir_node *n2)
 {
        ir_node *bl   = get_nodes_block(n1);
        ir_graph *irg = get_irn_irg(bl);
-       long vis_nr   = get_irg_visited(irg) + 1;
 
        assert(bl == get_nodes_block(n2));
-       set_irg_visited(irg, vis_nr);
-       return check_dependence(n1, n2, bl, vis_nr);
+
+       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)
@@ -813,7 +816,13 @@ static int cmp_call_dependecy(const void *c1, const void *c2)
                1  if second is "smaller" that first
                -1 if first is "smaller" that second
        */
-       return n1 == n2 ? 0 : (dependent_on(n1, n2) ? -1 : 1);
+       if (dependent_on(n1, n2))
+               return -1;
+
+       if (dependent_on(n2, n1))
+               return 1;
+
+       return 0;
 }
 
 /**
@@ -864,6 +873,7 @@ static void process_calls_in_block(ir_node *bl, void *data)
                for(i = n - 1; i >= 0; --i) {
                        ir_node *irn = nodes[i];
 
+                       DBG((env->dbg, LEVEL_3, "\tprocessing call %+F\n", irn));
                        switch(get_irn_opcode(irn)) {
                        case iro_Call:
                                curr_sp = adjust_call(env, irn, curr_sp);
@@ -896,7 +906,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)