/*
- * 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.
*
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;
+} /* get_base_sc */
+
/**
* Find the base address and entity of an Sel node.
*
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;
+ return tarval_cmp(tv_size, tv) & (ir_relation_less_equal) ? ir_no_alias : ir_may_alias;
} /* check_const */
/**
} 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) {
+ 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 */
ir_storage_class_class_t res = ir_sc_pointer;
if (is_Global(irn)) {
ir_entity *entity = get_Global_entity(irn);
- res = ir_sc_globalvar;
+ 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)) {
/*
* 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.
*/
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);
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) {
*/
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 &&
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;
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);
}
}
- 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);
}
}
}
*/
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:
*/
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);
+ if (is_Global(irn)) {
+ ir_entity *ent = get_Global_entity(irn);
set_entity_usage(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);
*
* @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)) {
/* 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);
} else
return;
flags = get_entity_usage(ent);
flags |= determine_entity_usage(irn, ent);
- set_entity_usage(ent, flags);
+ set_entity_usage(ent, (ir_entity_usage) flags);
} /* check_global_address */
/**
*/
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);
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));
}
/* 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;
projects / libfirm / blobdiff