X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Ftypewalk.c;h=523b1fe4c3ae2f7c09261614faa71ac9ede591cf;hb=db30faa048d1f60904d003f7bedf0f3358ff8903;hp=4a6e094cd9502906daf6cff14e11761fff0dc5c6;hpb=ef3f4288a57fc536e74087390be6d0f33771511d;p=libfirm diff --git a/ir/tr/typewalk.c b/ir/tr/typewalk.c index 4a6e094cd..523b1fe4c 100644 --- a/ir/tr/typewalk.c +++ b/ir/tr/typewalk.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. * @@ -21,7 +21,6 @@ * @file typewalk.c * @brief Functionality to modify the type graph. * @author Goetz Lindenmaier - * @version $Id$ * @brief * * Traverse the type information. The walker walks the whole ir graph @@ -42,6 +41,7 @@ #include "irnode_t.h" #include "irgwalk.h" #include "error.h" +#include "ircons.h" /** * The walker environment @@ -60,7 +60,7 @@ static void walk_initializer(ir_initializer_t *initializer, type_walk_func *pre, type_walk_func *post, void *env) { - switch(initializer->kind) { + switch (initializer->kind) { case IR_INITIALIZER_CONST: irn_type_walker(initializer->consti.value, pre, post, env); return; @@ -70,7 +70,7 @@ static void walk_initializer(ir_initializer_t *initializer, case IR_INITIALIZER_COMPOUND: { size_t i; - for(i = 0; i < initializer->compound.n_initializers; ++i) { + for (i = 0; i < initializer->compound.n_initializers; ++i) { ir_initializer_t *subinitializer = initializer->compound.initializers[i]; walk_initializer(subinitializer, pre, post, env); @@ -90,7 +90,7 @@ static void do_type_walk(type_or_ent tore, type_walk_func *post, void *env) { - int i, n_types, n_mem; + size_t i, n_types, n_mem; ir_entity *ent = NULL; ir_type *tp = NULL; ir_node *n; @@ -102,10 +102,13 @@ static void do_type_walk(type_or_ent tore, ent = tore.ent; if (entity_visited(ent)) return; + mark_entity_visited(ent); break; case k_type: + tp = tore.typ; if (type_visited(tp)) return; + mark_type_visited(tp); break; default: break; @@ -118,30 +121,23 @@ static void do_type_walk(type_or_ent tore, /* iterate */ switch (get_kind(tore.ent)) { case k_entity: - mark_entity_visited(ent); cont.typ = get_entity_owner(ent); do_type_walk(cont, pre, post, env); cont.typ = get_entity_type(ent); do_type_walk(cont, pre, post, env); - if (get_entity_variability(ent) != variability_uninitialized) { - /* walk over the value types */ - if (ent->has_initializer) { - walk_initializer(ent->attr.initializer, pre, post, env); - } else if (is_atomic_entity(ent)) { - n = get_atomic_ent_value(ent); + /* walk over the value types */ + if (ent->initializer != NULL) { + walk_initializer(ent->initializer, pre, post, env); + } else if (entity_has_compound_ent_values(ent)) { + size_t i, n_mem = get_compound_ent_n_values(ent); + for (i = 0; i < n_mem; ++i) { + n = get_compound_ent_value(ent, i); irn_type_walker(n, pre, post, env); - } else { - n_mem = get_compound_ent_n_values(ent); - for (i = 0; i < n_mem; ++i) { - n = get_compound_ent_value(ent, i); - irn_type_walker(n, pre, post, env); - } } } break; case k_type: - mark_type_visited(tp); switch (get_type_tpop_code(tp)) { case tpo_class: n_types = get_class_n_supertypes(tp); @@ -247,8 +243,9 @@ static void irn_type_walker( /** Check whether node contains types or entities as an attribute. If so start a walk over that information. */ -static void start_type_walk(ir_node *node, void *ctx) { - type_walk_env *env = ctx; +static void start_type_walk(ir_node *node, void *ctx) +{ + type_walk_env *env = (type_walk_env*)ctx; type_walk_func *pre; type_walk_func *post; void *envi; @@ -260,11 +257,12 @@ static void start_type_walk(ir_node *node, void *ctx) { irn_type_walker(node, pre, post, envi); } -/* walker: walks over all types */ -void type_walk(type_walk_func *pre, type_walk_func *post, void *env) { - int i, n_types = get_irp_n_types(); +void type_walk(type_walk_func *pre, type_walk_func *post, void *env) +{ + size_t i, n_types = get_irp_n_types(); type_or_ent cont; + irp_reserve_resources(irp, IRP_RESOURCE_TYPE_VISITED); inc_master_type_visited(); for (i = 0; i < n_types; ++i) { cont.typ = get_irp_type(i); @@ -272,29 +270,7 @@ void type_walk(type_walk_func *pre, type_walk_func *post, void *env) { } cont.typ = get_glob_type(); do_type_walk(cont, pre, post, env); -} - -void type_walk_prog(type_walk_func *pre, type_walk_func *post, void *env) { - int i, n_irgs = get_irp_n_irgs(); - type_or_ent cont; - - type_walk(pre, post, env); - - for (i = 0; i < n_irgs; ++i) { - ir_graph *irg = get_irp_irg(i); - cont.typ = get_irg_frame_type(irg); - do_type_walk(cont, pre, post, env); - - cont.typ = get_method_value_param_type(get_entity_type(get_irg_entity(irg))); - if(cont.typ) - do_type_walk(cont, pre, post, env); - } - - for (i = 0; i < IR_SEGMENT_COUNT; ++i) { - cont.typ = get_segment_type((ir_segment_t) i); - if(cont.typ) - do_type_walk(cont, pre, post, env); - } + irp_free_resources(irp, IRP_RESOURCE_TYPE_VISITED); } void type_walk_irg(ir_graph *irg, @@ -323,6 +299,7 @@ void type_walk_irg(ir_graph *irg, Here we initially increase the flag. We only call do_type_walk that does not increase the flag. */ + irp_reserve_resources(irp, IRP_RESOURCE_TYPE_VISITED); inc_master_type_visited(); irg_walk(get_irg_end(irg), start_type_walk, NULL, &type_env); @@ -333,6 +310,7 @@ void type_walk_irg(ir_graph *irg, do_type_walk(cont, pre, post, env); current_ir_graph = rem; + irp_free_resources(irp, IRP_RESOURCE_TYPE_VISITED); } static void type_walk_s2s_2(type_or_ent tore, @@ -341,7 +319,6 @@ static void type_walk_s2s_2(type_or_ent tore, void *env) { type_or_ent cont; - int i, n; /* marked? */ switch (get_kind(tore.ent)) { @@ -364,6 +341,8 @@ static void type_walk_s2s_2(type_or_ent tore, switch (get_type_tpop_code(tp)) { case tpo_class: { + size_t i, n; + n = get_class_n_supertypes(tp); for (i = 0; i < n; ++i) { cont.typ = get_class_supertype(tp, i); @@ -412,8 +391,9 @@ void type_walk_super2sub(type_walk_func *pre, void *env) { type_or_ent cont; - int i, n_types = get_irp_n_types(); + size_t i, n_types = get_irp_n_types(); + irp_reserve_resources(irp, IRP_RESOURCE_TYPE_VISITED); inc_master_type_visited(); cont.typ = get_glob_type(); type_walk_s2s_2(cont, pre, post, env); @@ -421,17 +401,15 @@ void type_walk_super2sub(type_walk_func *pre, cont.typ = get_irp_type(i); type_walk_s2s_2(cont, pre, post, env); } + irp_free_resources(irp, IRP_RESOURCE_TYPE_VISITED); } /*****************************************************************************/ -static void -type_walk_super_2(type_or_ent tore, - type_walk_func *pre, - type_walk_func *post, - void *env) { +static void type_walk_super_2(type_or_ent tore, type_walk_func *pre, + type_walk_func *post, void *env) +{ type_or_ent cont; - int i, n; /* marked? */ switch (get_kind(tore.ent)) { @@ -456,6 +434,8 @@ type_walk_super_2(type_or_ent tore, switch (get_type_tpop_code(tp)) { case tpo_class: { + size_t i, n; + /* execute pre method */ if (pre) pre(tore, env); @@ -494,12 +474,12 @@ type_walk_super_2(type_or_ent tore, } } -void type_walk_super(type_walk_func *pre, - type_walk_func *post, - void *env) { - int i, n_types = get_irp_n_types(); +void type_walk_super(type_walk_func *pre, type_walk_func *post, void *env) +{ + size_t i, n_types = get_irp_n_types(); type_or_ent cont; + irp_reserve_resources(irp, IRP_RESOURCE_TYPE_VISITED); inc_master_type_visited(); cont.typ = get_glob_type(); type_walk_super_2(cont, pre, post, env); @@ -507,18 +487,16 @@ void type_walk_super(type_walk_func *pre, cont.typ = get_irp_type(i); type_walk_super_2(cont, pre, post, env); } + irp_free_resources(irp, IRP_RESOURCE_TYPE_VISITED); } /*****************************************************************************/ -static void -class_walk_s2s_2(ir_type *tp, - class_walk_func *pre, - class_walk_func *post, - void *env) +static void class_walk_s2s_2(ir_type *tp, class_walk_func *pre, + class_walk_func *post, void *env) { - int i, n; + size_t i, n; /* marked? */ if (type_visited(tp)) return; @@ -550,9 +528,10 @@ void class_walk_super2sub(class_walk_func *pre, class_walk_func *post, void *env) { - int i, n_types = get_irp_n_types(); + size_t i, n_types = get_irp_n_types(); ir_type *tp; + irp_reserve_resources(irp, IRP_RESOURCE_TYPE_VISITED); inc_master_type_visited(); for (i = 0; i < n_types; i++) { tp = get_irp_type(i); @@ -564,15 +543,15 @@ void class_walk_super2sub(class_walk_func *pre, class_walk_s2s_2(tp, pre, post, env); } } + irp_free_resources(irp, IRP_RESOURCE_TYPE_VISITED); } -/* Walks over all entities in the type */ void walk_types_entities(ir_type *tp, entity_walk_func *doit, void *env) { - int i, n; + size_t i, n; switch (get_type_tpop_code(tp)) { case tpo_class: