X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Frta.c;h=ea0ae3fb6c0e2eb22edbb0a1a0d1a131462cf958;hb=65daf5bc390b02d68581f4c431dbdbfaae11b88f;hp=d0dc5a8e83e46347b4e22bd31b66d4f3a05b4ffc;hpb=2a78dbfb4ad9fbf9dbc46a11e737ef5ba75d205e;p=libfirm diff --git a/ir/ana/rta.c b/ir/ana/rta.c index d0dc5a8e8..ea0ae3fb6 100644 --- a/ir/ana/rta.c +++ b/ir/ana/rta.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. * @@ -29,45 +29,28 @@ #include "rta.h" #include +#include #include "irnode_t.h" #include "irprog_t.h" #include "irgraph_t.h" -#include "eset.h" +#include "pset_new.h" #include "irgwalk.h" #include "irgmod.h" -#include "irvrfy.h" +#include "irverify.h" #include "irprintf.h" #include "debug.h" #include "error.h" -# ifndef TRUE -# define TRUE 1 -# define FALSE 0 -# endif /* not defined TRUE */ - /** The debug handle. */ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) /* base data */ -static eset *_live_classes = NULL; +static pset_new_t *_live_classes = NULL; /* cache computed results */ -static eset *_live_graphs = NULL; - -/** - * Given a method, find the firm graph that implements that method. - */ -static ir_graph *get_implementing_graph(ir_entity *method) -{ - ir_graph *graph = NULL; - - if (get_entity_peculiarity(method) != peculiarity_description) - graph = get_entity_irg(get_SymConst_entity(get_atomic_ent_value(method))); - - return graph; -} +static pset_new_t *_live_graphs = NULL; /** * Add a graph to the set of live graphs. @@ -76,16 +59,16 @@ static ir_graph *get_implementing_graph(ir_entity *method) * @return non-zero if the graph was added, zero * if it was already in the live set */ -static int add_graph(ir_graph *graph) +static bool add_graph(ir_graph *graph) { - if (!eset_contains(_live_graphs, graph)) { + if (!pset_new_contains(_live_graphs, graph)) { DB((dbg, LEVEL_2, "RTA: new graph of %+F\n", graph)); - eset_insert(_live_graphs, graph); - return TRUE; + pset_new_insert(_live_graphs, graph); + return true; } - return FALSE; + return false; } /** @@ -95,32 +78,32 @@ static int add_graph(ir_graph *graph) * @return non-zero if the graph was added, zero * if it was already in the live set */ -static int add_class(ir_type *clazz) +static bool add_class(ir_type *clazz) { - if (!eset_contains(_live_classes, clazz)) { + if (!pset_new_contains(_live_classes, clazz)) { DB((dbg, LEVEL_2, "RTA: new class: %+F\n", clazz)); - eset_insert(_live_classes, clazz); - return TRUE; + pset_new_insert(_live_classes, clazz); + return true; } - return FALSE; + return false; } /** Given an entity, add all implementing graphs that belong to live classes * to _live_graphs. * - * Iff additions occurred, return TRUE, else FALSE. + * Iff additions occurred, return true, else false. */ -static int add_implementing_graphs(ir_entity *method) +static bool add_implementing_graphs(ir_entity *method) { - int i; - int n_over = get_entity_n_overwrittenby(method); + size_t i; + size_t n_over = get_entity_n_overwrittenby(method); ir_graph *graph = get_entity_irg(method); - int change = FALSE; + bool change = false; if (NULL == graph) - graph = get_implementing_graph(method); + graph = get_entity_irg(method); DB((dbg, LEVEL_2, "RTA: new call to %+F\n", method)); @@ -145,8 +128,8 @@ static int add_implementing_graphs(ir_entity *method) */ static void rta_act(ir_node *node, void *env) { - int *change = (int *)env; - ir_opcode op = get_irn_opcode(node); + bool *change = (bool*)env; + unsigned op = get_irn_opcode(node); if (iro_Call == op) { /* CALL */ ir_entity *ent = NULL; @@ -170,11 +153,6 @@ static void rta_act(ir_node *node, void *env) } else { /* it's an external allocated thing. */ } - } else if (get_SymConst_kind(ptr) == symconst_addr_name) { - /* Entities of kind addr_name may not be allocated in this compilation unit. - If so, the frontend built faulty Firm. So just ignore. */ - /* if (get_SymConst_name(ptr) != new_id_from_str("iro_Catch")) - assert(ent && "couldn't determine entity of call to SymConst of kind addr_name."); */ } else { /* other symconst. */ panic("This SymConst can not be an address for a method call."); @@ -195,9 +173,9 @@ static void rta_act(ir_node *node, void *env) Traverse the given graph to collect method accesses and object allocations. */ -static int rta_fill_graph(ir_graph* graph) +static bool rta_fill_graph(ir_graph* graph) { - int change = FALSE; + bool change = false; irg_walk_graph(graph, rta_act, NULL, &change); return change; } @@ -207,68 +185,62 @@ static int rta_fill_graph(ir_graph* graph) */ static int rta_fill_incremental(void) { - int i; - int n_runs = 0; - int rerun = TRUE; -#ifdef INTERPROCEDURAL_VIEW - int old_ip_view = get_interprocedural_view(); - - set_interprocedural_view(0); /* save this for later */ -#endif + size_t i, n; + int n_runs = 0; + bool rerun = true; /* init_tables has added main_irg to _live_graphs */ /* Need to take care of graphs that are externally visible or sticky. Pretend that they are called: */ - for (i = get_irp_n_irgs() - 1; i >= 0; --i) { + for (i = 0, n = get_irp_n_irgs(); i < n; ++i) { ir_graph *graph = get_irp_irg(i); ir_entity *ent = get_irg_entity(graph); + ir_linkage linkage = get_entity_linkage(ent); - if ((visibility_external_visible == get_entity_visibility(ent)) || - (stickyness_sticky == get_entity_stickyness(ent))) { - eset_insert(_live_graphs, graph); - } + if ((linkage & IR_LINKAGE_HIDDEN_USER) || entity_is_externally_visible(ent)) + pset_new_insert(_live_graphs, graph); } while (rerun) { ir_graph *graph; + pset_new_iterator_t iter; /* start off new */ - eset *live_graphs = _live_graphs; - _live_graphs = eset_create(); + pset_new_t *live_graphs = _live_graphs; + _live_graphs = XMALLOC(pset_new_t); + pset_new_init(_live_graphs); DB((dbg, LEVEL_2, "RTA: RUN %i\n", n_runs)); /* collect what we have found previously */ - eset_insert_all(_live_graphs, live_graphs); + foreach_pset_new(live_graphs, ir_graph*, graph, iter) { + pset_new_insert(_live_graphs, graph); + } - rerun = FALSE; - for (graph = eset_first(live_graphs); - graph != NULL; - graph = eset_next(live_graphs)) { + rerun = false; + foreach_pset_new(live_graphs, ir_graph*, graph, iter) { DB((dbg, LEVEL_2, "RTA: RUN %i: considering graph of %+F\n", n_runs, graph)); rerun |= rta_fill_graph(graph); } - eset_destroy(live_graphs); + pset_new_destroy(live_graphs); + free(live_graphs); ++n_runs; } -#ifdef INTERPROCEDURAL_VIEW - set_interprocedural_view(old_ip_view); /* cover up our traces */ -#endif - return n_runs; } +#ifdef DEBUG_libfirm /** * Count the number of graphs that we have found to be live. */ -static int stats(void) +static size_t stats(void) { - int i; - int n_live_graphs = 0; + size_t i, n; + size_t n_live_graphs = 0; - for (i = get_irp_n_irgs() - 1; i >= 0; --i) { + for (i = 0, n = get_irp_n_irgs(); i < n; ++i) { ir_graph *graph = get_irp_irg(i); if (rta_is_alive_graph(graph)) @@ -277,6 +249,7 @@ static int stats(void) return n_live_graphs; } +#endif /* remove a graph, part I */ /* @@ -290,37 +263,32 @@ static int stats(void) */ static void init_tables(void) { - ir_type *tp; - int i, n; - ir_graph *irg; + ir_graph *irg; + ir_segment_t segment; - _live_classes = eset_create(); - _live_graphs = eset_create(); + _live_classes = XMALLOC(pset_new_t); + pset_new_init(_live_classes); + _live_graphs = XMALLOC(pset_new_t); + pset_new_init(_live_graphs); irg = get_irp_main_irg(); if (irg != NULL) { /* add the main irg to the live set if one is specified */ - eset_insert(_live_graphs, irg); + pset_new_insert(_live_graphs, irg); } - /* Find static allocated classes */ - tp = get_glob_type(); - n = get_class_n_members(tp); - for (i = 0; i < n; ++i) { - ir_type *member_type = get_entity_type(get_class_member(tp, i)); - if (is_Class_type(member_type)) - eset_insert(_live_classes, member_type); - } + /* Find static allocated classes in all segments */ + for (segment = IR_SEGMENT_FIRST; segment <= IR_SEGMENT_LAST; ++segment) { + ir_type *tp = get_segment_type(segment); + size_t n = get_compound_n_members(tp); + size_t i; - tp = get_tls_type(); - n = get_struct_n_members(tp); - for (i = 0; i < n; ++i) { - ir_type *member_type = get_entity_type(get_struct_member(tp, i)); - if (is_Class_type(member_type)) - eset_insert(_live_classes, member_type); + for (i = 0; i < n; ++i) { + ir_type *member_type = get_entity_type(get_compound_member(tp, i)); + if (is_Class_type(member_type)) + pset_new_insert(_live_classes, member_type); + } } - - /** @FIXME: add constructors/destructors */ } /* @@ -329,18 +297,16 @@ static void init_tables(void) void rta_init(void) { int n_runs = 0; - int rem_vpi = get_visit_pseudo_irgs(); - set_visit_pseudo_irgs(1); FIRM_DBG_REGISTER(dbg, "firm.ana.rta"); # ifdef DEBUG_libfirm { - int i; - for (i = get_irp_n_irgs() - 1; i >= 0; --i) { - irg_vrfy(get_irp_irg(i)); + size_t i; + for (i = get_irp_n_irgs(); i > 0;) { + irg_verify(get_irp_irg(--i), 0); } - tr_vrfy(); + tr_verify(); } # endif /* defined DEBUG_libfirm */ @@ -348,22 +314,20 @@ void rta_init(void) n_runs = rta_fill_incremental(); - DB((dbg, LEVEL_1, "RTA: n_graphs = %i\n", get_irp_n_irgs())); - DB((dbg, LEVEL_1, "RTA: n_live_graphs = %i\n", stats())); + DB((dbg, LEVEL_1, "RTA: n_graphs = %zu\n", get_irp_n_irgs())); + DB((dbg, LEVEL_1, "RTA: n_live_graphs = %zu\n", stats())); DB((dbg, LEVEL_1, "RTA: n_runs = %i\n", n_runs)); # ifdef DEBUG_libfirm { - int i; + size_t i; - for (i = get_irp_n_irgs() - 1; i >= 0; --i) { - irg_vrfy(get_irp_irg(i)); + for (i = get_irp_n_irgs(); i > 0;) { + irg_verify(get_irp_irg(--i), 0); } - tr_vrfy(); + tr_verify(); } # endif /* defined DEBUG_libfirm */ - - set_visit_pseudo_irgs(rem_vpi); } /** @@ -372,16 +336,16 @@ void rta_init(void) * Changes the peculiarity of entities that represents * dead graphs to peculiarity_description. */ -static void make_entity_to_description(type_or_ent tore, void *env) { +static void make_entity_to_description(type_or_ent tore, void *env) +{ (void) env; if (is_entity(tore.ent)) { ir_entity *ent = tore.ent; - if ((is_Method_type(get_entity_type(ent))) && - (get_entity_peculiarity(ent) != peculiarity_description) && - (get_entity_visibility(ent) != visibility_external_allocated) ) { - ir_graph *irg = get_entity_irg(get_SymConst_entity(get_atomic_ent_value(ent))); - if (! eset_contains(_live_graphs, irg)) { + if ((is_Method_type(get_entity_type(ent))) && + !entity_is_externally_visible(ent)) { + ir_graph *irg = get_entity_irg(ent); + if (irg != NULL && ! pset_new_contains(_live_graphs, irg)) { set_entity_peculiarity(ent, peculiarity_description); set_entity_irg(ent, NULL); } @@ -394,24 +358,17 @@ static void make_entity_to_description(type_or_ent tore, void *env) { */ void rta_delete_dead_graphs(void) { - int i, n_dead_irgs, n_graphs = get_irp_n_irgs(); + size_t i, n_dead_irgs, n_graphs = get_irp_n_irgs(); ir_graph *irg, *next_irg, *dead_irgs; - int rem_vpi = get_visit_pseudo_irgs(); - set_visit_pseudo_irgs(1); - irp_reserve_resources(irp, IR_RESOURCE_IRG_LINK); n_dead_irgs = 0; dead_irgs = NULL; - for (i = n_graphs - 1; i >= 0; --i) { - irg = get_irp_irg(i); + for (i = n_graphs; i > 0;) { + irg = get_irp_irg(--i); if (! rta_is_alive_graph(irg)) { -#ifndef NDEBUG - ir_entity *ent = get_irg_entity(irg); - assert(visibility_external_visible != get_entity_visibility(ent)); -#endif set_irg_link(irg, dead_irgs); dead_irgs = irg; ++n_dead_irgs; @@ -421,34 +378,35 @@ void rta_delete_dead_graphs(void) /* Hmm, probably we need to run this only if dead_irgs is non-NULL */ type_walk(make_entity_to_description, NULL, NULL); for (irg = dead_irgs; irg != NULL; irg = next_irg) { - next_irg = get_irg_link(irg); + next_irg = (ir_graph*) get_irg_link(irg); remove_irp_irg(irg); } - DB((dbg, LEVEL_1, "RTA: dead methods = %i\n", n_dead_irgs)); + DB((dbg, LEVEL_1, "RTA: dead methods = %zu\n", n_dead_irgs)); irp_free_resources(irp, IR_RESOURCE_IRG_LINK); - set_visit_pseudo_irgs(rem_vpi); } /* Clean up the RTA data structures. Call this after calling rta_init */ void rta_cleanup(void) { # ifdef DEBUG_libfirm - int i; - for (i = get_irp_n_irgs() - 1; i >= 0; --i) { - irg_vrfy(get_irp_irg(i)); + size_t i; + for (i = get_irp_n_irgs(); i > 0;) { + irg_verify(get_irp_irg(--i), 0); } - tr_vrfy(); + tr_verify(); # endif /* defined DEBUG_libfirm */ if (_live_classes != NULL) { - eset_destroy(_live_classes); + pset_new_destroy(_live_classes); + free(_live_classes); _live_classes = NULL; } if (_live_graphs != NULL) { - eset_destroy(_live_graphs); + pset_new_destroy(_live_graphs); + free(_live_graphs); _live_graphs = NULL; } } @@ -456,19 +414,19 @@ void rta_cleanup(void) /* Say whether this class might be instantiated at any point in the program: */ int rta_is_alive_class(ir_type *clazz) { - return eset_contains(_live_classes, clazz); + return pset_new_contains(_live_classes, clazz); } /* Say whether this graph might be run at any time in the program: */ int rta_is_alive_graph(ir_graph *graph) { - return eset_contains(_live_graphs, graph); + return pset_new_contains(_live_graphs, graph); } /* dump our opinion */ void rta_report(void) { - int i, n; + size_t i, n; n = get_irp_n_types(); for (i = 0; i < n; ++i) {