X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Ftr_inheritance.c;h=16edd405bcd4dde016b779da530c5f7ea81a9f28;hb=fc0226bb6efed18fbc823d9ebd6c6b3707b6f3d5;hp=2bca584e71d5f84a12508b4f6e9683c3cbfc2632;hpb=10e58f9669ea6c77e82bd3bc12c4ac5bbaa6bb15;p=libfirm diff --git a/ir/tr/tr_inheritance.c b/ir/tr/tr_inheritance.c index 2bca584e7..16edd405b 100644 --- a/ir/tr/tr_inheritance.c +++ b/ir/tr/tr_inheritance.c @@ -21,7 +21,6 @@ * @file tr_inheritance.c * @brief Utility routines for inheritance representation * @author Goetz Lindenmaier - * @version $Id$ */ #include "config.h" @@ -35,8 +34,6 @@ #include "irgwalk.h" #include "irflag.h" -DEBUG_ONLY(static firm_dbg_module_t *dbg); - /* ----------------------------------------------------------------------- */ /* Resolve implicit inheritance. */ /* ----------------------------------------------------------------------- */ @@ -94,10 +91,6 @@ static void copy_entities_from_superclass(ir_type *clss, void *env) } } -/* Resolve implicit inheritance. - * - * Resolves the implicit inheritance supplied by firm. - */ void resolve_inheritance(mangle_inherited_name_func *mfunc) { if (!mfunc) @@ -177,7 +170,7 @@ static int tr_inh_trans_cmp(const void *e1, const void *e2, size_t size) */ static inline unsigned int tr_inh_trans_hash(const tr_inh_trans_tp *v) { - return HASH_PTR(v->kind); + return hash_ptr(v->kind); } /* This always completes successfully. */ @@ -342,18 +335,13 @@ static void compute_up_closure(ir_type *tp) } } -/** Compute the transitive closure of the subclass/superclass and - * overwrites/overwrittenby relation. - * - * This function walks over the ir (O(#types+#entities)) to compute the - * transitive closure. */ void compute_inh_transitive_closure(void) { size_t i, n_types = get_irp_n_types(); free_inh_transitive_closure(); /* The 'down' relation */ - irp_reserve_resources(irp, IR_RESOURCE_TYPE_VISITED); + irp_reserve_resources(irp, IRP_RESOURCE_TYPE_VISITED); inc_master_type_visited(); /* Inc twice: one if on stack, second if values computed. */ inc_master_type_visited(); for (i = 0; i < n_types; ++i) { @@ -402,10 +390,9 @@ void compute_inh_transitive_closure(void) } irp->inh_trans_closure_state = inh_transitive_closure_valid; - irp_free_resources(irp, IR_RESOURCE_TYPE_VISITED); + irp_free_resources(irp, IRP_RESOURCE_TYPE_VISITED); } -/** Free memory occupied by the transitive closure information. */ void free_inh_transitive_closure(void) { if (tr_inh_trans_set) { @@ -472,7 +459,6 @@ ir_entity *get_entity_trans_overwrittenby_next(const ir_entity *ent) /* - overwrites ---------------------------------------------------------- */ -/** Iterate over all transitive overwritten entities. */ ir_entity *get_entity_trans_overwrites_first(const ir_entity *ent) { assert_valid_state(); @@ -506,7 +492,6 @@ static int check_is_SubClass_of(ir_type *low, ir_type *high) return 0; } -/* Returns true if low is subclass of high. */ int is_SubClass_of(ir_type *low, ir_type *high) { assert(is_Class_type(low) && is_Class_type(high)); @@ -520,13 +505,6 @@ int is_SubClass_of(ir_type *low, ir_type *high) return check_is_SubClass_of(low, high); } - -/* Subclass check for pointers to classes. - * - * Dereferences at both types the same amount of pointer types (as - * many as possible). If the remaining types are both class types - * and subclasses, returns true, else false. Can also be called with - * two class types. */ int is_SubClass_ptr_of(ir_type *low, ir_type *high) { while (is_Pointer_type(low) && is_Pointer_type(high)) { @@ -590,12 +568,6 @@ static ir_entity *do_resolve_ent_polymorphy(ir_type *dynamic_class, ir_entity *s return static_ent; } -/* Resolve polymorphy in the inheritance relation. - * - * Returns the dynamically referenced entity if the static entity and the - * dynamic type are given. - * Search downwards in overwritten tree. - */ ir_entity *resolve_ent_polymorphy(ir_type *dynamic_class, ir_entity *static_ent) { ir_entity *res; @@ -641,92 +613,3 @@ ir_class_cast_state get_irp_class_cast_state(void) { return irp->class_cast_state; } - -const char *get_class_cast_state_string(ir_class_cast_state s) -{ -#define X(a) case a: return #a - switch (s) { - X(ir_class_casts_any); - X(ir_class_casts_transitive); - X(ir_class_casts_normalized); - X(ir_class_casts_state_max); - default: return "invalid class cast state"; - } -#undef X -} - -/* - State verification. ------------------------------------- */ - -typedef struct ccs_env { - ir_class_cast_state expected_state; - ir_class_cast_state worst_situation; -} ccs_env; - -/** - * Walker: check Casts. - */ -static void verify_irn_class_cast_state(ir_node *n, void *env) -{ - ccs_env *ccs = (ccs_env *)env; - ir_class_cast_state this_state = ir_class_casts_any; - ir_type *fromtype, *totype; - int ref_depth = 0; - - if (!is_Cast(n)) return; - - fromtype = get_irn_typeinfo_type(get_Cast_op(n)); - totype = get_Cast_type(n); - - 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++; - } - - if (!is_Class_type(totype)) return; - - if (is_SubClass_of(totype, fromtype) || - is_SubClass_of(fromtype, totype)) { - this_state = ir_class_casts_transitive; - if ((get_class_supertype_index(totype, fromtype) != (size_t)-1) || - (get_class_supertype_index(fromtype, totype) != (size_t)-1) || - fromtype == totype) { - this_state = ir_class_casts_normalized; - } - } - - if (!(this_state >= ccs->expected_state)) { - ir_printf(" Node is %+F\n", n); - ir_printf(" totype %+F\n", totype); - ir_printf(" fromtype %+F\n", fromtype); - ir_printf(" this_state: %s, exp. state: %s\n", - get_class_cast_state_string(this_state), - get_class_cast_state_string(ccs->expected_state)); - assert(this_state >= ccs->expected_state && - "invalid state class cast state setting in graph"); - } - - if (this_state < ccs->worst_situation) - ccs->worst_situation = this_state; -} - -/** Verify that the graph meets requirements of state set. */ -void verify_irg_class_cast_state(ir_graph *irg) -{ - ccs_env env; - - FIRM_DBG_REGISTER(dbg, "firm.tr.inheritance"); - - env.expected_state = get_irg_class_cast_state(irg); - env.worst_situation = ir_class_casts_normalized; - - irg_walk_graph(irg, NULL, verify_irn_class_cast_state, &env); - - if ((env.worst_situation > env.expected_state)) { - DB((dbg, LEVEL_1, "Note: class cast state is set lower than reqired " - "in graph \n\t%+F\n", irg)); - DB((dbg, LEVEL_1, " state is %s, reqired is %s\n", - get_class_cast_state_string(env.expected_state), - get_class_cast_state_string(env.worst_situation))); - } -}