projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
irop: Provide macro wrappers for [gs]et_generic_function_ptr_().
[libfirm]
/
ir
/
opt
/
ifconv.c
diff --git
a/ir/opt/ifconv.c
b/ir/opt/ifconv.c
index
511b891
..
1dcb312
100644
(file)
--- a/
ir/opt/ifconv.c
+++ b/
ir/opt/ifconv.c
@@
-21,7
+21,6
@@
* @file ir/opt/ifconv.c
* @brief If conversion
* @author Christoph Mallon
* @file ir/opt/ifconv.c
* @brief If conversion
* @author Christoph Mallon
- * @version $Id$
*/
#include "config.h"
*/
#include "config.h"
@@
-52,7
+51,7
@@
typedef struct walker_env {
bool changed; /**< Set if the graph was changed. */
} walker_env;
bool changed; /**< Set if the graph was changed. */
} walker_env;
-DEBUG_ONLY(static firm_dbg_module_t *dbg
);
+DEBUG_ONLY(static firm_dbg_module_t *dbg
;)
/**
* Returns non-zero if a Block can be emptied.
/**
* Returns non-zero if a Block can be emptied.
@@
-193,8
+192,8
@@
static void rewire(ir_node* node, int i, int j, ir_node* new_pred)
*/
static void split_block(ir_node* block, int i, int j)
{
*/
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;
ir_node **ins = ALLOCAN(ir_node*, arity + 1);
int new_pred_arity;
ir_node *phi;
@@
-214,10
+213,10
@@
static void split_block(ir_node* block, int i, int j)
set_irn_in(phi, k, ins);
}
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);
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;
set_irn_in(block, k, ins);
new_pred_arity = get_irn_arity(pred_block) - 1;
@@
-246,7
+245,7
@@
static void split_block(ir_node* block, int i, int j)
static void prepare_path(ir_node* block, int i, const ir_node* dependency)
{
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;
int pred_arity;
int j;
@@
-334,7
+333,11
@@
restart:
mux_true = get_Phi_pred(p, i);
mux_false = get_Phi_pred(p, 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;
}
supported = false;
break;
}
@@
-393,8
+396,8
@@
restart:
} while (phi != NULL);
/* move mux operands into mux_block */
} 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;
if (arity == 2) {
unsigned mark;
@@
-469,6
+472,12
@@
void opt_if_conv(ir_graph *irg)
walker_env env;
const backend_params *be_params = be_get_backend_param();
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;
/* get the parameters */
env.allow_ifconv = be_params->allow_ifconv;
env.changed = false;
@@
-477,9
+486,6
@@
void opt_if_conv(ir_graph *irg)
DB((dbg, LEVEL_1, "Running if-conversion on %+F\n", irg));
DB((dbg, LEVEL_1, "Running if-conversion on %+F\n", irg));
- normalize_one_return(irg);
- remove_critical_cf_edges(irg);
-
compute_cdep(irg);
ir_reserve_resources(irg, IR_RESOURCE_BLOCK_MARK | IR_RESOURCE_PHI_LIST);
compute_cdep(irg);
ir_reserve_resources(irg, IR_RESOURCE_BLOCK_MARK | IR_RESOURCE_PHI_LIST);
@@
-492,13
+498,13
@@
void opt_if_conv(ir_graph *irg)
if (env.changed) {
local_optimize_graph(irg);
if (env.changed) {
local_optimize_graph(irg);
-
- /* graph has changed, invalidate analysis info */
- set_irg_extblk_inconsistent(irg);
- set_irg_doms_inconsistent(irg);
}
free_cdep(irg);
}
free_cdep(irg);
+
+ 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)
}
ir_graph_pass_t *opt_if_conv_pass(const char *name)