cleanup irphase: phase_reinit is a special case and doesn't polute the main callback...
[libfirm] / ir / be / belive.c
index fb51388..4a46e93 100644 (file)
@@ -29,7 +29,6 @@
 /* statev is expensive here, only enable when needed */
 #define DISABLE_STATEV
 
-#include "impl.h"
 #include "iredges_t.h"
 #include "irgwalk.h"
 #include "irprintf_t.h"
 
 #include "beutil.h"
 #include "belive_t.h"
-#include "beirg_t.h"
-#include "besched_t.h"
+#include "beirg.h"
+#include "besched.h"
 #include "bemodule.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
-/* see comment in compute_liveness() */
-#define LV_COMPUTE_SORTED
 #define LV_STD_SIZE             64
+
+/* if defined, use binary search for already live nodes, else linear */
 #define LV_USE_BINARY_SEARCH
 #undef  LV_INTESIVE_CHECKS
 
@@ -77,16 +76,6 @@ static inline int is_liveness_node(const ir_node *irn)
        }
 }
 
-int (be_lv_next_irn)(const struct _be_lv_t *lv, const ir_node *bl, unsigned flags, int i)
-{
-       return _be_lv_next_irn(lv, bl, flags, i);
-}
-
-const ir_node * (be_lv_get_irn)(const struct _be_lv_t *lv, const ir_node *bl, int i)
-{
-       return _be_lv_get_irn(lv, bl, i);
-}
-
 int (be_is_live_in)(const be_lv_t *lv, const ir_node *block, const ir_node *irn)
 {
        return _be_is_live_xxx(lv, block, irn, be_lv_state_in);
@@ -113,16 +102,16 @@ static inline unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned
        int lo       = 0;
        int hi       = n;
 
-       if(n == 0)
+       if (n == 0)
                return 0;
 
-       while(lo < hi) {
+       do {
                int md          = lo + ((hi - lo) >> 1);
                unsigned md_idx = payload[md].u.node.idx;
 
-               if(idx > md_idx)
+               if (idx > md_idx)
                        lo = md + 1;
-               else if(idx < md_idx)
+               else if (idx < md_idx)
                        hi = md;
                else {
                        res = md;
@@ -131,15 +120,15 @@ static inline unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned
                }
 
                res = lo;
-       }
+       } while (lo < hi);
 
 #ifdef LV_INTESIVE_CHECKS
        {
                unsigned i;
-               for(i = res; i < n; ++i)
+               for (i = res; i < n; ++i)
                        assert(payload[i].u.node.idx >= idx);
 
-               for(i = 0; i < res; ++i)
+               for (i = 0; i < res; ++i)
                        assert(payload[i].u.node.idx < idx);
        }
 #endif
@@ -152,12 +141,13 @@ static inline unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned
 /**
  * This function searches linearly for the node in the array.
  */
-static inline unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned idx) {
+static inline unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned idx)
+{
        unsigned n  = arr[0].u.head.n_members;
        unsigned i;
 
-       for(i = 0; i < n; ++i) {
-               if(arr[i + 1].u.node.idx == idx)
+       for (i = 0; i < n; ++i) {
+               if (arr[i + 1].u.node.idx == idx)
                        return i;
        }
 
@@ -172,7 +162,7 @@ struct _be_lv_info_node_t *be_lv_get(const struct _be_lv_t *li, const ir_node *b
 
        stat_ev_tim_push();
        irn_live = phase_get_irn_data(&li->ph, bl);
-       if(irn_live) {
+       if (irn_live) {
                unsigned idx = get_irn_idx(irn);
 
                /* Get the position of the index in the array. */
@@ -182,7 +172,7 @@ struct _be_lv_info_node_t *be_lv_get(const struct _be_lv_t *li, const ir_node *b
                struct _be_lv_info_node_t *rec = &irn_live[pos + 1].u.node;
 
                /* Check, if the irn is in deed in the array. */
-               if(rec->idx == idx)
+               if (rec->idx == idx)
                        res = rec;
        }
        stat_ev_tim_pop("be_lv_get");
@@ -203,13 +193,13 @@ static struct _be_lv_info_node_t *be_lv_get_or_set(struct _be_lv_t *li, ir_node
        struct _be_lv_info_node_t *res = &irn_live[pos + 1].u.node;
 
        /* Check, if the irn is in deed in the array. */
-       if(res->idx != idx) {
+       if (res->idx != idx) {
                struct _be_lv_info_t *payload;
                unsigned n_members = irn_live[0].u.head.n_members;
                unsigned n_size    = irn_live[0].u.head.n_size;
                unsigned i;
 
-               if(n_members + 1 >= n_size) {
+               if (n_members + 1 >= n_size) {
                        /* double the array size. Remember that the first entry is
                         * metadata about the array and not a real array element */
                        unsigned old_size_bytes  = (n_size + 1) * sizeof(irn_live[0]);
@@ -225,7 +215,7 @@ static struct _be_lv_info_node_t *be_lv_get_or_set(struct _be_lv_t *li, ir_node
                }
 
                payload = &irn_live[1];
-               for(i = n_members; i > pos; --i) {
+               for (i = n_members; i > pos; --i) {
                        payload[i] = payload[i - 1];
                }
 
@@ -243,7 +233,7 @@ static struct _be_lv_info_node_t *be_lv_get_or_set(struct _be_lv_t *li, ir_node
                unsigned last = 0;
                struct _be_lv_info_t *payload = &irn_live[1];
 
-               for(i = 0; i < n; ++i) {
+               for (i = 0; i < n; ++i) {
                        assert(payload[i].u.node.idx >= last);
                        last = payload[i].u.node.idx;
                }
@@ -262,7 +252,7 @@ static int be_lv_remove(struct _be_lv_t *li, const ir_node *bl,
 {
        struct _be_lv_info_t *irn_live = phase_get_irn_data(&li->ph, bl);
 
-       if(irn_live) {
+       if (irn_live) {
                unsigned n   = irn_live[0].u.head.n_members;
                unsigned idx = get_irn_idx(irn);
                unsigned pos = _be_liveness_bsearch(irn_live, idx);
@@ -270,10 +260,10 @@ static int be_lv_remove(struct _be_lv_t *li, const ir_node *bl,
                struct _be_lv_info_node_t *res = &payload[pos].u.node;
 
                /* The node is in deed in the block's array. Let's remove it. */
-               if(res->idx == idx) {
+               if (res->idx == idx) {
                        unsigned i;
 
-                       for(i = pos + 1; i < n; ++i)
+                       for (i = pos + 1; i < n; ++i)
                                payload[i - 1] = payload[i];
 
                        payload[n - 1].u.node.idx   = 0;
@@ -291,9 +281,9 @@ static int be_lv_remove(struct _be_lv_t *li, const ir_node *bl,
 static void register_node(be_lv_t *lv, const ir_node *irn)
 {
        unsigned idx = get_irn_idx(irn);
-       if(idx >= bitset_size(lv->nodes)) {
+       if (idx >= bitset_size(lv->nodes)) {
                bitset_t *nw = bitset_malloc(2 * idx);
-               bitset_copy(nw, lv->nodes);
+               bitset_copy_into(nw, lv->nodes);
                bitset_free(lv->nodes);
                lv->nodes = nw;
        }
@@ -334,38 +324,47 @@ static inline void mark_live_end(be_lv_t *lv, ir_node *block, ir_node *irn)
        register_node(lv, irn);
 }
 
+static struct {
+       be_lv_t  *lv;         /**< The liveness object. */
+       ir_node  *def;        /**< The node (value). */
+       ir_node  *def_block;  /**< The block of def. */
+       bitset_t *visited;    /**< A set were all visited blocks are recorded. */
+} re;
+
 /**
  * Mark a node (value) live out at a certain block. Do this also
  * transitively, i.e. if the block is not the block of the value's
  * definition, all predecessors are also marked live.
- * @param def The node (value).
  * @param block The block to mark the value live out of.
- * @param visited A set were all visited blocks are recorded.
  * @param is_true_out Is the node real out there or only live at the end
  * of the block.
  */
-static void live_end_at_block(be_lv_t *lv, ir_node *def, ir_node *block, bitset_t *visited, int is_true_out)
+static void live_end_at_block(ir_node *block, int is_true_out)
 {
+       be_lv_t *lv  = re.lv;
+       ir_node *def = re.def;
+       bitset_t *visited;
+
        mark_live_end(lv, block, def);
-       if(is_true_out)
+       if (is_true_out)
                mark_live_out(lv, block, def);
 
-       if(!bitset_contains_irn(visited, block)) {
+       visited = re.visited;
+       if (!bitset_contains_irn(visited, block)) {
                bitset_add_irn(visited, block);
 
                /*
-               * If this block is not the definition block, we have to go up
-               * further.
-               */
-               if(get_nodes_block(def) != block) {
-                       int i, n;
+                * If this block is not the definition block, we have to go up
+                * further.
+                */
+               if (re.def_block != block) {
+                       int i;
 
                        mark_live_in(lv, block, def);
 
-                       for(i = 0, n = get_Block_n_cfgpreds(block); i < n; ++i)
-                               live_end_at_block(lv, def, get_Block_cfgpred_block(block, i), visited, 1);
+                       for (i = get_Block_n_cfgpreds(block) - 1; i >= 0; --i)
+                               live_end_at_block(get_Block_cfgpred_block(block, i), 1);
                }
-
        }
 }
 
@@ -384,18 +383,18 @@ typedef struct lv_remove_walker_t {
  * Liveness analysis for a value.
  * Compute the set of all blocks a value is live in.
  * @param irn     The node (value).
- * @param walker  walker data
  */
-static void liveness_for_node(ir_node *irn, lv_walker_t *walker)
+static void liveness_for_node(ir_node *irn)
 {
-       be_lv_t         *lv      = walker->lv;
-       bitset_t        *visited = walker->data;
        const ir_edge_t *edge;
        ir_node *def_block;
 
-       bitset_clear_all(visited);
+       bitset_clear_all(re.visited);
        def_block = get_nodes_block(irn);
 
+       re.def       = irn;
+       re.def_block = def_block;
+
        /* Go over all uses of the value */
        foreach_out_edge(irn, edge) {
                ir_node *use = edge->src;
@@ -421,7 +420,7 @@ static void liveness_for_node(ir_node *irn, lv_walker_t *walker)
                 */
                if (is_Phi(use)) {
                        ir_node *pred_block = get_Block_cfgpred_block(use_block, edge->pos);
-                       live_end_at_block(lv, irn, pred_block, visited, 0);
+                       live_end_at_block(pred_block, 0);
                }
 
                /*
@@ -429,13 +428,13 @@ static void liveness_for_node(ir_node *irn, lv_walker_t *walker)
                 * out on the predecessors.
                 */
                else if (def_block != use_block) {
-                       int i, n;
+                       int i;
 
-                       mark_live_in(lv, use_block, irn);
+                       mark_live_in(re.lv, use_block, irn);
 
-                       for (i = 0, n = get_Block_n_cfgpreds(use_block); i < n; ++i) {
+                       for (i = get_Block_n_cfgpreds(use_block) - 1; i >= 0; --i) {
                                ir_node *pred_block = get_Block_cfgpred_block(use_block, i);
-                               live_end_at_block(lv, irn, pred_block, visited, 1);
+                               live_end_at_block(pred_block, 1);
                        }
                }
        }
@@ -465,16 +464,16 @@ static const char *lv_flags_to_str(unsigned flags)
 
 static void lv_dump_block(void *context, FILE *f, const ir_node *bl)
 {
-       if(is_Block(bl)) {
+       if (is_Block(bl)) {
                be_lv_t *lv = context;
                struct _be_lv_info_t *info = phase_get_irn_data(&lv->ph, bl);
 
                fprintf(f, "liveness:\n");
-               if(info) {
+               if (info) {
                        unsigned n = info[0].u.head.n_members;
                        unsigned i;
 
-                       for(i = 0; i < n; ++i) {
+                       for (i = 0; i < n; ++i) {
                                struct _be_lv_info_node_t *n = &info[i+1].u.node;
                                ir_fprintf(f, "%s %+F\n", lv_flags_to_str(n->flags), get_idx_irn(lv->irg, n->idx));
                        }
@@ -482,11 +481,10 @@ static void lv_dump_block(void *context, FILE *f, const ir_node *bl)
        }
 }
 
-static void *lv_phase_data_init(ir_phase *phase, const ir_node *irn, void *old)
+static void *lv_phase_data_init(ir_phase *phase, const ir_node *irn)
 {
        struct _be_lv_info_t *info = phase_alloc(phase, LV_STD_SIZE * sizeof(info[0]));
        (void) irn;
-       (void) old;
 
        memset(info, 0, LV_STD_SIZE * sizeof(info[0]));
        info[0].u.head.n_size = LV_STD_SIZE - 1;
@@ -497,58 +495,40 @@ static void *lv_phase_data_init(ir_phase *phase, const ir_node *irn, void *old)
  * Walker, collect all nodes for which we want calculate liveness info
  * on an obstack.
  */
-static void collect_nodes(ir_node *irn, void *data)
+static void collect_liveness_nodes(ir_node *irn, void *data)
 {
-       struct obstack *obst = data;
+       ir_node **nodes = data;
        if (is_liveness_node(irn))
-               obstack_ptr_grow(obst, irn);
+               nodes[get_irn_idx(irn)] = irn;
 }
 
-#ifdef LV_COMPUTE_SORTED
-/**
- * Compare two nodes by its node index.
- */
-static int node_idx_cmp(const void *a, const void *b)
-{
-       const ir_node *p = *(ir_node **) a;
-       const ir_node *q = *(ir_node **) b;
-       int ia = get_irn_idx(p);
-       int ib = get_irn_idx(q);
-       return ia - ib;
-}
-#endif /* LV_COMPUTE_SORTED */
-
 static void compute_liveness(be_lv_t *lv)
 {
-       struct obstack obst;
-       lv_walker_t w;
        ir_node **nodes;
        int i, n;
 
        stat_ev_tim_push();
-       obstack_init(&obst);
-       irg_walk_graph(lv->irg, NULL, collect_nodes, &obst);
-       n      = obstack_object_size(&obst) / sizeof(nodes[0]);
-       nodes  = obstack_finish(&obst);
+       n = get_irg_last_idx(lv->irg);
+       nodes = NEW_ARR_F(ir_node *, n);
+       memset(nodes, 0, sizeof(nodes[0]) * n);
 
        /*
         * inserting the variables sorted by their ID is probably
         * more efficient since the binary sorted set insertion
         * will not need to move around the data.
-        * However, if sorting the variables a priori pays off
-        * needs to be checked, hence the define.
         */
-#ifdef LV_COMPUTE_SORTED
-       qsort(nodes, n, sizeof(nodes[0]), node_idx_cmp);
-#endif
+       irg_walk_graph(lv->irg, NULL, collect_liveness_nodes, nodes);
 
-       w.lv   = lv;
-       w.data = bitset_obstack_alloc(&obst, get_irg_last_idx(lv->irg));
+       re.lv      = lv;
+       re.visited = bitset_malloc(n);
 
-       for (i = 0; i < n; ++i)
-               liveness_for_node(nodes[i], &w);
+       for (i = 0; i < n; ++i) {
+               if (nodes[i] != NULL)
+                       liveness_for_node(nodes[i]);
+       }
 
-       obstack_free(&obst, NULL);
+       DEL_ARR_F(nodes);
+       free(re.visited);
        register_hook(hook_node_info, &lv->hook_info);
        stat_ev_tim_pop("be_lv_sets_cons");
 }
@@ -556,23 +536,23 @@ static void compute_liveness(be_lv_t *lv)
 void be_liveness_assure_sets(be_lv_t *lv)
 {
        if (!lv->nodes) {
-               BE_TIMER_PUSH(t_live);
+               be_timer_push(T_LIVE);
 
                lv->nodes = bitset_malloc(2 * get_irg_last_idx(lv->irg));
-               phase_init(&lv->ph, "liveness", lv->irg, PHASE_DEFAULT_GROWTH, lv_phase_data_init, NULL);
+               phase_init(&lv->ph, lv->irg, lv_phase_data_init);
                compute_liveness(lv);
                /* be_live_chk_compare(lv, lv->lvc); */
 
-               BE_TIMER_POP(t_live);
+               be_timer_pop(T_LIVE);
        }
 }
 
 void be_liveness_assure_chk(be_lv_t *lv)
 {
 #ifndef USE_LIVE_CHK
-       BE_TIMER_PUSH(t_verify);
+       be_timer_push(t_verify);
        be_liveness_assure_sets(lv);
-       BE_TIMER_POP(t_verify);
+       be_timer_pop(t_verify);
 #else
        (void) lv;
 #endif
@@ -582,21 +562,20 @@ void be_liveness_invalidate(be_lv_t *lv)
 {
        if (lv && lv->nodes) {
                unregister_hook(hook_node_info, &lv->hook_info);
-               phase_free(&lv->ph);
+               phase_deinit(&lv->ph);
                bitset_free(lv->nodes);
                lv->nodes = NULL;
        }
 }
 
 /* Compute the inter block liveness for a graph. */
-be_lv_t *be_liveness(const be_irg_t *birg)
+be_lv_t *be_liveness(ir_graph *irg)
 {
        be_lv_t *lv = XMALLOCZ(be_lv_t);
 
-       lv->irg  = be_get_birg_irg(birg);
-       lv->birg = birg;
+       lv->irg  = irg;
 #ifdef USE_LIVE_CHK
-       lv->dfs  = dfs_new(&absgraph_irg_cfg_succ, lv->irg);
+       lv->dfs  = dfs_new(&absgraph_irg_cfg_succ, irg);
        lv->lvc  = lv_chk_new(lv->irg, lv->dfs);
 #endif
        lv->hook_info.context = lv;
@@ -609,19 +588,19 @@ void be_liveness_recompute(be_lv_t *lv)
 {
        unsigned last_idx;
 
-       BE_TIMER_PUSH(t_live);
+       be_timer_push(T_LIVE);
        last_idx = get_irg_last_idx(lv->irg);
-       if(last_idx >= bitset_size(lv->nodes)) {
+       if (last_idx >= bitset_size(lv->nodes)) {
                bitset_free(lv->nodes);
                lv->nodes = bitset_malloc(last_idx * 2);
        } else
                bitset_clear_all(lv->nodes);
 
-       phase_free(&lv->ph);
-       phase_init(&lv->ph, "liveness", lv->irg, PHASE_DEFAULT_GROWTH, lv_phase_data_init, NULL);
+       phase_deinit(&lv->ph);
+       phase_init(&lv->ph, lv->irg, lv_phase_data_init);
        compute_liveness(lv);
 
-       BE_TIMER_POP(t_live);
+       be_timer_pop(T_LIVE);
 }
 
 
@@ -649,7 +628,7 @@ void be_liveness_remove(be_lv_t *lv, const ir_node *irn)
                w.lv  = lv;
                w.irn = irn;
                dom_tree_walk(get_nodes_block(irn), lv_remove_irn_walker, NULL, &w);
-               if(idx < bitset_size(lv->nodes))
+               if (idx < bitset_size(lv->nodes))
                        bitset_clear(lv->nodes, idx);
        }
 }
@@ -658,11 +637,10 @@ void be_liveness_introduce(be_lv_t *lv, ir_node *irn)
 {
        /* Don't compute liveness information for non-data nodes. */
        if (lv->nodes && is_liveness_node(irn)) {
-               lv_walker_t w;
-               w.lv   = lv;
-               w.data = bitset_malloc(get_irg_last_idx(lv->irg));
-               liveness_for_node(irn, &w);
-               bitset_free(w.data);
+               re.lv      = lv;
+               re.visited = bitset_malloc(get_irg_last_idx(lv->irg));
+               liveness_for_node(irn);
+               bitset_free(re.visited);
        }
 }
 
@@ -681,32 +659,32 @@ static void lv_check_walker(ir_node *bl, void *data)
        struct _be_lv_info_t *curr = phase_get_irn_data(&lv->ph, bl);
        struct _be_lv_info_t *fr   = phase_get_irn_data(&fresh->ph, bl);
 
-       if(!fr && curr && curr[0].u.head.n_members > 0) {
+       if (!fr && curr && curr[0].u.head.n_members > 0) {
                unsigned i;
 
                ir_fprintf(stderr, "%+F liveness should be empty but current liveness contains:\n", bl);
-               for(i = 0; i < curr[0].u.head.n_members; ++i) {
+               for (i = 0; i < curr[0].u.head.n_members; ++i) {
                        ir_fprintf(stderr, "\t%+F\n", get_idx_irn(lv->irg, curr[1 + i].u.node.idx));
                }
        }
 
-       else if(curr) {
+       else if (curr) {
                unsigned n_curr  = curr[0].u.head.n_members;
                unsigned n_fresh = fr[0].u.head.n_members;
 
                unsigned i;
 
-               if(n_curr != n_fresh) {
+               if (n_curr != n_fresh) {
                        ir_fprintf(stderr, "%+F: liveness set sizes differ. curr %d, correct %d\n", bl, n_curr, n_fresh);
 
                        ir_fprintf(stderr, "current:\n");
-                       for(i = 0; i < n_curr; ++i) {
+                       for (i = 0; i < n_curr; ++i) {
                                struct _be_lv_info_node_t *n = &curr[1 + i].u.node;
                                ir_fprintf(stderr, "%+F %u %+F %s\n", bl, i, get_idx_irn(lv->irg, n->idx), lv_flags_to_str(n->flags));
                        }
 
                        ir_fprintf(stderr, "correct:\n");
-                       for(i = 0; i < n_fresh; ++i) {
+                       for (i = 0; i < n_fresh; ++i) {
                                struct _be_lv_info_node_t *n = &fr[1 + i].u.node;
                                ir_fprintf(stderr, "%+F %u %+F %s\n", bl, i, get_idx_irn(lv->irg, n->idx), lv_flags_to_str(n->flags));
                        }
@@ -717,7 +695,7 @@ static void lv_check_walker(ir_node *bl, void *data)
 void be_liveness_check(be_lv_t *lv)
 {
        lv_walker_t w;
-       be_lv_t *fresh = be_liveness(lv->birg);
+       be_lv_t *fresh = be_liveness(lv->irg);
 
        w.lv   = lv;
        w.data = fresh;
@@ -729,7 +707,7 @@ void be_liveness_check(be_lv_t *lv)
 static void lv_dump_block_walker(ir_node *irn, void *data)
 {
        lv_walker_t *w = data;
-       if(is_Block(irn))
+       if (is_Block(irn))
                lv_dump_block(w->lv, w->data, irn);
 }
 
@@ -750,7 +728,7 @@ void be_liveness_dumpto(const be_lv_t *lv, const char *cls_name)
        FILE *f;
        char buf[128];
        ir_snprintf(buf, sizeof(buf), "%F_%s-live.txt", lv->irg, cls_name);
-       if((f = fopen(buf, "wt")) != NULL) {
+       if ((f = fopen(buf, "wt")) != NULL) {
                be_liveness_dump(lv, f);
                fclose(f);
        }
@@ -764,19 +742,19 @@ static void dom_check(ir_node *irn, void *data)
 {
        int *problem_found = data;
 
-       if(!is_Block(irn) && irn != get_irg_end(get_irn_irg(irn))) {
+       if (!is_Block(irn) && irn != get_irg_end(get_irn_irg(irn))) {
                int i, n;
                ir_node *bl = get_nodes_block(irn);
 
-               for(i = 0, n = get_irn_arity(irn); i < n; ++i) {
+               for (i = 0, n = get_irn_arity(irn); i < n; ++i) {
                        ir_node *op     = get_irn_n(irn, i);
                        ir_node *def_bl = get_nodes_block(op);
                        ir_node *use_bl = bl;
 
-                       if(is_Phi(irn))
+                       if (is_Phi(irn))
                                use_bl = get_Block_cfgpred_block(bl, i);
 
-                       if(get_irn_opcode(use_bl) != iro_Bad
+                       if (get_irn_opcode(use_bl) != iro_Bad
                             && get_irn_opcode(def_bl) != iro_Bad
                             && !block_dominates(def_bl, use_bl)) {
                                ir_fprintf(stderr, "Verify warning: %+F in %+F must dominate %+F for user %+F (%s)\n", op, def_bl, use_bl, irn, get_irg_dump_name(get_irn_irg(op)));
@@ -862,7 +840,7 @@ void be_liveness_nodes_live_at(const be_lv_t *lv,
                 * If we encounter the node we want to insert the Perm after,
                 * exit immediately, so that this node is still live
                 */
-               if(irn == pos)
+               if (irn == pos)
                        return;
 
                be_liveness_transfer(cls, irn, live);
@@ -925,9 +903,8 @@ void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc)
        obstack_free(&obst, NULL);
 }
 
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_live);
 void be_init_live(void)
 {
        FIRM_DBG_REGISTER(dbg, "firm.be.liveness");
 }
-
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_live);