/*-----------------------------------------------------------------*/
static INLINE void insert_entity_in_owner (entity *ent) {
- type *owner = ent->owner;
+ ir_type *owner = ent->owner;
switch (get_type_tpop_code(owner)) {
case tpo_class: {
add_class_member (owner, ent);
* @return the new created entity
*/
static INLINE entity *
-new_rd_entity (dbg_info *db, type *owner, ident *name, type *type)
+new_rd_entity (dbg_info *db, ir_type *owner, ident *name, ir_type *type)
{
entity *res;
ir_graph *rem;
else
res->allocation = allocation_automatic;
- res->visibility = visibility_local;
+ res->visibility = visibility_local;
+ res->volatility = volatility_non_volatile;
+ res->stickyness = stickyness_unsticky;
+ res->offset = -1;
+ res->peculiarity = peculiarity_existent;
+ res->link = NULL;
+
if (is_Method_type(type)) {
symconst_symbol sym;
- sym.entity_p = res;
- res->variability = variability_constant;
- rem = current_ir_graph;
- current_ir_graph = get_const_code_irg();
- res->value = new_SymConst(sym, symconst_addr_ent);
- current_ir_graph = rem;
- res->irg_add_properties = 0;
+ sym.entity_p = res;
+ rem = current_ir_graph;
+ current_ir_graph = get_const_code_irg();
+ res->value = new_SymConst(sym, symconst_addr_ent);
+ current_ir_graph = rem;
+ res->variability = variability_constant;
+ res->irg_add_properties = mtp_property_inherited;
+ res->param_access = NULL;
+ res->param_weight = NULL;
}
else {
res->variability = variability_uninitialized;
res->val_paths = NULL;
}
- res->volatility = volatility_non_volatile;
- res->stickyness = stickyness_unsticky;
- res->offset = -1;
- res->link = NULL;
- res->peculiarity = peculiarity_existent;
-
if (is_Class_type(owner)) {
res->overwrites = NEW_ARR_F(entity *, 0);
res->overwrittenby = NEW_ARR_F(entity *, 0);
}
entity *
-new_d_entity (type *owner, ident *name, type *type, dbg_info *db) {
+new_d_entity (ir_type *owner, ident *name, ir_type *type, dbg_info *db) {
entity *res;
assert_legal_owner_of_ent(owner);
}
entity *
-new_entity (type *owner, ident *name, type *type) {
+new_entity (ir_type *owner, ident *name, ir_type *type) {
return new_d_entity(owner, name, type, NULL);
}
}
ent->val_paths = NULL;
ent->values = NULL;
+
+ if (ent->param_access) {
+ DEL_ARR_F(ent->param_access);
+ ent->param_access = NULL;
+ }
+ if (ent->param_weight) {
+ DEL_ARR_F(ent->param_weight);
+ ent->param_weight = NULL;
+ }
}
entity *
-copy_entity_own (entity *old, type *new_owner) {
+copy_entity_own (entity *old, ir_type *new_owner) {
entity *newe;
assert(old && old->kind == k_entity);
assert_legal_owner_of_ent(new_owner);
#ifdef DEBUG_libfirm
return ent->nr;
#else
- return 0;
+ return (long)PTR_TO_INT(ent);
#endif
}
return get_entity_ident(ent);
}
-/*
-void set_entitye_ld_name (entity *, char *ld_name);
-void set_entity_ld_ident (entity *, ident *ld_ident);
-*/
-
-type *
+ir_type *
(get_entity_owner)(entity *ent) {
return _get_entity_owner(ent);
}
void
-set_entity_owner (entity *ent, type *owner) {
+set_entity_owner (entity *ent, ir_type *owner) {
assert(ent && ent->kind == k_entity);
assert_legal_owner_of_ent(owner);
ent->owner = owner;
}
void /* should this go into type.c? */
-assert_legal_owner_of_ent(type *owner) {
+assert_legal_owner_of_ent(ir_type *owner) {
assert(get_type_tpop_code(owner) == tpo_class ||
get_type_tpop_code(owner) == tpo_union ||
get_type_tpop_code(owner) == tpo_struct ||
return _get_entity_ld_name(ent);
}
-type *
+ir_type *
(get_entity_type)(entity *ent) {
return _get_entity_type(ent);
}
void
-(set_entity_type)(entity *ent, type *type) {
+(set_entity_type)(entity *ent, ir_type *type) {
_set_entity_type(ent, type);
}
if ((is_compound_type(ent->type)) &&
(ent->variability == variability_uninitialized) && (var != variability_uninitialized)) {
- /* Allocate datastructures for constant values */
+ /* Allocate data structures for constant values */
ent->values = NEW_ARR_F(ir_node *, 0);
ent->val_paths = NEW_ARR_F(compound_graph_path *, 0);
}
if ((is_compound_type(ent->type)) &&
(var == variability_uninitialized) && (ent->variability != variability_uninitialized)) {
- /* Free datastructures for constant values */
+ /* Free data structures for constant values */
DEL_ARR_F(ent->values); ent->values = NULL;
DEL_ARR_F(ent->val_paths); ent->val_paths = NULL;
}
case iro_Const:
case iro_SymConst:
case iro_Unknown:
- return true; break;
+ return 1;
case iro_Conv:
case iro_Cast:
return is_irn_const_expression(get_irn_n(n, 0));
default:
- return false;
break;
}
- return false;
+ return 0;
}
/*
/* Creates a new compound graph path. */
compound_graph_path *
-new_compound_graph_path(type *tp, int length) {
+new_compound_graph_path(ir_type *tp, int length) {
compound_graph_path *res;
assert(is_type(tp) && is_compound_type(tp));
int is_proper_compound_graph_path(compound_graph_path *gr, int pos) {
int i;
entity *node;
- type *owner = gr->tp;
+ ir_type *owner = gr->tp;
for (i = 0; i <= pos; i++) {
node = get_compound_graph_path_node(gr, i);
if (node == NULL)
/* Path not yet complete. */
- return true;
+ return 1;
if (get_entity_owner(node) != owner)
- return false;
+ return 0;
owner = get_entity_type(node);
}
if (pos == get_compound_graph_path_length(gr))
if (!is_atomic_type(owner))
- return false;
- return true;
+ return 0;
+ return 1;
}
/* Returns the length of a graph path */
int len1 = get_compound_graph_path_length(path1);
int len2 = get_compound_graph_path_length(path2);
- if (len2 > len1) return false;
+ if (len2 > len1) return 0;
for (i = 0; i < len1; i++) {
- type *tp;
+ ir_type *tp;
entity *node1 = get_compound_graph_path_node(path1, i);
entity *node2 = get_compound_graph_path_node(path2, i);
- if (node1 != node2) return false;
+ if (node1 != node2) return 0;
tp = get_entity_owner(node1);
if (is_Array_type(tp)) {
low = get_array_lower_bound_int(tp, 0);
if (low + visited_indicees[i] < get_compound_graph_path_array_index(path2, i)) {
visited_indicees[i]++;
- return false;
+ return 0;
}
else
assert(low + visited_indicees[i] == get_compound_graph_path_array_index(path2, i));
}
}
- return true;
+ return 1;
}
/* Returns the position of a value with the given path.
void
add_compound_ent_value(entity *ent, ir_node *val, entity *member) {
compound_graph_path *path;
- type *owner_tp = get_entity_owner(member);
+ ir_type *owner_tp = get_entity_owner(member);
assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
path = new_compound_graph_path(get_entity_type(ent), 1);
path->list[0].node = member;
set_array_entity_values(entity *ent, tarval **values, int num_vals) {
int i;
ir_graph *rem = current_ir_graph;
- type *arrtp = get_entity_type(ent);
+ ir_type *arrtp = get_entity_type(ent);
ir_node *val;
- type *elttp = get_array_element_type(arrtp);
+ ir_type *elttp = get_array_element_type(arrtp);
assert(is_Array_type(arrtp));
assert(get_array_n_dimensions(arrtp) == 1);
for (i = 0; i < path_len; ++i) {
entity *node = get_compound_graph_path_node(path, i);
- type *node_tp = get_entity_type(node);
- type *owner_tp = get_entity_owner(node);
+ ir_type *node_tp = get_entity_type(node);
+ ir_type *owner_tp = get_entity_owner(node);
if (is_Array_type(owner_tp)) {
int size = get_type_size_bits(node_tp);
int align = get_type_alignment_bits(node_tp);
}
-static void init_index(type *arr) {
+static void init_index(ir_type *arr) {
int init;
int dim = 0;
static int get_next_index(entity *elem_ent) {
- type *arr = get_entity_owner(elem_ent);
+ ir_type *arr = get_entity_owner(elem_ent);
int next;
int dim = 0;
* evaluate the index against the upper bound.)
*/
void compute_compound_ent_array_indicees(entity *ent) {
- type *tp = get_entity_type(ent);
+ ir_type *tp = get_entity_type(ent);
int i, n_vals;
entity *unknown_bound_entity = NULL;
int j, path_len = get_compound_graph_path_length(path);
for (j = 0; j < path_len; ++j) {
entity *node = get_compound_graph_path_node(path, j);
- type *elem_tp = get_entity_type(node);
+ ir_type *elem_tp = get_entity_type(node);
if (is_Array_type(elem_tp)) {
int dim = 0;
int j, path_len = get_compound_graph_path_length(path);
for (j = 0; j < path_len; ++j) {
entity *node = get_compound_graph_path_node(path, j);
- type *owner_tp = get_entity_owner(node);
+ ir_type *owner_tp = get_entity_owner(node);
if (is_Array_type(owner_tp))
set_compound_graph_path_array_index (path, j, get_next_index(node));
}
A second iteration now permutes the actual elements into two
new arrays. */
void sort_compound_ent_values(entity *ent) {
- type *tp;
+ ir_type *tp;
int i, n_vals;
int tp_size;
int size;
}
int is_atomic_entity(entity *ent) {
- type* t = get_entity_type(ent);
+ ir_type *t = get_entity_type(ent);
assert(ent && ent->kind == k_entity);
return (is_Primitive_type(t) || is_Pointer_type(t) ||
is_Enumeration_type(t) || is_Method_type(t));
}
int is_compound_entity(entity *ent) {
- type* t = get_entity_type(ent);
+ ir_type *t = get_entity_type(ent);
assert(ent && ent->kind == k_entity);
return (is_Class_type(t) || is_Struct_type(t) ||
is_Array_type(t) || is_Union_type(t));
/**
* @todo not implemented!!! */
-bool equal_entity(entity *ent1, entity *ent2) {
+int equal_entity(entity *ent1, entity *ent2) {
fprintf(stderr, " calling unimplemented equal entity!!! \n");
- return true;
+ return 1;
}
return _entity_not_visited(ent);
}
-unsigned (get_entity_additional_properties)(const entity *ent) {
- return _get_entity_additional_properties(ent);
-}
+/* Returns the mask of the additional entity properties. */
+unsigned get_entity_additional_properties(entity *ent) {
+ ir_graph *irg;
-void (set_entity_additional_properties)(entity *ent, unsigned property_mask) {
- _set_entity_additional_properties(ent, property_mask);
-}
+ assert(is_Method_type(get_entity_type(ent)));
+
+ /* first check, if the graph has additional properties */
+ irg = get_entity_irg(ent);
+
+ if (irg)
+ return get_irg_additional_properties(irg);
-void (set_entity_additional_property)(entity *ent, unsigned flag) {
- _set_entity_additional_property(ent, (irg_additional_property)flag);
+ if (ent->irg_add_properties & mtp_property_inherited)
+ return get_method_additional_properties(get_entity_type(ent));
+
+ return ent->irg_add_properties;
}
-/* Returns the calling convention of an entities graph. */
-unsigned (get_entity_calling_convention)(const entity *ent) {
- return _get_entity_calling_convention(ent);
+/* Sets the mask of the additional graph properties. */
+void set_entity_additional_properties(entity *ent, unsigned property_mask)
+{
+ ir_graph *irg;
+
+ assert(is_Method_type(get_entity_type(ent)));
+
+ /* first check, if the graph exists */
+ irg = get_entity_irg(ent);
+ if (irg)
+ set_irg_additional_properties(irg, property_mask);
+ else {
+ /* do not allow to set the mtp_property_inherited flag or
+ * the automatic inheritance of flags will not work */
+ ent->irg_add_properties = property_mask & ~mtp_property_inherited;
+ }
}
-/* Sets the calling convention of an entities graph. */
-void (set_entity_calling_convention)(entity *ent, unsigned cc_mask) {
- _set_entity_calling_convention(ent, cc_mask);
+/* Sets one additional graph property. */
+void set_entity_additional_property(entity *ent, mtp_additional_property flag)
+{
+ ir_graph *irg;
+
+ assert(is_Method_type(get_entity_type(ent)));
+
+ /* first check, if the graph exists */
+ irg = get_entity_irg(ent);
+ if (irg)
+ set_irg_additional_property(irg, flag);
+ else {
+ unsigned mask = ent->irg_add_properties;
+
+ if (mask & mtp_property_inherited)
+ mask = get_method_additional_properties(get_entity_type(ent));
+
+ /* do not allow to set the mtp_property_inherited flag or
+ * the automatic inheritance of flags will not work */
+ ent->irg_add_properties = mask | (flag & ~mtp_property_inherited);
+ }
}
void firm_init_entity(void)