X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelistsched.c;h=dbdf8cf99142891073e23557e026de6b07fc4e88;hb=3dff5ea08f916551668dc18b449327a8a593bc9f;hp=22abca702e9388987fbde956ee1bec311b8694e6;hpb=0df5e0ea5d4d6a566339ac4b93a73719858e81e1;p=libfirm diff --git a/ir/be/belistsched.c b/ir/be/belistsched.c index 22abca702..dbdf8cf99 100644 --- a/ir/be/belistsched.c +++ b/ir/be/belistsched.c @@ -22,7 +22,6 @@ * @brief Primitive list scheduling with different node selectors. * @author Sebastian Hack * @date 20.10.2004 - * @version $Id$ */ #include "config.h" @@ -37,14 +36,13 @@ #include "obst.h" #include "list.h" -#include "iterator.h" #include "iredges_t.h" #include "irgwalk.h" #include "irnode_t.h" #include "irmode_t.h" #include "irdump.h" -#include "irprintf_t.h" +#include "irprintf.h" #include "array.h" #include "debug.h" #include "irtools.h" @@ -56,12 +54,11 @@ #include "belistsched.h" #include "bearch.h" #include "bestat.h" -#include "beirg.h" #include "lc_opts.h" #include "lc_opts_enum.h" -DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL); +DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) /** * Scheduling environment for the whole graph. @@ -114,7 +111,7 @@ static void add_to_sched(block_sched_env_t *env, ir_node *irn); static void node_ready(block_sched_env_t *env, ir_node *pred, ir_node *irn) { if (is_Proj(irn) - || (arch_irn_get_flags(irn) & arch_irn_flags_not_scheduled)) { + || (arch_get_irn_flags(irn) & arch_irn_flags_not_scheduled)) { selected(env, irn); DB((dbg, LEVEL_3, "\tmaking immediately available: %+F\n", irn)); } else if (be_is_Keep(irn) || be_is_CopyKeep(irn)) { @@ -165,8 +162,6 @@ static void try_make_ready(block_sched_env_t *env, ir_node *pred, ir_node *irn) static void selected(block_sched_env_t *env, ir_node *node) { - const ir_edge_t *edge; - /* notify the selector about the finally selected node. */ if (env->selector->node_selected) env->selector->node_selected(env->selector_block_env, node); @@ -193,7 +188,7 @@ static void selected(block_sched_env_t *env, ir_node *node) */ static void add_to_sched(block_sched_env_t *env, ir_node *irn) { - assert(! (arch_irn_get_flags(irn) & arch_irn_flags_not_scheduled)); + assert(! (arch_get_irn_flags(irn) & arch_irn_flags_not_scheduled)); sched_add_before(env->block, irn); @@ -222,7 +217,6 @@ static void list_sched_block(ir_node *block, void *env_ptr) const list_sched_selector_t *selector = env->selector; block_sched_env_t be; - const ir_edge_t *edge; ir_nodeset_t *cands = &be.cands; /* Initialize the block's list head that will hold the schedule. */ @@ -266,6 +260,8 @@ static void list_sched_block(ir_node *block, void *env_ptr) add_to_sched(&be, irn); } + ir_nodeset_destroy(cands); + if (selector->finish_block) selector->finish_block(be.selector_block_env); }