fix sse/x87 fixup code added at wrong places

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

diff --git a/ir/be/ia32/ia32_x87.c b/ir/be/ia32/ia32_x87.c
index c291176..d2cf8cc 100644 (file)
--- a/ir/be/ia32/ia32_x87.c
+++ b/ir/be/ia32/ia32_x87.c
@@ -1537,22 +1537,32 @@ int sim_Keep(x87_state *state, ir_node *node)
        int                    reg_id;
        int                    op_stack_idx;
        unsigned               live;
+       int                    i, arity;
+       int                    node_added = NO_NODE_ADDED;
 
-       op      = get_irn_n(node, 0);
-       op_reg  = arch_get_irn_register(state->sim->arch_env, op);
-       if(arch_register_get_class(op_reg) != &ia32_reg_classes[CLASS_ia32_vfp])
-               return NO_NODE_ADDED;
+       DB((dbg, LEVEL_1, ">>> %+F\n", node));
+
+       arity = get_irn_arity(node);
+       for(i = 0; i < arity; ++i) {
+               op      = get_irn_n(node, i);
+               op_reg  = arch_get_irn_register(state->sim->arch_env, op);
+               if(arch_register_get_class(op_reg) != &ia32_reg_classes[CLASS_ia32_vfp])
+                       continue;
 
-       reg_id = arch_register_get_index(op_reg);
-       live   = vfp_live_args_after(state->sim, node, 0);
+               reg_id = arch_register_get_index(op_reg);
+               live   = vfp_live_args_after(state->sim, node, 0);
 
-       op_stack_idx = x87_on_stack(state, reg_id);
-       if(op_stack_idx >= 0 && !is_vfp_live(reg_id, live)) {
-               x87_create_fpop(state, sched_next(node), 1);
-               return NODE_ADDED;
+               op_stack_idx = x87_on_stack(state, reg_id);
+               if(op_stack_idx >= 0 && !is_vfp_live(reg_id, live)) {
+                       x87_create_fpop(state, sched_next(node), 1);
+                       node_added = NODE_ADDED;
+               }
        }
 
-       return NO_NODE_ADDED;
+       DB((dbg, LEVEL_1, "Stack after: "));
+       DEBUG_ONLY(x87_dump_stack(state));
+
+       return node_added;
 }
 
 static
@@ -1659,24 +1669,23 @@ static ir_node *create_Copy(x87_state *state, ir_node *n) {
  * @return NO_NODE_ADDED
  */
 static int sim_Copy(x87_state *state, ir_node *n) {
-       x87_simulator         *sim;
-       ir_node               *pred;
-       const arch_register_t *out;
-       const arch_register_t *op1;
-       ir_node               *node, *next;
-       ia32_x87_attr_t       *attr;
-       int                   op1_idx, out_idx;
-       unsigned              live;
-
-       ir_mode *mode = get_irn_mode(n);
-
-       if (!mode_is_float(mode))
+       x87_simulator               *sim = state->sim;
+       ir_node                     *pred;
+       const arch_register_t       *out;
+       const arch_register_t       *op1;
+       const arch_register_class_t *class;
+       ir_node                     *node, *next;
+       ia32_x87_attr_t             *attr;
+       int                         op1_idx, out_idx;
+       unsigned                    live;
+
+       class = arch_get_irn_reg_class(sim->arch_env, n, -1);
+       if (class->regs != ia32_vfp_regs)
                return 0;
 
-       sim = state->sim;
        pred = get_irn_n(n, 0);
-       out = x87_get_irn_register(sim, n);
-       op1 = x87_get_irn_register(sim, pred);
+       out  = x87_get_irn_register(sim, n);
+       op1  = x87_get_irn_register(sim, pred);
        live = vfp_live_args_after(sim, n, REGMASK(out));
 
        DB((dbg, LEVEL_1, ">>> %+F %s -> %s\n", n,
@@ -1772,11 +1781,10 @@ static int sim_Copy(x87_state *state, ir_node *n) {
 }  /* sim_Copy */
 
 /**
- * Returns the result proj of the call, or NULL if the result is not used
+ * Returns the result proj of the call
  */
 static ir_node *get_call_result_proj(ir_node *call) {
        const ir_edge_t *edge;
-       ir_node *resproj = NULL;
 
        /* search the result proj */
        foreach_out_edge(call, edge) {
@@ -1784,23 +1792,10 @@ static ir_node *get_call_result_proj(ir_node *call) {
                long pn = get_Proj_proj(proj);
 
                if (pn == pn_be_Call_first_res) {
-                       resproj = proj;
-                       break;
-               }
-       }
-       if (resproj == NULL) {
-               return NULL;
-       }
-
-       /* the result proj is connected to a Keep and maybe other nodes */
-       foreach_out_edge(resproj, edge) {
-               ir_node *pred = get_edge_src_irn(edge);
-               if (!be_is_Keep(pred)) {
-                       return resproj;
+                       return proj;
                }
        }
 
-       /* only be_Keep found, so result is not used */
        return NULL;
 }  /* get_call_result_proj */
 
@@ -1822,11 +1817,13 @@ static int sim_Call(x87_state *state, ir_node *n, const arch_env_t *arch_env)
        const arch_register_t *reg;
        (void) arch_env;
 
+       DB((dbg, LEVEL_1, ">>> %+F\n", n));
+
        /* at the begin of a call the x87 state should be empty */
        assert(state->depth == 0 && "stack not empty before call");
 
        if (get_method_n_ress(call_tp) <= 0)
-               return NO_NODE_ADDED;
+               goto end_call;
 
        /*
         * If the called function returns a float, it is returned in st(0).
@@ -1837,15 +1834,18 @@ static int sim_Call(x87_state *state, ir_node *n, const arch_env_t *arch_env)
        mode     = get_type_mode(res_type);
 
        if (mode == NULL || !mode_is_float(mode))
-               return NO_NODE_ADDED;
+               goto end_call;
 
        resproj = get_call_result_proj(n);
-       if (resproj == NULL)
-               return NO_NODE_ADDED;
+       assert(resproj != NULL);
 
        reg = x87_get_irn_register(state->sim, resproj);
        x87_push(state, arch_register_get_index(reg), resproj);
 
+end_call:
+       DB((dbg, LEVEL_1, "Stack after: "));
+       DEBUG_ONLY(x87_dump_stack(state));
+
        return NO_NODE_ADDED;
 }  /* sim_Call */