X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeintlive_t.h;h=e694d0139a8957c0147881ce30caf012b0315c37;hb=2bc2dd4bd4f64982e9c5d2f1ea70d63d0eb10044;hp=49827ee35a40be314cbe297acfc4261af3d46fa4;hpb=fc8907376ecd32d779af9224ce11361913c09af2;p=libfirm

diff --git a/ir/be/beintlive_t.h b/ir/be/beintlive_t.h
index 49827ee35..e694d0139 100644
--- a/ir/be/beintlive_t.h
+++ b/ir/be/beintlive_t.h
@@ -16,8 +16,11 @@
 #include "irphase_t.h"
 #include "iredges_t.h"
 
-#include "beirg_t.h"
-#include "besched_t.h"
+#include "statev.h"
+
+#include "beirg.h"
+#include "besched.h"
+#include "belive_t.h"
 
 /**
  * Check dominance of two nodes in the same block.
@@ -25,11 +28,11 @@
  * @param b The second node.
  * @return 1 if a comes before b in the same block or if a == b, 0 else.
  */
-static INLINE int _value_dominates_intrablock(const ir_node *a, const ir_node *b)
+static inline int _value_dominates_intrablock(const ir_node *a, const ir_node *b)
 {
 	/* TODO: ? :  can be removed?! */
-	sched_timestep_t as = is_Phi(a) ? 0 : sched_get_time_step(a);
-	sched_timestep_t bs = is_Phi(b) ? 0 : sched_get_time_step(b);
+	sched_timestep_t as = sched_is_scheduled(a) ? sched_get_time_step(a) : 0;
+	sched_timestep_t bs = sched_is_scheduled(b) ? sched_get_time_step(b) : 0;
 	return as <= bs;
 }
 
@@ -39,11 +42,11 @@ static INLINE int _value_dominates_intrablock(const ir_node *a, const ir_node *b
  * @param b The second node.
  * @return 1 if a comes before b in the same block, 0 else.
  */
-static INLINE int _value_strictly_dominates_intrablock(const ir_node *a, const ir_node *b)
+static inline int _value_strictly_dominates_intrablock(const ir_node *a, const ir_node *b)
 {
 	/* TODO: ? :  can be removed?! */
-	sched_timestep_t as = is_Phi(a) ? 0 : sched_get_time_step(a);
-	sched_timestep_t bs = is_Phi(b) ? 0 : sched_get_time_step(b);
+	sched_timestep_t as = sched_is_scheduled(a) ? sched_get_time_step(a) : 0;
+	sched_timestep_t bs = sched_is_scheduled(b) ? sched_get_time_step(b) : 0;
 	return as < bs;
 }
 
@@ -54,10 +57,10 @@ static INLINE int _value_strictly_dominates_intrablock(const ir_node *a, const i
  * @param b The second node.
  * @return 1 if a dominates b or if a == b, 0 else.
  */
-static INLINE int _value_dominates(const ir_node *a, const ir_node *b)
+static inline int _value_dominates(const ir_node *a, const ir_node *b)
 {
-	const ir_node *block_a = get_block(a);
-	const ir_node *block_b = get_block(b);
+	const ir_node *block_a = get_block_const(a);
+	const ir_node *block_b = get_block_const(b);
 
 	/*
 	 * a and b are not in the same block,
@@ -80,10 +83,10 @@ static INLINE int _value_dominates(const ir_node *a, const ir_node *b)
  * @param b The second node.
  * @return 1 if a dominates b, 0 else.
  */
-static INLINE int _value_strictly_dominates(const ir_node *a, const ir_node *b)
+static inline int _value_strictly_dominates(const ir_node *a, const ir_node *b)
 {
-	const ir_node *block_a = get_block(a);
-	const ir_node *block_b = get_block(b);
+	const ir_node *block_a = get_block_const(a);
+	const ir_node *block_b = get_block_const(b);
 
 	/*
 	 * a and b are not in the same block,
@@ -106,34 +109,38 @@ static INLINE int _value_strictly_dominates(const ir_node *a, const ir_node *b)
  * @param b The second value.
  * @return 1, if a and b interfere, 0 if not.
  */
-static INLINE int _lv_values_interfere(const be_lv_t *lv, const ir_node *a, const ir_node *b)
+static inline int be_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 res = 0;
+
+	/*
+	 * 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;
+		a2b = 1;
+	}
 
 	/* If there is no dominance relation, they do not interfere. */
-	if((a2b | b2a) > 0) {
+	if(a2b) {
 		const ir_edge_t *edge;
-		ir_node *bb;
-
-		/*
-		 * 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;
-		}
+		ir_node *bb = get_nodes_block(b);
 
-		bb = get_nodes_block(b);
+		//stat_ev_dbl("beintlive_ignore", arch_irn_is(lv->birg->main_env->arch_env, a, ignore));
 
 		/*
 		 * 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(be_is_live_end(lv, bb, a)) {
+			res = 1;
+			goto end;
+		}
 
 		/*
 		 * Look at all usages of a.
@@ -148,12 +155,15 @@ static INLINE int _lv_values_interfere(const be_lv_t *lv, const ir_node *a, cons
 		 */
 		foreach_out_edge(a, edge) {
 			const ir_node *user = get_edge_src_irn(edge);
-			if(get_nodes_block(user) == bb && !is_Phi(user) && _value_strictly_dominates(b, user))
-				return 1;
+			if(get_nodes_block(user) == bb && !is_Phi(user) && _value_strictly_dominates(b, user)) {
+				res = 1;
+				goto end;
+			}
 		}
   	}
 
-	return 0;
+end:
+	return res;
 }
 
 
@@ -165,7 +175,7 @@ static INLINE int _lv_values_interfere(const be_lv_t *lv, const ir_node *a, cons
  * @param edge The use.
  * @return     1, if @p irn dominates the use @p edge.
  */
-static INLINE int _dominates_use(const ir_node *irn, const ir_edge_t *edge)
+static inline int _dominates_use(const ir_node *irn, const ir_edge_t *edge)
 {
 	ir_node *use = get_edge_src_irn(edge);
 
@@ -187,7 +197,7 @@ static INLINE int _dominates_use(const ir_node *irn, const ir_edge_t *edge)
  * @param edge The use.
  * @return     1, if @p irn strictly dominates the use @p edge.
  */
-static INLINE int _strictly_dominates_use(const ir_node *irn, const ir_edge_t *edge)
+static inline int _strictly_dominates_use(const ir_node *irn, const ir_edge_t *edge)
 {
 	return get_edge_src_irn(edge) != irn && _dominates_use(irn, edge);
 }
@@ -199,7 +209,7 @@ static INLINE int _strictly_dominates_use(const ir_node *irn, const ir_edge_t *e
  * @param where The location to check for.
  * @return      1, if @p irn is live in front of @p where.
  */
-static INLINE int _be_lv_chk_before_irn(const be_irg_t *birg, const ir_node *irn, const ir_node *where)
+static inline int _be_lv_chk_before_irn(const be_irg_t *birg, const ir_node *irn, const ir_node *where)
 {
 	const be_lv_t *lv = be_get_birg_liveness(birg);
 	const ir_edge_t *edge;
@@ -234,7 +244,7 @@ static INLINE int _be_lv_chk_before_irn(const be_irg_t *birg, const ir_node *irn
  * @param where The location to check for.
  * @return      1, if @p irn is live after @p where.
  */
-static INLINE int _be_lv_chk_after_irn(const be_irg_t *birg, const ir_node *irn, const ir_node *where)
+static inline int _be_lv_chk_after_irn(const be_irg_t *birg, const ir_node *irn, const ir_node *where)
 {
 	const be_lv_t *lv = be_get_birg_liveness(birg);
 	const ir_edge_t *edge;
@@ -255,7 +265,6 @@ static INLINE int _be_lv_chk_after_irn(const be_irg_t *birg, const ir_node *irn,
 
 #define value_dominates_intrablock(a, b)         _value_dominates_intrablock(a, b)
 #define value_dominates(a, b)                    _value_dominates(a, b)
-#define values_interfere(birg, a, b)             _lv_values_interfere(be_get_birg_liveness(birg), a, b)
 #define dominates_use(a, e)                      _dominates_use(a, e)
 #define strictly_dominates_use(a, e)             _strictly_dominates_use(a, e)
 #define be_lv_chk_before_irn(birg, a, b)         _be_lv_chk_before_irn(birg, a, b)