X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbera.c;h=2178ec7e57d6ba609e581f6a249667f4a9635f7e;hb=4ed245f5007168dab7850942a7ee6b6b29a19817;hp=8eb997955b440429a0ebbf024ff3684337090355;hpb=c38e85b1f7746f2aa398446296ab25619c99e8eb;p=libfirm

diff --git a/ir/be/bera.c b/ir/be/bera.c
index 8eb997955..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;
 	}
 
@@ -49,7 +57,7 @@ int value_dominates(const ir_node *a, const ir_node *b)
  * @param b The second value.
  * @return 1, if a and b interfere, 0 if not.
  */
-int values_interfere(const ir_node *a, const ir_node *b)
+int values_interfere(const be_lv_t *lv, const ir_node *a, const ir_node *b)
 {
 	int a2b = value_dominates(a, b);
 	int b2a = value_dominates(b, a);
@@ -75,7 +83,7 @@ int values_interfere(const ir_node *a, const ir_node *b)
 		 * If a is live end in b's block it is
 		 * live at b's definition (a dominates b)
 		 */
-		if(is_live_end(bb, a))
+		if(be_is_live_end(lv, bb, a))
 			return 1;
 
 		/*
@@ -83,22 +91,17 @@ int values_interfere(const ir_node *a, const ir_node *b)
 		 * 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.
+		 * 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)) {
+			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;
+  }
+  return 0;
 }