X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelive_t.h;h=ba4efc180181a49ac6a39ffbdb2699336a5644ff;hb=e599bf38ff03a4a97e7d14fbf1e8df7a690c57b7;hp=3f248fea26b8f4993e44efeab255e4b5a24fcc4c;hpb=3c2f7c0c9e0bff5d97a973bc224579922bb7df81;p=libfirm

diff --git a/ir/be/belive_t.h b/ir/be/belive_t.h
index 3f248fea2..ba4efc180 100644
--- a/ir/be/belive_t.h
+++ b/ir/be/belive_t.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -27,9 +27,12 @@
 #ifndef FIRM_BE_BELIVE_T_H
 #define FIRM_BE_BELIVE_T_H
 
+#include "be_types.h"
 #include "irgraph_t.h"
 #include "irphase_t.h"
 #include "irhooks.h"
+#include "dfs.h"
+#include "statev.h"
 
 #include "pset.h"
 #include "bitset.h"
@@ -42,9 +45,10 @@
 #include "irlivechk.h"
 #endif
 
-struct _be_lv_t {
+struct be_lv_t {
 	ir_phase ph;
 	ir_graph *irg;
+	dfs_t *dfs;
 	bitset_t *nodes;
 	hook_entry_t hook_info;
 #ifdef USE_LIVE_CHK
@@ -52,26 +56,28 @@ struct _be_lv_t {
 #endif
 };
 
-struct _be_lv_info_node_t {
+typedef struct be_lv_info_node_t be_lv_info_node_t;
+struct be_lv_info_node_t {
 	unsigned idx;
 	unsigned flags;
 };
 
-struct _be_lv_info_head_t {
+struct be_lv_info_head_t {
 	unsigned n_members;
 	unsigned n_size;
 };
 
-struct _be_lv_info_t {
+struct be_lv_info_t {
 	union {
-		struct _be_lv_info_head_t head;
-		struct _be_lv_info_node_t node;
+		struct be_lv_info_head_t head;
+		struct be_lv_info_node_t node;
 	} u;
 };
 
-static INLINE int _be_lv_next_irn(const struct _be_lv_t *lv, const ir_node *bl, unsigned flags, int i)
+static inline int _be_lv_next_irn(const be_lv_t *lv, const ir_node *bl,
+                                  unsigned flags, int i)
 {
-	struct _be_lv_info_t *arr = phase_get_irn_data(&lv->ph, bl);
+	be_lv_info_t *arr = (be_lv_info_t*)phase_get_irn_data(&lv->ph, bl);
 
 	if (arr) {
 		int n_members = (int) arr[0].u.head.n_members;
@@ -87,34 +93,36 @@ static INLINE int _be_lv_next_irn(const struct _be_lv_t *lv, const ir_node *bl,
 	return -1;
 }
 
-static INLINE ir_node *_be_lv_get_irn(const struct _be_lv_t *lv, const ir_node *bl, int i)
+static inline ir_node *_be_lv_get_irn(const be_lv_t *lv, const ir_node *bl, int i)
 {
-	struct _be_lv_info_t *arr = phase_get_irn_data(&lv->ph, bl);
+	be_lv_info_t *arr = (be_lv_info_t*)phase_get_irn_data(&lv->ph, bl);
 	return get_idx_irn(lv->irg, arr[i + 1].u.node.idx);
 }
 
-struct _be_lv_info_node_t *be_lv_get(const struct _be_lv_t *li, const ir_node *bl, const ir_node *irn);
+be_lv_info_node_t *be_lv_get(const be_lv_t *li, const ir_node *bl, const ir_node *irn);
 
-static INLINE int _be_is_live_xxx(const struct _be_lv_t *li, const ir_node *block, const ir_node *irn, unsigned flags)
+static inline int _be_is_live_xxx(const be_lv_t *li, const ir_node *block, const ir_node *irn, unsigned flags)
 {
+	int res;
+
 	if (li->nodes) {
-		struct _be_lv_info_node_t *info = be_lv_get(li, block, irn);
-		return info ? (info->flags & flags) != 0 : 0;
+		be_lv_info_node_t *info = be_lv_get(li, block, irn);
+		res = info ? (info->flags & flags) != 0 : 0;
 	}
 
 #ifdef USE_LIVE_CHK
 	else
-		return (lv_chk_bl_xxx(li->lvc, block, irn) & flags) != 0;
-#else
-	assert(li->nodes && "node sets must be computed");
+		res = (lv_chk_bl_xxx(li->lvc, block, irn) & flags) != 0;
 #endif /* USE_LIVE_CHK */
+
+	return res;
 }
 
 #define be_lv_foreach(lv, bl, flags, i) \
 	for (i = _be_lv_next_irn(lv, bl, flags, 0); i >= 0; i = _be_lv_next_irn(lv, bl, flags, i + 1))
 
 
-static INLINE pset *_be_lv_pset_put(const struct _be_lv_t *lv, const ir_node *block, int state, pset *s)
+static inline pset *_be_lv_pset_put(const be_lv_t *lv, const ir_node *block, int state, pset *s)
 {
 	int i;
 	be_lv_foreach(lv, block, state, i)
@@ -133,4 +141,4 @@ static INLINE pset *_be_lv_pset_put(const struct _be_lv_t *lv, const ir_node *bl
 
 #define be_lv_has_info_about(lv, irn) bitset_is_set((lv)->nodes, get_irn_idx(irn))
 
-#endif /* FIRM_BE_BELIVE_T_H */
+#endif