X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelive_t.h;h=a8d939d881543dea1edf99c12504d5c70325146b;hb=79268f7122ba8f5820658967157b3a9c78ea492a;hp=5b5da70555eab2f0b3a24cd88e3cbf57b9dc2f1b;hpb=51e652d857c3448114970916285fdbebecdd968b;p=libfirm

diff --git a/ir/be/belive_t.h b/ir/be/belive_t.h
index 5b5da7055..a8d939d88 100644
--- a/ir/be/belive_t.h
+++ b/ir/be/belive_t.h
@@ -26,10 +26,12 @@
 #ifndef FIRM_BE_BELIVE_T_H
 #define FIRM_BE_BELIVE_T_H
 
+#include <stdbool.h>
 #include "be_types.h"
 #include "irgraph_t.h"
 #include "irnodehashmap.h"
 #include "irhooks.h"
+#include "irlivechk.h"
 #include "statev.h"
 
 #include "pset.h"
@@ -37,21 +39,13 @@
 
 #include "belive.h"
 
-#define USE_LIVE_CHK
-
-#ifdef USE_LIVE_CHK
-#include "irlivechk.h"
-#endif
-
 struct be_lv_t {
 	ir_nodehashmap_t map;
 	struct obstack   obst;
+	bool             sets_valid;
 	ir_graph        *irg;
-	bitset_t        *nodes;
 	hook_entry_t     hook_info;
-#ifdef USE_LIVE_CHK
 	lv_chk_t        *lvc;
-#endif
 };
 
 typedef struct be_lv_info_node_t be_lv_info_node_t;
@@ -70,30 +64,6 @@ union be_lv_info_t {
 	struct be_lv_info_node_t node;
 };
 
-static inline int _be_lv_next_irn(const be_lv_t *lv, const ir_node *block,
-                                  unsigned flags, int i)
-{
-	be_lv_info_t *arr = (be_lv_info_t*)ir_nodehashmap_get(&lv->map, block);
-	if (arr != NULL) {
-		int n_members = (int) arr[0].head.n_members;
-		while(i < n_members) {
-			if(arr[i + 1].node.flags & flags) {
-				return i;
-			}
-			++i;
-		}
-	}
-
-	return -1;
-}
-
-static inline ir_node *_be_lv_get_irn(const be_lv_t *lv, const ir_node *block,
-                                      int i)
-{
-	be_lv_info_t *arr = (be_lv_info_t*)ir_nodehashmap_get(&lv->map, block);
-	return get_idx_irn(lv->irg, arr[i + 1].node.idx);
-}
-
 be_lv_info_node_t *be_lv_get(const be_lv_t *li, const ir_node *block,
                              const ir_node *irn);
 
@@ -102,29 +72,55 @@ static inline unsigned _be_is_live_xxx(const be_lv_t *li, const ir_node *block,
 {
 	unsigned res;
 
-	if (li->nodes != NULL) {
+	if (li->sets_valid) {
 		be_lv_info_node_t *info = be_lv_get(li, block, irn);
 		res = info != NULL ? (info->flags & flags) != 0 : 0;
+	} else {
+		res = (lv_chk_bl_xxx(li->lvc, block, irn) & flags) != 0;
 	}
 
-#ifdef USE_LIVE_CHK
-	else
-		res = (lv_chk_bl_xxx(li->lvc, block, irn) & flags) != 0;
-#endif
+	return res;
+}
 
+typedef struct lv_iterator_t
+{
+	be_lv_info_t *info;
+	ir_graph     *irg;
+	be_lv_state_t flags;
+	size_t        i;
+} lv_iterator_t;
+
+static inline lv_iterator_t be_lv_iteration_begin(const be_lv_t *lv,
+	const ir_node *block, be_lv_state_t flags)
+{
+	lv_iterator_t res;
+	res.info  = ir_nodehashmap_get(be_lv_info_t, &lv->map, block);
+	res.irg   = get_Block_irg(block);
+	res.flags = flags;
+	res.i     = res.info != NULL ? res.info[0].head.n_members : 0;
 	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 ir_node *be_lv_iteration_next(lv_iterator_t *iterator)
+{
+	while (iterator->i != 0) {
+		const be_lv_info_t *info = iterator->info + iterator->i--;
+		if (info->node.flags & iterator->flags)
+			return get_idx_irn(iterator->irg, info->node.idx);
+	}
+	return NULL;
+}
 
+#define be_lv_foreach(lv, block, flags, node) \
+	for (bool once = true; once;) \
+		for (lv_iterator_t iter = be_lv_iteration_begin((lv), (block), (flags)); once; once = false) \
+			for (ir_node *node; (node = be_lv_iteration_next(&iter)) != NULL;)
 
 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)
-		pset_insert_ptr(s, _be_lv_get_irn(lv, block, i));
+	be_lv_foreach(lv, block, state, node)
+		pset_insert_ptr(s, node);
 	return s;
 }