X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fopt%2Ftropt.c;h=49ded9020a5dc43945ab0532517a8278950327e0;hb=63c22f8a9964eaedaa6ab509de10cca18604709e;hp=3716a70d27ff30476dd33ce478414d0cabd4b999;hpb=f8d7cadcac7404b56a67f0c6b6cd71a76cda9bd6;p=libfirm

diff --git a/ir/opt/tropt.c b/ir/opt/tropt.c
index 3716a70d2..49ded9020 100644
--- a/ir/opt/tropt.c
+++ b/ir/opt/tropt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -22,7 +22,6 @@
  * @brief   Perform optimizations of the type representation.
  * @date    20.4.2005
  * @author  Goetz Lindenmaier
- * @version $Id$
  */
 #include "config.h"
 
@@ -44,9 +43,9 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg;)
 
 /* - statistics ---------------------------------------------- */
 
-static int n_casts_normalized = 0;
-static int n_casts_removed    = 0;
-static int n_sels_concretized = 0;
+static size_t n_casts_normalized = 0;
+static size_t n_casts_removed    = 0;
+static size_t n_sels_concretized = 0;
 
 /* - Cast normalization. ------------------------------------- */
 
@@ -62,26 +61,15 @@ static gen_pointer_type_to_func gen_pointer_type_to = default_gen_pointer_type_t
  */
 static ir_type *default_gen_pointer_type_to(ir_type *tp)
 {
-	ir_type *res = NULL;
-	if (get_trouts_state() == outs_consistent) {
-		if (get_type_n_pointertypes_to(tp) > 0) {
-			res = get_type_pointertype_to(tp, 0);
-		} else {
-			res = new_type_pointer(tp);
-			/* Update trout for pointer types, so we can use it in next call. */
-			add_type_pointertype_to(tp, res);
-		}
-	} else {
-		res = find_pointer_type_to_type(tp);
-		if (res == firm_unknown_type)
-			res = new_type_pointer(tp);
-	}
+	ir_type *res = find_pointer_type_to_type(tp);
+	if (is_unknown_type(res))
+		res = new_type_pointer(tp);
 
 	return res;
 }
 
 /** Return a type that is a depth times pointer to type. */
-static ir_type *pointerize_type(ir_type *tp, int depth)
+static ir_type *pointerize_type(ir_type *tp, size_t depth)
 {
 	for (; depth > 0; --depth) {
 		tp = gen_pointer_type_to(tp);
@@ -95,21 +83,21 @@ static ir_node *normalize_values_type(ir_type *totype, ir_node *pred)
 	ir_type *fromtype = get_irn_typeinfo_type(pred);
 	ir_node *new_cast = pred;
 	ir_node *block;
-	int ref_depth = 0;
+	size_t  ref_depth = 0;
 
 	if (totype == fromtype) return pred;   /* Case for optimization! */
 
 	while (is_Pointer_type(totype) && is_Pointer_type(fromtype)) {
 		totype   = get_pointer_points_to_type(totype);
 		fromtype = get_pointer_points_to_type(fromtype);
-		ref_depth++;
+		++ref_depth;
 	}
 
 	if (!is_Class_type(totype))   return pred;
 	if (!is_Class_type(fromtype)) return pred;
 
-	if ((get_class_supertype_index(totype, fromtype) != -1) ||
-		(get_class_supertype_index(fromtype, totype) != -1) ) {
+	if ((get_class_supertype_index(totype, fromtype) != (size_t)-1) ||
+		(get_class_supertype_index(fromtype, totype) != (size_t)-1) ) {
 			/* It's just what we want ... */
 			return pred;
 	}
@@ -118,11 +106,12 @@ static ir_node *normalize_values_type(ir_type *totype, ir_node *pred)
 
 	if (is_SubClass_of(totype, fromtype)) {
 		/* downcast */
-		while (get_class_subtype_index(fromtype, totype) == -1) {
+		while (get_class_subtype_index(fromtype, totype) == (size_t)-1) {
 			/* Insert a cast to a subtype of fromtype. */
 			ir_type *new_type = NULL;
 			ir_node *new_cast;
-			int i, n_subtypes = get_class_n_subtypes(fromtype);
+			size_t   i;
+			size_t   n_subtypes = get_class_n_subtypes(fromtype);
 			for (i = 0; i < n_subtypes && !new_type; ++i) {
 				ir_type *new_sub = get_class_subtype(fromtype, i);
 				if (is_SuperClass_of(new_sub, totype))
@@ -133,17 +122,16 @@ static ir_node *normalize_values_type(ir_type *totype, ir_node *pred)
 			new_type = pointerize_type(new_type, ref_depth);
 			new_cast = new_r_Cast(block, pred, new_type);
 			pred = new_cast;
-			n_casts_normalized ++;
+			++n_casts_normalized;
 			set_irn_typeinfo_type(new_cast, new_type);  /* keep type information up to date. */
-			if (get_trouts_state() != outs_none) add_type_cast(new_type, new_cast);
 		}
 	} else {
 		assert(is_SuperClass_of(totype, fromtype));
 		/* upcast */
-		while (get_class_supertype_index(fromtype, totype) == -1) {
+		while (get_class_supertype_index(fromtype, totype) == (size_t)-1) {
 			/* Insert a cast to a supertype of fromtype. */
 			ir_type *new_type = NULL;
-			int i, n_supertypes = get_class_n_supertypes(fromtype);
+			size_t i, n_supertypes = get_class_n_supertypes(fromtype);
 			for (i = 0; i < n_supertypes && !new_type; ++i) {
 				ir_type *new_super = get_class_supertype(fromtype, i);
 				if (is_SubClass_of(new_super, totype))
@@ -154,9 +142,8 @@ static ir_node *normalize_values_type(ir_type *totype, ir_node *pred)
 			new_type = pointerize_type(new_type, ref_depth);
 			new_cast = new_r_Cast(block, pred, new_type);
 			pred = new_cast;
-			n_casts_normalized ++;
+			++n_casts_normalized;
 			set_irn_typeinfo_type(new_cast, new_type);  /* keep type information up to date. */
-			if (get_trouts_state() != outs_none) add_type_cast(new_type, new_cast);
 		}
 	}
 	return new_cast;
@@ -175,7 +162,8 @@ static void normalize_irn_class_cast(ir_node *n, void *env)
 		res = normalize_values_type(totype, pred);
 		set_Cast_op(n, res);
 	} else if (is_Call(n)) {
-		int i, n_params = get_Call_n_params(n);
+		size_t n_params = get_Call_n_params(n);
+		size_t i;
 		ir_type *tp = get_Call_type(n);
 		for (i = 0; i < n_params; ++i) {
 			res = normalize_values_type(get_method_param_type(tp, i), get_Call_param(n, i));
@@ -188,9 +176,8 @@ static void normalize_irn_class_cast(ir_node *n, void *env)
 static void pure_normalize_irg_class_casts(ir_graph *irg)
 {
 	assert(get_irg_class_cast_state(irg) != ir_class_casts_any &&
-		"Cannot normalize irregular casts.");
+	       "Cannot normalize irregular casts.");
 	if (get_irg_class_cast_state(irg) == ir_class_casts_normalized) {
-		verify_irg_class_cast_state(irg);
 		return;
 	}
 
@@ -215,7 +202,7 @@ void normalize_irg_class_casts(ir_graph *irg, gen_pointer_type_to_func gppt_fct)
 
 void normalize_irp_class_casts(gen_pointer_type_to_func gppt_fct)
 {
-	int i;
+	size_t i, n;
 	if (gppt_fct) gen_pointer_type_to = gppt_fct;
 
 #if 0
@@ -223,14 +210,15 @@ void normalize_irp_class_casts(gen_pointer_type_to_func gppt_fct)
 		simple_analyse_types();
 #endif
 
-	for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
-		pure_normalize_irg_class_casts(get_irp_irg(i));
+	for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
+		ir_graph *irg = get_irp_irg(i);
+		pure_normalize_irg_class_casts(irg);
 	}
 
 	set_irp_class_cast_state(ir_class_casts_normalized);
 	gen_pointer_type_to = default_gen_pointer_type_to;
 
-	DB((dbg, SET_LEVEL_1, " Cast normalization: %d Casts inserted.\n", n_casts_normalized));
+	DB((dbg, SET_LEVEL_1, " Cast normalization: %zu Casts inserted.\n", n_casts_normalized));
 }
 
 
@@ -308,18 +296,14 @@ static int cancel_out_casts(ir_node *cast)
  */
 static int concretize_selected_entity(ir_node *sel)
 {
-	ir_node   *cast, *ptr = get_Sel_ptr(sel);
-	ir_type   *orig_tp, *cast_tp;
-	ir_entity *new_ent, *sel_ent;
-	int       res = 0;
-
-	sel_ent = get_Sel_entity(sel);
-	cast    = get_Sel_ptr(sel);
+	int res = 0;
 
+	ir_entity *sel_ent = get_Sel_entity(sel);
+	ir_node   *cast    = get_Sel_ptr(sel);
 	while (is_Cast(cast)) {
-		cast_tp = get_Cast_type(cast);
-		ptr     = get_Cast_op(cast);
-		orig_tp = get_irn_typeinfo_type(ptr);
+		ir_type *cast_tp = get_Cast_type(cast);
+		ir_node *ptr     = get_Cast_op(cast);
+		ir_type *orig_tp = get_irn_typeinfo_type(ptr);
 
 		/* we handle only classes */
 		if (!is_Pointer_type(orig_tp)|| !is_Pointer_type(cast_tp))
@@ -335,13 +319,13 @@ static int concretize_selected_entity(ir_node *sel)
 
 		/* The sel entity should be a member of the cast_tp, else
 		   the graph was not properly typed. */
-		if (get_class_member_index(cast_tp, sel_ent) == -1)
+		if (get_class_member_index(cast_tp, sel_ent) == (size_t)-1)
 			return res;
 
-		new_ent = resolve_ent_polymorphy(orig_tp, sel_ent);
+		ir_entity *new_ent = resolve_ent_polymorphy(orig_tp, sel_ent);
 
 		/* New ent must be member of orig_tp. */
-		if (get_class_member_index(orig_tp, new_ent) == -1)
+		if (get_class_member_index(orig_tp, new_ent) == (size_t)-1)
 			return res;
 
 		/* all checks done, we can remove the Cast and update the Sel */
@@ -461,7 +445,7 @@ static int remove_Cmp_Null_cast(ir_node *cmp)
  */
 static void irn_optimize_class_cast(ir_node *n, void *env)
 {
-	int *changed = env;
+	int *changed = (int*)env;
 
 	if (is_Cast(n))
 		*changed |= cancel_out_casts(n);
@@ -485,15 +469,7 @@ void optimize_class_casts(void)
 	changed = 0;
 	all_irg_walk(NULL, irn_optimize_class_cast, &changed);
 
-	if (changed) {
-		int i;
-
-		set_trouts_inconsistent();
-		for (i = get_irp_n_irgs() - 1; i >= 0; --i)
-			set_irg_outs_inconsistent(get_irp_irg(i));
-	}
-
-	DB((dbg, SET_LEVEL_1, " Cast optimization: %d Casts removed, %d Sels concretized.\n",
+	DB((dbg, SET_LEVEL_1, " Cast optimization: %zu Casts removed, %zu Sels concretized.\n",
 		n_casts_removed, n_sels_concretized));
 }