/*
- * 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.
*
X(ir_no_alias);
X(ir_may_alias);
X(ir_sure_alias);
- default: assert(0); return "UNKNOWN";
+ default:
+ panic("UNKNOWN alias relation");
}
#undef X
}
if (opt & aa_opt_inherited)
return global_mem_disamgig_opt;
return opt;
-} /* get_irg_memory_disambiguator_options */
+}
/* Set the memory disambiguator options for a graph. */
void set_irg_memory_disambiguator_options(ir_graph *irg, unsigned options)
{
irg->mem_disambig_opt = options & ~aa_opt_inherited;
-} /* set_irg_memory_disambiguator_options */
+}
/* Set the global disambiguator options for all graphs not having local options. */
void set_irp_memory_disambiguator_options(unsigned options)
{
global_mem_disamgig_opt = options;
-} /* set_irp_memory_disambiguator_options */
+}
+
+/* Get the base storage class (ignore modifier) */
+ir_storage_class_class_t get_base_sc(ir_storage_class_class_t x)
+{
+ return x & ~ir_sc_modifiers;
+}
/**
* Find the base address and entity of an Sel node.
}
*pEnt = get_Sel_entity(sel);
return ptr;
-} /* find_base_adr */
+}
/**
* Check if a given Const node is greater or equal a given size.
*/
static ir_alias_relation check_const(const ir_node *cns, int size)
{
- tarval *tv = get_Const_tarval(cns);
- tarval *tv_size;
+ ir_tarval *tv = get_Const_tarval(cns);
+ ir_tarval *tv_size;
if (size == 0)
return tarval_is_null(tv) ? ir_may_alias : ir_no_alias;
tv_size = new_tarval_from_long(size, get_tarval_mode(tv));
- return tarval_cmp(tv_size, tv) & (pn_Cmp_Eq|pn_Cmp_Lt) ? ir_no_alias : ir_may_alias;
-} /* check_const */
+ return tarval_cmp(tv_size, tv) & (ir_relation_less_equal) ? ir_no_alias : ir_may_alias;
+}
/**
* Treat idx1 and idx2 as integer indexes and check if they differ always more than size.
return ir_sure_alias;
if (is_Const(idx1) && is_Const(idx2)) {
/* both are const, we can compare them */
- tarval *tv1 = get_Const_tarval(idx1);
- tarval *tv2 = get_Const_tarval(idx2);
- tarval *tv, *tv_size;
+ ir_tarval *tv1 = get_Const_tarval(idx1);
+ ir_tarval *tv2 = get_Const_tarval(idx2);
+ ir_tarval *tv, *tv_size;
ir_mode *m1, *m2;
if (size == 0)
if (get_mode_sign(m1) != get_mode_sign(m2)) {
/* find the signed */
if (mode_is_signed(m2)) {
- tarval *t = tv1;
+ ir_tarval *t = tv1;
ir_mode *tm = m1;
tv1 = tv2; m1 = m2;
tv2 = t; m2 = tm;
} else {
tv_size = new_tarval_from_long(size, m2);
- if (tarval_cmp(tv2, tv_size) & (pn_Cmp_Eq|pn_Cmp_Gt)) {
+ if (tarval_cmp(tv2, tv_size) & (ir_relation_greater_equal)) {
/* tv1 is negative and tv2 >= tv_size, so the difference is bigger than size */
return ir_no_alias;
}
tv1 = tarval_convert_to(tv1, m2);
/* now we can compare without overflow */
- return tarval_cmp(tv1, tv2) & (pn_Cmp_Eq|pn_Cmp_Gt) ? ir_no_alias : ir_may_alias;
+ return tarval_cmp(tv1, tv2) & (ir_relation_greater_equal) ? ir_no_alias : ir_may_alias;
}
}
}
- if (tarval_cmp(tv1, tv2) == pn_Cmp_Gt) {
- tarval *t = tv1;
+ if (tarval_cmp(tv1, tv2) == ir_relation_greater) {
+ ir_tarval *t = tv1;
tv1 = tv2;
tv2 = t;
}
/* tv1 is now the "smaller" one */
tv = tarval_sub(tv2, tv1, NULL);
tv_size = new_tarval_from_long(size, get_tarval_mode(tv));
- return tarval_cmp(tv_size, tv) & (pn_Cmp_Eq|pn_Cmp_Lt) ? ir_no_alias : ir_may_alias;
+ return tarval_cmp(tv_size, tv) & (ir_relation_less_equal) ? ir_no_alias : ir_may_alias;
}
/* Note: we rely here on the fact that normalization puts constants on the RIGHT side */
}
return ir_may_alias;
-} /* different_index */
+}
/**
* Two Sel addresses have the same base address, check if there offsets are
(void) different_index;
#endif
return ir_may_alias;
-} /* different_sel_offsets */
+}
/**
* Determine the alias relation by checking if adr1 and adr2 are pointer
{
ir_entity *ent1 = NULL, *ent2 = NULL;
- if (is_Global(adr1))
- ent1 = get_Global_entity(adr1);
+ if (is_SymConst_addr_ent(adr1))
+ ent1 = get_SymConst_entity(adr1);
else if (is_Sel(adr1))
ent1 = get_Sel_entity(adr1);
- if (is_Global(adr2))
- ent2 = get_Global_entity(adr2);
+ if (is_SymConst_addr_ent(adr2))
+ ent2 = get_SymConst_entity(adr2);
else if (is_Sel(adr2))
ent2 = get_Sel_entity(adr2);
}
}
return ir_may_alias;
-} /* different_types */
+}
/**
* Returns non-zero if a node is a result on a malloc-like routine.
if (! is_Call(node))
return 0;
node = get_Call_ptr(node);
- if (is_Global(node)) {
- ir_entity *ent = get_Global_entity(node);
+ if (is_SymConst_addr_ent(node)) {
+ ir_entity *ent = get_SymConst_entity(node);
if (get_entity_additional_properties(ent) & mtp_property_malloc)
return 1;
return 0;
}
return 0;
-} /* is_malloc_Result */
+}
-/**
- * Classify a base pointer.
- *
- * @param irg the graph of the pointer
- * @param irn the node representing the base address
- * @param ent the base entity of the base address iff any
- */
-ir_storage_class_class_t classify_pointer(const ir_graph *irg, const ir_node *irn, const ir_entity *ent)
+ir_storage_class_class_t classify_pointer(const ir_node *irn,
+ const ir_entity *ent)
{
+ ir_graph *irg = get_irn_irg(irn);
ir_storage_class_class_t res = ir_sc_pointer;
- if (is_Global(irn)) {
- ir_entity *entity = get_Global_entity(irn);
- res = ir_sc_globalvar;
+ if (is_SymConst_addr_ent(irn)) {
+ ir_entity *entity = get_SymConst_entity(irn);
+ ir_type *owner = get_entity_owner(entity);
+ res = owner == get_tls_type() ? ir_sc_tls : ir_sc_globalvar;
if (! (get_entity_usage(entity) & ir_usage_address_taken))
res |= ir_sc_modifier_nottaken;
} else if (irn == get_irg_frame(irg)) {
res = ir_sc_localvar;
if (ent != NULL && !(get_entity_usage(ent) & ir_usage_address_taken))
res |= ir_sc_modifier_nottaken;
- } else if (irn == get_irg_tls(irg)) {
- res = ir_sc_tls;
- if (ent != NULL && !(get_entity_usage(ent) & ir_usage_address_taken))
- res |= ir_sc_modifier_nottaken;
} else if (is_Proj(irn) && is_malloc_Result(irn)) {
return ir_sc_malloced;
} else if (is_Const(irn)) {
/**
* Determine the alias relation between two addresses.
*
- * @param irg the graph of both memory operations
* @param addr1 pointer address of the first memory operation
* @param mode1 the mode of the accessed data through addr1
* @param addr2 pointer address of the second memory operation
* @return found memory relation
*/
static ir_alias_relation _get_alias_relation(
- const ir_graph *irg,
const ir_node *adr1, const ir_mode *mode1,
const ir_node *adr2, const ir_mode *mode2)
{
const ir_node *base2;
const ir_node *orig_adr1 = adr1;
const ir_node *orig_adr2 = adr2;
+ ir_graph *irg;
unsigned mode_size;
ir_storage_class_class_t class1, class2, mod1, mod2;
int have_const_offsets;
if (adr1 == adr2)
return ir_sure_alias;
+ irg = get_irn_irg(adr1);
options = get_irg_memory_disambiguator_options(irg);
/* The Armageddon switch */
while (is_Add(adr1)) {
ir_node *add_right = get_Add_right(adr1);
if (is_Const(add_right) && !mode_is_reference(get_irn_mode(add_right))) {
- tarval *tv = get_Const_tarval(add_right);
+ ir_tarval *tv = get_Const_tarval(add_right);
offset1 += get_tarval_long(tv);
adr1 = get_Add_left(adr1);
} else if (mode_is_reference(get_irn_mode(add_right))) {
while (is_Add(adr2)) {
ir_node *add_right = get_Add_right(adr2);
if (is_Const(add_right) && !mode_is_reference(get_irn_mode(add_right))) {
- tarval *tv = get_Const_tarval(add_right);
+ ir_tarval *tv = get_Const_tarval(add_right);
offset2 += get_tarval_long(tv);
adr2 = get_Add_left(adr2);
} else if (mode_is_reference(get_irn_mode(add_right))) {
/*
* Bitfields can be constructed as Sels from its base address.
* As they have different entities, the disambiguator would find that they are
- * alias free. While this is true for it's values, it is false for the addresses
+ * alias free. While this is true for its values, it is false for the addresses
* (strictly speaking, the Sel's are NOT the addresses of the bitfields).
* So, skip those bitfield selecting Sel's.
*/
return different_sel_offsets(adr1, adr2);
}
- mod1 = classify_pointer(irg, base1, ent1);
- mod2 = classify_pointer(irg, base2, ent2);
+ mod1 = classify_pointer(base1, ent1);
+ mod2 = classify_pointer(base2, ent2);
- class1 = GET_BASE_SC(mod1);
- class2 = GET_BASE_SC(mod2);
+ class1 = get_base_sc(mod1);
+ class2 = get_base_sc(mod2);
+
+ /* struct-access cannot alias with variables */
+ if (ent1 == NULL && ent2 != NULL && is_compound_type(get_entity_owner(ent2))
+ && (class1 == ir_sc_globalvar || class1 == ir_sc_localvar || class1 == ir_sc_tls || class1 == ir_sc_globaladdr)) {
+ return ir_no_alias;
+ }
+ if (ent2 == NULL && ent1 != NULL && is_compound_type(get_entity_owner(ent1))
+ && (class2 == ir_sc_globalvar || class2 == ir_sc_localvar || class2 == ir_sc_tls || class2 == ir_sc_globaladdr)) {
+ return ir_no_alias;
+ }
if (class1 == ir_sc_pointer || class2 == ir_sc_pointer) {
/* swap pointer class to class1 */
ir_storage_class_class_t temp = mod1;
mod1 = mod2;
mod2 = temp;
- class1 = GET_BASE_SC(mod1);
- class2 = GET_BASE_SC(mod2);
+ class1 = get_base_sc(mod1);
+ class2 = get_base_sc(mod2);
}
/* a pointer and an object whose address was never taken */
if (mod2 & ir_sc_modifier_nottaken) {
/* for some reason CSE didn't happen yet for the 2 SymConsts... */
return ir_may_alias;
} else if (class1 == ir_sc_globaladdr) {
- tarval *tv = get_Const_tarval(base1);
- offset1 += get_tarval_long(tv);
- tv = get_Const_tarval(base2);
- offset2 += get_tarval_long(tv);
+ ir_tarval *tv = get_Const_tarval(base1);
+ offset1 += get_tarval_long(tv);
+ tv = get_Const_tarval(base2);
+ offset2 += get_tarval_long(tv);
if ((unsigned long)labs(offset2 - offset1) >= mode_size)
return ir_no_alias;
/* do we have a language specific memory disambiguator? */
if (language_disambuigator != NULL) {
- ir_alias_relation rel = language_disambuigator(irg, orig_adr1, mode1, orig_adr2, mode2);
+ ir_alias_relation rel = language_disambuigator(orig_adr1, mode1, orig_adr2, mode2);
if (rel != ir_may_alias)
return rel;
}
/* access points-to information here */
return ir_may_alias;
-} /* _get_alias_relation */
+}
/*
* Determine the alias relation between two addresses.
*/
ir_alias_relation get_alias_relation(
- const ir_graph *irg,
const ir_node *adr1, const ir_mode *mode1,
const ir_node *adr2, const ir_mode *mode2)
{
- ir_alias_relation rel = _get_alias_relation(irg, adr1, mode1, adr2, mode2);
+ ir_alias_relation rel = _get_alias_relation(adr1, mode1, adr2, mode2);
DB((dbg, LEVEL_1, "alias(%+F, %+F) = %s\n", adr1, adr2, get_ir_alias_relation_name(rel)));
return rel;
-} /* get_alias_relation */
+}
/* Set a source language specific memory disambiguator function. */
void set_language_memory_disambiguator(DISAMBIGUATOR_FUNC func)
{
language_disambuigator = func;
-} /* set_language_memory_disambiguator */
+}
/** The result cache for the memory disambiguator. */
static set *result_cache = NULL;
/** An entry in the relation cache. */
typedef struct mem_disambig_entry {
- const ir_node *adr1; /**< The first address. */
- const ir_mode *mode1; /**< The first address mode. */
- const ir_node *adr2; /**< The second address. */
- const ir_mode *mode2; /**< The second address mode. */
+ const ir_node *adr1; /**< The first address. */
+ const ir_mode *mode1; /**< The first address mode. */
+ const ir_node *adr2; /**< The second address. */
+ const ir_mode *mode2; /**< The second address mode. */
ir_alias_relation result; /**< The alias relation result. */
} mem_disambig_entry;
-#define HASH_ENTRY(adr1, adr2) (HASH_PTR(adr1) ^ HASH_PTR(adr2))
+#define HASH_ENTRY(adr1, adr2) (HASH_PTR(adr1) ^ HASH_PTR(adr2))
/**
* Compare two relation cache entries.
*/
static int cmp_mem_disambig_entry(const void *elt, const void *key, size_t size)
{
- const mem_disambig_entry *p1 = elt;
- const mem_disambig_entry *p2 = key;
+ const mem_disambig_entry *p1 = (const mem_disambig_entry*) elt;
+ const mem_disambig_entry *p2 = (const mem_disambig_entry*) key;
(void) size;
return p1->adr1 == p2->adr1 && p1->adr2 == p2->adr2 &&
p1->mode1 == p2->mode1 && p1->mode2 == p2->mode2;
-} /* cmp_mem_disambig_entry */
+}
/**
* Initialize the relation cache.
void mem_disambig_init(void)
{
result_cache = new_set(cmp_mem_disambig_entry, 8);
-} /* mem_disambig_init */
+}
/*
* Determine the alias relation between two addresses.
*/
ir_alias_relation get_alias_relation_ex(
- const ir_graph *irg,
const ir_node *adr1, const ir_mode *mode1,
const ir_node *adr2, const ir_mode *mode2)
{
key.adr2 = adr2;
key.mode1 = mode1;
key.mode2 = mode2;
- entry = set_find(result_cache, &key, sizeof(key), HASH_ENTRY(adr1, adr2));
+ entry = (mem_disambig_entry*) set_find(result_cache, &key, sizeof(key), HASH_ENTRY(adr1, adr2));
if (entry != NULL)
return entry->result;
- key.result = get_alias_relation(irg, adr1, mode1, adr2, mode2);
+ key.result = get_alias_relation(adr1, mode1, adr2, mode2);
set_insert(result_cache, &key, sizeof(key), HASH_ENTRY(adr1, adr2));
return key.result;
-} /* get_alias_relation_ex */
+}
/* Free the relation cache. */
void mem_disambig_term(void)
del_set(result_cache);
result_cache = NULL;
}
-} /* mem_disambig_term */
+}
/**
* Check the mode of a Load/Store with the mode of the entity
if (ent_mode != mode) {
if (ent_mode == NULL ||
get_mode_size_bits(ent_mode) != get_mode_size_bits(mode) ||
- get_mode_sort(ent_mode) != get_mode_sort(mode) ||
get_mode_arithmetic(ent_mode) != irma_twos_complement ||
get_mode_arithmetic(mode) != irma_twos_complement)
return true;
}
return false;
-} /* is_hidden_cast */
+}
/**
* Determine the usage state of a node (or its successor Sels).
ir_mode *emode, *mode;
ir_node *value;
ir_type *tp;
- ir_entity_usage res = 0;
+ unsigned res = 0;
for (i = get_irn_n_outs(irn) - 1; i >= 0; --i) {
ir_node *succ = get_irn_out(irn, i);
res |= determine_entity_usage(succ, entity);
break;
case iro_Sel: {
- ir_entity *entity = get_Sel_entity(succ);
+ ir_entity *sel_entity = get_Sel_entity(succ);
/* this analysis can't handle unions correctly */
- if (is_Union_type(get_entity_owner(entity))) {
+ if (is_Union_type(get_entity_owner(sel_entity))) {
res |= ir_usage_unknown;
break;
}
/* Check the successor of irn. */
- res |= determine_entity_usage(succ, entity);
+ res |= determine_entity_usage(succ, sel_entity);
break;
}
}
}
- return res;
+ return (ir_entity_usage) res;
}
/**
{
ir_type *ft = get_irg_frame_type(irg);
ir_node *irg_frame;
- int i, j, k, static_link_arg;
+ size_t i, n;
+ int j, k, static_link_arg;
/* set initial state to not_taken, as this is the "smallest" state */
- for (i = get_class_n_members(ft) - 1; i >= 0; --i) {
+ for (i = 0, n = get_class_n_members(ft); i < n; ++i) {
ir_entity *ent = get_class_member(ft, i);
/* methods can only be analyzed globally */
if (! is_method_entity(ent)) {
- ir_entity_usage flags = 0;
+ ir_entity_usage flags = ir_usage_none;
if (get_entity_linkage(ent) & IR_LINKAGE_HIDDEN_USER)
flags = ir_usage_unknown;
set_entity_usage(ent, flags);
irg_frame = get_irg_frame(irg);
- for (i = get_irn_n_outs(irg_frame) - 1; i >= 0; --i) {
- ir_node *succ = get_irn_out(irg_frame, i);
+ for (j = get_irn_n_outs(irg_frame) - 1; j >= 0; --j) {
+ ir_node *succ = get_irn_out(irg_frame, j);
ir_entity *entity;
- ir_entity_usage flags;
+ unsigned flags;
if (!is_Sel(succ))
continue;
entity = get_Sel_entity(succ);
flags = get_entity_usage(entity);
flags |= determine_entity_usage(succ, entity);
- set_entity_usage(entity, flags);
+ set_entity_usage(entity, (ir_entity_usage) flags);
}
/* check inner functions accessing outer frame */
static_link_arg = 0;
- for (i = get_class_n_members(ft) - 1; i >= 0; --i) {
+ for (i = 0, n = get_class_n_members(ft); i < n; ++i) {
ir_entity *ent = get_class_member(ft, i);
ir_graph *inner_irg;
ir_node *args;
if (get_entity_owner(entity) == ft) {
/* found an access to the outer frame */
- ir_entity_usage flags;
+ unsigned flags;
flags = get_entity_usage(entity);
flags |= determine_entity_usage(succ, entity);
- set_entity_usage(entity, flags);
+ set_entity_usage(entity, (ir_entity_usage) flags);
}
}
}
/* now computed */
- irg->entity_usage_state = ir_entity_usage_computed;
-}
-
-ir_entity_usage_computed_state get_irg_entity_usage_state(const ir_graph *irg)
-{
- return irg->entity_usage_state;
-}
-
-void set_irg_entity_usage_state(ir_graph *irg, ir_entity_usage_computed_state state)
-{
- irg->entity_usage_state = state;
+ set_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_ENTITY_USAGE);
}
void assure_irg_entity_usage_computed(ir_graph *irg)
{
- if (irg->entity_usage_state != ir_entity_usage_not_computed)
+ if (is_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_ENTITY_USAGE))
return;
analyse_irg_entity_usage(irg);
*/
static void init_entity_usage(ir_type *tp)
{
- int i;
+ size_t i, n;
/* We have to be conservative: All external visible entities are unknown */
- for (i = get_compound_n_members(tp) - 1; i >= 0; --i) {
- ir_entity *ent = get_compound_member(tp, i);
- ir_entity_usage flags = ir_usage_none;
+ for (i = 0, n = get_compound_n_members(tp); i < n; ++i) {
+ ir_entity *ent = get_compound_member(tp, i);
+ unsigned flags = ir_usage_none;
if (entity_is_externally_visible(ent)) {
flags |= ir_usage_unknown;
}
- set_entity_usage(ent, flags);
+ set_entity_usage(ent, (ir_entity_usage) flags);
}
}
*/
static void check_initializer_nodes(ir_initializer_t *initializer)
{
- unsigned i;
- ir_node *n;
+ size_t i;
+ ir_node *n;
switch (initializer->kind) {
case IR_INITIALIZER_CONST:
/* let's check if it's an address */
n = initializer->consti.value;
- if (is_Global(n)) {
- ir_entity *ent = get_Global_entity(n);
+ if (is_SymConst_addr_ent(n)) {
+ ir_entity *ent = get_SymConst_entity(n);
set_entity_usage(ent, ir_usage_unknown);
}
return;
return;
}
panic("invalid initializer found");
-} /* check_initializer_nodes */
+}
/**
* Mark all entities used in the initializer for the given entity as unknown
*/
static void check_initializer(ir_entity *ent)
{
- ir_node *n;
- int i;
-
/* Beware: Methods are always initialized with "themself". This does not
* count as a taken address.
* TODO: this initialisation with "themself" is wrong and should be removed
if (ent->initializer != NULL) {
check_initializer_nodes(ent->initializer);
} else if (entity_has_compound_ent_values(ent)) {
- for (i = get_compound_ent_n_values(ent) - 1; i >= 0; --i) {
- n = get_compound_ent_value(ent, i);
+ size_t i, n;
+
+ for (i = 0, n = get_compound_ent_n_values(ent); i < n; ++i) {
+ ir_node *irn = get_compound_ent_value(ent, i);
/* let's check if it's an address */
- if (is_Global(n)) {
- ir_entity *ent = get_Global_entity(n);
- set_entity_usage(ent, ir_usage_unknown);
+ if (is_SymConst_addr_ent(irn)) {
+ ir_entity *symconst_ent = get_SymConst_entity(irn);
+ set_entity_usage(symconst_ent, ir_usage_unknown);
}
}
}
*/
static void check_initializers(ir_type *tp)
{
- int i;
+ size_t i, n;
- for (i = get_compound_n_members(tp) - 1; i >= 0; --i) {
+ for (i = 0, n = get_compound_n_members(tp); i < n; ++i) {
ir_entity *ent = get_compound_member(tp, i);
check_initializer(ent);
}
-} /* check_initializers */
+}
#ifdef DEBUG_libfirm
/**
*
* @param tp a compound type
*/
-static void print_entity_usage_flags(ir_type *tp)
+static void print_entity_usage_flags(const ir_type *tp)
{
- int i;
- for (i = get_compound_n_members(tp) - 1; i >= 0; --i) {
+ size_t i, n;
+ for (i = 0, n = get_compound_n_members(tp); i < n; ++i) {
ir_entity *ent = get_compound_member(tp, i);
ir_entity_usage flags = get_entity_usage(ent);
/**
* Post-walker: check for global entity address
*/
-static void check_global_address(ir_node *irn, void *env)
+static void check_global_address(ir_node *irn, void *data)
{
- ir_node *tls = env;
ir_entity *ent;
- ir_entity_usage flags;
+ unsigned flags;
+ (void) data;
- if (is_Global(irn)) {
+ if (is_SymConst_addr_ent(irn)) {
/* A global. */
- ent = get_Global_entity(irn);
- } else if (is_Sel(irn) && get_Sel_ptr(irn) == tls) {
- /* A TLS variable. */
- ent = get_Sel_entity(irn);
+ ent = get_SymConst_entity(irn);
} else
return;
flags = get_entity_usage(ent);
flags |= determine_entity_usage(irn, ent);
- set_entity_usage(ent, flags);
-} /* check_global_address */
+ set_entity_usage(ent, (ir_entity_usage) flags);
+}
/**
* Update the entity usage flags of all global entities.
*/
static void analyse_irp_globals_entity_usage(void)
{
- int i;
+ size_t i, n;
ir_segment_t s;
for (s = IR_SEGMENT_FIRST; s <= IR_SEGMENT_LAST; ++s) {
check_initializers(type);
}
- for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+ for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
ir_graph *irg = get_irp_irg(i);
assure_irg_outs(irg);
- irg_walk_graph(irg, NULL, check_global_address, get_irg_tls(irg));
+ irg_walk_graph(irg, NULL, check_global_address, NULL);
}
#ifdef DEBUG_libfirm
if (firm_dbg_get_mask(dbg) & LEVEL_1) {
- ir_segment_t s;
for (s = IR_SEGMENT_FIRST; s <= IR_SEGMENT_LAST; ++s) {
print_entity_usage_flags(get_segment_type(s));
}
ir_type *res;
pmap_entry *e = pmap_find(mtp_map, tp);
- if (e)
- return e->value;
+ if (e != NULL)
+ return (ir_type*) e->value;
res = clone_type_method(tp);
pmap_insert(mtp_map, tp, res);
return res;
-} /* clone_type_and_cache */
+}
/**
* Walker: clone all call types of Calls to methods having the
if (get_entity_additional_properties(ent) & mtp_property_private) {
if ((get_method_additional_properties(ctp) & mtp_property_private) == 0) {
ctp = clone_type_and_cache(ctp);
- set_method_additional_property(ctp, mtp_property_private);
+ add_method_additional_properties(ctp, mtp_property_private);
set_Call_type(call, ctp);
DB((dbgcall, LEVEL_1, "changed call to private method %+F using cloned type %+F\n", ent, ctp));
}
}
}
}
-} /* update_calls_to_private */
+}
/* Mark all private methods, i.e. those of which all call sites are known. */
void mark_private_methods(void)
{
- int i;
+ size_t i, n;
int changed = 0;
assure_irp_globals_entity_usage_computed();
mtp_map = pmap_create();
/* first step: change the calling conventions of the local non-escaped entities */
- for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+ for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
ir_graph *irg = get_irp_irg(i);
ir_entity *ent = get_irg_entity(irg);
ir_entity_usage flags = get_entity_usage(ent);
- if (!entity_is_externally_visible(ent) &&
- !(flags & ir_usage_address_taken)) {
+ if (!(flags & ir_usage_address_taken) && !entity_is_externally_visible(ent)) {
ir_type *mtp = get_entity_type(ent);
- set_entity_additional_property(ent, mtp_property_private);
+ add_entity_additional_properties(ent, mtp_property_private);
DB((dbgcall, LEVEL_1, "found private method %+F\n", ent));
if ((get_method_additional_properties(mtp) & mtp_property_private) == 0) {
/* need a new type */
mtp = clone_type_and_cache(mtp);
- set_method_additional_property(mtp, mtp_property_private);
+ add_method_additional_properties(mtp, mtp_property_private);
set_entity_type(ent, mtp);
DB((dbgcall, LEVEL_2, "changed entity type of %+F to %+F\n", ent, mtp));
changed = 1;
all_irg_walk(NULL, update_calls_to_private, NULL);
pmap_destroy(mtp_map);
-} /* mark_private_methods */
+}
/* create a pass for mark_private_methods() */
ir_prog_pass_t *mark_private_methods_pass(const char *name)
{
return def_prog_pass(name ? name : "mark_private_methods", mark_private_methods);
-} /* mark_private_methods_pass */
+}
projects / libfirm / blobdiff