fehler156: aligning the stack does not work.

[libfirm] / ir / opt / convopt.c

diff --git a/ir/opt/convopt.c b/ir/opt/convopt.c
index 3e85fd2..5ecf85e 100644 (file)
--- a/ir/opt/convopt.c
+++ b/ir/opt/convopt.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.
  *
@@ -106,12 +106,18 @@ int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
                return conv_const_tv(node, dest_mode) == tarval_bad ? 1 : 0;
        }
 
+       if (is_Conv(node) &&
+                       is_downconv(mode, dest_mode) &&
+                       get_irn_mode(get_Conv_op(node)) == dest_mode) {
+               return -1;
+       }
+
        if (get_irn_n_edges(node) > 1) {
                DB((dbg, LEVEL_3, "multi outs at %+F\n", node));
                return 1;
        }
 
-       if (is_Conv(node) && is_downconv(get_irn_mode(node), dest_mode)) {
+       if (is_Conv(node) && is_downconv(mode, dest_mode)) {
                return get_conv_costs(get_Conv_op(node), dest_mode) - 1;
        }
 
@@ -134,7 +140,7 @@ int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
        }
 #endif
 
-       if (!is_optimizable_node(node)) {
+       if (!mode_is_int(mode) || !is_optimizable_node(node)) {
                return 1;
        }
 
@@ -159,10 +165,11 @@ static ir_node *place_conv(ir_node *node, ir_mode *dest_mode)
 static
 ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
 {
-       size_t arity;
-       size_t i;
+       ir_mode *mode = get_irn_mode(node);
+       size_t   arity;
+       size_t   i;
 
-       if (get_irn_mode(node) == dest_mode)
+       if (mode == dest_mode)
                return node;
 
        if (is_Const(node)) {
@@ -175,15 +182,21 @@ ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
                }
        }
 
+       if (is_Conv(node) &&
+                       is_downconv(mode, dest_mode) &&
+                       get_irn_mode(get_Conv_op(node)) == dest_mode) {
+               return get_Conv_op(node);
+       }
+
        if (get_irn_n_edges(node) > 1) {
                return place_conv(node, dest_mode);
        }
 
-       if (is_Conv(node) && is_downconv(get_irn_mode(node), dest_mode)) {
+       if (is_Conv(node) && is_downconv(mode, dest_mode)) {
                return conv_transform(get_Conv_op(node), dest_mode);
        }
 
-       if (!is_optimizable_node(node)) {
+       if (!mode_is_int(mode) || !is_optimizable_node(node)) {
                return place_conv(node, dest_mode);
        }
 
@@ -243,6 +256,9 @@ void conv_opt_walker(ir_node *node, void *data)
        mode      = get_irn_mode(node);
        pred_mode = get_irn_mode(pred);
 
+       if (mode_is_reference(mode) || mode_is_reference(pred_mode))
+               return;
+
        if (!is_Phi(pred) && !is_downconv(pred_mode, mode))
                return;