X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelive_t.h;h=f40a49b52e2ac1a663c630b6f7f2e6baf38295a3;hb=36e688467f3e9fed2b96e2d7f323edffa4268b53;hp=727e9d6842c9e288ffb91fa47f48b21acb13ad6f;hpb=4d5c3365a58cba59993045a9e08e686d8ae079a7;p=libfirm

diff --git a/ir/be/belive_t.h b/ir/be/belive_t.h
index 727e9d684..f40a49b52 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.
  *
@@ -18,59 +18,69 @@
  */
 
 /**
- * Internal headers for liveness analysis.
- * @author Sebastian Hack
- * @date 6.12.2004
+ * @file
+ * @brief       Internal headers for liveness analysis.
+ * @author      Sebastian Hack
+ * @date        06.12.2004
+ * @version     $Id$
  */
+#ifndef FIRM_BE_BELIVE_T_H
+#define FIRM_BE_BELIVE_T_H
 
-#ifndef _BELIVE_T_H
-#define _BELIVE_T_H
-
+#include "be_types.h"
 #include "irgraph_t.h"
-#include "iredges_t.h"
-#include "irphase_t.h"
+#include "irnodehashmap.h"
 #include "irhooks.h"
+#include "dfs.h"
+#include "statev.h"
 
 #include "pset.h"
-#include "set.h"
-#include "list.h"
-#include "hashptr.h"
 #include "bitset.h"
 
 #include "belive.h"
 
-struct _be_lv_t {
-	ir_phase ph;
-	ir_graph *irg;
-	bitset_t *nodes;
-	hook_entry_t hook_info;
+#define USE_LIVE_CHK
+
+#ifdef USE_LIVE_CHK
+#include "irlivechk.h"
+#endif
+
+struct be_lv_t {
+	ir_nodehashmap_t map;
+	struct obstack   obst;
+	ir_graph        *irg;
+	dfs_t           *dfs;
+	bitset_t        *nodes;
+	hook_entry_t     hook_info;
+#ifdef USE_LIVE_CHK
+	lv_chk_t        *lvc;
+#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 {
-	union {
-		struct _be_lv_info_head_t head;
-		struct _be_lv_info_node_t node;
-	} u;
+union be_lv_info_t {
+	struct be_lv_info_head_t head;
+	struct be_lv_info_node_t node;
 };
 
-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 *block,
+                                  unsigned flags, int i)
 {
-	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;
-
+	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].u.node.flags & flags) {
+			if(arr[i + 1].node.flags & flags) {
 				return i;
 			}
 			++i;
@@ -80,25 +90,40 @@ 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 *block,
+                                      int i)
 {
-	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);
+	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);
 }
 
-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 *block,
+                             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 unsigned _be_is_live_xxx(const be_lv_t *li, const ir_node *block,
+                                       const ir_node *irn, unsigned flags)
 {
-	struct _be_lv_info_node_t *info = be_lv_get(li, block, irn);
-	return info ? (info->flags & flags) != 0 : 0;
+	unsigned res;
+
+	if (li->nodes != NULL) {
+		be_lv_info_node_t *info = be_lv_get(li, block, irn);
+		res = info != NULL ? (info->flags & flags) != 0 : 0;
+	}
+
+#ifdef USE_LIVE_CHK
+	else
+		res = (lv_chk_bl_xxx(li->lvc, block, irn) & flags) != 0;
+#endif
+
+	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))
+	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)