static ir_node *get_cf_op(ir_node *n) {
ir_node *pred;
- n = skip_nop(n);
+ n = skip_Id(n);
n = skip_Tuple(n);
pred = skip_Proj(n);
if (!(is_cfop(pred) || is_fragile_op(pred) ||
ir_node *pred = get_cf_op(get_Block_cfgpred(node, i));
pred = get_nodes_block(pred);
if(get_irn_opcode(pred) == iro_Block) {
- /* recursion */
- irg_block_walk_2(pred, pre, post, env);
+ /* recursion */
+ irg_block_walk_2(pred, pre, post, env);
}
else {
- assert(get_irn_opcode(pred) == iro_Bad);
+ assert(get_irn_opcode(pred) == iro_Bad);
}
}
if (is_no_Block(node)) block = get_nodes_block(node); else block = node;
assert(get_irn_opcode(block) == iro_Block);
irg_block_walk_2(block, pre, post, env);
+
/* keepalive: the endless loops ... */
if (get_irn_op(node) == op_End) {
int arity = get_irn_arity(node);
if (get_irn_op(pred) == op_Block)
irg_block_walk_2(pred, pre, post, env);
}
+ /* Sometimes the blocks died, but are still reachable through Phis.
+ * Make sure the algorithms that try to remove these reach them. */
+ for (i = 0; i < arity; i++) {
+ pred = get_irn_n(node, i);
+ if (get_irn_op(pred) == op_Phi) {
+ ir_node *block = get_nodes_block(pred);
+
+ if (! is_Bad(block))
+ irg_block_walk_2(block, pre, post, env);
+ }
+ }
}
return;
current_ir_graph = rem;
}
-
-
-/********************************************************************/
-/** Walking support for interprocedural analysis **/
-/** **/
-/** @@@ Don't use, not operational yet, doesn't grok recursions!! **/
-/** @@@ Header for irgwalk.h, here until it works. **/
-/** **/
-/** Interprocedural walking should not walk all predecessors of **/
-/** all nodes. When leaving a procedure the walker should only **/
-/** follow the edge corresponding to the most recent entry of the **/
-/** procedure. The following functions use an internal stack to **/
-/** remember the current call site of a procedure. **/
-/** They also set current_ir_graph correctly. **/
-/** **/
-/** Usage example: **/
-/** **/
-/** void init_ip_walk (); **/
-/** work_on_graph(some_end_node); **/
-/** void finish_ip_walk(); **/
-/** **/
-/** work_on_graph(ir_node *n) { **/
-/** for (i = 0; i < get_irn_arity(n); i++) { **/
-/** if (...) continue; **/
-/** ir_node *m = get_irn_ip_pred(n, i); **/
-/** if !m continue; **/
-/** work_on_graph(m); **/
-/** return_recur(n, i); **/
-/** } **/
-/** } **/
-/********************************************************************/
-
-/* Call for i in {0|-1 ... get_irn_arity(n)}.
- If n is a conventional node returns the same node as get_irn_n(n, i).
- If the predecessors of n are in the callee of the procedure n belongs
- to, returns get_irn_n(n, i) if this node is in the callee on the top
- of the stack, else returns NULL.
- If the predecessors of n are in a procedure called by the procedure n
- belongs to pushes the caller on the caller stack in the callee.
- Sets current_ir_graph to the graph the node returned is in. */
-ir_node *get_irn_ip_pred(ir_node *n, int pos);
-
-/* If get_irn_ip_pred() returned a node (not NULL) this must be
- called to clear up the stacks.
- Sets current_ir_graph to the graph n is in. */
-void return_recur(ir_node *n, int pos);
-
-
-/********************************************************************/
-/** Walking support for interprocedural analysis **/
-/********************************************************************/
-
-#define MIN_STACK_SIZE 40
-
-typedef struct callsite_stack {
- int tos;
- ir_node **s;
-} callsite_stack;
-
-/* Access the stack in the irg **************************************/
-
-static INLINE void
-set_irg_callsite_stack(ir_graph *g, callsite_stack *s) {
- set_irg_link(g, s);
-}
-
-static INLINE callsite_stack *
-get_irg_callsite_stack(ir_graph *g) {
- return (callsite_stack *) get_irg_link(g);
-}
-
-/* A stack of callsites *********************************************/
-
-/* @@@ eventually change the implementation so the new_ only sets the field
- to NULL, and the stack is only allocated if used. Saves Memory! */
-static INLINE callsite_stack *
-new_callsite_stack(ir_graph *g) {
- callsite_stack *res = (callsite_stack *)malloc(sizeof(callsite_stack));
- res->tos = 0;
- res->s = NEW_ARR_F (ir_node *, MIN_STACK_SIZE);
- set_irg_callsite_stack(g, res);
- return(res);
-}
-
-static INLINE void
-free_callsite_stack(ir_graph *g) {
- callsite_stack *s = get_irg_callsite_stack(g);
- DEL_ARR_F(s->s);
- free(s);
-}
-
-static INLINE void
-push_callsite(ir_graph *callee, ir_node *callsite) {
- callsite_stack *s = get_irg_callsite_stack(callee);
- if (s->tos == ARR_LEN(s->s)) {
- int nlen = ARR_LEN (s->s) * 2;
- ARR_RESIZE (ir_node *, s->s, nlen);
- }
- s->s[s->tos] = callsite;
- s->tos++;
-}
-
-static INLINE ir_node *
-get_top_of_callsite_stack(ir_graph *callee) {
- callsite_stack *s = get_irg_callsite_stack(callee);
- return (s->s[s->tos-1]);
-}
-
-static INLINE
-ir_node * pop_callsite(ir_graph *callee) {
- callsite_stack *s = get_irg_callsite_stack(callee);
- s->tos--;
- return (s->s[s->tos]);
-}
-
-
-/* Initialization routines ******************************************/
-
-void init_ip_walk (void) {
- int i;
- for (i = 0; i < get_irp_n_irgs(); i++)
- new_callsite_stack(get_irp_irg(i));
-}
-
-void finish_ip_walk(void) {
- int i;
- for (i = 0; i < get_irp_n_irgs(); i++)
- free_callsite_stack(get_irp_irg(i));
- set_irg_link(get_irp_irg(i), NULL);
-}
-
-/* walker routines **************************************************/
-
-/* cf_pred is End* */
-static INLINE void
-enter_procedure(ir_node *block, ir_node *cf_pred, int pos) {
- ir_node *callbegin;
- ir_graph *irg = get_irn_irg(cf_pred);
-
- assert(interprocedural_view);
-
- interprocedural_view = 0;
- callbegin = skip_Proj(get_irn_n(block, 0));
- assert(get_irn_op(callbegin) == op_CallBegin);
- interprocedural_view = 1;
-
- push_callsite(irg, callbegin);
- current_ir_graph = irg;
-}
-
-/* cf_pred is CallBegin */
-static INLINE bool
-leave_procedure(ir_node *block, ir_node *cf_pred, int pos) {
- ir_node *tos = get_top_of_callsite_stack(current_ir_graph);
-
- assert(get_irn_op(cf_pred) == op_CallBegin);
-
- if (tos == cf_pred) {
- /* We entered this procedure by the call pred pos refers to. */
- pop_callsite(current_ir_graph);
- current_ir_graph = get_CallBegin_irg(cf_pred);
- return true;
- } else {
- /* We won't walk. */
- return false;
- }
-}
-
-ir_node *get_irn_ip_pred(ir_node *n, int pos) {
-
- if (interprocedural_view) {
-
- /* Find the cf_pred refering to pos. */
- ir_node *block = n;
- ir_node *cf_pred;
- if (get_irn_opcode(n) == iro_Filter) block = get_nodes_block(n);
- cf_pred = skip_Proj(get_irn_n(block, pos));
-
- /* Check whether we enter or leave a procedure and act according. */
- if ((get_irn_op(cf_pred) == op_EndReg) ||
- (get_irn_op(cf_pred) == op_EndExcept))
- enter_procedure(block, cf_pred, pos);
- if (get_irn_op(cf_pred) == op_CallBegin)
- if (!leave_procedure(block, cf_pred, pos)) return NULL;
- }
-
- return get_irn_n(n, pos);
-}
-
-static INLINE void
-re_enter_procedure(ir_node *block, ir_node *cf_pred, int pos) {
- ir_node *callbegin = pop_callsite(current_ir_graph);
- assert(interprocedural_view);
- current_ir_graph = get_CallBegin_irg(callbegin);
-}
-
-static INLINE void
-re_leave_procedure(ir_node *block, ir_node *cf_pred, int pos) {
- ir_node *proj;
- ir_graph *callee;
-
- assert(get_irn_op(cf_pred) == op_CallBegin);
-
- /* Find the irg block is in. */
- proj = get_Block_cg_cfgpred(block, pos);
- assert(is_Proj(proj));
- callee = get_entity_irg(get_Call_callee(get_CallBegin_call(cf_pred),
- get_Proj_proj(proj)));
- current_ir_graph = callee;
- push_callsite(callee, cf_pred);
-}
-
-void
-return_recur(ir_node *n, int pos) {
- ir_node *block;
- ir_node *cf_pred;
-
- if (!interprocedural_view) return;
-
- /* Find the cf_pred refering to pos. */
- block = n;
- if (get_irn_opcode(n) == iro_Filter) block = get_nodes_block(n);
- cf_pred = skip_Proj(get_irn_n(block, pos));
-
- /* Check whether we re_enter or re_leave a procedure and act according. */
- if ((get_irn_op(cf_pred) == op_EndReg) ||
- (get_irn_op(cf_pred) == op_EndExcept))
- re_enter_procedure(block, cf_pred, pos);
- if (get_irn_op(cf_pred) == op_CallBegin)
- re_leave_procedure(block, cf_pred, pos);
-}
projects / libfirm / blobdiff