some more debug output if no definition for a value is found on a path

[libfirm] / ir / be / besched.c

diff --git a/ir/be/besched.c b/ir/be/besched.c
index 82cc3e7..d498843 100644 (file)
--- a/ir/be/besched.c
+++ b/ir/be/besched.c
@@ -15,6 +15,7 @@
 #include "irgraph_t.h"
 #include "iredges_t.h"
 #include "ircons.h"
+#include "irextbb.h"
 #include "debug.h"
 
 #include "bearch.h"
@@ -183,7 +184,7 @@ int sched_verify_irg(ir_graph *irg)
 
 int sched_skip_cf_predicator(const ir_node *irn, void *data) {
        arch_env_t *ae = data;
-       return arch_irn_classify(ae, irn) == arch_irn_class_branch;
+       return arch_irn_class_is(ae, irn, branch);
 }
 
 int sched_skip_phi_predicator(const ir_node *irn, void *data) {
@@ -211,54 +212,82 @@ typedef struct {
        unsigned n_blks;  /**< number of blocks in the list */
 } anchor;
 
-/**
- * Ext-Block walker: create a block schedule
- */
-static void create_block_list(ir_extblk *blk, void *env) {
-       anchor *list = env;
-       int i, n;
+static void add_block(anchor *list, ir_node *block) {
+       if(list->start == NULL) {
+               list->start = block;
+               list->end = block;
+       } else {
+               set_irn_link(list->end, block);
+               list->end = block;
+       }
 
-       for (i = 0, n = get_extbb_n_blocks(blk); i < n; ++i) {
-               ir_node *block = get_extbb_block(blk, i);
+       list->n_blks++;
+}
 
-               set_irn_link(block, NULL);
-               if (list->start)
-                       set_irn_link(list->end, block);
-               else
-                       list->start = block;
+static void create_block_list(ir_node *leader_block, anchor *list) {
+       int i;
+       ir_node *block = NULL;
+       const ir_edge_t *edge;
 
-               list->end = block;
-               ++list->n_blks;
+       ir_extblk *extbb = get_Block_extbb(leader_block);
+       if(extbb_visited(extbb))
+               return;
+       mark_extbb_visited(extbb);
+
+       for(i = 0; i < get_extbb_n_blocks(extbb); ++i) {
+               block = get_extbb_block(extbb, i);
+               add_block(list, block);
+       }
+
+       assert(block != NULL);
+
+       // pick successor extbbs
+       foreach_block_succ(block, edge) {
+               ir_node *succ = get_edge_src_irn(edge);
+
+               create_block_list(succ, list);
+       }
+
+       for(i = 0; i < get_extbb_n_blocks(extbb) - 1; ++i) {
+               block = get_extbb_block(extbb, i);
+               foreach_block_succ(block, edge) {
+                       ir_node *succ = get_edge_src_irn(edge);
+
+                       create_block_list(succ, list);
+               }
        }
 }
 
+void compute_extbb_execfreqs(ir_graph *irg, exec_freq_t *execfreqs);
+
 /*
  * Calculates a block schedule. The schedule is stored as a linked
  * list starting at the start_block of the irg.
  */
-ir_node **sched_create_block_schedule(ir_graph *irg)
+ir_node **sched_create_block_schedule(ir_graph *irg, exec_freq_t *execfreqs)
 {
        anchor list;
        ir_node **blk_list, *b, *n;
        unsigned i;
 
        /* schedule extended basic blocks */
-       compute_extbb(irg);
+       compute_extbb_execfreqs(irg, execfreqs);
+       //compute_extbb(irg);
 
        list.start  = NULL;
        list.end    = NULL;
        list.n_blks = 0;
-       irg_extblock_walk_graph(irg, NULL, create_block_list, &list);
+       inc_irg_block_visited(irg);
+       create_block_list(get_irg_start_block(irg), &list);
 
        /** create an array, so we can go forward and backward */
        blk_list = NEW_ARR_D(ir_node *, irg->obst,list.n_blks);
 
        for (i = 0, b = list.start; b; b = n, ++i) {
                n = get_irn_link(b);
-               set_irn_link(b, INT_TO_PTR(i));
-
                blk_list[i] = b;
        }
+
        return blk_list;
 }