projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fixed off-by-one error after phase refactoring
[libfirm]
/
ir
/
opt
/
return.c
diff --git
a/ir/opt/return.c
b/ir/opt/return.c
index
6117c7d
..
5eca06b
100644
(file)
--- a/
ir/opt/return.c
+++ b/
ir/opt/return.c
@@
-30,6
+30,7
@@
#include "ircons_t.h"
#include "irnode_t.h"
#include "irgmod.h"
#include "ircons_t.h"
#include "irnode_t.h"
#include "irgmod.h"
+#include "irpass.h"
#define set_bit(n) (returns[(n) >> 3] |= 1 << ((n) & 7))
#define get_bit(n) (returns[(n) >> 3] & (1 << ((n) & 7)))
#define set_bit(n) (returns[(n) >> 3] |= 1 << ((n) & 7))
#define get_bit(n) (returns[(n) >> 3] & (1 << ((n) & 7)))
@@
-57,7
+58,8
@@
* res = c;
* return res;
*/
* res = c;
* return res;
*/
-void normalize_one_return(ir_graph *irg) {
+void normalize_one_return(ir_graph *irg)
+{
ir_node *endbl = get_irg_end_block(irg);
int i, j, k, n, last_idx, n_rets, n_ret_vals = -1;
unsigned char *returns;
ir_node *endbl = get_irg_end_block(irg);
int i, j, k, n, last_idx, n_rets, n_ret_vals = -1;
unsigned char *returns;
@@
-116,7
+118,7
@@
void normalize_one_return(ir_graph *irg) {
ir_node *block = get_nodes_block(ret);
/* create a new Jmp for every Ret and place the in in */
ir_node *block = get_nodes_block(ret);
/* create a new Jmp for every Ret and place the in in */
- in[j] = new_r_Jmp(
irg,
block);
+ in[j] = new_r_Jmp(block);
/* save the return values and shuffle them */
for (k = 0; k < n_ret_vals; ++k)
/* save the return values and shuffle them */
for (k = 0; k < n_ret_vals; ++k)
@@
-149,10
+151,10
@@
void normalize_one_return(ir_graph *irg) {
if (first)
in[i] = first;
else
if (first)
in[i] = first;
else
- in[i] = new_r_Phi(
irg,
block, n_rets, &retvals[j], get_irn_mode(retvals[j]));
+ in[i] = new_r_Phi(block, n_rets, &retvals[j], get_irn_mode(retvals[j]));
}
}
- endbl_in[last_idx++] = new_rd_Return(combined_dbgi,
irg,
block, in[0], n_ret_vals-1, &in[1]);
+ endbl_in[last_idx++] = new_rd_Return(combined_dbgi, block, in[0], n_ret_vals-1, &in[1]);
set_irn_in(endbl, last_idx, endbl_in);
set_irn_in(endbl, last_idx, endbl_in);
@@
-166,6
+168,12
@@
void normalize_one_return(ir_graph *irg) {
set_irg_loopinfo_inconsistent(irg);
}
set_irg_loopinfo_inconsistent(irg);
}
+/* Create a graph pass. */
+ir_graph_pass_t *normalize_one_return_pass(const char *name)
+{
+ return def_graph_pass(name ? name : "one_ret", normalize_one_return);
+}
+
/**
* Check, whether a Return can be moved on block upwards.
*
/**
* Check, whether a Return can be moved on block upwards.
*
@@
-182,7
+190,8
@@
void normalize_one_return(ir_graph *irg) {
* All predecessors of the Return block must be Jmp's of course, or we
* cannot move it up, so we add blocks if needed.
*/
* All predecessors of the Return block must be Jmp's of course, or we
* cannot move it up, so we add blocks if needed.
*/
-static int can_move_ret(ir_node *ret) {
+static int can_move_ret(ir_node *ret)
+{
ir_node *retbl = get_nodes_block(ret);
int i, n = get_irn_arity(ret);
ir_node *retbl = get_nodes_block(ret);
int i, n = get_irn_arity(ret);
@@
-209,7
+218,7
@@
static int can_move_ret(ir_node *ret) {
/* simply place a new block here */
ir_graph *irg = get_irn_irg(retbl);
ir_node *block = new_r_Block(irg, 1, &pred);
/* simply place a new block here */
ir_graph *irg = get_irn_irg(retbl);
ir_node *block = new_r_Block(irg, 1, &pred);
- ir_node *jmp = new_r_Jmp(
irg,
block);
+ ir_node *jmp = new_r_Jmp(block);
set_Block_cfgpred(retbl, i, jmp);
}
}
set_Block_cfgpred(retbl, i, jmp);
}
}
@@
-236,7
+245,8
@@
static int can_move_ret(ir_node *ret) {
* else
* return c;
*/
* else
* return c;
*/
-void normalize_n_returns(ir_graph *irg) {
+void normalize_n_returns(ir_graph *irg)
+{
int i, j, n, n_rets, n_finals, n_ret_vals;
ir_node *list = NULL;
ir_node *final = NULL;
int i, j, n, n_rets, n_finals, n_ret_vals;
ir_node *list = NULL;
ir_node *final = NULL;
@@
-308,7
+318,7
@@
void normalize_n_returns(ir_graph *irg) {
in[j] = (is_Phi(pred) && get_nodes_block(pred) == block) ? get_Phi_pred(pred, i) : pred;
}
in[j] = (is_Phi(pred) && get_nodes_block(pred) == block) ? get_Phi_pred(pred, i) : pred;
}
- new_ret = new_rd_Return(dbgi,
irg,
new_bl, in[0], n_ret_vals - 1, &in[1]);
+ new_ret = new_rd_Return(dbgi, new_bl, in[0], n_ret_vals - 1, &in[1]);
if (! is_Bad(new_ret)) {
/*
if (! is_Bad(new_ret)) {
/*
@@
-373,3
+383,9
@@
void normalize_n_returns(ir_graph *irg) {
set_irg_outs_inconsistent(irg);
set_irg_loopinfo_inconsistent(current_ir_graph);
}
set_irg_outs_inconsistent(irg);
set_irg_loopinfo_inconsistent(current_ir_graph);
}
+
+/* Create a graph pass. */
+ir_graph_pass_t *normalize_n_returns_pass(const char *name)
+{
+ return def_graph_pass(name ? name : "n_rets", normalize_n_returns);
+}