BugFix: ls_mode must be set to Iu when transforming float stores to int stores

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

diff --git a/ir/be/ia32/ia32_x87.c b/ir/be/ia32/ia32_x87.c
index 4a270d9..4938e3d 100644 (file)
--- a/ir/be/ia32/ia32_x87.c
+++ b/ir/be/ia32/ia32_x87.c
@@ -1,5 +1,5 @@
 /*
- * 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.
  *
@@ -52,6 +52,7 @@
 #include "gen_ia32_new_nodes.h"
 #include "gen_ia32_regalloc_if.h"
 #include "ia32_x87.h"
+#include "ia32_architecture.h"
 
 #define N_x87_REGS 8
 
@@ -169,6 +170,7 @@ static int x87_get_st_reg(const x87_state *state, int pos) {
        return state->st[MASK_TOS(state->tos + pos)].reg_idx;
 }  /* x87_get_st_reg */
 
+#ifdef DEBUG_libfirm
 /**
  * Return the node at st(pos).
  *
@@ -182,7 +184,6 @@ static ir_node *x87_get_st_node(const x87_state *state, int pos) {
        return state->st[MASK_TOS(state->tos + pos)].node;
 }  /* x87_get_st_node */
 
-#ifdef DEBUG_libfirm
 /**
  * Dump the stack for debugging.
  *
@@ -671,13 +672,13 @@ static void x87_create_fpush(x87_state *state, ir_node *n, int pos, int op_idx)
  */
 static ir_node *x87_create_fpop(x87_state *state, ir_node *n, int num)
 {
-       ir_node *fpop;
+       ir_node         *fpop = NULL;
        ia32_x87_attr_t *attr;
-       int cpu = state->sim->isa->opt_arch;
 
+       assert(num > 0);
        while (num > 0) {
                x87_pop(state);
-               if (ARCH_ATHLON(cpu))
+               if (ia32_cg_config.use_ffreep)
                        fpop = new_rd_ia32_ffreep(NULL, get_irn_irg(n), get_nodes_block(n));
                else
                        fpop = new_rd_ia32_fpop(NULL, get_irn_irg(n), get_nodes_block(n));
@@ -1212,8 +1213,9 @@ static int sim_store(x87_state *state, ir_node *n, ir_op *op, ir_op *op_p) {
                        Solution:
                                - stack not full: push value and fstp
                                - stack full: fstp value and load again
+                       Note that we cannot test on mode_E, because floats might be 96bit ...
                */
-               if (mode == mode_E || mode == mode_Ls) {
+               if (get_mode_size_bits(mode) > 64 || mode == mode_Ls) {
                        if (depth < N_x87_REGS) {
                                /* ok, we have a free register: push + fstp */
                                x87_create_fpush(state, n, op2_idx, n_ia32_vfst_val);
@@ -1382,7 +1384,7 @@ static int sim_Fucom(x87_state *state, ir_node *n) {
        int reg_index_1 = arch_register_get_index(op1);
        int reg_index_2 = arch_register_get_index(op2);
        unsigned live = vfp_live_args_after(sim, n, 0);
-       int                    flipped  = attr->attr.data.cmp_flipped;
+       int                    permuted = attr->attr.data.ins_permuted;
        int xchg = 0;
        int pops = 0;
        int node_added = NO_NODE_ADDED;
@@ -1412,7 +1414,7 @@ static int sim_Fucom(x87_state *state, ir_node *n) {
                                        /* res = tos X op */
                                } else if (op2_idx == 0) {
                                        /* res = op X tos */
-                                       flipped = !flipped;
+                                       permuted = !permuted;
                                        xchg    = 1;
                                } else {
                                        /* bring the first one to tos */
@@ -1449,7 +1451,7 @@ static int sim_Fucom(x87_state *state, ir_node *n) {
                                }
                                /* res = op X tos, pop */
                                pops    = 1;
-                               flipped = !flipped;
+                               permuted = !permuted;
                                xchg    = 1;
                        } else {
                                /* both operands are dead here, check first for identity. */
@@ -1484,7 +1486,7 @@ static int sim_Fucom(x87_state *state, ir_node *n) {
                                                op2_idx = 0;
                                        }
                                        /* res = op X tos, pop, pop */
-                                       flipped = !flipped;
+                                       permuted = !permuted;
                                        xchg    = 1;
                                        pops    = 2;
                                } else {
@@ -1498,7 +1500,7 @@ static int sim_Fucom(x87_state *state, ir_node *n) {
                                                op2_idx = 0;
                                                /* res = op X tos, pop, pop */
                                                pops    = 2;
-                                               flipped = !flipped;
+                                               permuted = !permuted;
                                                xchg    = 1;
                                        } else if (op2_idx == 0) {
                                                /* second one is TOS, move to st(1) */
@@ -1585,14 +1587,15 @@ static int sim_Fucom(x87_state *state, ir_node *n) {
                attr->x87[1] = op2;
        }
        attr->x87[2] = NULL;
-       attr->attr.data.cmp_flipped = flipped;
+       attr->attr.data.ins_permuted = permuted;
 
-       if (op2_idx >= 0)
+       if (op2_idx >= 0) {
                DB((dbg, LEVEL_1, "<<< %s %s, %s\n", get_irn_opname(n),
                        arch_register_get_name(op1), arch_register_get_name(op2)));
-       else
+       } else {
                DB((dbg, LEVEL_1, "<<< %s %s, [AM]\n", get_irn_opname(n),
                        arch_register_get_name(op1)));
+       }
 
        return node_added;
 }
@@ -2094,11 +2097,9 @@ static x87_state *x87_kill_deads(x87_simulator *sim, ir_node *block, x87_state *
                DEBUG_ONLY(x87_dump_stack(state));
 
                if (kill_mask != 0 && live == 0) {
-                       int cpu = sim->isa->arch;
-
                        /* special case: kill all registers */
-                       if (ARCH_ATHLON(sim->isa->opt_arch) && ARCH_MMX(cpu)) {
-                               if (ARCH_AMD(cpu)) {
+                       if (ia32_cg_config.use_femms || ia32_cg_config.use_emms) {
+                               if (ia32_cg_config.use_femms) {
                                        /* use FEMMS on AMD processors to clear all */
                                        keep = new_rd_ia32_femms(NULL, get_irn_irg(block), block);
                                } else {