projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify x87_dump_stack().
[libfirm]
/
ir
/
opt
/
ifconv.c
diff --git
a/ir/opt/ifconv.c
b/ir/opt/ifconv.c
index
04502fc
..
d56b723
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.
@@
-283,6
+282,8
@@
restart:
ir_cdep* cdep;
pred0 = get_Block_cfgpred_block(block, i);
ir_cdep* cdep;
pred0 = get_Block_cfgpred_block(block, i);
+ if (pred0 == block) continue;
+
for (cdep = find_cdep(pred0); cdep != NULL; cdep = get_cdep_next(cdep)) {
const ir_node* dependency = get_cdep_node(cdep);
ir_node* projx0 = walk_to_projx(pred0, dependency);
for (cdep = find_cdep(pred0); cdep != NULL; cdep = get_cdep_next(cdep)) {
const ir_node* dependency = get_cdep_node(cdep);
ir_node* projx0 = walk_to_projx(pred0, dependency);
@@
-310,6
+311,7
@@
restart:
dbg_info* cond_dbg;
pred1 = get_Block_cfgpred_block(block, j);
dbg_info* cond_dbg;
pred1 = get_Block_cfgpred_block(block, j);
+ if (pred1 == block) continue;
if (!is_cdep_on(pred1, dependency)) continue;
if (!is_cdep_on(pred1, dependency)) continue;
@@
-331,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;
}
@@
-466,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;
@@
-474,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);
@@
-489,15
+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_outs_inconsistent(irg);
- set_irg_extblk_inconsistent(irg);
- set_irg_loopinfo_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)