projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fixed error with cse and programs containing endless loops:
[libfirm]
/
ir
/
ir
/
irnode.c
diff --git
a/ir/ir/irnode.c
b/ir/ir/irnode.c
index
5812682
..
97e0392
100644
(file)
--- a/
ir/ir/irnode.c
+++ b/
ir/ir/irnode.c
@@
-224,6
+224,7
@@
ir_node *
void
set_irn_n (ir_node *node, int n, ir_node *in) {
assert(node && -1 <= n && n < get_irn_arity(node));
void
set_irn_n (ir_node *node, int n, ir_node *in) {
assert(node && -1 <= n && n < get_irn_arity(node));
+ assert(in && in->kind == k_ir_node);
if ((n == -1) && (get_irn_opcode(node) == iro_Filter)) {
/* Change block pred in both views! */
node->in[n + 1] = in;
if ((n == -1) && (get_irn_opcode(node) == iro_Filter)) {
/* Change block pred in both views! */
node->in[n + 1] = in;
@@
-457,13
+458,13
@@
get_irn_block_attr (ir_node *node)
/* this works for all except Block */
ir_node *
/* this works for all except Block */
ir_node *
-get_nodes_
B
lock (ir_node *node) {
+get_nodes_
b
lock (ir_node *node) {
assert (!(node->op == op_Block));
return get_irn_n(node, -1);
}
void
assert (!(node->op == op_Block));
return get_irn_n(node, -1);
}
void
-set_nodes_
B
lock (ir_node *node, ir_node *block) {
+set_nodes_
b
lock (ir_node *node, ir_node *block) {
assert (!(node->op == op_Block));
set_irn_n(node, -1, block);
}
assert (!(node->op == op_Block));
set_irn_n(node, -1, block);
}
@@
-601,12
+602,12
@@
get_Block_handler (ir_node *block) {
/ * handler handling for Nodes * /
void
set_Node_handler (ir_node *node, ir_node *handler) {
/ * handler handling for Nodes * /
void
set_Node_handler (ir_node *node, ir_node *handler) {
- set_Block_handler (get_nodes_
B
lock (node), handler);
+ set_Block_handler (get_nodes_
b
lock (node), handler);
}
ir_node *
get_Node_handler (ir_node *node) {
}
ir_node *
get_Node_handler (ir_node *node) {
- return (get_Block_handler (get_nodes_
B
lock (node)));
+ return (get_Block_handler (get_nodes_
b
lock (node)));
}
/ * exc_t handling for Blocks * /
}
/ * exc_t handling for Blocks * /
@@
-622,11
+623,11
@@
exc_t get_Block_exc (ir_node *block) {
/ * exc_t handling for Nodes * /
void set_Node_exc (ir_node *node, exc_t exc) {
/ * exc_t handling for Nodes * /
void set_Node_exc (ir_node *node, exc_t exc) {
- set_Block_exc (get_nodes_
B
lock (node), exc);
+ set_Block_exc (get_nodes_
b
lock (node), exc);
}
exc_t get_Node_exc (ir_node *node) {
}
exc_t get_Node_exc (ir_node *node) {
- return (get_Block_exc (get_nodes_
B
lock (node)));
+ return (get_Block_exc (get_nodes_
b
lock (node)));
}
*/
}
*/
@@
-675,12
+676,6
@@
void remove_Block_cg_cfgpred_arr(ir_node * node) {
node->attr.block.in_cg = NULL;
}
node->attr.block.in_cg = NULL;
}
-/* Start references the irg it is in. */
-ir_graph *
-get_Start_irg(ir_node *node) {
- return get_irn_irg(node);
-}
-
void
set_Start_irg(ir_node *node, ir_graph *irg) {
assert(node->op == op_Start);
void
set_Start_irg(ir_node *node, ir_graph *irg) {
assert(node->op == op_Start);
@@
-721,13
+716,6
@@
free_End (ir_node *end) {
in array afterwards ... */
}
in array afterwards ... */
}
-ir_graph *get_EndReg_irg (ir_node *end) {
- return get_irn_irg(end);
-}
-
-ir_graph *get_EndExcept_irg (ir_node *end) {
- return get_irn_irg(end);
-}
/*
> Implementing the case construct (which is where the constant Proj node is
/*
> Implementing the case construct (which is where the constant Proj node is
@@
-889,10
+877,6
@@
set_Const_type (ir_node *node, type *tp) {
if (tp != unknown_type) {
assert (is_atomic_type(tp));
assert (get_type_mode(tp) == get_irn_mode(node));
if (tp != unknown_type) {
assert (is_atomic_type(tp));
assert (get_type_mode(tp) == get_irn_mode(node));
- assert (!tarval_is_entity(get_Const_tarval(node)) ||
- (is_pointer_type(tp) &&
- (get_pointer_points_to_type(tp) ==
- get_entity_type(get_tarval_entity(get_Const_tarval(node))))));
}
node->attr.con.tp = tp;
}
node->attr.con.tp = tp;
@@
-1186,9
+1170,6
@@
void set_CallBegin_ptr (ir_node *node, ir_node *ptr) {
assert(node->op == op_CallBegin);
set_irn_n(node, 0, ptr);
}
assert(node->op == op_CallBegin);
set_irn_n(node, 0, ptr);
}
-ir_graph * get_CallBegin_irg (ir_node *node) {
- return get_irn_irg(node);
-}
ir_node * get_CallBegin_call (ir_node *node) {
assert(node->op == op_CallBegin);
return node->attr.callbegin.call;
ir_node * get_CallBegin_call (ir_node *node) {
assert(node->op == op_CallBegin);
return node->attr.callbegin.call;
@@
-1885,11
+1866,11
@@
skip_Tuple (ir_node *node) {
if (!get_opt_normalize()) return node;
if (!get_opt_normalize()) return node;
- node = skip_
nop
(node);
+ node = skip_
Id
(node);
if (get_irn_op(node) == op_Proj) {
if (get_irn_op(node) == op_Proj) {
- pred = skip_
nop
(get_Proj_pred(node));
+ pred = skip_
Id
(get_Proj_pred(node));
if (get_irn_op(pred) == op_Proj) /* nested Tuple ? */
if (get_irn_op(pred) == op_Proj) /* nested Tuple ? */
- pred = skip_
nop
(skip_Tuple(pred));
+ pred = skip_
Id
(skip_Tuple(pred));
if (get_irn_op(pred) == op_Tuple)
return get_Tuple_pred(pred, get_Proj_proj(node));
}
if (get_irn_op(pred) == op_Tuple)
return get_Tuple_pred(pred, get_Proj_proj(node));
}
@@
-1899,7
+1880,7
@@
skip_Tuple (ir_node *node) {
/** returns operand of node if node is a Cast */
ir_node *skip_Cast (ir_node *node) {
if (node && get_irn_op(node) == op_Cast) {
/** returns operand of node if node is a Cast */
ir_node *skip_Cast (ir_node *node) {
if (node && get_irn_op(node) == op_Cast) {
- return skip_
nop
(get_irn_n(node, 0));
+ return skip_
Id
(get_irn_n(node, 0));
} else {
return node;
}
} else {
return node;
}
@@
-1910,7
+1891,7
@@
ir_node *skip_Cast (ir_node *node) {
than any other approach, as Id chains are resolved and all point to the real node, or
all id's are self loops. */
ir_node *
than any other approach, as Id chains are resolved and all point to the real node, or
all id's are self loops. */
ir_node *
-skip_
nop
(ir_node *node) {
+skip_
Id
(ir_node *node) {
/* don't assert node !!! */
if (!get_opt_normalize()) return node;
/* don't assert node !!! */
if (!get_opt_normalize()) return node;
@@
-1924,7
+1905,7
@@
skip_nop (ir_node *node) {
assert (get_irn_arity (node) > 0);
node->in[0+1] = node;
assert (get_irn_arity (node) > 0);
node->in[0+1] = node;
- res = skip_
nop
(rem_pred);
+ res = skip_
Id
(rem_pred);
if (res->op == op_Id) /* self-loop */ return node;
node->in[0+1] = res;
if (res->op == op_Id) /* self-loop */ return node;
node->in[0+1] = res;
@@
-1938,7
+1919,7
@@
skip_nop (ir_node *node) {
than any other approach, as Id chains are resolved and all point to the real node, or
all id's are self loops. */
ir_node *
than any other approach, as Id chains are resolved and all point to the real node, or
all id's are self loops. */
ir_node *
-skip_
nop
(ir_node *node) {
+skip_
Id
(ir_node *node) {
ir_node *pred;
/* don't assert node !!! */
ir_node *pred;
/* don't assert node !!! */
@@
-1961,7
+1942,7
@@
skip_nop (ir_node *node) {
assert (get_irn_arity (node) > 0);
node->in[0+1] = node; /* turn us into a self referencing Id: shorten Id cycles. */
assert (get_irn_arity (node) > 0);
node->in[0+1] = node; /* turn us into a self referencing Id: shorten Id cycles. */
- res = skip_
nop
(rem_pred);
+ res = skip_
Id
(rem_pred);
if (res->op == op_Id) /* self-loop */ return node;
node->in[0+1] = res; /* Turn Id chain into Ids all referencing the chain end. */
if (res->op == op_Id) /* self-loop */ return node;
node->in[0+1] = res; /* Turn Id chain into Ids all referencing the chain end. */
@@
-1972,11
+1953,6
@@
skip_nop (ir_node *node) {
}
#endif
}
#endif
-ir_node *
-skip_Id (ir_node *node) {
- return skip_nop(node);
-}
-
int
is_Bad (ir_node *node) {
assert(node);
int
is_Bad (ir_node *node) {
assert(node);
@@
-2023,10
+1999,6
@@
int is_ip_cfop(ir_node *node) {
return is_ip_cfopcode(get_irn_op(node));
}
return is_ip_cfopcode(get_irn_op(node));
}
-ir_graph *get_ip_cfop_irg(ir_node *n) {
- return get_irn_irg(n);
-}
-
/* Returns true if the operation can change the control flow because
of an exception. */
int
/* Returns true if the operation can change the control flow because
of an exception. */
int