X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Ftypewalk.c;h=523b1fe4c3ae2f7c09261614faa71ac9ede591cf;hb=db30faa048d1f60904d003f7bedf0f3358ff8903;hp=ae88d06dbd545026b829d8264e6ad021cda26fb9;hpb=1a26f4853c07d1ecd68a097409dd602edfe29eff;p=libfirm diff --git a/ir/tr/typewalk.c b/ir/tr/typewalk.c index ae88d06db..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 @@ -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; @@ -130,7 +130,7 @@ static void do_type_walk(type_or_ent tore, if (ent->initializer != NULL) { walk_initializer(ent->initializer, pre, post, env); } else if (entity_has_compound_ent_values(ent)) { - n_mem = get_compound_ent_n_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); @@ -245,7 +245,7 @@ static void irn_type_walker( If so start a walk over that information. */ static void start_type_walk(ir_node *node, void *ctx) { - type_walk_env *env = ctx; + type_walk_env *env = (type_walk_env*)ctx; type_walk_func *pre; type_walk_func *post; void *envi; @@ -257,13 +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(); + size_t i, n_types = get_irp_n_types(); type_or_ent cont; - irp_reserve_resources(irp, IR_RESOURCE_TYPE_VISITED); + 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); @@ -271,31 +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); - irp_free_resources(irp, IR_RESOURCE_TYPE_VISITED); -} - -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 = IR_SEGMENT_FIRST; i <= IR_SEGMENT_LAST; ++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, @@ -324,7 +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, IR_RESOURCE_TYPE_VISITED); + irp_reserve_resources(irp, IRP_RESOURCE_TYPE_VISITED); inc_master_type_visited(); irg_walk(get_irg_end(irg), start_type_walk, NULL, &type_env); @@ -335,7 +310,7 @@ void type_walk_irg(ir_graph *irg, do_type_walk(cont, pre, post, env); current_ir_graph = rem; - irp_free_resources(irp, IR_RESOURCE_TYPE_VISITED); + irp_free_resources(irp, IRP_RESOURCE_TYPE_VISITED); } static void type_walk_s2s_2(type_or_ent tore, @@ -344,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)) { @@ -367,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); @@ -415,9 +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, IR_RESOURCE_TYPE_VISITED); + 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); @@ -425,18 +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, IR_RESOURCE_TYPE_VISITED); + 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)) { @@ -461,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); @@ -499,13 +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, IR_RESOURCE_TYPE_VISITED); + 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); @@ -513,19 +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, IR_RESOURCE_TYPE_VISITED); + 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; @@ -557,10 +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, IR_RESOURCE_TYPE_VISITED); + irp_reserve_resources(irp, IRP_RESOURCE_TYPE_VISITED); inc_master_type_visited(); for (i = 0; i < n_types; i++) { tp = get_irp_type(i); @@ -572,16 +543,15 @@ void class_walk_super2sub(class_walk_func *pre, class_walk_s2s_2(tp, pre, post, env); } } - irp_free_resources(irp, IR_RESOURCE_TYPE_VISITED); + 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: