X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Ftropt.c;h=bb55255962f7059cf9c8cbb98da5299709368d89;hb=4d7f507c357a0bdb1433ef3973645ece971e3824;hp=999735d1f3e8b6fe82b295db9e492a6bac402722;hpb=9d500f9aa4f5fe482e47417ce1190b9193856543;p=libfirm

diff --git a/ir/opt/tropt.c b/ir/opt/tropt.c
index 999735d1f..bb5525596 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.
  *
@@ -32,7 +32,6 @@
 #include "irprog.h"
 #include "irtypeinfo.h"
 #include "irgwalk.h"
-#include "irsimpletype.h"
 #include "trouts.h"
 #include "ircons.h"
 #include "irgmod.h"
@@ -45,9 +44,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. ------------------------------------- */
 
@@ -61,30 +60,18 @@ static gen_pointer_type_to_func gen_pointer_type_to = default_gen_pointer_type_t
  * Find a pointer type to a given type.
  * Uses and updates trouts if available.
  */
-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 {
-			ir_mode *mode = is_Method_type(tp) ? mode_P_code : mode_P_data;
-
-			res = new_type_pointer(id_mangle_u(get_type_ident(tp), ptr_type_suffix), tp, mode);
-			/* 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(id_mangle_u(get_type_ident(tp), ptr_type_suffix), tp, mode_P_data);
-	}
+static ir_type *default_gen_pointer_type_to(ir_type *tp)
+{
+	ir_type *res = find_pointer_type_to_type(tp);
+	if (res == firm_unknown_type)
+		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);
 	}
@@ -92,37 +79,40 @@ static ir_type *pointerize_type(ir_type *tp, int depth) {
 }
 
 
-static ir_node *normalize_values_type(ir_type *totype, ir_node *pred) {
+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;
-	int ref_depth = 0;
+	ir_node *block;
+	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;
 	}
 
-	set_cur_block(get_nodes_block(pred));
+	block = get_nodes_block(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))
@@ -131,19 +121,18 @@ static ir_node *normalize_values_type(ir_type *totype, ir_node *pred) {
 			assert(new_type);
 			fromtype = new_type;
 			new_type = pointerize_type(new_type, ref_depth);
-			new_cast = new_Cast(pred, new_type);
+			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))
@@ -152,11 +141,10 @@ static ir_node *normalize_values_type(ir_type *totype, ir_node *pred) {
 			assert(new_type);
 			fromtype = new_type;
 			new_type = pointerize_type(new_type, ref_depth);
-			new_cast = new_Cast(pred, new_type);
+			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;
@@ -165,7 +153,8 @@ static ir_node *normalize_values_type(ir_type *totype, ir_node *pred) {
 /**
  * Post-Walker.
  */
-static void normalize_irn_class_cast(ir_node *n, void *env) {
+static void normalize_irn_class_cast(ir_node *n, void *env)
+{
 	ir_node *res;
 	(void) env;
 	if (is_Cast(n)) {
@@ -174,7 +163,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));
@@ -184,7 +174,8 @@ static void normalize_irn_class_cast(ir_node *n, void *env) {
 }
 
 
-static void pure_normalize_irg_class_casts(ir_graph *irg) {
+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.");
 	if (get_irg_class_cast_state(irg) == ir_class_casts_normalized) {
@@ -197,7 +188,8 @@ static void pure_normalize_irg_class_casts(ir_graph *irg) {
 }
 
 
-void normalize_irg_class_casts(ir_graph *irg, gen_pointer_type_to_func gppt_fct) {
+void normalize_irg_class_casts(ir_graph *irg, gen_pointer_type_to_func gppt_fct)
+{
 	assert(get_irp_typeinfo_state() == ir_typeinfo_consistent);
 
 	if (gppt_fct) gen_pointer_type_to = gppt_fct;
@@ -210,21 +202,25 @@ void normalize_irg_class_casts(ir_graph *irg, gen_pointer_type_to_func gppt_fct)
 	gen_pointer_type_to = default_gen_pointer_type_to;
 }
 
-void normalize_irp_class_casts(gen_pointer_type_to_func gppt_fct) {
-	int i;
+void normalize_irp_class_casts(gen_pointer_type_to_func gppt_fct)
+{
+	size_t i, n;
 	if (gppt_fct) gen_pointer_type_to = gppt_fct;
 
+#if 0
 	if (get_irp_typeinfo_state() != ir_typeinfo_consistent)
 		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));
 }
 
 
@@ -244,10 +240,10 @@ void normalize_irp_class_casts(gen_pointer_type_to_func gppt_fct) {
  *
  * @return 1 if the cast was changed
  */
-static int cancel_out_casts(ir_node *cast) {
+static int cancel_out_casts(ir_node *cast)
+{
 	ir_node *orig, *pred = get_Cast_op(cast);
 	ir_type *tp_cast, *tp_pred, *tp_orig;
-	int ref_depth = 0;
 
 	if (!is_Cast(pred)) return 0;
 	orig = get_Cast_op(pred);
@@ -262,7 +258,6 @@ static int cancel_out_casts(ir_node *cast) {
 		tp_cast = get_pointer_points_to_type(tp_cast);
 		tp_pred = get_pointer_points_to_type(tp_pred);
 		tp_orig = get_pointer_points_to_type(tp_orig);
-		ref_depth++;
 	}
 
 	if (!is_Class_type(tp_cast) || !is_Class_type(tp_pred) || !is_Class_type(tp_orig))
@@ -301,7 +296,8 @@ static int cancel_out_casts(ir_node *cast) {
  *
  * @return 1 if Cast's where removed
  */
-static int concretize_selected_entity(ir_node *sel) {
+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;
@@ -329,13 +325,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);
 
 		/* 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 */
@@ -409,7 +405,9 @@ static int concretize_Phi_type(ir_node *phi)
  *
  * @return 1 if Cast's where removed
  */
-static int remove_Cmp_Null_cast(ir_node *cmp) {
+static int remove_Cmp_Null_cast(ir_node *cmp)
+{
+	ir_graph *irg;
 	ir_node *cast, *null, *new_null;
 	int     cast_pos, null_pos;
 	ir_type *fromtype;
@@ -438,9 +436,10 @@ static int remove_Cmp_Null_cast(ir_node *cmp) {
 		return 0;
 
 	/* Transform Cmp */
+	irg = get_irn_irg(cmp);
 	set_irn_n(cmp, cast_pos, get_Cast_op(cast));
 	fromtype = get_irn_typeinfo_type(get_Cast_op(cast));
-	new_null = new_Const_type(get_Const_tarval(null), fromtype);
+	new_null = new_r_Const(irg, get_Const_tarval(null));
 	set_irn_typeinfo_type(new_null, fromtype);
 	set_irn_n(cmp, null_pos, new_null);
 	++n_casts_removed;
@@ -450,8 +449,9 @@ static int remove_Cmp_Null_cast(ir_node *cmp) {
 /**
  * Post-Walker: Optimize class casts (mostly by trying to remove them)
  */
-static void irn_optimize_class_cast(ir_node *n, void *env) {
-	int *changed = env;
+static void irn_optimize_class_cast(ir_node *n, void *env)
+{
+	int *changed = (int*)env;
 
 	if (is_Cast(n))
 		*changed |= cancel_out_casts(n);
@@ -463,27 +463,23 @@ static void irn_optimize_class_cast(ir_node *n, void *env) {
 		*changed |= remove_Cmp_Null_cast(n);
 }
 
-void optimize_class_casts(void) {
+void optimize_class_casts(void)
+{
 	int changed;
 
+#if 0
 	if (get_irp_typeinfo_state() != ir_typeinfo_consistent)
 		simple_analyse_types();
+#endif
 
 	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));
 }
 
-void firm_init_class_casts_opt(void) {
+void firm_init_class_casts_opt(void)
+{
 	FIRM_DBG_REGISTER(dbg, "firm.opt.tropt");
 }