fixed some bugs
[libfirm] / ir / be / bemain.c
index 65da796..bba2b16 100644 (file)
@@ -124,8 +124,10 @@ static const lc_opt_table_entry_t be_main_options[] = {
        LC_OPT_ENT_ENUM_PTR("ra", "register allocator", &ra_var),
        LC_OPT_ENT_ENUM_PTR("isa", "the instruction set architecture", &isa_var),
 
+#ifdef WITH_ILP
        LC_OPT_ENT_STR ("ilp.server", "the ilp server name", be_options.ilp_server, sizeof(be_options.ilp_server)),
        LC_OPT_ENT_STR ("ilp.solver", "the ilp solver name", be_options.ilp_solver, sizeof(be_options.ilp_solver)),
+#endif /* WITH_ILP */
        { NULL }
 };
 
@@ -180,14 +182,14 @@ static be_main_env_t *be_init_env(be_main_env_t *env)
 
        /* Register the irn handler of the architecture */
        if (arch_isa_get_irn_handler(env->arch_env->isa))
-               arch_env_add_irn_handler(env->arch_env, arch_isa_get_irn_handler(env->arch_env->isa));
+               arch_env_push_irn_handler(env->arch_env, arch_isa_get_irn_handler(env->arch_env->isa));
 
                /*
                * Register the node handler of the back end infrastructure.
                * This irn handler takes care of the platform independent
                * spill, reload and perm nodes.
        */
-       arch_env_add_irn_handler(env->arch_env, &be_node_irn_handler);
+       arch_env_push_irn_handler(env->arch_env, &be_node_irn_handler);
 
        return env;
 }
@@ -289,10 +291,9 @@ static void be_main_loop(FILE *file_handle)
                arch_code_generator_before_sched(birg.cg);
                list_sched(isa, irg);
 
-               dump(DUMP_SCHED, irg, "-sched", dump_ir_block_graph_sched);
-
                /* connect all stack modifying nodes together (see beabi.c) */
                be_abi_fix_stack_nodes(birg.abi);
+               dump(DUMP_SCHED, irg, "-sched", dump_ir_block_graph_sched);
 
                /* Verify the schedule */
                sched_verify_irg(irg);
@@ -302,8 +303,8 @@ static void be_main_loop(FILE *file_handle)
                ra->allocate(&birg);
                dump(DUMP_RA, irg, "-ra", dump_ir_block_graph_sched);
 
-               /* This is not ready yet: */
-               /* be_abi_fix_stack_bias(birg.abi); */
+               arch_code_generator_after_ra(birg.cg);
+               be_abi_fix_stack_bias(birg.abi);
 
                arch_code_generator_done(birg.cg);
                dump(DUMP_FINAL, irg, "-end", dump_ir_block_graph_sched);