projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
keep_alive_barrier operand used wrong block; schedule keep behind phi sequences
[libfirm]
/
ir
/
be
/
betranshlp.c
diff --git
a/ir/be/betranshlp.c
b/ir/be/betranshlp.c
index
196422b
..
07e4991
100644
(file)
--- a/
ir/be/betranshlp.c
+++ b/
ir/be/betranshlp.c
@@
-68,7
+68,7
@@
int be_is_transformed(const ir_node *node)
static inline ir_node *be_get_transformed_node(ir_node *old_node)
{
if (irn_visited(old_node)) {
static inline ir_node *be_get_transformed_node(ir_node *old_node)
{
if (irn_visited(old_node)) {
- ir_node *new_node = get_irn_link(old_node);
+ ir_node *new_node =
(ir_node*)
get_irn_link(old_node);
assert(new_node != NULL);
return new_node;
}
assert(new_node != NULL);
return new_node;
}
@@
-211,7
+211,7
@@
static void fix_loops(ir_node *node)
changed = 0;
if (! is_Block(node)) {
ir_node *block = get_nodes_block(node);
changed = 0;
if (! is_Block(node)) {
ir_node *block = get_nodes_block(node);
- ir_node *new_block = get_irn_link(block);
+ ir_node *new_block =
(ir_node*)
get_irn_link(block);
if (new_block != NULL) {
set_nodes_block(node, new_block);
if (new_block != NULL) {
set_nodes_block(node, new_block);
@@
-225,7
+225,7
@@
static void fix_loops(ir_node *node)
arity = get_irn_arity(node);
for (i = 0; i < arity; ++i) {
ir_node *in = get_irn_n(node, i);
arity = get_irn_arity(node);
for (i = 0; i < arity; ++i) {
ir_node *in = get_irn_n(node, i);
- ir_node *nw = get_irn_link(in);
+ ir_node *nw =
(ir_node*)
get_irn_link(in);
if (nw != NULL && nw != in) {
set_irn_n(node, i, nw);
if (nw != NULL && nw != in) {
set_irn_n(node, i, nw);
@@
-244,7
+244,7
@@
static void fix_loops(ir_node *node)
arity = get_irn_deps(node);
for (i = 0; i < arity; ++i) {
ir_node *in = get_irn_dep(node, i);
arity = get_irn_deps(node);
for (i = 0; i < arity; ++i) {
ir_node *in = get_irn_dep(node, i);
- ir_node *nw = get_irn_link(in);
+ ir_node *nw =
(ir_node*)
get_irn_link(in);
if (nw != NULL && nw != in) {
set_irn_dep(node, i, nw);
if (nw != NULL && nw != in) {
set_irn_dep(node, i, nw);
@@
-292,7
+292,7
@@
static ir_node *new_be_Anchor(ir_graph *irg)
/* Hack: some places in the code ask the Anchor for its register
requirements */
/* Hack: some places in the code ask the Anchor for its register
requirements */
- new_anchor = new_Anchor(irg);
+ new_anchor = new_
r_
Anchor(irg);
info = be_get_info(new_anchor);
info->out_infos = NEW_ARR_D(reg_out_info_t, obst, 1);
memset(info->out_infos, 0, 1 * sizeof(info->out_infos[0]));
info = be_get_info(new_anchor);
info->out_infos = NEW_ARR_D(reg_out_info_t, obst, 1);
memset(info->out_infos, 0, 1 * sizeof(info->out_infos[0]));
@@
-345,7
+345,7
@@
static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform)
/* process worklist (this should transform all nodes in the graph) */
while (! waitq_empty(env.worklist)) {
/* process worklist (this should transform all nodes in the graph) */
while (! waitq_empty(env.worklist)) {
- ir_node *node = waitq_get(env.worklist);
+ ir_node *node =
(ir_node*)
waitq_get(env.worklist);
be_transform_node(node);
}
be_transform_node(node);
}
@@
-357,7
+357,7
@@
static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform)
if (anchor == NULL)
continue;
if (anchor == NULL)
continue;
- anchor = get_irn_link(anchor);
+ anchor =
(ir_node*)
get_irn_link(anchor);
fix_loops(anchor);
set_irn_n(new_anchor, i, anchor);
}
fix_loops(anchor);
set_irn_n(new_anchor, i, anchor);
}
@@
-374,7
+374,6
@@
static ir_node *gen_Block(ir_node *node)
{
ir_graph *irg = current_ir_graph;
dbg_info *dbgi = get_irn_dbg_info(node);
{
ir_graph *irg = current_ir_graph;
dbg_info *dbgi = get_irn_dbg_info(node);
- ir_node *macroblock = get_Block_MacroBlock(node);
ir_node *block;
block = new_ir_node(dbgi, irg, NULL, get_irn_op(node), get_irn_mode(node),
ir_node *block;
block = new_ir_node(dbgi, irg, NULL, get_irn_op(node), get_irn_mode(node),
@@
-382,14
+381,6
@@
static ir_node *gen_Block(ir_node *node)
copy_node_attr(irg, node, block);
block->node_nr = node->node_nr;
copy_node_attr(irg, node, block);
block->node_nr = node->node_nr;
- if (node == macroblock) {
- /* this node is a macroblock header */
- set_Block_MacroBlock(block, block);
- } else {
- macroblock = be_transform_node(macroblock);
- set_Block_MacroBlock(block, macroblock);
- }
-
/* put the preds in the worklist */
be_enqueue_preds(node);
/* put the preds in the worklist */
be_enqueue_preds(node);
@@
-479,16
+470,12
@@
void be_transform_graph(ir_graph *irg, arch_pretrans_nodes *func)
int be_mux_is_abs(ir_node *sel, ir_node *mux_true, ir_node *mux_false)
{
int be_mux_is_abs(ir_node *sel, ir_node *mux_true, ir_node *mux_false)
{
- ir_node *cmp_left;
- ir_node *cmp_right;
- ir_node *cmp;
- ir_mode *mode;
- pn_Cmp pnc;
+ ir_node *cmp_left;
+ ir_node *cmp_right;
+ ir_mode *mode;
+ ir_relation relation;
- if (!is_Proj(sel))
- return 0;
- cmp = get_Proj_pred(sel);
- if (!is_Cmp(cmp))
+ if (!is_Cmp(sel))
return 0;
/**
return 0;
/**
@@
-502,42
+489,31
@@
int be_mux_is_abs(ir_node *sel, ir_node *mux_true, ir_node *mux_false)
return 0;
/* must be <, <=, >=, > */
return 0;
/* must be <, <=, >=, > */
- pnc = get_Proj_proj(sel);
- switch (pnc) {
- case pn_Cmp_Ge:
- case pn_Cmp_Gt:
- case pn_Cmp_Le:
- case pn_Cmp_Lt:
- case pn_Cmp_Uge:
- case pn_Cmp_Ug:
- case pn_Cmp_Ul:
- case pn_Cmp_Ule:
- break;
- default:
+ relation = get_Cmp_relation(sel);
+ if ((relation & ir_relation_less_greater) == 0)
return 0;
return 0;
- }
- if (!is_negated_value(mux_true, mux_false))
+ if (!i
r_i
s_negated_value(mux_true, mux_false))
return 0;
/* must be x cmp 0 */
return 0;
/* must be x cmp 0 */
- cmp_right = get_Cmp_right(
cmp
);
+ cmp_right = get_Cmp_right(
sel
);
if (!is_Const(cmp_right) || !is_Const_null(cmp_right))
return 0;
if (!is_Const(cmp_right) || !is_Const_null(cmp_right))
return 0;
- cmp_left = get_Cmp_left(
cmp
);
+ cmp_left = get_Cmp_left(
sel
);
if (cmp_left == mux_false) {
if (cmp_left == mux_false) {
- if (
pnc & pn_Cmp_Lt
) {
+ if (
relation & ir_relation_less
) {
return 1;
} else {
return 1;
} else {
- assert(
pnc & pn_Cmp_Gt
);
+ assert(
relation & ir_relation_greater
);
return -1;
}
} else if (cmp_left == mux_true) {
return -1;
}
} else if (cmp_left == mux_true) {
- if (
pnc & pn_Cmp_Lt
) {
+ if (
relation & ir_relation_less
) {
return -1;
} else {
return -1;
} else {
- assert(
pnc & pn_Cmp_Gt
);
+ assert(
relation & ir_relation_greater
);
return 1;
}
}
return 1;
}
}
@@
-547,7
+523,6
@@
int be_mux_is_abs(ir_node *sel, ir_node *mux_true, ir_node *mux_false)
ir_node *be_get_abs_op(ir_node *sel)
{
ir_node *be_get_abs_op(ir_node *sel)
{
- ir_node *cmp = get_Proj_pred(sel);
- ir_node *cmp_left = get_Cmp_left(cmp);
+ ir_node *cmp_left = get_Cmp_left(sel);
return cmp_left;
}
return cmp_left;
}