projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sparc: implement float->unsigned conversions
[libfirm]
/
ir
/
be
/
belive_t.h
diff --git
a/ir/be/belive_t.h
b/ir/be/belive_t.h
index
c5379fe
..
6d79f01
100644
(file)
--- a/
ir/be/belive_t.h
+++ b/
ir/be/belive_t.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 1995-200
7
University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-200
8
University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
*
* This file is part of libFirm.
*
@@
-22,15
+22,16
@@
* @brief Internal headers for liveness analysis.
* @author Sebastian Hack
* @date 06.12.2004
* @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 FIRM_BE_BELIVE_T_H
#define FIRM_BE_BELIVE_T_H
+#include <stdbool.h>
+#include "be_types.h"
#include "irgraph_t.h"
#include "irgraph_t.h"
-#include "ir
phase_t
.h"
+#include "ir
nodehashmap
.h"
#include "irhooks.h"
#include "irhooks.h"
-#include "
dfs
.h"
+#include "
irlivechk
.h"
#include "statev.h"
#include "pset.h"
#include "statev.h"
#include "pset.h"
@@
-38,52
+39,40
@@
#include "belive.h"
#include "belive.h"
-#define USE_LIVE_CHK
-
-#ifdef USE_LIVE_CHK
-#include "irlivechk.h"
-#endif
-
-struct be_irg_t;
-
-struct _be_lv_t {
- ir_phase ph;
- ir_graph *irg;
- dfs_t *dfs;
- const struct be_irg_t *birg;
- bitset_t *nodes;
- hook_entry_t hook_info;
-#ifdef USE_LIVE_CHK
- lv_chk_t *lvc;
-#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;
+ lv_chk_t *lvc;
};
};
-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;
};
unsigned idx;
unsigned flags;
};
-struct
_
be_lv_info_head_t {
+struct be_lv_info_head_t {
unsigned n_members;
unsigned n_size;
};
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) {
while(i < n_members) {
- if(arr[i + 1].
u.
node.flags & flags) {
+ if(arr[i + 1].node.flags & flags) {
return i;
}
++i;
return i;
}
++i;
@@
-93,27
+82,27
@@
static INLINE int _be_lv_next_irn(const struct _be_lv_t *lv, const ir_node *bl,
return -1;
}
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)
{
{
- int res;
-
- if (li->nodes) {
- struct _be_lv_info_node_t *info = be_lv_get(li, block, irn);
- res = info ? (info->flags & flags) != 0 : 0;
- }
+ unsigned res;
-#ifdef USE_LIVE_CHK
- else
+ 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;
res = (lv_chk_bl_xxx(li->lvc, block, irn) & flags) != 0;
-#endif /* USE_LIVE_CHK */
+ }
return res;
}
return res;
}
@@
-122,7
+111,8
@@
static INLINE int _be_is_live_xxx(const struct _be_lv_t *li, const ir_node *bloc
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)
{
int i;
be_lv_foreach(lv, block, state, i)
@@
-141,4
+131,4
@@
static INLINE pset *_be_lv_pset_put(const struct _be_lv_t *lv, const ir_node *bl
#define be_lv_has_info_about(lv, irn) bitset_is_set((lv)->nodes, get_irn_idx(irn))
#define be_lv_has_info_about(lv, irn) bitset_is_set((lv)->nodes, get_irn_idx(irn))
-#endif
/* FIRM_BE_BELIVE_T_H */
+#endif