X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fopt_confirms.c;h=510ffccaeccd121a3805404cca2c25b3cbbc3b87;hb=7af9389c7b0901e561e4bc1dee02f46876152893;hp=0e6ca9a58ca081c110ff7aa9984527549213e365;hpb=778f86e10809ed70dc9b509509c0d012dcfaf413;p=libfirm

diff --git a/ir/opt/opt_confirms.c b/ir/opt/opt_confirms.c
index 0e6ca9a58..510ffccae 100644
--- a/ir/opt/opt_confirms.c
+++ b/ir/opt/opt_confirms.c
@@ -23,9 +23,7 @@
  * @author  Michael Beck
  * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #undef DEBUG_CONFIRM
 
@@ -97,7 +95,8 @@ static tarval *compare_iv_dbg(const interval_t *l_iv, const interval_t *r_iv, pn
  * This is a often needed case, so we handle here Confirm
  * nodes too.
  */
-int value_not_zero(ir_node *n, ir_node **confirm) {
+int value_not_zero(const ir_node *n, ir_node_cnst_ptr *confirm)
+{
 #define RET_ON(x)  if (x) { *confirm = n; return 1; }; break
 
 	tarval *tv;
@@ -175,31 +174,47 @@ int value_not_zero(ir_node *n, ir_node **confirm) {
  * - A SymConst(entity) is NEVER a NULL pointer
  * - Confirms are evaluated
  */
-int value_not_null(ir_node *n, ir_node **confirm) {
-	ir_op *op;
+int value_not_null(const ir_node *n, ir_node_cnst_ptr *confirm)
+{
+	tarval *tv;
 
 	*confirm = NULL;
-	n  = skip_Cast(n);
+	n  = skip_Cast_const(n);
+
+	tv = value_of(n);
+	if (tarval_is_constant(tv) && ! tarval_is_null(tv))
+		return 1;
 
-	op = get_irn_op(n);
 	assert(mode_is_reference(get_irn_mode(n)));
 	if (get_opt_sel_based_null_check_elim()) {
 		/* skip all Sel nodes and Cast's */
-		while (op == op_Sel) {
+		while (is_Sel(n)) {
 			n = skip_Cast(get_Sel_ptr(n));
-			op = get_irn_op(n);
 		}
 	}
-	if (op == op_SymConst && get_SymConst_kind(n) == symconst_addr_ent)
+	while (1) {
+		if (is_Cast(n)) { n = get_Cast_op(n); continue; }
+		if (is_Proj(n)) { n = get_Proj_pred(n); continue; }
+		break;
+	}
+
+	if (is_Global(n)) {
+		/* global references are never NULL */
+		return 1;
+	} else if (n == get_irg_frame(current_ir_graph)) {
+		/* local references are never NULL */
+		return 1;
+	} else if (is_Alloc(n)) {
+		/* alloc never returns NULL (it throws an exception instead) */
 		return 1;
-	if (op == op_Const) {
-		if (!is_Const_null(n))
-			return 1;
 	} else {
+		/* check for more Confirms */
 		for (; is_Confirm(n); n = skip_Cast(get_Confirm_value(n))) {
-			if (get_Confirm_cmp(n) != pn_Cmp_Lg) {
+			if (get_Confirm_cmp(n) == pn_Cmp_Lg) {
 				ir_node *bound = get_Confirm_bound(n);
-				if (is_Const(bound) && is_Const_null(bound)) {
+				tarval  *tv    = value_of(bound);
+
+				if (tarval_is_null(tv)) {
 					*confirm = n;
 					return 1;
 				}
@@ -214,7 +229,8 @@ int value_not_null(ir_node *n, ir_node **confirm) {
  * If the mode of the value did not honor signed zeros, else
  * check for >= 0 or < 0.
  */
-value_classify_sign classify_value_sign(ir_node *n) {
+value_classify_sign classify_value_sign(ir_node *n)
+{
 	tarval *tv, *c;
 	ir_mode *mode;
 	pn_Cmp cmp, ncmp;
@@ -235,7 +251,7 @@ value_classify_sign classify_value_sign(ir_node *n) {
 		}
 		break;
 	}
-	if (get_irn_op(n) != op_Confirm)
+	if (!is_Confirm(n))
 		return value_classified_unknown;
 
 	tv  = value_of(get_Confirm_bound(n));
@@ -321,7 +337,8 @@ value_classify_sign classify_value_sign(ir_node *n) {
  * @return the filled interval or NULL if no interval
  *         can be created (happens only on floating point
  */
-static interval_t *get_interval_from_tv(interval_t *iv, tarval *tv) {
+static interval_t *get_interval_from_tv(interval_t *iv, tarval *tv)
+{
 	ir_mode *mode = get_tarval_mode(tv);
 
 	if (tv == tarval_bad) {
@@ -368,7 +385,8 @@ static interval_t *get_interval_from_tv(interval_t *iv, tarval *tv) {
  * @return the filled interval or NULL if no interval
  *         can be created (happens only on floating point
  */
-static interval_t *get_interval(interval_t *iv, ir_node *bound, pn_Cmp pnc) {
+static interval_t *get_interval(interval_t *iv, ir_node *bound, pn_Cmp pnc)
+{
 	ir_mode *mode = get_irn_mode(bound);
 	tarval  *tv   = value_of(bound);
 
@@ -470,7 +488,8 @@ static interval_t *get_interval(interval_t *iv, ir_node *bound, pn_Cmp pnc) {
  *   tarval_b_true or tarval_b_false it it can be evaluated,
  *   tarval_bad else
  */
-static tarval *(compare_iv)(const interval_t *l_iv, const interval_t *r_iv, pn_Cmp pnc) {
+static tarval *(compare_iv)(const interval_t *l_iv, const interval_t *r_iv, pn_Cmp pnc)
+{
 	pn_Cmp res;
 	unsigned flags;
 	tarval *tv_true = tarval_b_true, *tv_false = tarval_b_false;
@@ -594,7 +613,8 @@ static tarval *(compare_iv)(const interval_t *l_iv, const interval_t *r_iv, pn_C
 /**
  * Returns non-zero, if a given relation is transitive.
  */
-static int is_transitive(pn_Cmp pnc) {
+static int is_transitive(pn_Cmp pnc)
+{
 	return (pn_Cmp_False < pnc && pnc < pn_Cmp_Lg);
 }  /* is_transitive */
 
@@ -607,7 +627,8 @@ static int is_transitive(pn_Cmp pnc) {
  * @param right  the right operand of the Cmp
  * @param pnc    the compare relation
  */
-tarval *computed_value_Cmp_Confirm(ir_node *cmp, ir_node *left, ir_node *right, pn_Cmp pnc) {
+tarval *computed_value_Cmp_Confirm(ir_node *cmp, ir_node *left, ir_node *right, pn_Cmp pnc)
+{
 	ir_node         *l_bound;
 	pn_Cmp          l_pnc, res_pnc, neg_pnc;
 	interval_t      l_iv, r_iv;
@@ -622,8 +643,9 @@ tarval *computed_value_Cmp_Confirm(ir_node *cmp, ir_node *left, ir_node *right,
 
 		pnc = get_inversed_pnc(pnc);
 	} else if (! is_Confirm(left)) {
-		/* no Confirm on either one side, finish */
-		return tarval_bad;
+		/* nothing more found */
+		tv = tarval_bad;
+		goto check_null_case;
 	}
 
 	/* ok, here at least left is a Confirm, right might be */
@@ -756,6 +778,24 @@ tarval *computed_value_Cmp_Confirm(ir_node *cmp, ir_node *left, ir_node *right,
 			get_interval(&l_iv, l_bound, l_pnc),
 			get_interval_from_tv(&r_iv, tv),
 			pnc);
+	} else {
+check_null_case:
+		/* check some other cases */
+		if ((pnc == pn_Cmp_Eq || pnc == pn_Cmp_Lg) &&
+			is_Const(right) && is_Const_null(right)) {
+			/* for == 0 or != 0 we have some special tools */
+			ir_mode       *mode = get_irn_mode(left);
+			const ir_node *dummy;
+			if (mode_is_reference(mode)) {
+				if (value_not_null(left, &dummy)) {
+					tv = pnc == pn_Cmp_Eq ? tarval_b_false : tarval_b_true;
+				}
+			} else {
+				if (value_not_zero(left, &dummy)) {
+					tv = pnc == pn_Cmp_Eq ? tarval_b_false : tarval_b_true;
+				}
+			}
+		}
 	}
 
 	if (tv != tarval_bad)
@@ -772,7 +812,8 @@ tarval *computed_value_Cmp_Confirm(ir_node *cmp, ir_node *left, ir_node *right,
  * @param len   length of the string buffer
  * @param iv    the interval
  */
-static int iv_snprintf(char *buf, size_t len, const interval_t *iv) {
+static int iv_snprintf(char *buf, size_t len, const interval_t *iv)
+{
 	char smin[64], smax[64];
 
 	if (iv) {
@@ -799,7 +840,8 @@ static int iv_snprintf(char *buf, size_t len, const interval_t *iv) {
  * @param r_iv  the right interval
  * @param pnc   the compare relation
  */
-static void print_iv_cmp(const interval_t *l_iv, const interval_t *r_iv, pn_Cmp pnc) {
+static void print_iv_cmp(const interval_t *l_iv, const interval_t *r_iv, pn_Cmp pnc)
+{
 	char sl[128], sr[128];
 
 	iv_snprintf(sl, sizeof(sl), l_iv);
@@ -815,7 +857,8 @@ static void print_iv_cmp(const interval_t *l_iv, const interval_t *r_iv, pn_Cmp
  * @param r_iv  the right interval
  * @param pnc   the compare relation
  */
-static tarval *compare_iv_dbg(const interval_t *l_iv, const interval_t *r_iv, pn_Cmp pnc) {
+static tarval *compare_iv_dbg(const interval_t *l_iv, const interval_t *r_iv, pn_Cmp pnc)
+{
 	tarval *tv = (compare_iv)(l_iv, r_iv, pnc);
 
 	if (tv == tarval_bad)