* Walker environment.
*/
typedef struct _env_t {
- unsigned num_confirms; /**< number of inserted Confirm nodes */
- unsigned num_consts; /**< number of constants placed */
- unsigned num_eq; /**< number of equalities placed */
+ unsigned num_confirms; /**< Number of inserted Confirm nodes. */
+ unsigned num_consts; /**< Number of constants placed. */
+ unsigned num_eq; /**< Number of equalities placed. */
+ unsigned num_non_null; /**< Number of non-null Confirms. */
} env_t;
/** The debug handle. */
set_irn_n(succ, pos, c);
DBG_OPT_CONFIRM_C(irn, c);
-// ir_printf("1 Replacing input %d of node %n with %n\n", pos, succ, c);
+ DB((dbg, LEVEL_2, "Replacing input %d of node %+F with %+F\n", pos, succ, c));
env->num_consts += 1;
}
set_irn_n(user, pos, con);
DBG_OPT_CONFIRM_C(old, con);
- DB((dbg, LEVEL_2, "Replacing input %d of node %n with %n\n", pos, user, con));
+ DB((dbg, LEVEL_2, "Replacing input %d of node %+F with %+F\n", pos, user, con));
env->num_consts += 1;
} else {
set_irn_n(user, pos, right);
DBG_OPT_CONFIRM(left, right);
- DB((dbg, LEVEL_2, "Replacing input %d of node %n with %n\n", pos, user, right));
+ DB((dbg, LEVEL_2, "Replacing input %d of node %+F with %+F\n", pos, user, right));
env->num_eq += 1;
} else if (block_dominates(blk, cond_block)) {
pos = get_edge_src_pos(edge);
set_irn_n(succ, pos, c);
- DB((dbg, LEVEL_2, "Replacing input %d of node %n with %n\n", pos, succ, c));
+ DB((dbg, LEVEL_2, "Replacing input %d of node %+F with %+F\n", pos, succ, c));
env->num_confirms += 1;
}
ir_node *cmp;
pn_Cmp pnc;
+#if 0
handle_modeb(block, selector, get_Proj_proj(proj), env);
-
+#endif
/* this should be an IF, check this */
if (! is_Proj(selector))
return;
} /* insert_Confirm_in_block */
/**
- * The given will be dereferenced, add non-null confirms.
+ * Checks if a node is a non-null Confirm.
+ */
+static int is_non_null_Confirm(const ir_node *ptr) {
+ for (;;) {
+ if (! is_Confirm(ptr))
+ break;
+ if (get_Confirm_cmp(ptr) == pn_Cmp_Lg) {
+ ir_node *bound = get_Confirm_bound(ptr);
+
+ if (is_Const(bound) && is_Const_null(bound))
+ return 1;
+ }
+ ptr = get_Confirm_value(ptr);
+ }
+ /*
+ * While a SymConst is not a Confirm, it is non-null
+ * anyway. This helps to reduce the number of
+ * constructed Confirms.
+ */
+ if (is_SymConst_addr_ent(ptr))
+ return 1;
+ return 0;
+} /* is_non_null_Confirm */
+
+/**
+ * The given pointer will be dereferenced, add non-null Confirms.
*
* @param ptr a node representing an address
* @param block the block of the dereferencing instruction
ir_node *blk;
+ if (is_Confirm(succ)) {
+ /* beware of loops */
+ continue;
+ }
+
if ((is_Load(succ) || is_Store(succ)) &&
get_nodes_block(succ) == block) {
/* Ignore Loads and Store in the same block for now,
}
set_irn_n(succ, pos, c);
- DB((dbg, LEVEL_2, "Replacing input %d of node %n with %n\n", pos, succ, c));
-
+ DB((dbg, LEVEL_2, "Replacing input %d of node %+F with %+F\n", pos, succ, c));
+ env->num_non_null += 1;
env->num_confirms += 1;
}
}
} /* insert_non_null */
-/**
- * Checks if a node is a non-null Confirm.
- */
-static int is_non_null_Confirm(const ir_node *ptr) {
- for (;;) {
- if (! is_Confirm(ptr))
- return 0;
- if (get_Confirm_cmp(ptr) == pn_Cmp_Lg) {
- ir_node *bound = get_Confirm_bound(ptr);
-
- if (is_Const(bound) && is_Const_null(bound))
- return 1;
- }
- ptr = get_Confirm_value(ptr);
- }
-} /* is_non_null_Confirm */
-
/**
* Pre-walker: Called for every node to insert Confirm nodes
*/
env.num_confirms = 0;
env.num_consts = 0;
env.num_eq = 0;
+ env.num_non_null = 0;
- if (get_opt_global_null_ptr_elimination()) {
+ if (0 && get_opt_global_null_ptr_elimination()) {
/* do global NULL test elimination */
irg_walk_graph(irg, insert_Confirm, NULL, &env);
} else {
DB((dbg, LEVEL_1, "# Confirms inserted : %u\n", env.num_confirms));
DB((dbg, LEVEL_1, "# Const replacements: %u\n", env.num_consts));
DB((dbg, LEVEL_1, "# node equalities : %u\n", env.num_eq));
+ DB((dbg, LEVEL_1, "# non-null Confirms : %u\n", env.num_non_null));
/* deactivate edges if they where off */
if (! edges_active)
exchange(n, value);
else {
/*
- * Strange: a Confirm is it's own bound. This can happen
+ * Strange: a Confirm is its own bound. This can happen
* in dead blocks when Phi nodes are already removed.
*/
exchange(n, new_Bad());