/*
- * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
for (i = get_irn_arity(irn) - 1; i >= 0; i--) {
ir_node *in = get_irn_n(irn, i);
- if (! be_is_live_end(env->liveness, block, in) && /* if the value lives outside of block: do not count */
- mode_is_datab(get_irn_mode(in)) && /* must be data node */
- ! arch_irn_is(env->arch_env, in, ignore)) /* ignore "ignore" nodes :) */
+ if (mode_is_datab(get_irn_mode(in)) && /* must be data node */
+ ! arch_irn_is(env->arch_env, in, ignore) && /* ignore "ignore" nodes :) */
+ ! be_is_live_end(env->liveness, block, in) /* if the value lives outside of block: do not count */
+
+ ) {
num_in++;
+ }
}
return num_out - num_in;
foreach_out_edge(block, edge) {
ir_node *succ = get_edge_src_irn(edge);
+ if (is_Block(succ)) {
+ /* A Block-Block edge. This should be the MacroBlock
+ * edge, ignore it. */
+ assert(get_Block_MacroBlock(succ) == block && "Block-Block edge found");
+ continue;
+ }
+ if (is_Anchor(succ)) {
+ /* ignore a keep alive edge */
+ continue;
+ }
if (is_root(succ, block)) {
mark_root_node(env, succ);
set_irn_link(succ, root);
* @param birg The backend irg object
* @return The environment
*/
-static trace_env_t *trace_init(const arch_env_t *arch_env, ir_graph *irg) {
+static trace_env_t *trace_init(const be_irg_t *birg) {
trace_env_t *env = xcalloc(1, sizeof(*env));
+ ir_graph *irg = be_get_birg_irg(birg);
int nn = get_irg_last_idx(irg);
- env->arch_env = arch_env;
+ env->arch_env = be_get_birg_arch_env(birg);
env->curr_time = 0;
env->sched_info = NEW_ARR_F(trace_irn_t, nn);
- env->liveness = be_liveness(irg);
+ env->liveness = be_liveness(birg);
FIRM_DBG_REGISTER(env->dbg, "firm.be.sched.trace");
be_liveness_assure_chk(env->liveness);
return irn;
}
-static void *muchnik_init_graph(const list_sched_selector_t *vtab, const arch_env_t *arch_env, ir_graph *irg)
+static void *muchnik_init_graph(const list_sched_selector_t *vtab, const be_irg_t *birg)
{
- trace_env_t *env = trace_init(arch_env, irg);
+ trace_env_t *env = trace_init(birg);
env->selector = vtab;
- env->selector_env = (void*) arch_env;
+ env->selector_env = (void*) be_get_birg_arch_env(birg);
return (void *)env;
}
return graph_env;
}
-static const list_sched_selector_t muchnik_selector_struct = {
+const list_sched_selector_t muchnik_selector = {
muchnik_init_graph,
muchnik_init_block,
muchnik_select,
trace_free /* finish_graph */
};
-const list_sched_selector_t *muchnik_selector = &muchnik_selector_struct;
-
/**
* Execute the heuristic function.
*/
return cand;
}
-static const list_sched_selector_t heuristic_selector_struct = {
+const list_sched_selector_t heuristic_selector = {
muchnik_init_graph,
muchnik_init_block,
heuristic_select,
NULL, /* finish_block */
trace_free /* finish_graph */
};
-
-const list_sched_selector_t *heuristic_selector = &heuristic_selector_struct;