* @file
* @brief Support for ir graph modification.
* @author Martin Trapp, Christian Schaefer, Goetz Lindenmaier
- * @version $Id$
*/
#include "config.h"
#include "irtools.h"
#include "error.h"
-/**
- * Turns a node into a "useless" Tuple. The Tuple just forms a tuple
- * from several inputs.
- * This is useful if a node returning a tuple is removed, but the Projs
- * extracting values from the tuple are not available.
- */
-void turn_into_tuple(ir_node *node, int arity)
+void turn_into_tuple(ir_node *const node, int const arity, ir_node *const *const in)
{
- ir_graph *irg = get_irn_irg(node);
- ir_node **in = ALLOCAN(ir_node*, arity);
- int i;
-
- /* construct a new in array, with every input being bad */
- for (i = 0; i < arity; ++i) {
- in[i] = new_r_Bad(irg);
- }
set_irn_in(node, arity, in);
set_irn_op(node, op_Tuple);
}
-/**
- * Insert irnode `new' in place of irnode `old'
- * Since `new' may be bigger than `old' replace `old'
- * by an op_Id which is smaller than everything.
- */
void exchange(ir_node *old, ir_node *nw)
{
ir_graph *irg;
/* 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->op = op_Id;
- old->in = NEW_ARR_D (ir_node *, irg->obst, 2);
+ old->in = NEW_ARR_D(ir_node*, get_irg_obstack(irg), 2);
old->in[0] = block;
old->in[1] = nw;
}
-}
-/*--------------------------------------------------------------------*/
-/* Functionality for collect_phis */
-/*--------------------------------------------------------------------*/
+ /* update irg flags */
+ clear_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_OUTS
+ | IR_GRAPH_PROPERTY_CONSISTENT_LOOPINFO);
+}
/**
* Walker: links all Phi nodes to their Blocks lists,
irg_walk_graph(irg, firm_clear_node_and_phi_links, collect_phiprojs_walker, NULL);
}
-/*--------------------------------------------------------------------*/
-/* Functionality for part_block */
-/*--------------------------------------------------------------------*/
-
/**
* Moves node and all predecessors of node from from_bl to to_bl.
* Does not move predecessors of Phi nodes (or block nodes).
/* 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)
+{
+ 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
ir_node *part_block_edges(ir_node *node)
{
- ir_graph *irg = get_irn_irg(node);
- ir_node *old_block = get_nodes_block(node);
- ir_node *new_block = new_r_Block(irg,
- get_Block_n_cfgpreds(old_block),
- get_Block_cfgpred_arr(old_block));
- const ir_edge_t *edge;
- const ir_edge_t *next;
+ ir_graph *irg = get_irn_irg(node);
+ ir_node *old_block = get_nodes_block(node);
+ ir_node *new_block = new_r_Block(irg, get_Block_n_cfgpreds(old_block), get_Block_cfgpred_arr(old_block));
/* old_block has no predecessors anymore for now */
set_irn_in(old_block, 0, NULL);
move_edges(node, old_block, new_block);
/* move Phi nodes to new_block */
- foreach_out_edge_safe(old_block, edge, next) {
+ foreach_out_edge_safe(old_block, edge) {
ir_node *phi = get_edge_src_irn(edge);
if (!is_Phi(phi))
continue;
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);
}
projects / libfirm / blobdiff