#ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
#endif
#include "rta.h"
#include "eset.h"
#include "irgwalk.h"
#include "irgmod.h"
+#include "typewalk.h"
#include "irvrfy.h"
#include "trvrfy.h"
return (FALSE);
}
-static int add_class (type *clazz)
+static int add_class (ir_type *clazz)
{
if (!eset_contains (_live_classes, clazz)) {
if (verbose > 1) {
/* 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.");
}
} else if (iro_Alloc == op) { /* ALLOC */
- type *type = get_Alloc_type (node);
+ ir_type *type = get_Alloc_type (node);
*change |= add_class (type);
}
}
/** Traverse all graphs to collect method accesses and object allocations.
- *
- * @param rerun Whether to rely on is_alive in a second run
*/
static int rta_fill_incremental (void)
{
int rerun = TRUE;
int old_ip_view = get_interprocedural_view();
- set_interprocedural_view(false); /* save this for later */
+ set_interprocedural_view(0); /* save this for later */
/* init_tables has added main_irg to _live_graphs */
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;
}
/**
- Initialise the static data structures.
+ Initialize the static data structures.
*/
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))
+ ir_type *member_type = get_entity_type(get_class_member(get_glob_type(), i));
+ 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));
}
}
tr_vrfy ();
# endif /* defined DEBUG_libfirm */
+
+ set_visit_pseudo_irgs(rem_vpi);
}
/**
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);
}
}
}
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);
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 */
}
/* Say whether this class might be instantiated at any point in the program: */
-int rta_is_alive_class (type *clazz)
+int rta_is_alive_class (ir_type *clazz)
{
return (eset_contains (_live_classes, clazz));
}
int i;
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)) {
+ ir_type *tp = get_irp_type(i);
+ if (is_Class_type(tp) && rta_is_alive_class(tp)) {
fprintf(stdout, "RTA: considered allocated: "); DDMT(tp);
}
}
/*
* $Log$
+ * Revision 1.35 2006/01/13 21:51:59 beck
+ * renamed all types 'type' to 'ir_type'
+ *
+ * Revision 1.34 2006/01/02 15:01:16 beck
+ * missing include added
+ *
+ * Revision 1.33 2005/11/17 17:26:57 beck
+ * removed bool type and depency from stdbool.h (not C89)
+ *
+ * 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
*