fix fucompp emitter when no register is needed

[libfirm] / ir / be / ia32 / ia32_optimize.c

diff --git a/ir/be/ia32/ia32_optimize.c b/ir/be/ia32/ia32_optimize.c
index 765f42f..df2c308 100644 (file)
--- a/ir/be/ia32/ia32_optimize.c
+++ b/ir/be/ia32/ia32_optimize.c
@@ -239,14 +239,10 @@ static void ia32_transform_const(ir_node *irn, void *env) {
        tenv.irn  = irn;
        DEBUG_ONLY(tenv.mod = cg->mod;)
 
-       // Matze: this stuff shouldn't be needed anymore
-       // spilling+rematerialisation does a better job for this
-#if 0
        /* place const either in the smallest dominator of all its users or the original block */
        if (cg->opt & IA32_OPT_PLACECNST)
                tenv.block = node_users_smallest_common_dominator(irn, 1);
        else
-#endif
                tenv.block = get_nodes_block(irn);
 
        switch (get_irn_opcode(irn)) {
@@ -503,17 +499,7 @@ static void ia32_create_Push(ir_node *irn, ia32_code_gen_t *cg) {
                if the IncSP points to NoMem -> just use the memory input from store
                if IncSP points to somewhere else -> sync memory of IncSP and Store
        */
-       mem = be_get_IncSP_mem(sp);
-       if (mem == get_irg_no_mem(irg))
-               mem = get_irn_n(irn, 3);
-       else {
-               ir_node *in[2];
-
-               in[0] = mem;
-               in[1] = get_irn_n(irn, 3);
-               mem   = new_r_Sync(irg, bl, 2, in);
-       }
-
+       mem  = get_irn_n(irn, 3);
        push = new_rd_ia32_Push(NULL, irg, bl, be_get_IncSP_pred(sp), val, mem);
        proj_res = new_r_Proj(irg, bl, push, get_irn_mode(sp), pn_ia32_Push_stack);
        proj_M   = new_r_Proj(irg, bl, push, mode_M, pn_ia32_Push_M);
@@ -535,61 +521,7 @@ static void ia32_create_Push(ir_node *irn, ia32_code_gen_t *cg) {
  * Creates a Pop from IncSP(Load(sp))
  */
 static void ia32_create_Pop(ir_node *irn, ia32_code_gen_t *cg) {
-       ir_node *old_proj_M = be_get_IncSP_mem(irn);
-       ir_node *load = skip_Proj(old_proj_M);
-       ir_node *old_proj_res = NULL;
-       ir_node *bl, *pop, *next, *proj_res, *proj_sp, *proj_M;
-       const ir_edge_t *edge;
-       const arch_register_t *reg, *sp;
-
-       if (! is_ia32_Load(load) || get_ia32_am_offs(load))
-               return;
-
-       if (arch_get_irn_register(cg->arch_env, get_irn_n(load, 1)) !=
-               &ia32_gp_regs[REG_GP_NOREG])
-               return;
-       if (arch_get_irn_register(cg->arch_env, get_irn_n(load, 0)) != cg->isa->arch_isa.sp)
-               return;
-
-       /* ok, translate into pop */
-       foreach_out_edge(load, edge) {
-               ir_node *succ = get_edge_src_irn(edge);
-               if (succ != old_proj_M) {
-                       old_proj_res = succ;
-                       break;
-               }
-       }
-       if (! old_proj_res) {
-               assert(0);
-               return; /* should not happen */
-       }
-
-       bl = get_nodes_block(load);
-
-       /* IncSP is typically scheduled after the load, so remove it first */
-       sched_remove(irn);
-       next = sched_next(old_proj_res);
-       sched_remove(old_proj_res);
-       sched_remove(load);
-
-       reg = arch_get_irn_register(cg->arch_env, load);
-       sp  = arch_get_irn_register(cg->arch_env, irn);
-
-       pop      = new_rd_ia32_Pop(NULL, current_ir_graph, bl, get_irn_n(irn, 0), get_irn_n(load, 2));
-       proj_res = new_r_Proj(current_ir_graph, bl, pop, get_irn_mode(old_proj_res), pn_ia32_Pop_res);
-       proj_sp  = new_r_Proj(current_ir_graph, bl, pop, get_irn_mode(irn), pn_ia32_Pop_stack);
-       proj_M   = new_r_Proj(current_ir_graph, bl, pop, mode_M, pn_ia32_Pop_M);
-
-       exchange(old_proj_M, proj_M);
-       exchange(old_proj_res, proj_res);
-       exchange(irn, proj_sp);
-
-       arch_set_irn_register(cg->arch_env, proj_res, reg);
-       arch_set_irn_register(cg->arch_env, proj_sp, sp);
-
-       sched_add_before(next, proj_sp);
-       sched_add_before(proj_sp, proj_res);
-       sched_add_before(proj_res,pop);
+       /* TODO */
 }
 
 /**