X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Frta.c;h=eb613f34f763bf0041dfd3ad45ab405df2872cdf;hb=4bad1346ff2abc3923beea23e5ac949acc7ca514;hp=1f30553cdb84b51e958e810b43cac34c668f55ea;hpb=41c7a004112f3c431146fa41ff8f3869678ca40b;p=libfirm diff --git a/ir/ana/rta.c b/ir/ana/rta.c index 1f30553cd..eb613f34f 100644 --- a/ir/ana/rta.c +++ b/ir/ana/rta.c @@ -14,7 +14,7 @@ #ifdef HAVE_CONFIG_H -# include +# include "config.h" #endif #include "rta.h" @@ -23,6 +23,7 @@ #include "irnode_t.h" #include "irprog_t.h" +#include "irgraph_t.h" #include "eset.h" #include "irgwalk.h" @@ -173,18 +174,20 @@ static void rta_act (ir_node *node, void *env) /* CALL SYMCONST */ } else if (iro_SymConst == get_irn_opcode (ptr)) { if (get_SymConst_kind(ptr) == symconst_addr_ent) { + ir_graph *graph; + ent = get_SymConst_entity (ptr); - ir_graph *graph = get_entity_irg (ent); + graph = get_entity_irg (ent); if (graph) { *change |= add_graph (graph); } 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."); */ + /* 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. */ assert(0 && "This SymConst can not be an address for a method call."); @@ -227,9 +230,9 @@ static int rta_fill_incremental (void) int i; int n_runs = 0; int rerun = TRUE; - int old_ip_view = interprocedural_view; + int old_ip_view = get_interprocedural_view(); - interprocedural_view = 0; /* save this for later */ + set_interprocedural_view(false); /* save this for later */ /* init_tables has added main_irg to _live_graphs */ @@ -279,14 +282,14 @@ static int rta_fill_incremental (void) n_runs ++; } - interprocedural_view = old_ip_view; /* cover up our traces */ + set_interprocedural_view(old_ip_view); /* cover up our traces */ return (n_runs); } -/* - Count the number of graphs that we have found to be live. -*/ +/** + * Count the number of graphs that we have found to be live. + */ static int stats (void) { int i; @@ -342,7 +345,7 @@ static void force_description (entity *ent, entity *addr) } /** - Initialise the static data structures. + Initialize the static data structures. */ static void init_tables (void) { @@ -358,21 +361,23 @@ static void init_tables (void) /* Find static allocated classes */ for (i = 0; i < n_globs; ++i) { type *member_type = get_entity_type(get_class_member(get_glob_type(), i)); - if (is_class_type(member_type)) + if (is_Class_type(member_type)) eset_insert(_live_classes, member_type); } } /* - * Initialise the RTA data structures, and perform RTA. + * Initialize the RTA data structures, and perform RTA. * do_verbose If == 1, print statistics, if > 1, chatter about every detail */ void rta_init (int do_verbose) { - int n_runs = 0; + int i, n_runs = 0; + + int rem_vpi = get_visit_pseudo_irgs(); + set_visit_pseudo_irgs(1); # ifdef DEBUG_libfirm - int i; for (i = 0; i < get_irp_n_irgs(); i++) { irg_vrfy (get_irp_irg(i)); } @@ -399,6 +404,8 @@ void rta_init (int do_verbose) } tr_vrfy (); # endif /* defined DEBUG_libfirm */ + + set_visit_pseudo_irgs(rem_vpi); } /** @@ -411,13 +418,13 @@ static void make_entity_to_description(type_or_ent *tore, void *env) { if (get_kind(tore) == k_entity) { entity *ent = (entity *)tore; - if ((is_method_type(get_entity_type(ent))) && - (get_entity_peculiarity(ent) != peculiarity_description) && - (get_entity_visibility(ent) != visibility_external_allocated) ) { + 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)) { - set_entity_peculiarity(ent, peculiarity_description); - set_entity_irg(ent, NULL); + set_entity_peculiarity(ent, peculiarity_description); + set_entity_irg(ent, NULL); } } } @@ -432,10 +439,14 @@ void rta_delete_dead_graphs (void) int n_graphs = get_irp_n_irgs (); ir_graph *graph = NULL; int n_dead_graphs = 0; + ir_graph **dead_graphs; + + int rem_vpi = get_visit_pseudo_irgs(); + set_visit_pseudo_irgs(1); if (!get_optimize() || !get_opt_dead_method_elimination()) return; - ir_graph *dead_graphs[get_irp_n_irgs()]; + dead_graphs = xmalloc(sizeof(*dead_graphs) * get_irp_n_irgs()); for (i = 0; i < n_graphs; i++) { graph = get_irp_irg(i); @@ -461,6 +472,10 @@ void rta_delete_dead_graphs (void) if (verbose) { printf ("RTA: n_dead_graphs = %i\n", n_dead_graphs); } + + set_visit_pseudo_irgs(rem_vpi); + + free(dead_graphs); } /* Clean up the RTA data structures. Call this after calling rta_init */ @@ -504,7 +519,7 @@ void rta_report (void) for (i = 0; i < get_irp_n_types(); ++i) { type *tp = get_irp_type(i); - if (is_class_type(tp) && rta_is_alive_class(tp)) { + if (is_Class_type(tp) && rta_is_alive_class(tp)) { fprintf(stdout, "RTA: considered allocated: "); DDMT(tp); } } @@ -520,6 +535,22 @@ void rta_report (void) /* * $Log$ + * Revision 1.32 2005/01/05 14:24:52 beck + * renames all is_x*_type() functions to is_X*_type() to prevent name clash with EDG frontend + * + * Revision 1.31 2004/12/21 13:45:14 beck + * removed C99 constructs + * + * Revision 1.30 2004/12/02 16:16:11 beck + * fixed config.h include + * used xmalloc instead of malloc + * + * Revision 1.29 2004/11/11 13:28:08 goetz + * made pseudo irg aware + * + * Revision 1.28 2004/11/03 14:47:18 beck + * removed gloval intraprocedural_view variable and replaced by get_*() set_*() functions + * * Revision 1.27 2004/10/21 07:23:34 goetz * comments *