Commit 0f068c12 authored by Matthias Braun's avatar Matthias Braun
Browse files

fixes for latest be changes

parent 7cce4af0
......@@ -216,7 +216,7 @@ static void coalesce_blocks(blocksched_env_t *env)
entry = get_irn_link(block);
pred_entry = get_irn_link(pred_block);
/* TODO: what's this check for? */
/* is 1 of the blocks already attached to another block? */
if (pred_entry->next != NULL || entry->prev != NULL)
continue;
......
......@@ -752,23 +752,23 @@ static be_ra_timer_t *be_ra_chordal_main(be_irg_t *birg)
/* spilling */
switch(options.spill_method) {
case BE_CH_SPILL_MORGAN:
be_spill_morgan(&chordal_env);
be_spill_morgan(&pse.cenv);
break;
case BE_CH_SPILL_BELADY:
be_spill_belady(&chordal_env);
be_spill_belady(&pse.cenv);
break;
#ifdef WITH_ILP
case BE_CH_SPILL_REMAT:
be_spill_remat(&chordal_env);
be_spill_remat(&pse.cenv);
break;
#endif /* WITH_ILP */
default:
fprintf(stderr, "no valid spiller selected. falling back to belady\n");
be_spill_belady(&chordal_env);
be_spill_belady(&pse.cenv);
}
BE_TIMER_POP(ra_timer.t_spill);
dump(BE_CH_DUMP_SPILL, irg, chordal_env.cls, "-spill", dump_ir_block_graph_sched);
dump(BE_CH_DUMP_SPILL, irg, pse.cenv.cls, "-spill", dump_ir_block_graph_sched);
post_spill(&pse);
}
......@@ -787,7 +787,7 @@ static be_ra_timer_t *be_ra_chordal_main(be_irg_t *birg)
}
BE_TIMER_PUSH(ra_timer.t_spill);
arch_code_generator_spill(birg->cg, &chordal_env);
arch_code_generator_spill(birg->cg, &pse[j].cenv);
BE_TIMER_POP(ra_timer.t_spill);
dump(BE_CH_DUMP_SPILL, irg, NULL, "-spill", dump_ir_block_graph_sched);
......
......@@ -987,10 +987,9 @@ static void transform_to_Load(ia32_transform_env_t *env) {
entity *ent = be_get_frame_entity(irn);
ir_mode *mode = env->mode;
ir_node *noreg = ia32_new_NoReg_gp(env->cg);
ir_node *nomem = new_rd_NoMem(env->irg);
ir_node *sched_point = NULL;
ir_node *ptr = get_irn_n(irn, 0);
ir_node *mem = be_is_Reload(irn) ? get_irn_n(irn, 1) : nomem;
ir_node *ptr = get_irg_frame(env->irg);
ir_node *mem = get_irn_n(irn, be_pos_Reload_mem);
ir_node *new_op, *proj;
const arch_register_t *reg;
......@@ -1043,8 +1042,8 @@ static void transform_to_Store(ia32_transform_env_t *env) {
ir_mode *mode = env->mode;
ir_node *noreg = ia32_new_NoReg_gp(env->cg);
ir_node *nomem = new_rd_NoMem(env->irg);
ir_node *ptr = get_irn_n(irn, 0);
ir_node *val = get_irn_n(irn, 1);
ir_node *ptr = get_irg_frame(env->irg);
ir_node *val = get_irn_n(irn, be_pos_Spill_val);
ir_node *new_op, *proj;
ir_node *sched_point = NULL;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment