Iterate over all segment types when detecting static allocated objects in rta.

[libfirm] / ir / ana / irlivechk.c

diff --git a/ir/ana/irlivechk.c b/ir/ana/irlivechk.c
index 3ea67bd..c7dcf51 100644 (file)
--- a/ir/ana/irlivechk.c
+++ b/ir/ana/irlivechk.c
@@ -68,7 +68,7 @@ typedef struct bl_info_t {
        bitset_t *red_reachable;   /**< Holds all id's if blocks reachable
                                                                 in the CFG modulo back edges. */
 
-       bitset_t *be_tgt_reach;    /**< target blocks of back edges whose
+       bitset_t *be_tgt_reach;    /**< target blocks of back edges whose
                                                                 sources are reachable from this block
                                                                 in the reduced graph. */
 } bl_info_t;
@@ -88,7 +88,7 @@ struct lv_chk_t {
 static void *init_block_data(ir_phase *ph, const ir_node *irn)
 {
        lv_chk_t *lv      = firm_container_of(ph, lv_chk_t, ph);
-       bl_info_t *bi     = phase_alloc(ph, sizeof(bi[0]));
+       bl_info_t *bi     = (bl_info_t*) phase_alloc(ph, sizeof(bi[0]));
 
        bi->id            = get_Block_dom_tree_pre_num(irn);
        bi->block         = irn;
@@ -132,7 +132,7 @@ static void red_trans_closure(lv_chk_t *lv)
        int i, n;
 
        for (i = 0, n = dfs_get_n_nodes(lv->dfs); i < n; ++i) {
-               const ir_node *bl   = dfs_get_post_num_node(lv->dfs, i);
+               const ir_node *bl = (const ir_node*) dfs_get_post_num_node(lv->dfs, i);
                bl_info_t *bi = get_block_info(lv, bl);
 
                const ir_edge_t *edge;
@@ -168,7 +168,7 @@ static void compute_back_edge_chain(lv_chk_t *lv, const ir_node *bl)
        bitset_t *tmp = bitset_alloca(lv->n_blocks);
        bl_info_t *bi = get_block_info(lv, bl);
 
-       unsigned elm;
+       size_t elm;
 
        DBG((lv->dbg, LEVEL_2, "computing T_%d\n", bi->id));
 
@@ -205,7 +205,7 @@ static void compute_back_edge_chain(lv_chk_t *lv, const ir_node *bl)
 
 static inline void compute_back_edge_chains(lv_chk_t *lv)
 {
-       unsigned elm;
+       size_t elm;
        int i, n;
 
        DBG((lv->dbg, LEVEL_2, "back edge sources: %B\n", lv->back_edge_src));
@@ -214,7 +214,7 @@ static inline void compute_back_edge_chains(lv_chk_t *lv)
        }
 
        for (i = 0, n = dfs_get_n_nodes(lv->dfs); i < n; ++i) {
-               const ir_node *bl = dfs_get_post_num_node(lv->dfs, i);
+               const ir_node *bl = (const ir_node*) dfs_get_post_num_node(lv->dfs, i);
                bl_info_t *bi     = get_block_info(lv, bl);
 
                const ir_edge_t *edge;
@@ -234,7 +234,7 @@ static inline void compute_back_edge_chains(lv_chk_t *lv)
        }
 
        for (i = 0, n = dfs_get_n_nodes(lv->dfs); i < n; ++i) {
-               const ir_node *bl = dfs_get_post_num_node(lv->dfs, i);
+               const ir_node *bl = (const ir_node*) dfs_get_post_num_node(lv->dfs, i);
                bl_info_t *bi     = get_block_info(lv, bl);
                bitset_set(bi->be_tgt_reach, bi->id);
        }
@@ -278,7 +278,7 @@ lv_chk_t *lv_chk_new(ir_graph *irg, const dfs_t *dfs)
        /* fill the map which maps pre_num to block infos */
        for (i = res->n_blocks - 1; i >= 0; --i) {
                ir_node *irn  = (ir_node *) dfs_get_pre_num_node(res->dfs, i);
-               bl_info_t *bi = phase_get_or_set_irn_data(&res->ph, irn);
+               bl_info_t *bi = (bl_info_t*) phase_get_or_set_irn_data(&res->ph, irn);
                assert(bi->id < res->n_blocks);
                assert(res->map[bi->id] == NULL);
                res->map[bi->id] = bi;
@@ -293,7 +293,7 @@ lv_chk_t *lv_chk_new(ir_graph *irg, const dfs_t *dfs)
 #ifndef NDEBUG
        DBG((res->dbg, LEVEL_1, "liveness chk in %+F\n", irg));
        for (i = res->n_blocks - 1; i >= 0; --i) {
-               const ir_node *irn = dfs_get_pre_num_node(res->dfs, i);
+               const ir_node *irn = (const ir_node*) dfs_get_pre_num_node(res->dfs, i);
                bl_info_t *bi      = get_block_info(res, irn);
                DBG((res->dbg, LEVEL_1, "lv_chk for %d -> %+F\n", i, irn));
                DBG((res->dbg, LEVEL_1, "\tred reach: %B\n", bi->red_reachable));
@@ -569,7 +569,8 @@ unsigned lv_chk_bl_xxx(const lv_chk_t *lv, const ir_node *bl, const ir_node *var
                bitset_t *uses = bitset_alloca(lv->n_blocks);
                bitset_t *Tq;
 
-               unsigned i, min_dom, max_dom;
+               size_t i;
+               unsigned min_dom, max_dom;
                const ir_edge_t *edge;
 
                /* if the block has no DFS info, it cannot be reached.