allow_ifconv callback may not be NULL anymore

[libfirm] / ir / opt / ifconv.c

diff --git a/ir/opt/ifconv.c b/ir/opt/ifconv.c
index f5f8b9c..ee24f48 100644 (file)
--- a/ir/opt/ifconv.c
+++ b/ir/opt/ifconv.c
@@ -23,7 +23,6 @@
  * @author  Christoph Mallon
  * @version $Id$
  */
-
 #include "config.h"
 
 #include <assert.h>
@@ -40,8 +39,8 @@
 #include "irtools.h"
 #include "array_t.h"
 #include "irpass_t.h"
+#include "be.h"
 
-// debug
 #include "irdump.h"
 #include "debug.h"
 
@@ -49,32 +48,12 @@
  * Environment for if-conversion.
  */
 typedef struct walker_env {
-       const ir_settings_if_conv_t *params; /**< Conversion parameter. */
-       int                         changed; /**< Set if the graph was changed. */
+       arch_allow_ifconv_func allow_ifconv;
+       bool                   changed; /**< Set if the graph was changed. */
 } walker_env;
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg);
 
-/**
- * Default callback for Mux creation: don't allow any Mux nodes
- */
-static int default_allow_ifconv(ir_node *sel, ir_node *mux_false,
-                                ir_node *mux_true)
-{
-       (void) sel;
-       (void) mux_false;
-       (void) mux_true;
-       return 1;
-}
-
-/**
- * Default options.
- */
-static const ir_settings_if_conv_t default_info = {
-       0,    /* doesn't matter for Mux */
-       default_allow_ifconv
-};
-
 /**
  * Returns non-zero if a Block can be emptied.
  *
@@ -332,6 +311,7 @@ restart:
                                ir_node* p;
                                ir_node* pred1;
                                bool     supported;
+                               bool     negated;
                                dbg_info* cond_dbg;
 
                                pred1 = get_Block_cfgpred_block(block, j);
@@ -345,10 +325,18 @@ restart:
                                sel = get_Cond_selector(cond);
                                phi = get_Block_phis(block);
                                supported = true;
+                               negated   = get_Proj_proj(projx0) == pn_Cond_false;
                                for (p = phi; p != NULL; p = get_Phi_next(p)) {
-                                       ir_node *mux_false = get_Phi_pred(p, i);
-                                       ir_node *mux_true = get_Phi_pred(p, j);
-                                       if (!env->params->allow_ifconv(sel, mux_false, mux_true)) {
+                                       ir_node *mux_false;
+                                       ir_node *mux_true;
+                                       if (negated) {
+                                               mux_true  = get_Phi_pred(p, j);
+                                               mux_false = get_Phi_pred(p, i);
+                                       } else {
+                                               mux_true  = get_Phi_pred(p, i);
+                                               mux_false = get_Phi_pred(p, j);
+                                       }
+                                       if (!env->allow_ifconv(sel, mux_false, mux_true)) {
                                                supported = false;
                                                break;
                                        }
@@ -360,7 +348,7 @@ restart:
                                        cond, projx0, projx1
                                ));
 
-                               env->changed = 1;
+                               env->changed = true;
                                prepare_path(block, i, dependency);
                                prepare_path(block, j, dependency);
                                arity = get_irn_arity(block);
@@ -383,12 +371,12 @@ restart:
                                                 * one block, but not at the same memory node
                                                 */
                                                assert(get_irn_mode(phi) != mode_M);
-                                               if (get_Proj_proj(projx0) == pn_Cond_true) {
-                                                       t = val_i;
-                                                       f = val_j;
-                                               } else {
+                                               if (negated) {
                                                        t = val_j;
                                                        f = val_i;
+                                               } else {
+                                                       t = val_i;
+                                                       f = val_j;
                                                }
 
                                                mux = new_rd_Mux(cond_dbg, mux_block, sel, f, t, get_irn_mode(phi));
@@ -462,7 +450,7 @@ static void collect_phis(ir_node *node, void *env)
 
                add_Block_phi(block, node);
        } else {
-               if (is_no_Block(node) && get_irn_pinned(node) == op_pin_state_pinned) {
+               if (!is_Block(node) && get_irn_pinned(node) == op_pin_state_pinned) {
                        /*
                         * Ignore control flow nodes (except Raise), these will be removed.
                         */
@@ -476,13 +464,14 @@ static void collect_phis(ir_node *node, void *env)
        }
 }
 
-void opt_if_conv(ir_graph *irg, const ir_settings_if_conv_t *params)
+void opt_if_conv(ir_graph *irg)
 {
-       walker_env env;
+       walker_env            env;
+       const backend_params *be_params = be_get_backend_param();
 
        /* get the parameters */
-       env.params  = (params != NULL ? params : &default_info);
-       env.changed = 0;
+       env.allow_ifconv = be_params->allow_ifconv;
+       env.changed      = false;
 
        FIRM_DBG_REGISTER(dbg, "firm.opt.ifconv");
 
@@ -514,27 +503,7 @@ void opt_if_conv(ir_graph *irg, const ir_settings_if_conv_t *params)
        free_cdep(irg);
 }
 
-struct pass_t {
-       ir_graph_pass_t             pass;
-       const ir_settings_if_conv_t *params;
-};
-
-/**
- * Wrapper for running opt_if_conv() as an ir_graph pass.
- */
-static int pass_wrapper(ir_graph *irg, void *context)
-{
-       struct pass_t *pass = context;
-       opt_if_conv(irg, pass->params);
-       return 0;
-}
-
-ir_graph_pass_t *opt_if_conv_pass(const char *name,
-                                  const ir_settings_if_conv_t *params)
+ir_graph_pass_t *opt_if_conv_pass(const char *name)
 {
-       struct pass_t *pass = XMALLOCZ(struct pass_t);
-       pass->params = params;
-
-       return def_graph_pass_constructor(
-               &pass->pass, name ? name : "ifconv", pass_wrapper);
+       return def_graph_pass(name ? name : "ifconv", opt_if_conv);
 }