/*
- * 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.
*
ir_entity * ent;
arr = NEW_ARR_F(ir_entity *, size + 1);
arr[0] = NULL; /* Represents open method */
- for (ent = eset_first(set); size > 0; ent = eset_next(set), --size)
+ for (ent = (ir_entity*) eset_first(set); size > 0; ent = (ir_entity*) eset_next(set), --size)
arr[size] = ent;
} else {
ir_entity * ent;
arr = NEW_ARR_F(ir_entity *, size);
- for (size -= 1, ent = eset_first(set); size >= 0; ent = eset_next(set), --size)
+ for (size -= 1, ent = (ir_entity*) eset_first(set); size >= 0; ent = (ir_entity*) eset_next(set), --size)
arr[size] = ent;
}
eset_destroy(set);
*/
static void sel_methods_walker(ir_node *node, void *env)
{
- pmap *ldname_map = env;
ir_entity **arr;
+ (void)env;
/* Call standard optimizations */
if (is_Sel(node)) {
}
}
- /* replace SymConst(name)-operations by SymConst(ent) */
- if (is_SymConst(node)) {
- if (get_SymConst_kind(node) == symconst_addr_name) {
- pmap_entry *entry = pmap_find(ldname_map, get_SymConst_name(node));
- if (entry != NULL) { /* Method is declared in the compiled code */
- assert(!"There should not be a SymConst[addr_name] addressing a method with an implementation"
- "in this compilation unit. Use a SymConst[addr_ent].");
- }
- }
- } else if (is_Sel(node) && is_Method_type(get_entity_type(get_Sel_entity(node)))) {
+ if (is_Sel(node) && is_Method_type(get_entity_type(get_Sel_entity(node)))) {
ir_entity *ent = get_SymConst_entity(get_atomic_ent_value(get_Sel_entity(node)));
if (!eset_contains(entities, ent)) {
/* -- As an add on we get an optimization that removes polymorphic calls.
This optimization is more powerful than that in transform_node_Sel(). -- */
- arr = get_entity_link(ent);
+ arr = (ir_entity**) get_entity_link(ent);
if (arr == NULL) {
/*
* The Sel node never returns a pointer to a usable method.
* So we could replace the Sel node by a SymConst.
* This method must exists.
*/
- set_irg_current_block(current_ir_graph, get_nodes_block(node));
assert(get_entity_irg(arr[0]) != NULL);
- new_node = copy_const_value(get_irn_dbg_info(node), get_atomic_ent_value(arr[0]));
+ new_node = copy_const_value(get_irn_dbg_info(node), get_atomic_ent_value(arr[0]), get_nodes_block(node));
DBG_OPT_POLY(node, new_node);
exchange(node, new_node);
}
}
}
- all_irg_walk(sel_methods_walker, NULL, ldname_map);
+ all_irg_walk(sel_methods_walker, NULL, NULL);
pmap_destroy(ldname_map);
}
ent = get_Sel_entity(sel);
assert(is_Method_type(get_entity_type(ent))); /* what else? */
- arr = get_entity_link(ent);
+ arr = (ir_entity**) get_entity_link(ent);
if (arr) {
return arr;
} else {
*
* @param sel the Sel node
*/
-static int get_Sel_n_methods(ir_node * sel)
+static size_t get_Sel_n_methods(ir_node * sel)
{
return ARR_LEN(get_Sel_arr(sel));
}
/**
* Returns the ith possible called method entity at a Sel node.
*/
-static ir_entity * get_Sel_method(ir_node * sel, int pos)
+static ir_entity * get_Sel_method(ir_node * sel, size_t pos)
{
ir_entity ** arr = get_Sel_arr(sel);
- assert(pos >= 0 && pos < ARR_LEN(arr));
+ assert(pos < ARR_LEN(arr));
return arr[pos];
}
*/
static void free_mark(ir_node *node, eset * set)
{
- int i;
+ size_t i, n;
if (get_irn_link(node) == MARK)
return; /* already visited */
case iro_Sel: {
ir_entity *ent = get_Sel_entity(node);
if (is_method_entity(ent)) {
- for (i = get_Sel_n_methods(node) - 1; i >= 0; --i) {
+ for (i = 0, n = get_Sel_n_methods(node); i < n; ++i) {
eset_insert(set, get_Sel_method(node, i));
}
}
break;
case iro_Phi:
- for (i = get_Phi_n_preds(node) - 1; i >= 0; --i) {
+ {
+ int i, n;
+ for (i = 0, n = get_Phi_n_preds(node); i < n; ++i) {
free_mark(get_Phi_pred(node, i), set);
}
break;
+ }
case iro_Proj:
free_mark_proj(get_Proj_pred(node), get_Proj_proj(node), set);
break;
*/
static void free_ana_walker(ir_node *node, void *env)
{
- eset *set = env;
+ eset *set = (eset*) env;
int i;
if (get_irn_link(node) == MARK) {
* umgewandelt worden sein, d.h. SymConst-Operationen verweisen immer
* auf eine echt externe Methode.
*/
-static ir_entity **get_free_methods(int *length)
+static size_t get_free_methods(ir_entity ***free_methods)
{
eset *free_set = eset_create();
int i;
ir_entity *ent;
ir_graph *irg;
ir_type *tp;
+ size_t length;
for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
ir_linkage linkage;
add_method_address(ent, free_set);
}
tp = get_tls_type();
- for (i = get_struct_n_members(tp) - 1; i >= 0; --i) {
- ent = get_struct_member(tp, i);
+ for (i = get_class_n_members(tp) - 1; i >= 0; --i) {
+ ent = get_class_member(tp, i);
add_method_address(ent, free_set);
}
eset_insert(free_set, get_irg_entity(irg));
/* Finally, transform the set into an array. */
- *length = eset_count(free_set);
- arr = XMALLOCN(ir_entity*, *length);
- for (i = 0, ent = eset_first(free_set); ent; ent = eset_next(free_set)) {
+ length = eset_count(free_set);
+ arr = XMALLOCN(ir_entity*, length);
+ for (i = 0, ent = (ir_entity*) eset_first(free_set); ent; ent = (ir_entity*) eset_next(free_set)) {
arr[i++] = ent;
}
eset_destroy(free_set);
- return arr;
+ *free_methods = arr;
+ return length;
}
/*--------------------------------------------------------------------------*/
*/
static void callee_ana_node(ir_node *node, eset *methods)
{
- int i;
-
assert(mode_is_reference(get_irn_mode(node)) || is_Bad(node));
/* Beware of recursion */
if (get_irn_link(node) == MARK) {
call and ignore it completely. */
eset_insert(methods, unknown_entity); /* free method -> unknown */
break;
- case iro_SymConst:
- if (get_SymConst_kind(node) == symconst_addr_ent) {
- ir_entity *ent = get_SymConst_entity(node);
- assert(ent && is_method_entity(ent));
- eset_insert(methods, ent);
- } else {
- assert(get_SymConst_kind(node) == symconst_addr_name);
- /* external method (because fix_symconst()!) */
- eset_insert(methods, unknown_entity); /* free method -> unknown */
- }
+
+ case iro_SymConst: {
+ ir_entity *ent = get_SymConst_entity(node);
+ assert(ent && is_method_entity(ent));
+ eset_insert(methods, ent);
break;
- case iro_Sel:
+ }
+
+ case iro_Sel: {
/* polymorphic method */
- for (i = get_Sel_n_methods(node) - 1; i >= 0; --i) {
+ size_t i, n;
+ for (i = 0, n = get_Sel_n_methods(node); i < n; ++i) {
ir_entity *ent = get_Sel_method(node, i);
if (ent != NULL) {
eset_insert(methods, ent);
}
}
break;
+ }
case iro_Bad:
/* nothing */
break;
- case iro_Phi:
+ case iro_Phi: {
+ int i;
for (i = get_Phi_n_preds(node) - 1; i >= 0; --i) {
callee_ana_node(get_Phi_pred(node, i), methods);
}
break;
+ }
case iro_Mux:
callee_ana_node(get_Mux_false(node), methods);
eset *methods = eset_create();
ir_entity *ent;
ir_entity **arr;
- int i;
+ size_t i;
callee_ana_node(get_Call_ptr(call), methods);
arr = NEW_ARR_F(ir_entity *, eset_count(methods));
- for (i = 0, ent = eset_first(methods); ent; ent = eset_next(methods)) {
+ for (i = 0, ent = (ir_entity*) eset_first(methods); ent; ent = (ir_entity*) eset_next(methods)) {
arr[i] = ent;
/* we want the unknown_entity on the zero position for easy tests later */
if (ent == unknown_entity) {
{
ir_entity * ent;
assert(entities);
- for (ent = eset_first(entities); ent; ent = eset_next(entities)) {
- ir_entity ** arr = get_entity_link(ent);
+ for (ent = (ir_entity*) eset_first(entities); ent; ent = (ir_entity*) eset_next(entities)) {
+ ir_entity ** arr = (ir_entity**) get_entity_link(ent);
if (arr) {
DEL_ARR_F(arr);
}
/* Main drivers. */
/*--------------------------------------------------------------------------*/
-void cgana(int *length, ir_entity ***free_methods)
+size_t cgana(ir_entity ***free_methods)
{
+ size_t length;
/* Optimize Sel/SymConst nodes and compute all methods that implement an entity. */
sel_methods_init();
- *free_methods = get_free_methods(length);
+ length = get_free_methods(free_methods);
callee_ana();
sel_methods_dispose();
+ return length;
}
void free_callee_info(ir_graph *irg)
projects / libfirm / blobdiff