adapt to firm coding conventions

[libfirm] / ir / opt / convopt.c

diff --git a/ir/opt/convopt.c b/ir/opt/convopt.c
index 80de074..5d2785c 100644 (file)
--- a/ir/opt/convopt.c
+++ b/ir/opt/convopt.c
@@ -41,6 +41,7 @@
 #include "iroptimize.h"
 
 #include <assert.h>
+#include <stdbool.h>
 #include "debug.h"
 #include "ircons.h"
 #include "irgmod.h"
@@ -49,13 +50,13 @@
 #include "iredges_t.h"
 #include "irgwalk.h"
 #include "irprintf.h"
+#include "irpass.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg);
 
 static inline int imin(int a, int b) { return a < b ? a : b; }
 
-static
-int is_optimizable_node(const ir_node *node)
+static bool is_optimizable_node(const ir_node *node)
 {
        switch (get_irn_opcode(node)) {
                case iro_Add:
@@ -79,8 +80,7 @@ static tarval* conv_const_tv(const ir_node* cnst, ir_mode* dest_mode)
        return tarval_convert_to(get_Const_tarval(cnst), dest_mode);
 }
 
-static
-int is_downconv(ir_mode *src_mode, ir_mode *dest_mode)
+static int is_downconv(ir_mode *src_mode, ir_mode *dest_mode)
 {
        return
                mode_is_int(src_mode) &&
@@ -88,8 +88,7 @@ int is_downconv(ir_mode *src_mode, ir_mode *dest_mode)
                get_mode_size_bits(dest_mode) <= get_mode_size_bits(src_mode);
 }
 
-static
-int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
+static int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
 {
        ir_mode *mode = get_irn_mode(node);
        size_t arity;
@@ -115,10 +114,6 @@ int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
                return 1;
        }
 
-       if (is_Conv(node) && is_downconv(mode, dest_mode)) {
-               return get_conv_costs(get_Conv_op(node), dest_mode) - 1;
-       }
-
 #if 0 // TODO
        /* Take the minimum of the conversion costs for Phi predecessors as only one
         * branch is actually executed at a time */
@@ -138,7 +133,15 @@ int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
        }
 #endif
 
-       if (!mode_is_int(mode) || !is_optimizable_node(node)) {
+       if (!is_downconv(mode, dest_mode)) {
+               return 1;
+       }
+
+       if (is_Conv(node)) {
+               return get_conv_costs(get_Conv_op(node), dest_mode) - 1;
+       }
+
+       if (!is_optimizable_node(node)) {
                return 1;
        }
 
@@ -156,12 +159,11 @@ int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
 static ir_node *place_conv(ir_node *node, ir_mode *dest_mode)
 {
        ir_node *block = get_nodes_block(node);
-       ir_node *conv = new_r_Conv(current_ir_graph, block, node, dest_mode);
+       ir_node *conv = new_r_Conv(block, node, dest_mode);
        return conv;
 }
 
-static
-ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
+static ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
 {
        ir_mode *mode = get_irn_mode(node);
        size_t   arity;
@@ -190,11 +192,15 @@ ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
                return place_conv(node, dest_mode);
        }
 
-       if (is_Conv(node) && is_downconv(mode, dest_mode)) {
+       if (!is_downconv(mode, dest_mode)) {
+               return place_conv(node, dest_mode);
+       }
+
+       if (is_Conv(node)) {
                return conv_transform(get_Conv_op(node), dest_mode);
        }
 
-       if (!mode_is_int(mode) || !is_optimizable_node(node)) {
+       if (!is_optimizable_node(node)) {
                return place_conv(node, dest_mode);
        }
 
@@ -217,8 +223,7 @@ ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
 /* TODO, backends (at least ia32) can't handle it at the moment,
    and it's probably not more efficient on most archs */
 #if 0
-static
-void try_optimize_cmp(ir_node *node)
+static void try_optimize_cmp(ir_node *node)
 {
        ir_node *left  = get_Cmp_left(node);
        ir_node *right = get_Cmp_right(node);
@@ -228,10 +233,9 @@ void try_optimize_cmp(ir_node *node)
 }
 #endif
 
-static char changed;
+static bool changed;
 
-static
-void conv_opt_walker(ir_node *node, void *data)
+static void conv_opt_walker(ir_node *node, void *data)
 {
        ir_node *transformed;
        ir_node *pred;
@@ -263,25 +267,26 @@ void conv_opt_walker(ir_node *node, void *data)
        /* - 1 for the initial conv */
        costs = get_conv_costs(pred, mode) - 1;
        DB((dbg, LEVEL_2, "Costs for %+F -> %+F: %d\n", node, pred, costs));
-       if (costs > 0) return;
+       if (costs > 0)
+               return;
 
        transformed = conv_transform(pred, mode);
        if (node != transformed) {
                exchange(node, transformed);
-               changed = 1;
+               changed = true;
        }
 }
 
 int conv_opt(ir_graph *irg)
 {
-       char invalidate = 0;
+       bool invalidate = 0;
        FIRM_DBG_REGISTER(dbg, "firm.opt.conv");
 
        DB((dbg, LEVEL_1, "===> Performing conversion optimization on %+F\n", irg));
 
        edges_assure(irg);
        do {
-               changed = 0;
+               changed = false;
                irg_walk_graph(irg, NULL, conv_opt_walker, NULL);
                local_optimize_graph(irg);
                invalidate |= changed;
@@ -292,3 +297,9 @@ int conv_opt(ir_graph *irg)
        }
        return invalidate;
 }
+
+/* Creates an ir_graph pass for conv_opt. */
+ir_graph_pass_t *conv_opt_pass(const char *name)
+{
+       return def_graph_pass_ret(name ? name : "conv_opt", conv_opt);
+}