static void
optimize_in_place_wrapper (ir_node *n, void *env) {
int i;
- ir_node *optimized;
+ ir_node *optimized, *old;
for (i = 0; i < get_irn_arity(n); i++) {
- optimized = optimize_in_place_2(get_irn_n(n, i));
+ /* get?irn_n skips Id nodes, so comparison old != optimized does not
+ show all optimizations. Therefore always set new predecessor. */
+ old = get_irn_n(n, i);
+ optimized = optimize_in_place_2(old);
set_irn_n(n, i, optimized);
}
/* Copies the graph recursively, compacts the keepalive of the end node. */
static void
-copy_graph () {
+copy_graph (void) {
ir_node *oe, *ne; /* old end, new end */
ir_node *ka; /* keep alive */
int i;
Then fixes the fields in current_ir_graph containing nodes of the
graph. */
static void
-copy_graph_env () {
+copy_graph_env (void) {
ir_node *old_end;
/* Not all nodes remembered in current_ir_graph might be reachable
from the end node. Assure their link is set to NULL, so that
type *called_frame;
if (!get_optimize() || !get_opt_inline()) return;
- /** Turn off optimizations, this can cause problems when allocating new nodes. **/
+ /* -- Turn off optimizations, this can cause problems when allocating new nodes. -- */
rem_opt = get_optimize();
set_optimize(0);
if (get_irg_outs_state(current_ir_graph) == outs_consistent)
set_irg_outs_inconsistent(current_ir_graph);
- /** Check preconditions **/
+ /* -- Check preconditions -- */
assert(get_irn_op(call) == op_Call);
- /* @@@ TODO does not work for InterfaceIII.java after cgana
+ /* @@@ does not work for InterfaceIII.java after cgana
assert(get_Call_type(call) == get_entity_type(get_irg_ent(called_graph)));
assert(smaller_type(get_entity_type(get_irg_ent(called_graph)),
get_Call_type(call)));
*/
assert(get_type_tpop(get_Call_type(call)) == type_method);
- if (called_graph == current_ir_graph) return;
-
+ if (called_graph == current_ir_graph) {
+ set_optimize(rem_opt);
+ return;
+ }
-/**
+ /* --
the procedure and later replaces the Start node of the called graph.
Post_call is the old Call node and collects the results of the called
- graph. Both will end up being a tuple. **/
+ graph. Both will end up being a tuple. -- */
post_bl = get_nodes_Block(call);
set_irg_current_block(current_ir_graph, post_bl);
/* XxMxPxP of Start + parameter of Call */
pre_call = new_Tuple(5, in);
post_call = call;
-/**
+ /* --
The new block gets the ins of the old block, pre_call and all its
- predecessors and all Phi nodes. **/
+ predecessors and all Phi nodes. -- */
part_block(pre_call);
- /** Prepare state for dead node elimination **/
+ /* -- Prepare state for dead node elimination -- */
/* Visited flags in calling irg must be >= flag in called irg.
Else walker and arity computation will not work. */
if (get_irg_visited(current_ir_graph) <= get_irg_visited(called_graph))
/* Initialize for compaction of in arrays */
inc_irg_block_visited(current_ir_graph);
- /*** Replicate local entities of the called_graph ***/
+ /* -- Replicate local entities of the called_graph -- */
/* copy the entities. */
called_frame = get_irg_frame_type(called_graph);
for (i = 0; i < get_class_n_members(called_frame); i++) {
to inline, calling this inline will not visit the inlined nodes. */
set_irg_visited(current_ir_graph, get_irg_visited(current_ir_graph)-1);
- /** Performing dead node elimination inlines the graph **/
+ /* -- Performing dead node elimination inlines the graph -- */
/* Copies the nodes to the obstack of current_ir_graph. Updates links to new
entities. */
/* @@@ endless loops are not copied!! -- they should be, I think... */
set_irg_block_visited(called_graph, get_irg_block_visited(current_ir_graph));
set_Block_block_visited(get_irg_start_block(called_graph), 0);
- /*** Merge the end of the inlined procedure with the call site ***/
+ /* -- Merge the end of the inlined procedure with the call site -- */
/* We will turn the old Call node into a Tuple with the following
predecessors:
-1: Block of Tuple.
3: Phi of Exception memories.
*/
- /** Precompute some values **/
+ /* -- Precompute some values -- */
end_bl = get_new_node(get_irg_end_block(called_graph));
end = get_new_node(get_irg_end(called_graph));
arity = get_irn_arity(end_bl); /* arity = n_exc + n_ret */
set_irg_current_block(current_ir_graph, post_bl); /* just to make sure */
- /** archive keepalives **/
+ /* -- archive keepalives -- */
for (i = 0; i < get_irn_arity(end); i++)
add_End_keepalive(get_irg_end(current_ir_graph), get_irn_n(end, i));
/* The new end node will die, but the in array is not on the obstack ... */
free_End(end);
-/**
- Return nodes by Jump nodes. **/
+/* --
+ Return nodes by Jump nodes. -- */
n_ret = 0;
for (i = 0; i < arity; i++) {
ir_node *ret;
}
set_irn_in(post_bl, n_ret, cf_pred);
-/**
- turned into a tuple. **/
+/* --
+ turned into a tuple. -- */
turn_into_tuple(post_call, 4);
/* First the Memory-Phi */
n_ret = 0;
free(res_pred);
free(cf_pred);
-/**
+/* --
If the exception control flow from the Call directly branched to the
end block we now have the following control flow predecessor pattern:
ProjX -> Tuple -> Jmp.
We must remove the Jmp along with it's empty block and add Jmp's
- predecessors as predecessors of this end block. ***/
+ predecessors as predecessors of this end block. -- */
/* find the problematic predecessor of the end block. */
end_bl = get_irg_end_block(current_ir_graph);
for (i = 0; i < get_Block_n_cfgpreds(end_bl); i++) {
free(cf_pred);
}
- /** Turn cse back on. **/
+ /* -- Turn cse back on. -- */
set_optimize(rem_opt);
}
if (get_irn_op(addr) == op_Const) {
/* Check whether the constant is the pointer to a compiled entity. */
tv = get_Const_tarval(addr);
- if (tv->u.P.ent) {
- called_irg = get_entity_irg(tv->u.P.ent);
+ if (tarval_to_entity(tv)) {
+ called_irg = get_entity_irg(tarval_to_entity(tv));
if (called_irg && pos < MAX_INLINE) {
/* The Call node calls a locally defined method. Remember to inline. */
calls[pos] = call;
/* There are calls to inline */
collect_phiprojs(irg);
for (i = 0; i < pos; i++) {
- char buf[1024];
tarval *tv;
ir_graph *callee;
tv = get_Const_tarval(get_Call_ptr(calls[i]));
- callee = get_entity_irg(tv->u.P.ent);
+ callee = get_entity_irg(tarval_to_entity(tv));
if ((_obstack_memory_used(callee->obst) - obstack_room(callee->obst)) < size) {
inline_method(calls[i], callee);
}
Start, Call and end at pinned nodes as Store, Call. Place_early
places all floating nodes reachable from its argument through floating
nodes and adds all beginnings at pinned nodes to the worklist. */
-static INLINE void place_early () {
+static INLINE void place_early (void) {
assert(worklist);
inc_irg_visited(current_ir_graph);
}
}
-static INLINE void place_late() {
+static INLINE void place_late(void) {
assert(worklist);
inc_irg_visited(current_ir_graph);
/********************************************************************/
/* Removes Tuples from Block control flow predecessors.
- Optimizes blocks with equivalent_node(). */
+ Optimizes blocks with equivalent_node().
+ Replaces n by Bad if n is unreachable control flow. */
static void merge_blocks(ir_node *n, void *env) {
int i;
set_irn_link(n, NULL);
if (get_irn_op(n) == op_Block) {
/* Remove Tuples */
for (i = 0; i < get_Block_n_cfgpreds(n); i++)
- set_Block_cfgpred(n, i, skip_Tuple(get_Block_cfgpred(n, i)));
- } else if (get_irn_mode(n) == mode_X) {
+ /* GL @@@ : is this possible? if (get_opt_normalize()) -- added, all tests go throug.
+ A different order of optimizations might cause problems. */
+ if (get_opt_normalize())
+ set_Block_cfgpred(n, i, skip_Tuple(get_Block_cfgpred(n, i)));
+ } else if (get_optimize() && (get_irn_mode(n) == mode_X)) {
/* We will soon visit a block. Optimize it before visiting! */
ir_node *b = get_nodes_Block(n);
ir_node *new = equivalent_node(b);
while (irn_not_visited(b) && (!is_Bad(new)) && (new != b)) {
- /* We would have to run gigo if new is bad. */
- if (!get_optimize() || (!get_opt_control_flow_straightening()
- && !get_opt_control_flow_weak_simplification()))
- /* how could something be optimized if flags are not set? */
- assert(0 && "strange ??!!");
+ /* We would have to run gigo if new is bad, so we
+ promote it directly below. */
+ assert(((b == new) || get_opt_control_flow_straightening() || get_opt_control_flow_weak_simplification()) &&
+ ("strange flag setting"));
exchange (b, new);
b = new;
new = equivalent_node(b);
}
- if (is_Bad(new)) exchange (n, new_Bad());
+ /* GL @@@ get_opt_normalize hinzugefuegt, 5.5.2003 */
+ if (is_Bad(new) && get_opt_normalize()) exchange (n, new_Bad());
}
}
current_ir_graph = rem;
}
-/* Placed an empty basic block on critical control flow edges thereby
- removing them.
- A critical control flow edge is an edge from a block with several
- control exits to a block with several control entries (See Muchnic
- p. 407). */
+
+/**
+ * Called by walker of remove_critical_cf_edges.
+ *
+ * Place an empty block to an edge between a blocks of multiple
+ * predecessors and a block of multiple sucessors.
+ *
+ * @param n IR node
+ * @param env Envirnment of walker. This field is unused and has
+ * the value NULL.
+ */
+static void walk_critical_cf_edges(ir_node *n, void *env) {
+ int arity, i;
+ ir_node *pre, *block, **in, *jmp;
+
+ /* Block has multiple predecessors */
+ if ((op_Block == get_irn_op(n)) &&
+ (get_irn_arity(n) > 1)) {
+ arity = get_irn_arity(n);
+
+ for (i=0; i<arity; i++) {
+ pre = get_irn_n(n, i);
+ /* Predecessor has multiple sucessors. Insert new flow edge */
+ if ((NULL != pre) && (op_Proj == get_irn_op(pre))) {
+
+ /* set predeseccor array for new block */
+ in = NEW_ARR_D (ir_node *, current_ir_graph->obst, 1);
+ /* set predecessor of new block */
+ in[0] = pre;
+ block = new_Block(1, in);
+ /* insert new jmp node to new block */
+ switch_block(block);
+ jmp = new_Jmp();
+ switch_block(n);
+ /* set sucessor of new block */
+ set_irn_n(n, i, jmp);
+
+ } /* predecessor has multiple sucessors */
+ } /* for all predecessors */
+ } /* n is a block */
+}
+
void remove_critical_cf_edges(ir_graph *irg) {
- printf("WARNING: called unimplemented function!!!\n");
+ if (get_opt_critical_edges())
+ irg_walk_graph(irg, NULL, walk_critical_cf_edges, NULL);
}
projects / libfirm / blobdiff