X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=inline;f=ir%2Fbe%2Fbeintlive_t.h;h=051d1078eef5df4012046cb6e3dd8ff0722028b4;hb=f84594874e48e9883cfb1e040856f3f56782c956;hp=eca135bdcea20a58808995085eaf14593636fc2c;hpb=f2c2e45eb4e677fef5bf6a8e418b2a22441172d5;p=libfirm

diff --git a/ir/be/beintlive_t.h b/ir/be/beintlive_t.h
index eca135bdc..051d1078e 100644
--- a/ir/be/beintlive_t.h
+++ b/ir/be/beintlive_t.h
@@ -13,13 +13,12 @@
 #define _BELIVECHK_T_H
 
 #include "irgraph_t.h"
-#include "irphase_t.h"
 #include "iredges_t.h"
 
-#include "statev.h"
+#include "statev_t.h"
 
-#include "beirg_t.h"
-#include "besched_t.h"
+#include "beirg.h"
+#include "besched.h"
 #include "belive_t.h"
 
 /**
@@ -104,7 +103,7 @@ 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.
@@ -128,11 +127,8 @@ static inline int be_values_interfere(const be_lv_t *lv, const ir_node *a, const
 
 	/* If there is no dominance relation, they do not interfere. */
 	if(a2b) {
-		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)
@@ -160,7 +156,7 @@ static inline int be_values_interfere(const be_lv_t *lv, const ir_node *a, const
 				goto end;
 			}
 		}
-  	}
+	}
 
 end:
 	return res;
@@ -204,15 +200,15 @@ static inline int _strictly_dominates_use(const ir_node *irn, const ir_edge_t *e
 
 /**
  * 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 ir_edge_t *edge;
+	const be_lv_t *lv = be_get_irg_liveness(irg);
 
 	/* the node must strictly dominate the location, else it cannot be live there. */
 	if (!_value_dominates(irn, where) || irn == where)
@@ -239,15 +235,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 ir_edge_t *edge;
+	const be_lv_t *lv = be_get_irg_liveness(irg);
 
 	if (!_value_dominates(irn, where))
 		return 0;
@@ -267,7 +263,7 @@ static inline int _be_lv_chk_after_irn(const be_irg_t *birg, const ir_node *irn,
 #define value_dominates(a, b)                    _value_dominates(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