normalize some bittest constructs

[libfirm] / ir / be / beschedregpress.c

diff --git a/ir/be/beschedregpress.c b/ir/be/beschedregpress.c
index 35abd57..c7fe6a9 100644 (file)
--- a/ir/be/beschedregpress.c
+++ b/ir/be/beschedregpress.c
@@ -88,7 +88,7 @@ static int cmp_usage(const void *a, const void *b)
 
 static inline usage_stats_t *get_or_set_usage_stats(reg_pressure_selector_env_t *env, ir_node *irn)
 {
-       usage_stats_t *us = get_irn_link(irn);
+       usage_stats_t *us = (usage_stats_t*)get_irn_link(irn);
 
        if (!us) {
                us                   = OALLOC(&env->obst, usage_stats_t);
@@ -105,7 +105,7 @@ static inline usage_stats_t *get_or_set_usage_stats(reg_pressure_selector_env_t
 
 static inline usage_stats_t *get_usage_stats(ir_node *irn)
 {
-       usage_stats_t *us = get_irn_link(irn);
+       usage_stats_t *us = (usage_stats_t*)get_irn_link(irn);
        assert(us && "This node must have usage stats");
        return us;
 }
@@ -181,16 +181,6 @@ static void *reg_pressure_graph_init(const list_sched_selector_t *vtab, ir_graph
        return main_env;
 }
 
-static inline int must_appear_in_schedule(const list_sched_selector_t *sel, void *block_env, const ir_node *irn)
-{
-       int res = -1;
-
-       if (sel->to_appear_in_schedule)
-               res = sel->to_appear_in_schedule(block_env, irn);
-
-       return res >= 0 ? res : (to_appear_in_schedule(irn) || be_is_Keep(irn) || be_is_CopyKeep(irn) || be_is_Start(irn));
-}
-
 static void *reg_pressure_block_init(void *graph_env, ir_node *bl)
 {
        ir_node *irn;
@@ -199,18 +189,18 @@ static void *reg_pressure_block_init(void *graph_env, ir_node *bl)
        obstack_init(&env->obst);
        ir_nodeset_init(&env->already_scheduled);
        env->root              = NULL;
-       env->main_env          = graph_env;
+       env->main_env          = (reg_pressure_main_env_t*)graph_env;
 
        /*
        * Collect usage statistics.
        */
        sched_foreach(bl, irn) {
-               if (must_appear_in_schedule(env->main_env->vtab, env, irn)) {
+               if (to_appear_in_schedule(irn)) {
                        int i, n;
 
                        for (i = 0, n = get_irn_arity(irn); i < n; ++i) {
                                //ir_node *op = get_irn_n(irn, i);
-                               if (must_appear_in_schedule(env->main_env->vtab, env, irn)) {
+                               if (to_appear_in_schedule(irn)) {
                                        usage_stats_t *us = get_or_set_usage_stats(env, irn);
 #if 0 /* Liveness is not computed here! */
                                        if (is_live_end(bl, op))
@@ -228,7 +218,7 @@ static void *reg_pressure_block_init(void *graph_env, ir_node *bl)
 
 static void reg_pressure_block_free(void *block_env)
 {
-       reg_pressure_selector_env_t *env = block_env;
+       reg_pressure_selector_env_t *env = (reg_pressure_selector_env_t*)block_env;
        usage_stats_t *us;
 
        for (us = env->root; us; us = us->next)
@@ -264,7 +254,7 @@ static inline int reg_pr_costs(reg_pressure_selector_env_t *env, ir_node *irn)
        for (i = 0, n = get_irn_arity(irn); i < n; ++i) {
                ir_node *op = get_irn_n(irn, i);
 
-               if (must_appear_in_schedule(env->main_env->vtab, env, op))
+               if (to_appear_in_schedule(op))
                        sum += compute_max_hops(env, op);
        }
 
@@ -277,7 +267,7 @@ static ir_node *reg_pressure_select(void *block_env, ir_nodeset_t *ready_set,
                                     ir_nodeset_t *live_set)
 {
        ir_nodeset_iterator_t iter;
-       reg_pressure_selector_env_t *env = block_env;
+       reg_pressure_selector_env_t *env = (reg_pressure_selector_env_t*)block_env;
        ir_node *irn, *res     = NULL;
        int curr_cost          = INT_MAX;
        (void) live_set;
@@ -319,7 +309,6 @@ const list_sched_selector_t reg_pressure_selector = {
        reg_pressure_graph_init,
        reg_pressure_block_init,
        reg_pressure_select,
-       NULL,                    /* to_appear_in_schedule */
        NULL,                    /* node_ready */
        NULL,                    /* node_selected */
        NULL,                    /* exectime */