X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelive.c;h=12749a789e4b462c399aec959b72b66dcf85773d;hb=67c0573183f113a00eca153a9b80724641cd8e20;hp=1cf291fd321cdc0d516604f4b63f5792b8c14400;hpb=ea75e9d38674b468f602a0699fb64b9c01254797;p=libfirm

diff --git a/ir/be/belive.c b/ir/be/belive.c
index 1cf291fd3..12749a789 100644
--- a/ir/be/belive.c
+++ b/ir/be/belive.c
@@ -22,28 +22,24 @@
  * @brief       Interblock liveness analysis.
  * @author      Sebastian Hack
  * @date        06.12.2004
- * @version     $Id$
  */
 #include "config.h"
 
 /* statev is expensive here, only enable when needed */
 #define DISABLE_STATEV
 
-#include "impl.h"
 #include "iredges_t.h"
 #include "irgwalk.h"
-#include "irprintf_t.h"
-#include "irbitset.h"
+#include "irprintf.h"
 #include "irdump_t.h"
 #include "irnodeset.h"
 
-#include "dfs_t.h"
 #include "absgraph.h"
-#include "statev.h"
-
+#include "statev_t.h"
+#include "be_t.h"
+#include "bearch.h"
 #include "beutil.h"
 #include "belive_t.h"
-#include "beirg.h"
 #include "besched.h"
 #include "bemodule.h"
 
@@ -51,32 +47,6 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
 #define LV_STD_SIZE             64
 
-/* if defined, use binary search for already live nodes, else linear */
-#define LV_USE_BINARY_SEARCH
-#undef  LV_INTESIVE_CHECKS
-
-void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc);
-
-/**
- * Filter out some nodes for which we never need liveness.
- *
- * @param irn  the node t check
- * @return 0 if no liveness info is needed, 1 else
- */
-static inline int is_liveness_node(const ir_node *irn)
-{
-	switch (get_irn_opcode(irn)) {
-	case iro_Block:
-	case iro_Bad:
-	case iro_End:
-	case iro_Anchor:
-	case iro_NoMem:
-		return 0;
-	default:
-		return 1;
-	}
-}
-
 int (be_is_live_in)(const be_lv_t *lv, const ir_node *block, const ir_node *irn)
 {
 	return _be_is_live_xxx(lv, block, irn, be_lv_state_in);
@@ -92,13 +62,11 @@ int (be_is_live_end)(const be_lv_t *lv, const ir_node *block, const ir_node *irn
 	return _be_is_live_xxx(lv, block, irn, be_lv_state_end);
 }
 
-
-#ifdef LV_USE_BINARY_SEARCH
-static inline unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned idx)
+static inline unsigned _be_liveness_bsearch(be_lv_info_t *arr, const ir_node *node)
 {
-	struct _be_lv_info_t *payload = arr + 1;
+	be_lv_info_t *payload = arr + 1;
 
-	unsigned n   = arr[0].u.head.n_members;
+	unsigned n   = arr[0].head.n_members;
 	unsigned res = 0;
 	int lo       = 0;
 	int hi       = n;
@@ -107,73 +75,41 @@ static inline unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned
 		return 0;
 
 	do {
-		int md          = lo + ((hi - lo) >> 1);
-		unsigned md_idx = payload[md].u.node.idx;
+		int md           = lo + ((hi - lo) >> 1);
+		ir_node *md_node = payload[md].node.node;
 
-		if (idx > md_idx)
+		if (node > md_node)
 			lo = md + 1;
-		else if (idx < md_idx)
+		else if (node < md_node)
 			hi = md;
 		else {
 			res = md;
-			assert(payload[res].u.node.idx == idx);
 			break;
 		}
 
 		res = lo;
 	} while (lo < hi);
 
-#ifdef LV_INTESIVE_CHECKS
-	{
-		unsigned i;
-		for (i = res; i < n; ++i)
-			assert(payload[i].u.node.idx >= idx);
-
-		for (i = 0; i < res; ++i)
-			assert(payload[i].u.node.idx < idx);
-	}
-#endif
-
 	return res;
 }
 
-#else
-
-/**
- * This function searches linearly for the node in the array.
- */
-static inline unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned idx)
-{
-	unsigned n  = arr[0].u.head.n_members;
-	unsigned i;
-
-	for (i = 0; i < n; ++i) {
-		if (arr[i + 1].u.node.idx == idx)
-			return i;
-	}
-
-	return i;
-}
-#endif
-
-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)
 {
-	struct _be_lv_info_t *irn_live;
-	struct _be_lv_info_node_t *res = NULL;
+	be_lv_info_t *irn_live;
+	be_lv_info_node_t *res = NULL;
 
 	stat_ev_tim_push();
-	irn_live = phase_get_irn_data(&li->ph, bl);
-	if (irn_live) {
-		unsigned idx = get_irn_idx(irn);
-
+	irn_live = ir_nodehashmap_get(be_lv_info_t, &li->map, bl);
+	if (irn_live != NULL) {
 		/* Get the position of the index in the array. */
-		int pos = _be_liveness_bsearch(irn_live, idx);
+		int pos = _be_liveness_bsearch(irn_live, irn);
 
 		/* Get the record in question. 1 must be added, since the first record contains information about the array and must be skipped. */
-		struct _be_lv_info_node_t *rec = &irn_live[pos + 1].u.node;
+		be_lv_info_node_t *rec = &irn_live[pos + 1].node;
 
 		/* Check, if the irn is in deed in the array. */
-		if (rec->idx == idx)
+		if (rec->node == irn)
 			res = rec;
 	}
 	stat_ev_tim_pop("be_lv_get");
@@ -181,23 +117,27 @@ struct _be_lv_info_node_t *be_lv_get(const struct _be_lv_t *li, const ir_node *b
 	return res;
 }
 
-static struct _be_lv_info_node_t *be_lv_get_or_set(struct _be_lv_t *li, ir_node *bl, ir_node *irn)
+static be_lv_info_node_t *be_lv_get_or_set(be_lv_t *li, ir_node *bl,
+                                           ir_node *irn)
 {
-	struct _be_lv_info_t *irn_live = phase_get_or_set_irn_data(&li->ph, bl);
-
-	unsigned idx = get_irn_idx(irn);
+	be_lv_info_t *irn_live = ir_nodehashmap_get(be_lv_info_t, &li->map, bl);
+	if (irn_live == NULL) {
+		irn_live = OALLOCNZ(&li->obst, be_lv_info_t, LV_STD_SIZE);
+		irn_live[0].head.n_size = LV_STD_SIZE-1;
+		ir_nodehashmap_insert(&li->map, bl, irn_live);
+	}
 
 	/* Get the position of the index in the array. */
-	unsigned pos = _be_liveness_bsearch(irn_live, idx);
+	unsigned pos = _be_liveness_bsearch(irn_live, irn);
 
 	/* Get the record in question. 1 must be added, since the first record contains information about the array and must be skipped. */
-	struct _be_lv_info_node_t *res = &irn_live[pos + 1].u.node;
+	be_lv_info_node_t *res = &irn_live[pos + 1].node;
 
 	/* Check, if the irn is in deed in the array. */
-	if (res->idx != idx) {
-		struct _be_lv_info_t *payload;
-		unsigned n_members = irn_live[0].u.head.n_members;
-		unsigned n_size    = irn_live[0].u.head.n_size;
+	if (res->node != irn) {
+		be_lv_info_t *payload;
+		unsigned n_members = irn_live[0].head.n_members;
+		unsigned n_size    = irn_live[0].head.n_size;
 		unsigned i;
 
 		if (n_members + 1 >= n_size) {
@@ -206,13 +146,13 @@ static struct _be_lv_info_node_t *be_lv_get_or_set(struct _be_lv_t *li, ir_node
 			unsigned old_size_bytes  = (n_size + 1) * sizeof(irn_live[0]);
 			unsigned new_size        = (2 * n_size) + 1;
 			size_t   new_size_bytes  = new_size * sizeof(irn_live[0]);
-			struct _be_lv_info_t *nw = phase_alloc(&li->ph, new_size_bytes);
+			be_lv_info_t *nw = OALLOCN(&li->obst, be_lv_info_t, new_size);
 			memcpy(nw, irn_live, old_size_bytes);
 			memset(((char*) nw) + old_size_bytes, 0,
 			       new_size_bytes - old_size_bytes);
-			nw[0].u.head.n_size = new_size - 1;
+			nw[0].head.n_size = new_size - 1;
 			irn_live = nw;
-			phase_set_irn_data(&li->ph, bl, nw);
+			ir_nodehashmap_insert(&li->map, bl, nw);
 		}
 
 		payload = &irn_live[1];
@@ -220,27 +160,13 @@ static struct _be_lv_info_node_t *be_lv_get_or_set(struct _be_lv_t *li, ir_node
 			payload[i] = payload[i - 1];
 		}
 
-		++irn_live[0].u.head.n_members;
+		++irn_live[0].head.n_members;
 
-		res = &payload[pos].u.node;
-		res->idx    = idx;
-		res->flags  = 0;
+		res        = &payload[pos].node;
+		res->node  = irn;
+		res->flags = 0;
 	}
 
-#ifdef LV_INTESIVE_CHECKS
-	{
-		unsigned i;
-		unsigned n = irn_live[0].u.head.n_members;
-		unsigned last = 0;
-		struct _be_lv_info_t *payload = &irn_live[1];
-
-		for (i = 0; i < n; ++i) {
-			assert(payload[i].u.node.idx >= last);
-			last = payload[i].u.node.idx;
-		}
-	}
-#endif
-
 	return res;
 }
 
@@ -248,29 +174,28 @@ static struct _be_lv_info_node_t *be_lv_get_or_set(struct _be_lv_t *li, ir_node
  * Removes a node from the list of live variables of a block.
  * @return 1 if the node was live at that block, 0 if not.
  */
-static int be_lv_remove(struct _be_lv_t *li, const ir_node *bl,
+static int be_lv_remove(be_lv_t *li, const ir_node *bl,
                         const ir_node *irn)
 {
-	struct _be_lv_info_t *irn_live = phase_get_irn_data(&li->ph, bl);
+	be_lv_info_t *irn_live = ir_nodehashmap_get(be_lv_info_t, &li->map, bl);
 
-	if (irn_live) {
-		unsigned n   = irn_live[0].u.head.n_members;
-		unsigned idx = get_irn_idx(irn);
-		unsigned pos = _be_liveness_bsearch(irn_live, idx);
-		struct _be_lv_info_t *payload  = irn_live + 1;
-		struct _be_lv_info_node_t *res = &payload[pos].u.node;
+	if (irn_live != NULL) {
+		unsigned n   = irn_live[0].head.n_members;
+		unsigned pos = _be_liveness_bsearch(irn_live, irn);
+		be_lv_info_t *payload  = irn_live + 1;
+		be_lv_info_node_t *res = &payload[pos].node;
 
 		/* The node is in deed in the block's array. Let's remove it. */
-		if (res->idx == idx) {
+		if (res->node == irn) {
 			unsigned i;
 
 			for (i = pos + 1; i < n; ++i)
 				payload[i - 1] = payload[i];
 
-			payload[n - 1].u.node.idx   = 0;
-			payload[n - 1].u.node.flags = 0;
+			payload[n - 1].node.node  = NULL;
+			payload[n - 1].node.flags = 0;
 
-			--irn_live[0].u.head.n_members;
+			--irn_live[0].head.n_members;
 			DBG((dbg, LEVEL_3, "\tdeleting %+F from %+F at pos %d\n", irn, bl, pos));
 			return 1;
 		}
@@ -279,55 +204,9 @@ static int be_lv_remove(struct _be_lv_t *li, const ir_node *bl,
 	return 0;
 }
 
-static void register_node(be_lv_t *lv, const ir_node *irn)
-{
-	unsigned idx = get_irn_idx(irn);
-	if (idx >= bitset_size(lv->nodes)) {
-		bitset_t *nw = bitset_malloc(2 * idx);
-		bitset_copy(nw, lv->nodes);
-		bitset_free(lv->nodes);
-		lv->nodes = nw;
-	}
-
-	bitset_set(lv->nodes, idx);
-}
-
-/**
- * Mark a node as live-in in a block.
- */
-static inline void mark_live_in(be_lv_t *lv, ir_node *block, ir_node *irn)
-{
-	struct _be_lv_info_node_t *n = be_lv_get_or_set(lv, block, irn);
-	DBG((dbg, LEVEL_2, "marking %+F live in at %+F\n", irn, block));
-	n->flags |= be_lv_state_in;
-	register_node(lv, irn);
-}
-
-/**
- * Mark a node as live-out in a block.
- */
-static inline void mark_live_out(be_lv_t *lv, ir_node *block, ir_node *irn)
-{
-	struct _be_lv_info_node_t *n = be_lv_get_or_set(lv, block, irn);
-	DBG((dbg, LEVEL_2, "marking %+F live out at %+F\n", irn, block));
-	n->flags |= be_lv_state_out | be_lv_state_end;
-	register_node(lv, irn);
-}
-
-/**
- * Mark a node as live-end in a block.
- */
-static inline void mark_live_end(be_lv_t *lv, ir_node *block, ir_node *irn)
-{
-	struct _be_lv_info_node_t *n = be_lv_get_or_set(lv, block, irn);
-	DBG((dbg, LEVEL_2, "marking %+F live end at %+F\n", irn, block));
-	n->flags |= be_lv_state_end;
-	register_node(lv, irn);
-}
-
 static struct {
 	be_lv_t  *lv;         /**< The liveness object. */
-	ir_node  *def;	      /**< The node (value). */
+	ir_node  *def;        /**< The node (value). */
 	ir_node  *def_block;  /**< The block of def. */
 	bitset_t *visited;    /**< A set were all visited blocks are recorded. */
 } re;
@@ -342,17 +221,14 @@ static struct {
  */
 static void live_end_at_block(ir_node *block, int is_true_out)
 {
-	be_lv_t *lv  = re.lv;
-	ir_node *def = re.def;
-	bitset_t *visited;
+	be_lv_info_node_t *const n = be_lv_get_or_set(re.lv, block, re.def);
 
-	mark_live_end(lv, block, def);
-	if (is_true_out)
-		mark_live_out(lv, block, def);
+	DBG((dbg, LEVEL_2, "marking %+F live %s at %+F\n", re.def, is_true_out ? "end+out" : "end", block));
+	n->flags |= is_true_out ? be_lv_state_out | be_lv_state_end : be_lv_state_out;
 
-	visited = re.visited;
-	if (!bitset_contains_irn(visited, block)) {
-		bitset_add_irn(visited, block);
+	bitset_t *const visited = re.visited;
+	if (!bitset_is_set(visited, get_irn_idx(block))) {
+		bitset_set(visited, get_irn_idx(block));
 
 		/*
 		 * If this block is not the definition block, we have to go up
@@ -361,7 +237,8 @@ static void live_end_at_block(ir_node *block, int is_true_out)
 		if (re.def_block != block) {
 			int i;
 
-			mark_live_in(lv, block, def);
+			DBG((dbg, LEVEL_2, "marking %+F live in at %+F\n", re.def, block));
+			n->flags |= be_lv_state_in;
 
 			for (i = get_Block_n_cfgpreds(block) - 1; i >= 0; --i)
 				live_end_at_block(get_Block_cfgpred_block(block, i), 1);
@@ -369,11 +246,6 @@ static void live_end_at_block(ir_node *block, int is_true_out)
 	}
 }
 
-typedef struct _lv_walker_t {
-	be_lv_t *lv;
-	void *data;
-} lv_walker_t;
-
 typedef struct lv_remove_walker_t {
 	be_lv_t       *lv;
 	const ir_node *irn;
@@ -387,7 +259,6 @@ typedef struct lv_remove_walker_t {
  */
 static void liveness_for_node(ir_node *irn)
 {
-	const ir_edge_t *edge;
 	ir_node *def_block;
 
 	bitset_clear_all(re.visited);
@@ -431,7 +302,9 @@ static void liveness_for_node(ir_node *irn)
 		else if (def_block != use_block) {
 			int i;
 
-			mark_live_in(re.lv, use_block, irn);
+			be_lv_info_node_t *const n = be_lv_get_or_set(re.lv, use_block, irn);
+			DBG((dbg, LEVEL_2, "marking %+F live in at %+F\n", irn, use_block));
+			n->flags |= be_lv_state_in;
 
 			for (i = get_Block_n_cfgpreds(use_block) - 1; i >= 0; --i) {
 				ir_node *pred_block = get_Block_cfgpred_block(use_block, i);
@@ -443,82 +316,39 @@ static void liveness_for_node(ir_node *irn)
 
 static void lv_remove_irn_walker(ir_node *bl, void *data)
 {
-	lv_remove_walker_t *w = data;
+	lv_remove_walker_t *w = (lv_remove_walker_t*)data;
 	be_lv_remove(w->lv, bl, w->irn);
 }
 
-static const char *lv_flags_to_str(unsigned flags)
-{
-	static const char *states[] = {
-		"---",
-		"i--",
-		"-e-",
-		"ie-",
-		"--o",
-		"i-o",
-		"-eo",
-		"ieo"
-	};
-
-	return states[flags & 7];
-}
-
-static void lv_dump_block(void *context, FILE *f, const ir_node *bl)
-{
-	if (is_Block(bl)) {
-		be_lv_t *lv = context;
-		struct _be_lv_info_t *info = phase_get_irn_data(&lv->ph, bl);
-
-		fprintf(f, "liveness:\n");
-		if (info) {
-			unsigned n = info[0].u.head.n_members;
-			unsigned i;
-
-			for (i = 0; i < n; ++i) {
-				struct _be_lv_info_node_t *n = &info[i+1].u.node;
-				ir_fprintf(f, "%s %+F\n", lv_flags_to_str(n->flags), get_idx_irn(lv->irg, n->idx));
-			}
-		}
-	}
-}
-
-static void *lv_phase_data_init(ir_phase *phase, const ir_node *irn, void *old)
-{
-	struct _be_lv_info_t *info = phase_alloc(phase, LV_STD_SIZE * sizeof(info[0]));
-	(void) irn;
-	(void) old;
-
-	memset(info, 0, LV_STD_SIZE * sizeof(info[0]));
-	info[0].u.head.n_size = LV_STD_SIZE - 1;
-	return info;
-}
-
 /**
  * Walker, collect all nodes for which we want calculate liveness info
  * on an obstack.
  */
 static void collect_liveness_nodes(ir_node *irn, void *data)
 {
-	ir_node **nodes = data;
+	ir_node **nodes = (ir_node**)data;
 	if (is_liveness_node(irn))
 		nodes[get_irn_idx(irn)] = irn;
 }
 
-static void compute_liveness(be_lv_t *lv)
+void be_liveness_compute_sets(be_lv_t *lv)
 {
-	ir_node **nodes;
-	int i, n;
+	int       i;
+	int       n;
+
+	if (lv->sets_valid)
+		return;
+
+	be_timer_push(T_LIVE);
+	ir_nodehashmap_init(&lv->map);
+	obstack_init(&lv->obst);
 
-	stat_ev_tim_push();
 	n = get_irg_last_idx(lv->irg);
-	nodes = NEW_ARR_F(ir_node *, n);
-	memset(nodes, 0, sizeof(nodes[0]) * n);
+	ir_node **const nodes = NEW_ARR_FZ(ir_node*, n);
 
-	/*
-	 * inserting the variables sorted by their ID is probably
+	/* inserting the variables sorted by their ID is probably
 	 * more efficient since the binary sorted set insertion
-	 * will not need to move around the data.
-	 */
+	 * will not need to move around the data. */
 	irg_walk_graph(lv->irg, NULL, collect_liveness_nodes, nodes);
 
 	re.lv      = lv;
@@ -531,95 +361,58 @@ static void compute_liveness(be_lv_t *lv)
 
 	DEL_ARR_F(nodes);
 	free(re.visited);
-	register_hook(hook_node_info, &lv->hook_info);
-	stat_ev_tim_pop("be_lv_sets_cons");
-}
-
-void be_liveness_assure_sets(be_lv_t *lv)
-{
-	if (!lv->nodes) {
-		be_timer_push(T_LIVE);
 
-		lv->nodes = bitset_malloc(2 * get_irg_last_idx(lv->irg));
-		phase_init(&lv->ph, "liveness", lv->irg, PHASE_DEFAULT_GROWTH, lv_phase_data_init, NULL);
-		compute_liveness(lv);
-		/* be_live_chk_compare(lv, lv->lvc); */
+	be_timer_pop(T_LIVE);
 
-		be_timer_pop(T_LIVE);
-	}
+	lv->sets_valid = true;
 }
 
-void be_liveness_assure_chk(be_lv_t *lv)
+void be_liveness_compute_chk(be_lv_t *lv)
 {
-#ifndef USE_LIVE_CHK
-	be_timer_push(t_verify);
-	be_liveness_assure_sets(lv);
-	be_timer_pop(t_verify);
-#else
-	(void) lv;
-#endif
+	if (lv->lvc != NULL)
+		return;
+	lv->lvc = lv_chk_new(lv->irg);
 }
 
-void be_liveness_invalidate(be_lv_t *lv)
+void be_liveness_invalidate_sets(be_lv_t *lv)
 {
-	if (lv && lv->nodes) {
-		unregister_hook(hook_node_info, &lv->hook_info);
-		phase_free(&lv->ph);
-		bitset_free(lv->nodes);
-		lv->nodes = NULL;
-	}
+	if (!lv->sets_valid)
+		return;
+	obstack_free(&lv->obst, NULL);
+	ir_nodehashmap_destroy(&lv->map);
+	lv->sets_valid = false;
 }
 
-/* Compute the inter block liveness for a graph. */
-be_lv_t *be_liveness(ir_graph *irg)
+void be_liveness_invalidate_chk(be_lv_t *lv)
 {
-	be_lv_t *lv = XMALLOCZ(be_lv_t);
-
-	lv->irg  = irg;
-#ifdef USE_LIVE_CHK
-	lv->dfs  = dfs_new(&absgraph_irg_cfg_succ, irg);
-	lv->lvc  = lv_chk_new(lv->irg, lv->dfs);
-#endif
-	lv->hook_info.context = lv;
-	lv->hook_info.hook._hook_node_info = lv_dump_block;
+	be_liveness_invalidate_sets(lv);
 
-	return lv;
+	if (lv->lvc == NULL)
+		return;
+	lv_chk_free(lv->lvc);
+	lv->lvc = NULL;
 }
 
-void be_liveness_recompute(be_lv_t *lv)
+be_lv_t *be_liveness_new(ir_graph *irg)
 {
-	unsigned last_idx;
-
-	be_timer_push(T_LIVE);
-	last_idx = get_irg_last_idx(lv->irg);
-	if (last_idx >= bitset_size(lv->nodes)) {
-		bitset_free(lv->nodes);
-		lv->nodes = bitset_malloc(last_idx * 2);
-	} else
-		bitset_clear_all(lv->nodes);
+	be_lv_t *lv = XMALLOCZ(be_lv_t);
 
-	phase_free(&lv->ph);
-	phase_init(&lv->ph, "liveness", lv->irg, PHASE_DEFAULT_GROWTH, lv_phase_data_init, NULL);
-	compute_liveness(lv);
+	lv->irg = irg;
 
-	be_timer_pop(T_LIVE);
+	return lv;
 }
 
-
 void be_liveness_free(be_lv_t *lv)
 {
-	be_liveness_invalidate(lv);
-#ifdef USE_LIVE_CHK
-	lv_chk_free(lv->lvc);
-	dfs_free(lv->dfs);
-#endif
+	be_liveness_invalidate_sets(lv);
+	be_liveness_invalidate_chk(lv);
+
 	xfree(lv);
 }
 
 void be_liveness_remove(be_lv_t *lv, const ir_node *irn)
 {
-	if (lv->nodes) {
-		unsigned idx = get_irn_idx(irn);
+	if (lv->sets_valid) {
 		lv_remove_walker_t w;
 
 		/*
@@ -630,15 +423,13 @@ void be_liveness_remove(be_lv_t *lv, const ir_node *irn)
 		w.lv  = lv;
 		w.irn = irn;
 		dom_tree_walk(get_nodes_block(irn), lv_remove_irn_walker, NULL, &w);
-		if (idx < bitset_size(lv->nodes))
-			bitset_clear(lv->nodes, idx);
 	}
 }
 
 void be_liveness_introduce(be_lv_t *lv, ir_node *irn)
 {
 	/* Don't compute liveness information for non-data nodes. */
-	if (lv->nodes && is_liveness_node(irn)) {
+	if (lv->sets_valid && is_liveness_node(irn)) {
 		re.lv      = lv;
 		re.visited = bitset_malloc(get_irg_last_idx(lv->irg));
 		liveness_for_node(irn);
@@ -652,161 +443,20 @@ void be_liveness_update(be_lv_t *lv, ir_node *irn)
 	be_liveness_introduce(lv, irn);
 }
 
-static void lv_check_walker(ir_node *bl, void *data)
-{
-	lv_walker_t *w = data;
-	be_lv_t *lv    = w->lv;
-	be_lv_t *fresh = w->data;
-
-	struct _be_lv_info_t *curr = phase_get_irn_data(&lv->ph, bl);
-	struct _be_lv_info_t *fr   = phase_get_irn_data(&fresh->ph, bl);
-
-	if (!fr && curr && curr[0].u.head.n_members > 0) {
-		unsigned i;
-
-		ir_fprintf(stderr, "%+F liveness should be empty but current liveness contains:\n", bl);
-		for (i = 0; i < curr[0].u.head.n_members; ++i) {
-			ir_fprintf(stderr, "\t%+F\n", get_idx_irn(lv->irg, curr[1 + i].u.node.idx));
-		}
-	}
-
-	else if (curr) {
-		unsigned n_curr  = curr[0].u.head.n_members;
-		unsigned n_fresh = fr[0].u.head.n_members;
-
-		unsigned i;
-
-		if (n_curr != n_fresh) {
-			ir_fprintf(stderr, "%+F: liveness set sizes differ. curr %d, correct %d\n", bl, n_curr, n_fresh);
-
-			ir_fprintf(stderr, "current:\n");
-			for (i = 0; i < n_curr; ++i) {
-				struct _be_lv_info_node_t *n = &curr[1 + i].u.node;
-				ir_fprintf(stderr, "%+F %u %+F %s\n", bl, i, get_idx_irn(lv->irg, n->idx), lv_flags_to_str(n->flags));
-			}
-
-			ir_fprintf(stderr, "correct:\n");
-			for (i = 0; i < n_fresh; ++i) {
-				struct _be_lv_info_node_t *n = &fr[1 + i].u.node;
-				ir_fprintf(stderr, "%+F %u %+F %s\n", bl, i, get_idx_irn(lv->irg, n->idx), lv_flags_to_str(n->flags));
-			}
-		}
-	}
-}
-
-void be_liveness_check(be_lv_t *lv)
-{
-	lv_walker_t w;
-	be_lv_t *fresh = be_liveness(lv->irg);
-
-	w.lv   = lv;
-	w.data = fresh;
-	irg_block_walk_graph(lv->irg, lv_check_walker, NULL, &w);
-	be_liveness_free(fresh);
-}
-
-
-static void lv_dump_block_walker(ir_node *irn, void *data)
-{
-	lv_walker_t *w = data;
-	if (is_Block(irn))
-		lv_dump_block(w->lv, w->data, irn);
-}
-
-
-/* Dump the liveness information for a graph. */
-void be_liveness_dump(const be_lv_t *lv, FILE *f)
-{
-	lv_walker_t w;
-
-	w.lv   = (be_lv_t *) lv;
-	w.data = f;
-	irg_block_walk_graph(lv->irg, lv_dump_block_walker, NULL, &w);
-}
-
-/* Dump the liveness information for a graph. */
-void be_liveness_dumpto(const be_lv_t *lv, const char *cls_name)
-{
-	FILE *f;
-	char buf[128];
-	ir_snprintf(buf, sizeof(buf), "%F_%s-live.txt", lv->irg, cls_name);
-	if ((f = fopen(buf, "wt")) != NULL) {
-		be_liveness_dump(lv, f);
-		fclose(f);
-	}
-}
-
-/**
- * Walker: checks the every predecessors of a node dominate
- * the note.
- */
-static void dom_check(ir_node *irn, void *data)
-{
-	int *problem_found = data;
-
-	if (!is_Block(irn) && irn != get_irg_end(get_irn_irg(irn))) {
-		int i, n;
-		ir_node *bl = get_nodes_block(irn);
-
-		for (i = 0, n = get_irn_arity(irn); i < n; ++i) {
-			ir_node *op     = get_irn_n(irn, i);
-			ir_node *def_bl = get_nodes_block(op);
-			ir_node *use_bl = bl;
-
-			if (is_Phi(irn))
-				use_bl = get_Block_cfgpred_block(bl, i);
-
-			if (get_irn_opcode(use_bl) != iro_Bad
-			     && get_irn_opcode(def_bl) != iro_Bad
-			     && !block_dominates(def_bl, use_bl)) {
-				ir_fprintf(stderr, "Verify warning: %+F in %+F must dominate %+F for user %+F (%s)\n", op, def_bl, use_bl, irn, get_irg_dump_name(get_irn_irg(op)));
-				*problem_found = 1;
-			}
-		}
-	}
-}
-
-/* Check, if the SSA dominance property is fulfilled. */
-int be_check_dominance(ir_graph *irg)
-{
-	int problem_found = 0;
-
-	assure_doms(irg);
-	irg_walk_graph(irg, dom_check, NULL, &problem_found);
-
-	return !problem_found;
-}
-
 void be_liveness_transfer(const arch_register_class_t *cls,
                           ir_node *node, ir_nodeset_t *nodeset)
 {
-	int i, arity;
-
 	/* You should better break out of your loop when hitting the first phi
 	 * function. */
 	assert(!is_Phi(node) && "liveness_transfer produces invalid results for phi nodes");
 
-	if (get_irn_mode(node) == mode_T) {
-		const ir_edge_t *edge;
-
-		foreach_out_edge(node, edge) {
-			ir_node *proj = get_edge_src_irn(edge);
-
-			if (arch_irn_consider_in_reg_alloc(cls, proj)) {
-				ir_nodeset_remove(nodeset, proj);
-			}
-		}
-	} else if (arch_irn_consider_in_reg_alloc(cls, node)) {
-		ir_nodeset_remove(nodeset, node);
-	}
+	be_foreach_definition(node, cls, value, req,
+		ir_nodeset_remove(nodeset, value);
+	);
 
-	arity = get_irn_arity(node);
-	for (i = 0; i < arity; ++i) {
-		ir_node *op = get_irn_n(node, i);
-
-		if (arch_irn_consider_in_reg_alloc(cls, op))
-			ir_nodeset_insert(nodeset, op);
-	}
+	be_foreach_use(node, cls, in_req, op, op_req,
+		ir_nodeset_insert(nodeset, op);
+	);
 }
 
 
@@ -815,47 +465,32 @@ void be_liveness_end_of_block(const be_lv_t *lv,
                               const arch_register_class_t *cls,
                               const ir_node *block, ir_nodeset_t *live)
 {
-	int i;
-
-	assert(lv->nodes && "live sets must be computed");
-	be_lv_foreach(lv, block, be_lv_state_end, i) {
-		ir_node *node = be_lv_get_irn(lv, block, i);
-		if (!arch_irn_consider_in_reg_alloc(cls, node))
-			continue;
-
+	assert(lv->sets_valid && "live sets must be computed");
+	be_lv_foreach_cls(lv, block, be_lv_state_end, cls, node) {
 		ir_nodeset_insert(live, node);
 	}
 }
 
 
 
-void be_liveness_nodes_live_at(const be_lv_t *lv,
-                               const arch_register_class_t *cls,
-                               const ir_node *pos, ir_nodeset_t *live)
+void be_liveness_nodes_live_before(be_lv_t const *const lv, arch_register_class_t const *const cls, ir_node const *const pos, ir_nodeset_t *const live)
 {
-	const ir_node *bl = is_Block(pos) ? pos : get_nodes_block(pos);
-	ir_node *irn;
-
+	ir_node const *const bl = get_nodes_block(pos);
 	be_liveness_end_of_block(lv, cls, bl, live);
 	sched_foreach_reverse(bl, irn) {
-		/*
-		 * If we encounter the node we want to insert the Perm after,
-		 * exit immediately, so that this node is still live
-		 */
+		be_liveness_transfer(cls, irn, live);
 		if (irn == pos)
 			return;
-
-		be_liveness_transfer(cls, irn, live);
 	}
 }
 
 static void collect_node(ir_node *irn, void *data)
 {
-	struct obstack *obst = data;
+	struct obstack *obst = (struct obstack*)data;
 	obstack_ptr_grow(obst, irn);
 }
 
-void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc)
+static void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc)
 {
 	ir_graph *irg    = lv->irg;
 
@@ -868,36 +503,36 @@ void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc)
 
 	irg_block_walk_graph(irg, collect_node, NULL, &obst);
 	obstack_ptr_grow(&obst, NULL);
-	blocks = obstack_finish(&obst);
+	blocks = (ir_node**)obstack_finish(&obst);
 
 	irg_walk_graph(irg, collect_node, NULL, &obst);
 	obstack_ptr_grow(&obst, NULL);
-	nodes = obstack_finish(&obst);
+	nodes = (ir_node**)obstack_finish(&obst);
 
 	stat_ev_ctx_push("be_lv_chk_compare");
 	for (j = 0; nodes[j]; ++j) {
 		ir_node *irn = nodes[j];
+		if (is_Block(irn))
+			continue;
+
 		for (i = 0; blocks[i]; ++i) {
 			ir_node *bl = blocks[i];
+			int lvr_in  = be_is_live_in (lv, bl, irn);
+			int lvr_out = be_is_live_out(lv, bl, irn);
+			int lvr_end = be_is_live_end(lv, bl, irn);
 
-			if (!is_Block(irn)) {
-				int lvr_in  = be_is_live_in (lv, bl, irn);
-				int lvr_out = be_is_live_out(lv, bl, irn);
-				int lvr_end = be_is_live_end(lv, bl, irn);
+			int lvc_in  = lv_chk_bl_in (lvc, bl, irn);
+			int lvc_out = lv_chk_bl_out(lvc, bl, irn);
+			int lvc_end = lv_chk_bl_end(lvc, bl, irn);
 
-				int lvc_in  = lv_chk_bl_in (lvc, bl, irn);
-				int lvc_out = lv_chk_bl_out(lvc, bl, irn);
-				int lvc_end = lv_chk_bl_end(lvc, bl, irn);
+			if (lvr_in - lvc_in != 0)
+				ir_fprintf(stderr, "live in  info for %+F at %+F differs: nml: %d, chk: %d\n", irn, bl, lvr_in, lvc_in);
 
-				if (lvr_in - lvc_in != 0)
-					ir_fprintf(stderr, "live in  info for %+F at %+F differs: nml: %d, chk: %d\n", irn, bl, lvr_in, lvc_in);
+			if (lvr_end - lvc_end != 0)
+				ir_fprintf(stderr, "live end info for %+F at %+F differs: nml: %d, chk: %d\n", irn, bl, lvr_end, lvc_end);
 
-				if (lvr_end - lvc_end != 0)
-					ir_fprintf(stderr, "live end info for %+F at %+F differs: nml: %d, chk: %d\n", irn, bl, lvr_end, lvc_end);
-
-				if (lvr_out - lvc_out != 0)
-					ir_fprintf(stderr, "live out info for %+F at %+F differs: nml: %d, chk: %d\n", irn, bl, lvr_out, lvc_out);
-			}
+			if (lvr_out - lvc_out != 0)
+				ir_fprintf(stderr, "live out info for %+F at %+F differs: nml: %d, chk: %d\n", irn, bl, lvr_out, lvc_out);
 		}
 	}
 	stat_ev_ctx_pop("be_lv_chk_compare");
@@ -905,8 +540,9 @@ void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc)
 	obstack_free(&obst, NULL);
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_live);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_live)
 void be_init_live(void)
 {
+	(void)be_live_chk_compare;
 	FIRM_DBG_REGISTER(dbg, "firm.be.liveness");
 }