X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Ftropt.c;h=a4226154c4396d5d5b635bd259367eefdefe6d23;hb=9769cadd5c430154acd9c47fcb9cc601db6d3513;hp=69688e55dfc409c1143daf2abadb2c8bace843ae;hpb=f1a1a6092d9e4ebd9e22dd1c57d76ef8aeda74fc;p=libfirm diff --git a/ir/opt/tropt.c b/ir/opt/tropt.c index 69688e55d..a4226154c 100644 --- a/ir/opt/tropt.c +++ b/ir/opt/tropt.c @@ -17,10 +17,11 @@ #include "config.h" #endif +#include + #ifdef HAVE_ALLOCA_H #include #endif - #ifdef HAVE_MALLOC_H #include #endif @@ -37,7 +38,7 @@ #include "trouts.h" #include "ircons.h" #include "irgmod.h" -#include "irflag.h" +#include "irflag_t.h" /* - statistics ---------------------------------------------- */ @@ -47,14 +48,18 @@ static int n_sels_concretized = 0; /* - Cast normalization. ------------------------------------- */ -static type *default_gen_pointer_type_to(type *tp); +static ir_type *default_gen_pointer_type_to(ir_type *tp); #define PTR_TYPE_SUFFIX "cc_ptr_tp" /* class cast pointer type. */ static ident *ptr_type_suffix = NULL; static gen_pointer_type_to_func gen_pointer_type_to = default_gen_pointer_type_to; -static type *default_gen_pointer_type_to(type *tp) { - type *res = NULL; +/** + * 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); @@ -62,10 +67,11 @@ static type *default_gen_pointer_type_to(type *tp) { ir_mode *mode = is_Method_type(tp) ? mode_P_code : mode_P_data; res = new_type_pointer(mangle_u(get_type_ident(tp), ptr_type_suffix), tp, mode); - /* Update trout for pointertypes, so we can use it in next call. */ + /* Update trout for pointer types, so we can use it in next call. */ add_type_pointertype_to(tp, res); } - } else { + } + else { res = find_pointer_type_to_type(tp); if (res == firm_unknown_type) res = new_type_pointer(mangle_u(get_type_ident(tp), ptr_type_suffix), tp, mode_P_data); @@ -74,8 +80,8 @@ static type *default_gen_pointer_type_to(type *tp) { return res; } -/* Return a type that is a depth times pointer to type. */ -static type *pointerize_type(type *tp, int depth) { +/** Return a type that is a depth times pointer to type. */ +static ir_type *pointerize_type(ir_type *tp, int depth) { for (; depth > 0; --depth) { tp = gen_pointer_type_to(tp); } @@ -83,8 +89,8 @@ static type *pointerize_type(type *tp, int depth) { } -static ir_node *normalize_values_type(type *totype, ir_node *pred) { - type *fromtype = get_irn_typeinfo_type(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; @@ -107,17 +113,17 @@ static ir_node *normalize_values_type(type *totype, ir_node *pred) { set_cur_block(get_nodes_block(pred)); - if (is_subclass_of(totype, fromtype)) { + if (is_SubClass_of(totype, fromtype)) { /* downcast */ while (get_class_subtype_index(fromtype, totype) == -1) { /* Insert a cast to a subtype of fromtype. */ - type *new_type = NULL; + ir_type *new_type = NULL; ir_node *new_cast; int i, n_subtypes = get_class_n_subtypes(fromtype); for (i = 0; i < n_subtypes && !new_type; ++i) { - type *new_sub = get_class_subtype(fromtype, i); - if (is_superclass_of(new_sub, totype)) - new_type = new_sub; + ir_type *new_sub = get_class_subtype(fromtype, i); + if (is_SuperClass_of(new_sub, totype)) + new_type = new_sub; } assert(new_type); fromtype = new_type; @@ -130,15 +136,15 @@ static ir_node *normalize_values_type(type *totype, ir_node *pred) { } } else { - assert(is_superclass_of(totype, fromtype)); + assert(is_SuperClass_of(totype, fromtype)); /* upcast */ while (get_class_supertype_index(fromtype, totype) == -1) { /* Insert a cast to a supertype of fromtype. */ - type *new_type = NULL; + ir_type *new_type = NULL; int i, n_supertypes = get_class_n_supertypes(fromtype); for (i = 0; i < n_supertypes && !new_type; ++i) { - type *new_super = get_class_supertype(fromtype, i); - if (is_subclass_of(new_super, totype)) + ir_type *new_super = get_class_supertype(fromtype, i); + if (is_SubClass_of(new_super, totype)) new_type = new_super; } assert(new_type); @@ -159,12 +165,12 @@ static void normalize_irn_class_cast(ir_node *n, void *env) { ir_node *res; if (get_irn_op(n) == op_Cast) { ir_node *pred = get_Cast_op(n); - type *totype = get_Cast_type(n); + ir_type *totype = get_Cast_type(n); res = normalize_values_type(totype, pred); set_Cast_op(n, res); } else if (get_irn_op(n) == op_Call) { int i, n_params = get_Call_n_params(n); - type *tp = get_Call_type(n); + 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)); set_Call_param(n, i, res); @@ -222,9 +228,18 @@ void normalize_irp_class_casts(gen_pointer_type_to_func gppt_fct) { /* - Cast optimization. ------------------------------------------- */ +/** + * Optimizes Casts: + * + * (T1)(T2)x -> x + * + * (T3)(T2)x -> (T3)x + * + * if possible. + */ static void cancel_out_casts(ir_node *cast) { ir_node *orig, *pred = get_Cast_op(cast); - type *tp_cast, *tp_pred, *tp_orig; + ir_type *tp_cast, *tp_pred, *tp_orig; int ref_depth = 0; if (get_irn_op(pred) != op_Cast) return; @@ -247,7 +262,7 @@ static void cancel_out_casts(ir_node *cast) { if (!is_Class_type(tp_pred)) return; if (!is_Class_type(tp_orig)) return; - if (is_subclass_of(tp_pred, tp_cast) && get_opt_suppress_downcast_optimization()) + if (is_SubClass_of(tp_pred, tp_cast) && get_opt_suppress_downcast_optimization()) return; if (tp_cast == tp_orig) { @@ -256,12 +271,16 @@ static void cancel_out_casts(ir_node *cast) { return; } - if (!(is_subclass_of (tp_cast, tp_orig) || is_subclass_of (tp_orig, tp_cast))) - /* Avoid (B2)(A)(new B1()) --> (B2)(new B1()) */ + if (!(is_SubClass_of (tp_cast, tp_orig) || is_SubClass_of (tp_orig, tp_cast))) { + /* Avoid (B2)(A)(new B1()) --> (B2)(new B1()) + * if B1 =!> B2 and B2 =!> B1 + */ return; + } - if ((is_subclass_of (tp_cast, tp_pred) && is_superclass_of(tp_pred, tp_orig)) || - (is_superclass_of(tp_cast, tp_pred) && is_subclass_of (tp_pred, tp_orig)) ) { + if ((is_SubClass_of (tp_cast, tp_pred) && is_SuperClass_of(tp_pred, tp_orig)) || + (is_SuperClass_of(tp_cast, tp_pred) && is_SubClass_of (tp_pred, tp_orig)) ) { + /* Cast --> Pred --> Orig */ set_Cast_op (cast, orig); n_casts_removed ++; } @@ -269,7 +288,7 @@ static void cancel_out_casts(ir_node *cast) { static void concretize_selected_entity(ir_node *sel) { ir_node *cast, *ptr = get_Sel_ptr(sel); - type *orig_tp, *cast_tp; + ir_type *orig_tp, *cast_tp; entity *new_ent, *sel_ent; sel_ent = get_Sel_entity(sel); @@ -287,8 +306,8 @@ static void concretize_selected_entity(ir_node *sel) { if (!is_Class_type(orig_tp)) return; if (!is_Class_type(cast_tp)) return; - /* We only want to contretize, but not generalize. */ - if (!is_superclass_of(cast_tp, orig_tp)) return; + /* We only want to concretize, but not generalize. */ + if (!is_SuperClass_of(cast_tp, orig_tp)) return; /* Hmm, we are not properly typed. */ if (get_class_member_index(cast_tp, sel_ent) == -1) return; @@ -311,7 +330,7 @@ static void concretize_Phi_type(ir_node *phi) { int i, n_preds = get_Phi_n_preds(phi); ir_node **pred = alloca(n_preds * sizeof(ir_node *)); ir_node *new; - type *totype, *fromtype; + ir_type *totype, *fromtype; if (n_preds == 0) return; pred[0] = get_Phi_pred(phi, 0); @@ -343,7 +362,7 @@ static void concretize_Phi_type(ir_node *phi) { void remove_Cmp_Null_cast(ir_node *cmp) { ir_node *cast, *null, *new_null; int cast_pos, null_pos; - type *fromtype; + ir_type *fromtype; cast = get_Cmp_left(cmp); cast_pos = 0; @@ -371,6 +390,9 @@ void remove_Cmp_Null_cast(ir_node *cmp) { n_casts_removed ++; } +/** + * Post-Walker: + */ static void irn_optimize_class_cast(ir_node *n, void *env) { if (get_irn_op(n) == op_Cast) cancel_out_casts(n); @@ -395,7 +417,7 @@ void optimize_class_casts(void) { set_irg_outs_inconsistent(get_irp_irg(i)); if (get_opt_optimize_class_casts_verbose() && get_firm_verbosity()) { - printf(" Cast optimization: %d Casts removed, %d sels concretized.\n", + printf(" Cast optimization: %d Casts removed, %d Sels concretized.\n", n_casts_removed, n_sels_concretized); } }