make IS_ macros return 0 or 1

[libfirm] / ir / be / besched.c

diff --git a/ir/be/besched.c b/ir/be/besched.c
index b602716..331c626 100644 (file)
--- a/ir/be/besched.c
+++ b/ir/be/besched.c
@@ -55,8 +55,8 @@ FIRM_IMPL1(sched_prev, ir_node *, const ir_node *)
 FIRM_IMPL1(sched_is_scheduled, int, const ir_node *)
 FIRM_IMPL1(sched_first, ir_node *, const ir_node *)
 FIRM_IMPL1(sched_last, ir_node *, const ir_node *)
-FIRM_IMPL2(sched_add_after, ir_node *, ir_node *, ir_node *)
-FIRM_IMPL2(sched_add_before, ir_node *, ir_node *, ir_node *)
+FIRM_IMPL2_VOID(sched_add_after, ir_node *, ir_node *)
+FIRM_IMPL2_VOID(sched_add_before, ir_node *, ir_node *)
 FIRM_IMPL1_VOID(sched_init_block, ir_node *)
 FIRM_IMPL1_VOID(sched_reset, ir_node *)
 FIRM_IMPL2(sched_comes_after, int, const ir_node *, const ir_node *)
@@ -85,7 +85,7 @@ void be_sched_dump(FILE *f, ir_graph *irg)
 /* Init the scheduling stuff. */
 void be_init_sched(void)
 {
-       sched_irn_data_offset = register_additional_node_data(sizeof(sched_info_t));
+       sched_irn_data_offset = firm_register_additional_node_data(sizeof(sched_info_t));
 }
 
 BE_REGISTER_MODULE_CONSTRUCTOR(be_init_sched);
@@ -137,8 +137,9 @@ ir_node *sched_skip(ir_node *from, int forward, sched_predicator_t *predicator,
 //---------------------------------------------------------------------------
 
 typedef struct remove_dead_nodes_env_t_ {
-       ir_graph *irg;
        bitset_t *reachable;
+       ir_graph *irg;
+       be_lv_t  *lv;
 } remove_dead_nodes_env_t;
 
 /**
@@ -166,16 +167,21 @@ static void remove_dead_nodes_walker(ir_node *block, void *data)
                if (bitset_is_set(env->reachable, get_irn_idx(node)))
                        continue;
 
+               if(env->lv)
+                       be_liveness_remove(env->lv, node);
                sched_remove(node);
                be_kill_node(node);
        }
 }
 
-void be_remove_dead_nodes_from_schedule(ir_graph *irg)
+void be_remove_dead_nodes_from_schedule(be_irg_t *birg)
 {
+       ir_graph *irg = be_get_birg_irg(birg);
+
        remove_dead_nodes_env_t env;
-       env.irg = irg;
        env.reachable = bitset_alloca(get_irg_last_idx(irg));
+       env.lv  = be_get_birg_liveness(birg);
+       env.irg = irg;
 
        // mark all reachable nodes
        irg_walk_graph(irg, mark_dead_nodes_walker, NULL, &env);