X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeintlive_t.h;h=9961b6e5df30ebc8b114aea8687999c188a5d42f;hb=0318dc1a48ce72b311592c28affc31fabc95f026;hp=e0871c233b91a698e99a975c20bea81074cdf290;hpb=edc739b393d7982e78a573d854113f47293c96b1;p=libfirm

diff --git a/ir/be/beintlive_t.h b/ir/be/beintlive_t.h
index e0871c233..9961b6e5d 100644
--- a/ir/be/beintlive_t.h
+++ b/ir/be/beintlive_t.h
@@ -18,8 +18,8 @@
 
 #include "statev.h"
 
-#include "beirg_t.h"
-#include "besched_t.h"
+#include "beirg.h"
+#include "besched.h"
 #include "belive_t.h"
 
 /**
@@ -28,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;
 }
 
@@ -42,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;
 }
 
@@ -57,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,
@@ -83,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,
@@ -104,19 +104,17 @@ static INLINE int _value_strictly_dominates(const ir_node *a, const ir_node *b)
 
 /**
  * Check, if two values interfere.
- * @param lv Liveness information (in the future we should use a be_irg_t here).
+ * @param lv Liveness information
  * @param a The first value.
  * @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;
 
-	stat_ev_ctx_push("beintlive");
-
 	/*
 	 * Adjust a and b so, that a dominates b if
 	 * a dominates b or vice versa.
@@ -133,8 +131,6 @@ static INLINE int _lv_values_interfere(const be_lv_t *lv, const ir_node *a, cons
 		const ir_edge_t *edge;
 		ir_node *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)
@@ -162,10 +158,9 @@ static INLINE int _lv_values_interfere(const be_lv_t *lv, const ir_node *a, cons
 				goto end;
 			}
 		}
-  	}
+	}
 
 end:
-	stat_ev_ctx_pop("beintlive");
 	return res;
 }
 
@@ -178,7 +173,7 @@ end:
  * @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);
 
@@ -200,21 +195,22 @@ 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);
 }
 
 /**
  * Check, if a node is live in front of another.
- * @param birg  The backend irg.
+ * @param irg   The backend irg.
  * @param irn   The node.
  * @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(ir_graph *irg, const ir_node *irn,
+                                        const ir_node *where)
 {
-	const be_lv_t *lv = be_get_birg_liveness(birg);
+	const be_lv_t *lv = be_get_irg_liveness(irg);
 	const ir_edge_t *edge;
 
 	/* the node must strictly dominate the location, else it cannot be live there. */
@@ -242,14 +238,15 @@ static INLINE int _be_lv_chk_before_irn(const be_irg_t *birg, const ir_node *irn
 
 /**
  * Check, if a node is live after another node.
- * @param birg  The backend irg.
+ * @param irg   The backend irg.
  * @param irn   The node.
  * @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(ir_graph *irg, const ir_node *irn,
+                                       const ir_node *where)
 {
-	const be_lv_t *lv = be_get_birg_liveness(birg);
+	const be_lv_t *lv = be_get_irg_liveness(irg);
 	const ir_edge_t *edge;
 
 	if (!_value_dominates(irn, where))
@@ -268,10 +265,9 @@ 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)
-#define be_lv_chk_after_irn(birg, a, b)          _be_lv_chk_after_irn(birg, a, b)
+#define be_lv_chk_before_irn(irg, a, b)         _be_lv_chk_before_irn(irg, a, b)
+#define be_lv_chk_after_irn(irg, a, b)          _be_lv_chk_after_irn(irg, a, b)
 
-#endif /* _BELIVECHK_T_H */
+#endif