X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Ftropt.c;h=c9a0a7396708867fcf5338a49d81802e7af67b17;hb=829a66832c7e10daa5dc4cf2bbbb726176f787e7;hp=69688e55dfc409c1143daf2abadb2c8bace843ae;hpb=f1a1a6092d9e4ebd9e22dd1c57d76ef8aeda74fc;p=libfirm diff --git a/ir/opt/tropt.c b/ir/opt/tropt.c index 69688e55d..c9a0a7396 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 ---------------------------------------------- */ @@ -53,6 +54,10 @@ static type *default_gen_pointer_type_to(type *tp); static ident *ptr_type_suffix = NULL; static gen_pointer_type_to_func gen_pointer_type_to = default_gen_pointer_type_to; +/** + * Find a pointer type to a given type. + * Uses and updates trouts if available. + */ static type *default_gen_pointer_type_to(type *tp) { type *res = NULL; if (get_trouts_state() == outs_consistent) { @@ -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,7 +80,7 @@ static type *default_gen_pointer_type_to(type *tp) { return res; } -/* Return a type that is a depth times pointer to type. */ +/** Return a type that is a depth times pointer to type. */ static type *pointerize_type(type *tp, int depth) { for (; depth > 0; --depth) { tp = gen_pointer_type_to(tp); @@ -107,7 +113,7 @@ 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. */ @@ -115,9 +121,9 @@ static ir_node *normalize_values_type(type *totype, ir_node *pred) { 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; + 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,7 +136,7 @@ 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. */ @@ -138,7 +144,7 @@ static ir_node *normalize_values_type(type *totype, ir_node *pred) { 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)) + if (is_SubClass_of(new_super, totype)) new_type = new_super; } assert(new_type); @@ -222,6 +228,15 @@ 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; @@ -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 ++; } @@ -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; @@ -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);