projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement binary emitter for fpush.
[libfirm]
/
ir
/
opt
/
cfopt.c
diff --git
a/ir/opt/cfopt.c
b/ir/opt/cfopt.c
index
972703d
..
76160e5
100644
(file)
--- a/
ir/opt/cfopt.c
+++ b/
ir/opt/cfopt.c
@@
-50,6
+50,7
@@
#include "irflag_t.h"
#include "firmstat.h"
#include "irflag_t.h"
#include "firmstat.h"
+#include "irpass.h"
#include "iropt_dbg.h"
#include "iropt_dbg.h"
@@
-102,7
+103,7
@@
static int remove_senseless_conds(ir_node *bl) {
ir_node *cond_j = skip_Proj(pred_j);
if (cond_j == cond_i) {
ir_node *cond_j = skip_Proj(pred_j);
if (cond_j == cond_i) {
- ir_node *jmp = new_r_Jmp(
current_ir_graph,
get_nodes_block(cond_i));
+ ir_node *jmp = new_r_Jmp(get_nodes_block(cond_i));
set_irn_n(bl, i, jmp);
set_irn_n(bl, j, new_Bad());
set_irn_n(bl, i, jmp);
set_irn_n(bl, j, new_Bad());
@@
-225,7
+226,7
@@
static void remove_unreachable_blocks_and_conds(ir_node *block, void *env) {
*changed |= remove_senseless_conds(block);
/* clear the block mark of all non labeled blocks */
*changed |= remove_senseless_conds(block);
/* clear the block mark of all non labeled blocks */
- if (has_Block_
label
(block))
+ if (has_Block_
entity
(block))
set_Block_non_removable(block);
else
set_Block_removable(block);
set_Block_non_removable(block);
else
set_Block_removable(block);
@@
-244,7
+245,7
@@
static void collect_nodes(ir_node *n, void *ctx) {
if (code == iro_Block) {
/* mark the block as non-removable if it is labeled */
if (code == iro_Block) {
/* mark the block as non-removable if it is labeled */
- if (has_Block_
label
(n))
+ if (has_Block_
entity
(n))
set_Block_non_removable(n);
} else {
ir_node *b = get_nodes_block(n);
set_Block_non_removable(n);
} else {
ir_node *b = get_nodes_block(n);
@@
-562,7
+563,7
@@
static void optimize_blocks(ir_node *b, void *ctx) {
/* case 1: Do nothing */
} else if (is_Block_removable(pred) && !Block_block_visited(pred)) {
/* case 2: It's an empty block and not yet visited. */
/* case 1: Do nothing */
} else if (is_Block_removable(pred) && !Block_block_visited(pred)) {
/* case 2: It's an empty block and not yet visited. */
- assert(get_Block_n_cfgpreds(b) > 1 || has_Block_
label
(b));
+ assert(get_Block_n_cfgpreds(b) > 1 || has_Block_
entity
(b));
/* Else it should be optimized by equivalent_node. */
for (j = 0; j < get_Block_n_cfgpreds(pred); j++) {
ir_node *pred_X = get_Block_cfgpred(pred, j);
/* Else it should be optimized by equivalent_node. */
for (j = 0; j < get_Block_n_cfgpreds(pred); j++) {
ir_node *pred_X = get_Block_cfgpred(pred, j);
@@
-625,9
+626,9
@@
static int handle_switch_cond(ir_node *cond) {
if (proj2 == NULL) {
/* this Cond has only one Proj: must be the defProj */
if (proj2 == NULL) {
/* this Cond has only one Proj: must be the defProj */
- assert(get_Cond_default
P
roj(cond) == get_Proj_proj(proj1));
+ assert(get_Cond_default
_p
roj(cond) == get_Proj_proj(proj1));
/* convert it into a Jmp */
/* convert it into a Jmp */
- jmp = new_r_Jmp(
current_ir_graph,
blk);
+ jmp = new_r_Jmp(blk);
exchange(proj1, jmp);
return 1;
} else if (get_irn_link(proj2) == NULL) {
exchange(proj1, jmp);
return 1;
} else if (get_irn_link(proj2) == NULL) {
@@
-638,12
+639,12
@@
static int handle_switch_cond(ir_node *cond) {
if (tv != tarval_bad) {
/* we have a constant switch */
long num = get_tarval_long(tv);
if (tv != tarval_bad) {
/* we have a constant switch */
long num = get_tarval_long(tv);
- long def_num = get_Cond_default
P
roj(cond);
+ long def_num = get_Cond_default
_p
roj(cond);
if (def_num == get_Proj_proj(proj1)) {
/* first one is the defProj */
if (num == get_Proj_proj(proj2)) {
if (def_num == get_Proj_proj(proj1)) {
/* first one is the defProj */
if (num == get_Proj_proj(proj2)) {
- jmp = new_r_Jmp(
current_ir_graph,
blk);
+ jmp = new_r_Jmp(blk);
exchange(proj2, jmp);
exchange(proj1, new_Bad());
return 1;
exchange(proj2, jmp);
exchange(proj1, new_Bad());
return 1;
@@
-651,7
+652,7
@@
static int handle_switch_cond(ir_node *cond) {
} else if (def_num == get_Proj_proj(proj2)) {
/* second one is the defProj */
if (num == get_Proj_proj(proj1)) {
} else if (def_num == get_Proj_proj(proj2)) {
/* second one is the defProj */
if (num == get_Proj_proj(proj1)) {
- jmp = new_r_Jmp(
current_ir_graph,
blk);
+ jmp = new_r_Jmp(blk);
exchange(proj1, jmp);
exchange(proj2, new_Bad());
return 1;
exchange(proj1, jmp);
exchange(proj2, new_Bad());
return 1;
@@
-659,12
+660,12
@@
static int handle_switch_cond(ir_node *cond) {
} else {
/* neither: strange, Cond was not optimized so far */
if (num == get_Proj_proj(proj1)) {
} else {
/* neither: strange, Cond was not optimized so far */
if (num == get_Proj_proj(proj1)) {
- jmp = new_r_Jmp(
current_ir_graph,
blk);
+ jmp = new_r_Jmp(blk);
exchange(proj1, jmp);
exchange(proj2, new_Bad());
return 1;
} else if (num == get_Proj_proj(proj2)) {
exchange(proj1, jmp);
exchange(proj2, new_Bad());
return 1;
} else if (num == get_Proj_proj(proj2)) {
- jmp = new_r_Jmp(
current_ir_graph,
blk);
+ jmp = new_r_Jmp(blk);
exchange(proj2, jmp);
exchange(proj1, new_Bad());
return 1;
exchange(proj2, jmp);
exchange(proj1, new_Bad());
return 1;
@@
-873,3
+874,9
@@
restart:
current_ir_graph = rem;
}
current_ir_graph = rem;
}
+
+/* Creates an ir_graph pass for optimize_cf. */
+ir_graph_pass_t *optimize_cf_pass(const char *name)
+{
+ return def_graph_pass(name ? name : "optimize_cf", optimize_cf);
+} /* optimize_cf_pass */