X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbera.c;h=2178ec7e57d6ba609e581f6a249667f4a9635f7e;hb=b9d45e08e23bcf058fa8f2d9e18dd78e8cccd044;hp=f3b013928250e8731cd14f72b0ffb6daafa9b633;hpb=48f893878b07f6e334389ff52abda5cc2adbf179;p=libfirm diff --git a/ir/be/bera.c b/ir/be/bera.c index f3b013928..2178ec7e5 100644 --- a/ir/be/bera.c +++ b/ir/be/bera.c @@ -18,6 +18,14 @@ #include "besched_t.h" #include "belive_t.h" +static sched_timestep_t get_time_step(const ir_node *irn) +{ + if(is_Phi(irn)) + return 0; + + return sched_get_time_step(irn); +} + int value_dominates(const ir_node *a, const ir_node *b) { int res = 0; @@ -35,8 +43,8 @@ int value_dominates(const ir_node *a, const ir_node *b) * Dominance is determined by the time steps of the schedule. */ } else { - sched_timestep_t as = sched_get_time_step(a); - sched_timestep_t bs = sched_get_time_step(b); + sched_timestep_t as = get_time_step(a); + sched_timestep_t bs = get_time_step(b); res = as <= bs; } @@ -71,29 +79,29 @@ int values_interfere(const be_lv_t *lv, const ir_node *a, const ir_node *b) bb = get_nodes_block(b); - /* - * If a is live end in b's block it is - * live at b's definition (a dominates b) - */ - if(be_is_live_end(lv, bb, a)) - return 1; + /* + * If a is live end in b's block it is + * live at b's definition (a dominates b) + */ + if(be_is_live_end(lv, bb, a)) + return 1; - /* - * Look at all usages of a. - * If there's one usage of a in the block of b, then - * we check, if this use is dominated by b, if that's true - * a and b interfere. Note that b must strictly dominate the user, + /* + * Look at all usages of a. + * If there's one usage of a in the block of b, then + * we check, if this use is dominated by b, if that's true + * a and b interfere. Note that b must strictly dominate the user, * since if b is the last user of in the block, b and a do not * interfere. - * Uses of a not in b's block can be disobeyed, because the - * check for a being live at the end of b's block is already - * performed. - */ - foreach_out_edge(a, edge) { - const ir_node *user = edge->src; - if(get_nodes_block(user) == bb && !is_Phi(user) && b != user && value_dominates(b, user)) - return 1; - } + * Uses of a not in b's block can be disobeyed, because the + * check for a being live at the end of b's block is already + * performed. + */ + foreach_out_edge(a, edge) { + const ir_node *user = get_edge_src_irn(edge); + if(get_nodes_block(user) == bb && !is_Phi(user) && b != user && value_dominates(b, user)) + return 1; + } } return 0; }