X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelive_t.h;h=06ea057f70b7d0cb4594f3dd68e7d8891689d5ec;hb=29087feac9466883c278e53eec325d5e3099df1d;hp=6d79f0124cc90e6c7b70827096f05dc2c1d4c1bb;hpb=b482d88d58ce6517bbb6597aa04ffa86ade5f2c9;p=libfirm

diff --git a/ir/be/belive_t.h b/ir/be/belive_t.h
index 6d79f0124..06ea057f7 100644
--- a/ir/be/belive_t.h
+++ b/ir/be/belive_t.h
@@ -27,31 +27,27 @@
 #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"
-#include "bitset.h"
-
 #include "belive.h"
+#include "bearch.h"
+
+#define be_is_live_in(lv, bl, irn)    _be_is_live_xxx(lv, bl, irn, be_lv_state_in)
+#define be_is_live_end(lv, bl, irn)   _be_is_live_xxx(lv, bl, irn, be_lv_state_end)
+#define be_is_live_out(lv, bl, irn)   _be_is_live_xxx(lv, bl, irn, be_lv_state_out)
 
 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;
 	lv_chk_t        *lvc;
 };
 
 typedef struct be_lv_info_node_t be_lv_info_node_t;
 struct be_lv_info_node_t {
-	unsigned idx;
+	ir_node *node;
 	unsigned flags;
 };
 
@@ -65,30 +61,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);
 
@@ -107,28 +79,57 @@ static inline unsigned _be_is_live_xxx(const be_lv_t *li, const ir_node *block,
 	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))
+typedef struct lv_iterator_t
+{
+	be_lv_info_t *info;
+	size_t        i;
+} lv_iterator_t;
 
+static inline lv_iterator_t be_lv_iteration_begin(const be_lv_t *lv,
+	const ir_node *block)
+{
+	lv_iterator_t res;
+	res.info  = ir_nodehashmap_get(be_lv_info_t, &lv->map, block);
+	res.i     = res.info != NULL ? res.info[0].head.n_members : 0;
+	return res;
+}
 
-static inline pset *_be_lv_pset_put(const be_lv_t *lv, const ir_node *block,
-                                    int state, pset *s)
+static inline ir_node *be_lv_iteration_next(lv_iterator_t *iterator, be_lv_state_t flags)
 {
-	int i;
-	be_lv_foreach(lv, block, state, i)
-		pset_insert_ptr(s, _be_lv_get_irn(lv, block, i));
-	return s;
+	while (iterator->i != 0) {
+		const be_lv_info_t *info = iterator->info + iterator->i--;
+		if (info->node.flags & flags)
+			return info->node.node;
+	}
+	return NULL;
 }
 
-#define be_lv_get_irn(lv, bl, i)      _be_lv_get_irn(lv, bl, i)
-#define be_lv_pset_put_in(lv, bl, s)  _be_lv_pset_put(lv, bl, be_lv_state_in, s)
-#define be_lv_pset_put_out(lv, bl, s) _be_lv_pset_put(lv, bl, be_lv_state_out, s)
-#define be_lv_pset_put_end(lv, bl, s) _be_lv_pset_put(lv, bl, be_lv_state_end, s)
+static inline ir_node *be_lv_iteration_cls_next(lv_iterator_t *iterator, be_lv_state_t flags, const arch_register_class_t *cls)
+{
+	while (iterator->i != 0) {
+		const be_lv_info_t *info = iterator->info + iterator->i--;
+		if (!(info->node.flags & flags))
+			continue;
+
+		ir_node *node = info->node.node;
+		ir_mode *mode = get_irn_mode(node);
+		if (!mode_is_datab(mode))
+			continue;
+		if (!arch_irn_consider_in_reg_alloc(cls, node))
+			continue;
+		return node;
+	}
+	return NULL;
+}
 
-#define be_is_live_in(lv, bl, irn)    _be_is_live_xxx(lv, bl, irn, be_lv_state_in)
-#define be_is_live_end(lv, bl, irn)   _be_is_live_xxx(lv, bl, irn, be_lv_state_end)
-#define be_is_live_out(lv, bl, irn)   _be_is_live_xxx(lv, bl, irn, be_lv_state_out)
+#define be_lv_foreach(lv, block, flags, node) \
+	for (bool once = true; once;) \
+		for (lv_iterator_t iter = be_lv_iteration_begin((lv), (block)); once; once = false) \
+			for (ir_node *node; (node = be_lv_iteration_next(&iter, (flags))) != NULL;)
 
-#define be_lv_has_info_about(lv, irn) bitset_is_set((lv)->nodes, get_irn_idx(irn))
+#define be_lv_foreach_cls(lv, block, flags, cls, node) \
+	for (bool once = true; once;) \
+		for (lv_iterator_t iter = be_lv_iteration_begin((lv), (block)); once; once = false) \
+			for (ir_node *node; (node = be_lv_iteration_cls_next(&iter, (flags), (cls))) != NULL;)
 
 #endif