X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelive_t.h;h=857386e490383cbc03e047063c15f80085f76304;hb=b9d45e08e23bcf058fa8f2d9e18dd78e8cccd044;hp=5d446caa2b45b39dcecd2a08e72e733fe7f26620;hpb=9b060a71a2667ced8d103023eda0ff710e799867;p=libfirm

diff --git a/ir/be/belive_t.h b/ir/be/belive_t.h
index 5d446caa2..857386e49 100644
--- a/ir/be/belive_t.h
+++ b/ir/be/belive_t.h
@@ -7,79 +7,98 @@
 #ifndef _BELIVE_T_H
 #define _BELIVE_T_H
 
-#include "config.h"
+#include "firm_config.h"
 
-#include "belive.h"
-#include "pset.h"
+#include "irgraph_t.h"
+#include "iredges_t.h"
+#include "irphase_t.h"
+#include "irhooks.h"
 
-typedef struct _block_live_info_t {
-	pset *in; 				/**< The set of all values live in at that block. */
-	pset *out;				/**< The set of all values live out. */
-} block_live_info_t;
+#include "pset.h"
+#include "set.h"
+#include "list.h"
+#include "hashptr.h"
+#include "bitset.h"
 
-typedef struct _node_live_info_t {
-	int is_phi_op; 		/**< Marks the node as a phi operand. */
-} node_live_info_t;
+#include "belive.h"
 
-typedef struct _live_info_t {
+struct _be_lv_t {
+	phase_t ph;
+	ir_graph *irg;
+	bitset_t *nodes;
+	hook_entry_t hook_info;
+	firm_dbg_module_t *dbg;
+};
+
+struct _be_lv_info_node_t {
+	unsigned idx;
+	unsigned flags;
+};
+
+struct _be_lv_info_head_t {
+	unsigned n_members;
+	unsigned n_size;
+};
+
+struct _be_lv_info_t {
 	union {
-		block_live_info_t block;
-		node_live_info_t node;
-	} v;
-} live_info_t;
+		struct _be_lv_info_head_t head;
+		struct _be_lv_info_node_t node;
+	} u;
+};
 
-extern size_t live_irn_data_offset;
-
-#define get_irn_live_info(irn) get_irn_data(irn, live_info_t, live_irn_data_offset)
-#define get_live_info_irn(inf) get_irn_data_base(inf, live_irn_data_offset)
-
-#define get_block_live_info(irn) (&(get_irn_live_info(irn)->v.block))
-#define get_node_live_info(irn) (&(get_irn_live_info(irn)->v.node))
-
-static INLINE int __is_phi_operand(const ir_node *irn)
+static INLINE int _be_lv_next_irn(const struct _be_lv_t *lv, const ir_node *bl, unsigned flags, int i)
 {
-	assert(!is_Block(irn) && "No block node allowed here");
-	return get_node_live_info(irn)->is_phi_op;
+	struct _be_lv_info_t *arr     = phase_get_irn_data(&lv->ph, bl);
+	if(arr) {
+		int n_members = (int) arr[0].u.head.n_members;
+
+		while(i < n_members) {
+			if(arr[i + 1].u.node.flags & flags) {
+				return i;
+			}
+			++i;
+		}
+	}
+
+	return -1;
 }
 
-static INLINE int __is_live_in(const ir_node *block, const ir_node *irn)
+static INLINE ir_node * _be_lv_get_irn(const struct _be_lv_t *lv, const ir_node *bl, int i)
 {
-	block_live_info_t *info = get_block_live_info(block);
-
-	assert(is_Block(block) && "Need a block here");
-	return pset_find_ptr(info->in, irn) != NULL;
+	struct _be_lv_info_t *arr     = phase_get_irn_data(&lv->ph, bl);
+	return get_idx_irn(lv->irg, arr[i + 1].u.node.idx);
 }
 
-static INLINE int __is_live_out(const ir_node *block, const ir_node *irn)
-{
-	block_live_info_t *info = get_block_live_info(block);
-
-	assert(is_Block(block) && "Need a block here");
-	return pset_find_ptr(info->out, irn) != NULL;
-}
+struct _be_lv_info_node_t *be_lv_get(const struct _be_lv_t *li, const ir_node *bl, const ir_node *irn);
 
-static INLINE pset *__get_live_in(const ir_node *block)
+static INLINE int _be_is_live_xxx(const struct _be_lv_t *li, const ir_node *block, const ir_node *irn, unsigned flags)
 {
-	assert(is_Block(block) && "Need a block here");
-	return get_block_live_info(block)->in;
+	struct _be_lv_info_node_t *info = be_lv_get(li, block, irn);
+	return info ? (info->flags & flags) != 0 : 0;
 }
 
-static INLINE pset *__get_live_out(const ir_node *block)
+#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(struct _be_lv_t *lv, const ir_node *block, int state, pset *s)
 {
-	assert(is_Block(block) && "Need a block here");
-	return get_block_live_info(block)->out;
+	int i;
+	be_lv_foreach(lv, block, state, i)
+		pset_insert_ptr(s, _be_lv_get_irn(lv, block, i));
+	return s;
 }
 
-#define is_phi_operand(irn)			__is_phi_operand(irn)
-#define is_live_in(bl,irn) 			__is_live_in(bl, irn)
-#define is_live_out(bl,irn) 		__is_live_out(bl, irn)
-#define get_live_in(bl)					__get_live_in(bl)
-#define get_live_out(bl)				__get_live_out(bl)
+#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)
 
-/**
- * Initialize the liveness module.
- * To be called from be_init().
- */
-void be_liveness_init(void);
+#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_has_info_about(lv, irn) bitset_is_set((lv)->nodes, get_irn_idx(irn))
 
 #endif