* @date 21.04.2007
* @author Sebastian Hack
* @version $Id$
- * @summary
+ * @brief
*
* Liveness checks as developed by Benoit Boissinot, Fabrice Rastello and myself.
*
#include "statev.h"
-typedef struct _bl_info_t {
+typedef struct bl_info_t {
const ir_node *block; /**< The block. */
int be_tgt_calc : 1;
#define get_block_info(lv, bl) ((bl_info_t *) phase_get_irn_data(&(lv)->ph, bl))
-struct _lv_chk_t {
- ir_phase ph;
+struct lv_chk_t {
+ ir_phase ph;
const dfs_t *dfs;
- int n_blocks;
- bitset_t *back_edge_src;
- bitset_t *back_edge_tgt;
- bl_info_t **map;
+ int n_blocks;
+ bitset_t *back_edge_src;
+ bitset_t *back_edge_tgt;
+ bl_info_t **map;
DEBUG_ONLY(firm_dbg_module_t *dbg;)
};
-static void *init_block_data(ir_phase *ph, const ir_node *irn, void *old)
+static void *init_block_data(ir_phase *ph, const ir_node *irn)
{
- lv_chk_t *lv = container_of(ph, lv_chk_t, ph);
+ lv_chk_t *lv = firm_container_of(ph, lv_chk_t, ph);
bl_info_t *bi = phase_alloc(ph, sizeof(bi[0]));
bi->id = get_Block_dom_tree_pre_num(irn);
bi->red_reachable = bitset_obstack_alloc(phase_obst(ph), lv->n_blocks);
bi->be_tgt_reach = bitset_obstack_alloc(phase_obst(ph), lv->n_blocks);
bi->be_tgt_calc = 0;
- (void) old;
return bi;
}
* @param irn A node.
* @return 1 if the node shall be considered in liveness, 0 if not.
*/
-static INLINE int is_liveness_node(const ir_node *irn)
+static inline int is_liveness_node(const ir_node *irn)
{
switch (get_irn_opcode(irn)) {
case iro_Block:
case iro_End:
case iro_Anchor:
return 0;
- default:;
+ default:
+ break;
}
return 1;
bitset_t *tmp = bitset_alloca(lv->n_blocks);
bl_info_t *bi = get_block_info(lv, bl);
- bitset_pos_t elm;
+ unsigned elm;
DBG((lv->dbg, LEVEL_2, "computing T_%d\n", bi->id));
}
-static INLINE void compute_back_edge_chains(lv_chk_t *lv)
+static inline void compute_back_edge_chains(lv_chk_t *lv)
{
- bitset_pos_t elm;
+ unsigned elm;
int i, n;
DBG((lv->dbg, LEVEL_2, "back edge sources: %B\n", lv->back_edge_src));
compute_doms(irg);
stat_ev_tim_push();
- phase_init(&res->ph, "liveness check", irg, PHASE_DEFAULT_GROWTH, init_block_data, NULL);
+ phase_init(&res->ph, irg, init_block_data);
obst = phase_obst(&res->ph);
FIRM_DBG_REGISTER(res->dbg, "ir.ana.lvchk");
res->n_blocks = dfs_get_n_nodes(res->dfs);
res->back_edge_src = bitset_obstack_alloc(obst, res->n_blocks);
res->back_edge_tgt = bitset_obstack_alloc(obst, res->n_blocks);
- res->map = obstack_alloc(obst, res->n_blocks * sizeof(res->map[0]));
- memset(res->map, 0, res->n_blocks * sizeof(res->map[0]));
+ res->map = OALLOCNZ(obst, bl_info_t*, res->n_blocks);
#if 0
{
void lv_chk_free(lv_chk_t *lv)
{
- phase_free(&lv->ph);
+ phase_deinit(&lv->ph);
xfree(lv);
}
+#if 0
/**
* Check if a node is live at the end of a block.
* This function is for internal use as its code is shared between
end:
return res;
}
+#endif
/**
* Check a nodes liveness situation of a block.
* will be left. */
DBG((lv->dbg, LEVEL_2, "\tbe tgt reach: %B, dom span: [%d, %d]\n", Tq, min_dom, max_dom));
i = bitset_next_set(Tq, min_dom);
- while(i <= max_dom) {
+ while (i <= max_dom) {
bl_info_t *ti = lv->map[i];
int use_in_current_block = bitset_is_set(uses, ti->id);