* @file ir/opt/ifconv.c
* @brief If conversion
* @author Christoph Mallon
- * @version $Id$
*/
#include "config.h"
#include "array_t.h"
#include "irpass_t.h"
#include "be.h"
-#include "opt_manage.h"
#include "irdump.h"
#include "debug.h"
*/
static void split_block(ir_node* block, int i, int j)
{
- ir_node *pred_block = get_nodes_block(get_irn_n(block, i));
- int arity = get_irn_arity(block);
+ ir_node *pred_block = get_nodes_block(get_Block_cfgpred(block, i));
+ int arity = get_Block_n_cfgpreds(block);
ir_node **ins = ALLOCAN(ir_node*, arity + 1);
int new_pred_arity;
ir_node *phi;
set_irn_in(phi, k, ins);
}
- for (k = 0; k < i; ++k) ins[k] = get_irn_n(block, k);
+ for (k = 0; k < i; ++k) ins[k] = get_Block_cfgpred(block, k);
ins[k++] = get_irn_n(pred_block, j);
- for (; k < arity; ++k) ins[k] = get_irn_n(block, k);
- ins[k++] = get_irn_n(block, i);
+ for (; k < arity; ++k) ins[k] = get_Block_cfgpred(block, k);
+ ins[k++] = get_Block_cfgpred(block, i);
set_irn_in(block, k, ins);
new_pred_arity = get_irn_arity(pred_block) - 1;
static void prepare_path(ir_node* block, int i, const ir_node* dependency)
{
- ir_node* pred = get_nodes_block(get_irn_n(block, i));
+ ir_node* pred = get_nodes_block(get_Block_cfgpred(block, i));
int pred_arity;
int j;
mux_true = get_Phi_pred(p, i);
mux_false = get_Phi_pred(p, j);
}
- if (!env->allow_ifconv(sel, mux_false, mux_true)) {
+ if (mux_true == mux_false)
+ continue;
+ ir_mode *mode = get_irn_mode(mux_true);
+ if (mode == mode_M
+ || !env->allow_ifconv(sel, mux_false, mux_true)) {
supported = false;
break;
}
} while (phi != NULL);
/* move mux operands into mux_block */
- exchange(get_nodes_block(get_irn_n(block, i)), mux_block);
- exchange(get_nodes_block(get_irn_n(block, j)), mux_block);
+ exchange(get_nodes_block(get_Block_cfgpred(block, i)), mux_block);
+ exchange(get_nodes_block(get_Block_cfgpred(block, j)), mux_block);
if (arity == 2) {
unsigned mark;
}
}
-static ir_graph_state_t do_ifconv(ir_graph *irg)
+void opt_if_conv(ir_graph *irg)
{
walker_env env;
const backend_params *be_params = be_get_backend_param();
+ assure_irg_properties(irg,
+ IR_GRAPH_PROPERTY_NO_CRITICAL_EDGES
+ | IR_GRAPH_PROPERTY_NO_UNREACHABLE_CODE
+ | IR_GRAPH_PROPERTY_NO_BADS
+ | IR_GRAPH_PROPERTY_ONE_RETURN);
+
/* get the parameters */
env.allow_ifconv = be_params->allow_ifconv;
env.changed = false;
free_cdep(irg);
- return IR_GRAPH_STATE_NO_CRITICAL_EDGES | IR_GRAPH_STATE_ONE_RETURN;
-}
-
-optdesc_t opt_ifconv = {
- "if-conversion",
- IR_GRAPH_STATE_NO_CRITICAL_EDGES | IR_GRAPH_STATE_NO_UNREACHABLE_BLOCKS | IR_GRAPH_STATE_NO_BAD_BLOCKS | IR_GRAPH_STATE_ONE_RETURN,
- do_ifconv,
-};
-
-void opt_if_conv(ir_graph *irg)
-{
- perform_irg_optimization(irg, &opt_ifconv);
+ confirm_irg_properties(irg,
+ IR_GRAPH_PROPERTY_NO_CRITICAL_EDGES
+ | IR_GRAPH_PROPERTY_ONE_RETURN);
}
ir_graph_pass_t *opt_if_conv_pass(const char *name)