} else {
/* Allocate new array, don't free old in_array, it's on the obstack. */
ir_node *block = get_nodes_block(node);
- node->in = NEW_ARR_D (ir_node *, current_ir_graph->obst, arity+1);
- edges_invalidate(node, current_ir_graph);
+ edges_node_deleted(node, current_ir_graph);
+ node->in = NEW_ARR_D(ir_node *, current_ir_graph->obst, arity+1);
+ /* clear the new in array, else edge_notify tries to delete garbage */
+ memset(node->in, 0, (arity+1) * sizeof(node->in[0]));
set_nodes_block(node, block);
}
}
void
exchange (ir_node *old, ir_node *nw)
{
+ hook_replace(old, nw);
+
/*
* If new outs are on, we can skip the id node creation and reroute
* the edges from the old node to the new directly.
*/
if (edges_activated(current_ir_graph)) {
+ /* copy all dependencies from old to new */
+ add_irn_deps(nw, old);
+
edges_reroute(old, nw, current_ir_graph);
+ edges_reroute_kind(old, nw, EDGE_KIND_DEP, current_ir_graph);
+ edges_node_deleted(old, current_ir_graph);
+ old->op = op_Bad;
}
else {
/* Else, do it the old-fashioned way. */
block = is_Block(nw) ? nw : get_nodes_block(nw);
if (!block) {
- DDMN(old);
- DDMN(nw);
- assert(0 && "cannot find legal block for id");
+ DDMN(old);
+ DDMN(nw);
+ assert(0 && "cannot find legal block for id");
}
}
/* Functionality for collect_phis */
/*--------------------------------------------------------------------*/
-static void
-collect (ir_node *n, void *env) {
+/**
+ * Walker: links all Phi nodes to their Blocks and
+ * all Proj nodes to there predecessors
+ */
+static void collect(ir_node *n, void *env) {
ir_node *pred;
- if (get_irn_op(n) == op_Phi) {
+
+ if (is_Phi(n)) {
set_irn_link(n, get_irn_link(get_nodes_block(n)));
set_irn_link(get_nodes_block(n), n);
}
- if (get_irn_op(n) == op_Proj) {
+ else if (is_Proj(n)) {
pred = n;
- while (get_irn_op(pred) == op_Proj)
+ do {
pred = get_Proj_pred(pred);
+ } while (is_Proj(pred));
+
set_irn_link(n, get_irn_link(pred));
set_irn_link(pred, n);
}
}
void collect_phiprojs(ir_graph *irg) {
- ir_graph *rem;
-
- /* Remember external state of current_ir_graph. */
- rem = current_ir_graph;
- current_ir_graph = irg;
-
- irg_walk(get_irg_end(current_ir_graph), firm_clear_link, collect, NULL);
-
- current_ir_graph = rem;
+ irg_walk_graph(irg, firm_clear_link, collect, NULL);
}
proj = get_irn_link(node);
while (proj) {
if (get_nodes_block(proj) == from_bl)
- set_nodes_block(proj, to_bl);
+ set_nodes_block(proj, to_bl);
proj = get_irn_link(proj);
}
}
get_Block_cfgpred_arr(old_block));
set_irg_current_block(current_ir_graph, new_block);
{
- ir_node *in[1];
- in[0] = new_Jmp();
- set_irn_in(old_block, 1, in);
+ ir_node *jmp = new_Jmp();
+ set_irn_in(old_block, 1, &jmp);
irn_vrfy_irg(old_block, current_ir_graph);
}