X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firextbb2.c;h=31f77bea62c067b4c840aae5848f576c684e8522;hb=10e58f9669ea6c77e82bd3bc12c4ac5bbaa6bb15;hp=e408ecc5cba99cd357c40437f55028c7fd362c04;hpb=1a26f4853c07d1ecd68a097409dd602edfe29eff;p=libfirm diff --git a/ir/ana/irextbb2.c b/ir/ana/irextbb2.c index e408ecc5c..31f77bea6 100644 --- a/ir/ana/irextbb2.c +++ b/ir/ana/irextbb2.c @@ -39,8 +39,8 @@ #include "irprintf.h" #include "execfreq.h" -typedef struct _env { - struct obstack *obst; /**< the obstack where allocations took place */ +typedef struct env { + struct obstack *obst; /**< the obstack where allocations took place */ ir_extblk *head; /**< head of the list of all extended blocks */ ir_exec_freq *execfreqs; } env_t; @@ -122,14 +122,12 @@ static void pick_successor(ir_node *block, ir_extblk *extblk, env_t *env) ir_node *best_succ = NULL; double best_execfreq = -1; - /* + /* More than two successors means we have a jump table. we cannot include a jump target into the current extended basic block, so create a new one here. */ if (get_block_n_succs(block) > 2) { - const ir_edge_t *edge; - foreach_block_succ(block, edge) { ir_node *succ = get_edge_src_irn(edge); create_extblk(succ, env); @@ -182,7 +180,7 @@ static void pick_successor(ir_node *block, ir_extblk *extblk, env_t *env) */ void compute_extbb_execfreqs(ir_graph *irg, ir_exec_freq *execfreqs) { - env_t env; + env_t env; ir_extblk *extbb, *next; ir_node *endblock; @@ -223,8 +221,8 @@ void compute_extbb_execfreqs(ir_graph *irg, ir_exec_freq *execfreqs) extbb->blks = NEW_ARR_D(ir_node *, env.obst, len); - for (block = extbb->link, i = 0; i < len; ++i) { - ir_node *nblock = get_irn_link(block); + for (block = (ir_node*) extbb->link, i = 0; i < len; ++i) { + ir_node *nblock = (ir_node*) get_irn_link(block); /* ensure that the leader is the first one */ extbb->blks[len - 1 - i] = block; @@ -245,5 +243,5 @@ void compute_extbb_execfreqs(ir_graph *irg, ir_exec_freq *execfreqs) extbb->visited = 0; } - irg->extblk_state = extblk_valid; + irg->extblk_state = ir_extblk_info_valid; }