/*
- * 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.
*
#include "irprog.h"
#include "irtypeinfo.h"
#include "irgwalk.h"
-#include "irsimpletype.h"
#include "trouts.h"
#include "ircons.h"
#include "irgmod.h"
/* - 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. ------------------------------------- */
}
/** 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);
{
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))
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);
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);
}
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));
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
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));
}
/* 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 */
*/
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;
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;
*/
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);
{
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;
+ size_t i, n;
set_trouts_inconsistent();
- for (i = get_irp_n_irgs() - 1; i >= 0; --i)
+ for (i = 0, n = get_irp_n_irgs(); i < n; ++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));
}
projects / libfirm / blobdiff