X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbera.c;h=2178ec7e57d6ba609e581f6a249667f4a9635f7e;hb=b9d45e08e23bcf058fa8f2d9e18dd78e8cccd044;hp=f3ae848948f9af826411de59c5fce987a967b299;hpb=3a2cc1d47466d98f2f09a22425d122051a37a5e7;p=libfirm

diff --git a/ir/be/bera.c b/ir/be/bera.c
index f3ae84894..2178ec7e5 100644
--- a/ir/be/bera.c
+++ b/ir/be/bera.c
@@ -18,29 +18,37 @@
 #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;
+	int res = 0;
 	const ir_node *ba = get_block(a);
 	const ir_node *bb = get_block(b);
 
-  /*
-   * a and b are not in the same block,
-   * so dominance is determined by the dominance of the blocks.
-   */
-  if(ba != bb)
-    res = block_dominates(ba, bb);
+	/*
+	 * a and b are not in the same block,
+	 * so dominance is determined by the dominance of the blocks.
+	 */
+	if(ba != bb) {
+		res = block_dominates(ba, bb);
 
-  /*
-   * 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);
-    res = as <= bs;
-  }
+	/*
+	 * Dominance is determined by the time steps of the schedule.
+	 */
+	} else {
+		sched_timestep_t as = get_time_step(a);
+		sched_timestep_t bs = get_time_step(b);
+		res = as <= bs;
+	}
 
-  return res;
+	return res;
 }
 
 /**
@@ -49,50 +57,51 @@ 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);
+	int a2b = value_dominates(a, b);
+	int b2a = value_dominates(b, a);
+
+	/* If there is no dominance relation, they do not interfere. */
+	if((a2b | b2a) > 0) {
+		const ir_edge_t *edge;
+		ir_node *bb;
 
-  /* If there is no dominance relation, they do not interfere. */
-  if(a2b + b2a > 0) {
-    const ir_edge_t *edge;
-    ir_node *ba = get_nodes_block(a);
-    ir_node *bb = get_nodes_block(b);
+		/*
+		 * Adjust a and b so, that a dominates b if
+		 * a dominates b or vice versa.
+		 */
+		if(b2a) {
+			const ir_node *t = a;
+			a = b;
+			b = t;
+		}
 
-    /*
-     * Adjust a and b so, that a dominates b if
-     * a dominates b or vice versa.
-     */
-    if(b2a) {
-      const ir_node *t = a;
-      a = b;
-      b = t;
-    }
+		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(is_live_end(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.
-     * 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)
-          && value_dominates(b, user))
-        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,
+		 * 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 = get_edge_src_irn(edge);
+			if(get_nodes_block(user) == bb && !is_Phi(user) && b != user && value_dominates(b, user))
+				return 1;
+		}
   }
   return 0;
 }