- fix gen_Store(). Always generate integer stores for floating point constant stores.

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

diff --git a/ir/be/ia32/ia32_transform.c b/ir/be/ia32/ia32_transform.c
index 1161c18..2b85751 100644 (file)
--- a/ir/be/ia32/ia32_transform.c
+++ b/ir/be/ia32/ia32_transform.c
@@ -504,7 +504,8 @@ static void build_address_ptr(ia32_address_t *addr, ir_node *ptr, ir_node *mem)
        addr->mem   = be_transform_node(mem);
 }
 
-static void build_address(ia32_address_mode_t *am, ir_node *node)
+static void build_address(ia32_address_mode_t *am, ir_node *node,
+                          ia32_create_am_flags_t flags)
 {
        ir_node        *noreg_gp = ia32_new_NoReg_gp(env_cg);
        ia32_address_t *addr     = &am->addr;
@@ -535,7 +536,7 @@ static void build_address(ia32_address_mode_t *am, ir_node *node)
        am->am_node  = node;
 
        /* construct load address */
-       ia32_create_address_mode(addr, ptr, 0);
+       ia32_create_address_mode(addr, ptr, flags);
 
        addr->base  = addr->base  ? be_transform_node(addr->base)  : noreg_gp;
        addr->index = addr->index ? be_transform_node(addr->index) : noreg_gp;
@@ -696,7 +697,7 @@ static void match_arguments(ia32_address_mode_t *am, ir_node *block,
        noreg_gp = ia32_new_NoReg_gp(env_cg);
        if (new_op2 == NULL &&
            use_am && ia32_use_source_address_mode(block, op2, op1, other_op, flags)) {
-               build_address(am, op2);
+               build_address(am, op2, 0);
                new_op1     = (op1 == NULL ? NULL : be_transform_node(op1));
                if (mode_is_float(mode)) {
                        new_op2 = ia32_new_NoReg_vfp(env_cg);
@@ -708,7 +709,7 @@ static void match_arguments(ia32_address_mode_t *am, ir_node *block,
                       use_am &&
                       ia32_use_source_address_mode(block, op1, op2, other_op, flags)) {
                ir_node *noreg;
-               build_address(am, op1);
+               build_address(am, op1, 0);
 
                if (mode_is_float(mode)) {
                        noreg = ia32_new_NoReg_vfp(env_cg);
@@ -1975,10 +1976,10 @@ static ir_node *dest_am_binop(ir_node *node, ir_node *op1, ir_node *op2,
        commutative = (flags & match_commutative) != 0;
 
        if (use_dest_am(src_block, op1, mem, ptr, op2)) {
-               build_address(&am, op1);
+               build_address(&am, op1, ia32_create_am_double_use);
                new_op = create_immediate_or_transform(op2, 0);
        } else if (commutative && use_dest_am(src_block, op2, mem, ptr, op1)) {
-               build_address(&am, op2);
+               build_address(&am, op2, ia32_create_am_double_use);
                new_op = create_immediate_or_transform(op1, 0);
        } else {
                return NULL;
@@ -2032,7 +2033,7 @@ static ir_node *dest_am_unop(ir_node *node, ir_node *op, ir_node *mem,
                return NULL;
 
        memset(&am, 0, sizeof(am));
-       build_address(&am, op);
+       build_address(&am, op, ia32_create_am_double_use);
 
        dbgi     = get_irn_dbg_info(node);
        block    = be_transform_node(src_block);
@@ -2263,7 +2264,8 @@ static int is_float_to_int_conv(const ir_node *node)
 }
 
 /**
- * Transform a Store(floatConst).
+ * Transform a Store(floatConst) into a sequence of
+ * integer stores.
  *
  * @return the created ia32 Store node
  */
@@ -2343,11 +2345,11 @@ static ir_node *gen_vfist(dbg_info *dbgi, ir_graph *irg, ir_node *block, ir_node
        return new_node;
 }
 /**
- * Transforms a normal Store.
+ * Transforms a general (no special case) Store.
  *
  * @return the created ia32 Store node
  */
-static ir_node *gen_normal_Store(ir_node *node)
+static ir_node *gen_general_Store(ir_node *node)
 {
        ir_node  *val       = get_Store_value(node);
        ir_mode  *mode      = get_irn_mode(val);
@@ -2451,18 +2453,14 @@ static ir_node *gen_Store(ir_node *node)
        ir_mode  *mode = get_irn_mode(val);
 
        if (mode_is_float(mode) && is_Const(val)) {
-               int transform;
-
-               /* we are storing a floating point constant */
-               if (ia32_cg_config.use_sse2) {
-                       transform = !is_simple_sse_Const(val);
-               } else {
-                       transform = !is_simple_x87_Const(val);
-               }
-               if (transform)
-                       return gen_float_const_Store(node, val);
+               /* We can transform every floating const store
+                  into a sequence of integer stores.
+                  If the constant is already in a register,
+                  it would be better to use it, but we don't
+                  have this information here. */
+               return gen_float_const_Store(node, val);
        }
-       return gen_normal_Store(node);
+       return gen_general_Store(node);
 }
 
 /**