X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeifg.c;h=3b3b4394c350c659536f6d5c48aece940060ff15;hb=02046d6f22e734521c84dfb2f342cf61e6442c2f;hp=c3224c68dd31440ced6f58ed36dfef79de459b8e;hpb=aa89f2a8eee2c5a5b84b6b5377ddc5d57b3aa2e0;p=libfirm diff --git a/ir/be/beifg.c b/ir/be/beifg.c index c3224c68d..3b3b4394c 100644 --- a/ir/be/beifg.c +++ b/ir/be/beifg.c @@ -637,33 +637,33 @@ void be_ifg_dump_dot(be_ifg_t *ifg, ir_graph *irg, FILE *file, const be_ifg_dump bitset_free(nodes); } -static void int_comp_rec(const be_chordal_env_t *cenv, ir_node *n, bitset_t *seen) +static void int_comp_rec(be_irg_t *birg, be_ifg_t *ifg, ir_node *n, bitset_t *seen) { - void *neigh_it = be_ifg_neighbours_iter_alloca(cenv->ifg); + void *neigh_it = be_ifg_neighbours_iter_alloca(ifg); ir_node *m; - be_ifg_foreach_neighbour(cenv->ifg, neigh_it, n, m) { - if(!bitset_contains_irn(seen, m) && !arch_irn_is(cenv->birg->main_env->arch_env, m, ignore)) { + be_ifg_foreach_neighbour(ifg, neigh_it, n, m) { + if(!bitset_contains_irn(seen, m) && !arch_irn_is(birg->main_env->arch_env, m, ignore)) { bitset_add_irn(seen, m); - int_comp_rec(cenv, m, seen); + int_comp_rec(birg, ifg, m, seen); } } } -static int int_component_stat(const be_chordal_env_t *cenv) +static int int_component_stat(be_irg_t *birg, be_ifg_t *ifg) { - int n_comp = 0; - void *nodes_it = be_ifg_nodes_iter_alloca(cenv->ifg); - bitset_t *seen = bitset_irg_malloc(cenv->irg); + int n_comp = 0; + void *nodes_it = be_ifg_nodes_iter_alloca(ifg); + bitset_t *seen = bitset_irg_malloc(birg->irg); ir_node *n; - be_ifg_foreach_node(cenv->ifg, nodes_it, n) { - if(!bitset_contains_irn(seen, n) && !arch_irn_is(cenv->birg->main_env->arch_env, n, ignore)) { + be_ifg_foreach_node(ifg, nodes_it, n) { + if (! bitset_contains_irn(seen, n) && ! arch_irn_is(birg->main_env->arch_env, n, ignore)) { ++n_comp; bitset_add_irn(seen, n); - int_comp_rec(cenv, n, seen); + int_comp_rec(birg, ifg, n, seen); } } @@ -671,24 +671,24 @@ static int int_component_stat(const be_chordal_env_t *cenv) return n_comp; } -void be_ifg_stat(const be_chordal_env_t *cenv, be_ifg_stat_t *stat) +void be_ifg_stat(be_irg_t *birg, be_ifg_t *ifg, be_ifg_stat_t *stat) { - void *nodes_it = be_ifg_nodes_iter_alloca(cenv->ifg); - void *neigh_it = be_ifg_neighbours_iter_alloca(cenv->ifg); - bitset_t *nodes = bitset_irg_malloc(cenv->irg); - - ir_node *n, *m; + void *nodes_it = be_ifg_nodes_iter_alloca(ifg); + void *neigh_it = be_ifg_neighbours_iter_alloca(ifg); + bitset_t *nodes = bitset_irg_malloc(birg->irg); + ir_node *n, *m; memset(stat, 0, sizeof(stat[0])); - be_ifg_foreach_node(cenv->ifg, nodes_it, n) { + + be_ifg_foreach_node(ifg, nodes_it, n) { stat->n_nodes += 1; - be_ifg_foreach_neighbour(cenv->ifg, neigh_it, n, m) { + be_ifg_foreach_neighbour(ifg, neigh_it, n, m) { bitset_add_irn(nodes, n); stat->n_edges += !bitset_contains_irn(nodes, m); } } - stat->n_comps = int_component_stat(cenv); + stat->n_comps = int_component_stat(birg, ifg); bitset_free(nodes); }