* @file
* @brief Support for ir graph modification.
* @author Martin Trapp, Christian Schaefer, Goetz Lindenmaier
- * @version $Id$
*/
#include "config.h"
{
ir_graph *irg = get_irn_irg(node);
ir_node **in = ALLOCAN(ir_node*, arity);
+ ir_node *bad = new_r_Bad(irg, mode_ANY);
int i;
/* construct a new in array, with every input being bad */
for (i = 0; i < arity; ++i) {
- in[i] = new_r_Bad(irg);
+ in[i] = bad;
}
set_irn_in(node, arity, in);
set_irn_op(node, op_Tuple);
/* copy all dependencies from old to new */
add_irn_deps(nw, old);
- edges_reroute(old, nw, irg);
- edges_reroute_kind(old, nw, EDGE_KIND_DEP, irg);
- edges_node_deleted(old, irg);
+ edges_reroute(old, nw);
+ edges_reroute_kind(old, nw, EDGE_KIND_DEP);
+ edges_node_deleted(old);
/* noone is allowed to reference this node anymore */
set_irn_op(old, op_Deleted);
} else {
old->in[0] = block;
old->in[1] = nw;
}
+
+ /* update irg flags */
+ clear_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_OUTS
+ | IR_GRAPH_STATE_CONSISTENT_LOOPINFO);
}
/*--------------------------------------------------------------------*/
/* move its Projs */
if (get_irn_mode(node) == mode_T) {
- ir_node *proj = get_irn_link(node);
+ ir_node *proj = (ir_node*)get_irn_link(node);
while (proj) {
if (get_nodes_block(proj) == from_bl)
set_nodes_block(proj, to_bl);
- proj = get_irn_link(proj);
+ proj = (ir_node*)get_irn_link(proj);
}
}
}
}
+static void move_projs(const ir_node *node, ir_node *to_bl)
+{
+ const ir_edge_t *edge;
+
+ if (get_irn_mode(node) != mode_T)
+ return;
+
+ foreach_out_edge(node, edge) {
+ ir_node *proj = get_edge_src_irn(edge);
+ if (!is_Proj(proj))
+ continue;
+ set_nodes_block(proj, to_bl);
+ move_projs(proj, to_bl);
+ }
+}
+
/**
* Moves node and all predecessors of node from from_bl to to_bl.
* Does not move predecessors of Phi nodes (or block nodes).
set_nodes_block(node, to_bl);
/* move its Projs */
- if (get_irn_mode(node) == mode_T) {
- const ir_edge_t *edge;
- foreach_out_edge(node, edge) {
- ir_node *proj = get_edge_src_irn(edge);
- set_nodes_block(proj, to_bl);
- }
- }
+ move_projs(node, to_bl);
/* We must not move predecessors of Phi nodes, even if they are in
* from_bl. (because these are values from an earlier loop iteration
void part_block(ir_node *node)
{
- ir_node *new_block, *old_block;
- ir_node *phi, *jmp;
- ir_graph *rem = current_ir_graph;
+ ir_graph *irg = get_irn_irg(node);
+ ir_node *new_block, *old_block;
+ ir_node *phi, *jmp;
/* Turn off optimizations so that blocks are not merged again. */
int rem_opt = get_opt_optimize();
set_optimize(0);
- current_ir_graph = get_irn_irg(node);
-
/* Transform the control flow */
old_block = get_nodes_block(node);
- new_block = new_Block(get_Block_n_cfgpreds(old_block),
- get_Block_cfgpred_arr(old_block));
+ new_block = new_r_Block(irg, get_Block_n_cfgpreds(old_block),
+ get_Block_cfgpred_arr(old_block));
/* create a jump from new_block to old_block, which is now the lower one */
jmp = new_r_Jmp(new_block);
}
set_optimize(rem_opt);
- current_ir_graph = rem;
}
ir_node *part_block_edges(ir_node *node)
void kill_node(ir_node *node)
{
ir_graph *irg = get_irn_irg(node);
- ir_node *bad = get_irg_bad(irg);
- int i;
- for (i = get_irn_arity(node) - 1; i >= -1; --i) {
- set_irn_n(node, i, bad);
+ if (edges_activated(irg)) {
+ edges_node_deleted(node);
}
- exchange(node, bad);
+ /* noone is allowed to reference this node anymore */
+ set_irn_op(node, op_Deleted);
}