# include <config.h>
#endif
-
# include <stdlib.h>
# include <stddef.h>
# include <string.h>
+
# include "type_t.h"
-# include "tpop_t.h"
+
# include "irprog_t.h"
+# include "ircons.h"
+# include "tpop_t.h"
# include "typegmod.h"
-# include "array.h"
-# include "irprog.h"
# include "mangle.h"
-# include "tv.h"
-# include "ircons.h"
+# include "tv_t.h"
+
+# include "array.h"
/*******************************************************************/
/** TYPE **/
node_size = offsetof(type, attr) + type_op->attr_size;
res = (type *) xmalloc (node_size);
+ memset((void *)res, 0, node_size);
add_irp_type(res); /* Remember the new type global. */
- res->kind = k_type;
+ res->kind = k_type;
res->type_op = type_op;
- res->mode = mode;
- res->name = name;
- res->state = layout_undefined;
- res->size = -1;
- res->visit = 0;
- res -> link = NULL;
+ res->mode = mode;
+ res->name = name;
+ res->state = layout_undefined;
+ res->size = -1;
+ res->visit = 0;
+ res -> link = NULL;
#ifdef DEBUG_libfirm
- res->nr = get_irp_new_node_nr();
+ res->nr = get_irp_new_node_nr();
#endif
return res;
((tp->type_op != type_pointer) || mode_is_reference(m)) );
/* Modes of pointers must be references. */
- if (tp->type_op == type_primitive) {
+ switch (get_type_tpop_code(tp)) {
+ case tpo_primitive:
/* For primitive size depends on the mode. */
tp->size = get_mode_size_bits(m);
tp->mode = m;
- }
- if ((tp->type_op == type_enumeration) || (tp->type_op == type_pointer)) {
+ break;
+ case tpo_enumeration:
+ case tpo_pointer:
/* For pointer and enumeration size depends on the mode, but only byte size allowed. */
assert((get_mode_size_bits(m) & 7) == 0 && "unorthodox modes not implemented");
tp->size = get_mode_size_bits(m);
tp->mode = m;
+ break;
+ case tpo_struct:
+ case tpo_class:
+ /* for classes and structs we allow to set a mode if the layout is fixed AND the size matches */
+ assert(get_type_state(tp) == layout_fixed &&
+ tp->size == get_mode_size_bits(m) &&
+ "mode don't match struct/class layout");
+ tp->mode = m;
+ break;
+ default:
+ assert(0 && "setting a mode is NOT allowed for this type");
}
}
if (tp->type_op == type_primitive)
tp->size = size;
else {
- tp->size = (size + 7) & ~7;
+ /* argh: we must allow to set negative values as "invalid size" */
+ tp->size = (size >= 0) ? (size + 7) & ~7 : size;
assert(tp->size == size && "setting a bit size is NOT allowed for this type");
}
}
case tpo_class:
{
assert(get_type_size_bits(tp) > -1);
- if (tp != get_glob_type())
- for (i = 0; i < get_class_n_members(tp); i++) {
+ if (tp != get_glob_type()) {
+ int n_mem = get_class_n_members(tp);
+ for (i = 0; i < n_mem; i++) {
if (get_entity_offset_bits(get_class_member(tp, i)) <= -1)
{ DDMT(tp); DDME(get_class_member(tp, i)); }
assert(get_entity_offset_bits(get_class_member(tp, i)) > -1);
(get_entity_allocation(get_class_member(tp, i)) == allocation_automatic));
*/
}
+ }
} break;
case tpo_struct:
{
res = new_type(type_class, NULL, name);
- res->attr.ca.members = NEW_ARR_F (entity *, 1);
- res->attr.ca.subtypes = NEW_ARR_F (type *, 1);
- res->attr.ca.supertypes = NEW_ARR_F (type *, 1);
+ res->attr.ca.members = NEW_ARR_F (entity *, 0);
+ res->attr.ca.subtypes = NEW_ARR_F (type *, 0);
+ res->attr.ca.supertypes = NEW_ARR_F (type *, 0);
res->attr.ca.peculiarity = peculiarity_existent;
res->attr.ca.dfn = 0;
ARR_APP1 (entity *, clss->attr.ca.members, member);
}
-int get_class_n_members (type *clss) {
- assert(clss && (clss->type_op == type_class));
- return (ARR_LEN (clss->attr.ca.members))-1;
+int (get_class_n_members) (type *clss) {
+ return __get_class_n_members(clss);
}
int get_class_member_index(type *clss, entity *mem) {
return -1;
}
-entity *get_class_member (type *clss, int pos) {
- assert(clss && (clss->type_op == type_class));
- assert(pos >= 0 && pos < get_class_n_members(clss));
- return clss->attr.ca.members[pos+1];
+entity *(get_class_member) (type *clss, int pos) {
+ return __get_class_member(clss, pos);
}
entity *get_class_member_by_name(type *clss, ident *name) {
void set_class_member (type *clss, entity *member, int pos) {
assert(clss && (clss->type_op == type_class));
assert(pos >= 0 && pos < get_class_n_members(clss));
- clss->attr.ca.members[pos+1] = member;
+ clss->attr.ca.members[pos] = member;
}
void set_class_members (type *clss, entity **members, int arity) {
int i;
assert(clss && (clss->type_op == type_class));
DEL_ARR_F(clss->attr.ca.members);
- clss->attr.ca.members = NEW_ARR_F (entity *, 1);
+ clss->attr.ca.members = NEW_ARR_F (entity *, 0);
for (i = 0; i < arity; i++) {
set_entity_owner(members[i], clss);
ARR_APP1 (entity *, clss->attr.ca.members, members[i]);
void remove_class_member(type *clss, entity *member) {
int i;
assert(clss && (clss->type_op == type_class));
- for (i = 1; i < (ARR_LEN (clss->attr.ca.members)); i++) {
+ for (i = 0; i < (ARR_LEN (clss->attr.ca.members)); i++) {
if (clss->attr.ca.members[i] == member) {
for(; i < (ARR_LEN (clss->attr.ca.members)) - 1; i++)
clss->attr.ca.members[i] = clss->attr.ca.members[i + 1];
}
int get_class_n_subtypes (type *clss) {
assert(clss && (clss->type_op == type_class));
- return (ARR_LEN (clss->attr.ca.subtypes))-1;
+ return (ARR_LEN (clss->attr.ca.subtypes));
}
type *get_class_subtype (type *clss, int pos) {
assert(clss && (clss->type_op == type_class));
assert(pos >= 0 && pos < get_class_n_subtypes(clss));
- return clss->attr.ca.subtypes[pos+1] = skip_tid(clss->attr.ca.subtypes[pos+1]);
+ return clss->attr.ca.subtypes[pos] = skip_tid(clss->attr.ca.subtypes[pos]);
}
void set_class_subtype (type *clss, type *subtype, int pos) {
assert(clss && (clss->type_op == type_class));
assert(pos >= 0 && pos < get_class_n_subtypes(clss));
- clss->attr.ca.subtypes[pos+1] = subtype;
+ clss->attr.ca.subtypes[pos] = subtype;
}
void remove_class_subtype(type *clss, type *subtype) {
int i;
assert(clss && (clss->type_op == type_class));
- for (i = 1; i < (ARR_LEN (clss->attr.ca.subtypes)); i++)
+ for (i = 0; i < (ARR_LEN (clss->attr.ca.subtypes)); i++)
if (clss->attr.ca.subtypes[i] == subtype) {
for(; i < (ARR_LEN (clss->attr.ca.subtypes))-1; i++)
clss->attr.ca.subtypes[i] = clss->attr.ca.subtypes[i+1];
}
int get_class_n_supertypes (type *clss) {
assert(clss && (clss->type_op == type_class));
- return (ARR_LEN (clss->attr.ca.supertypes))-1;
+ return (ARR_LEN (clss->attr.ca.supertypes));
}
int get_class_supertype_index(type *clss, type *super_clss) {
int i;
type *get_class_supertype (type *clss, int pos) {
assert(clss && (clss->type_op == type_class));
assert(pos >= 0 && pos < get_class_n_supertypes(clss));
- return clss->attr.ca.supertypes[pos+1] = skip_tid(clss->attr.ca.supertypes[pos+1]);
+ return clss->attr.ca.supertypes[pos] = skip_tid(clss->attr.ca.supertypes[pos]);
}
void set_class_supertype (type *clss, type *supertype, int pos) {
assert(clss && (clss->type_op == type_class));
assert(pos >= 0 && pos < get_class_n_supertypes(clss));
- clss->attr.ca.supertypes[pos+1] = supertype;
+ clss->attr.ca.supertypes[pos] = supertype;
}
void remove_class_supertype(type *clss, type *supertype) {
int i;
assert(clss && (clss->type_op == type_class));
- for (i = 1; i < (ARR_LEN (clss->attr.ca.supertypes)); i++)
+ for (i = 0; i < (ARR_LEN (clss->attr.ca.supertypes)); i++)
if (clss->attr.ca.supertypes[i] == supertype) {
for(; i < (ARR_LEN (clss->attr.ca.supertypes))-1; i++)
clss->attr.ca.supertypes[i] = clss->attr.ca.supertypes[i+1];
type *new_type_struct (ident *name) {
type *res;
res = new_type(type_struct, NULL, name);
- res->attr.sa.members = NEW_ARR_F (entity *, 1);
+ res->attr.sa.members = NEW_ARR_F (entity *, 0);
return res;
}
type *new_d_type_struct (ident *name, dbg_info* db) {
/* manipulate private fields of struct */
int get_struct_n_members (type *strct) {
assert(strct && (strct->type_op == type_struct));
- return (ARR_LEN (strct->attr.sa.members))-1;
+ return (ARR_LEN (strct->attr.sa.members));
}
void add_struct_member (type *strct, entity *member) {
entity *get_struct_member (type *strct, int pos) {
assert(strct && (strct->type_op == type_struct));
assert(pos >= 0 && pos < get_struct_n_members(strct));
- return strct->attr.sa.members[pos+1];
+ return strct->attr.sa.members[pos];
}
int get_struct_member_index(type *strct, entity *mem) {
assert(strct && (strct->type_op == type_struct));
assert(pos >= 0 && pos < get_struct_n_members(strct));
assert(get_entity_type(member)->type_op != type_method);/* @@@ lowerfirm !!*/
- strct->attr.sa.members[pos+1] = member;
+ strct->attr.sa.members[pos] = member;
}
void remove_struct_member(type *strct, entity *member) {
int i;
assert(strct && (strct->type_op == type_struct));
- for (i = 1; i < (ARR_LEN (strct->attr.sa.members)); i++)
+ for (i = 0; i < (ARR_LEN (strct->attr.sa.members)); i++)
if (strct->attr.sa.members[i] == member) {
for(; i < (ARR_LEN (strct->attr.sa.members))-1; i++)
strct->attr.sa.members[i] = strct->attr.sa.members[i+1];
assert((get_mode_size_bytes(mode_P_mach) != -1) && "unorthodox modes not implemented");
res = new_type(type_method, mode_P_mach, name);
res->state = layout_fixed;
- res->size = get_mode_size_bytes(mode_P_mach);
+ res->size = get_mode_size_bits(mode_P_mach);
res->attr.ma.n_params = n_param;
res->attr.ma.param_type = (type **) xmalloc (sizeof (type *) * n_param);
res->attr.ma.value_params = NULL;
res = new_type(type_union, NULL, name);
/*res->attr.ua.unioned_type = (type **) xmalloc (sizeof (type *) * n_types);
res->attr.ua.delim_names = (ident **) xmalloc (sizeof (ident *) * n_types); */
- res->attr.ua.members = NEW_ARR_F (entity *, 1);
+ res->attr.ua.members = NEW_ARR_F (entity *, 0);
return res;
}
type *new_d_type_union (ident *name, dbg_info* db) {
#endif
int get_union_n_members (type *uni) {
assert(uni && (uni->type_op == type_union));
- return (ARR_LEN (uni->attr.ua.members))-1;
+ return (ARR_LEN (uni->attr.ua.members));
}
void add_union_member (type *uni, entity *member) {
assert(uni && (uni->type_op == type_union));
entity *get_union_member (type *uni, int pos) {
assert(uni && (uni->type_op == type_union));
assert(pos >= 0 && pos < get_union_n_members(uni));
- return uni->attr.ua.members[pos+1];
+ return uni->attr.ua.members[pos];
}
void set_union_member (type *uni, int pos, entity *member) {
assert(uni && (uni->type_op == type_union));
assert(pos >= 0 && pos < get_union_n_members(uni));
- uni->attr.ua.members[pos+1] = member;
+ uni->attr.ua.members[pos] = member;
}
void remove_union_member(type *uni, entity *member) {
int i;
assert(uni && (uni->type_op == type_union));
- for (i = 1; i < (ARR_LEN (uni->attr.ua.members)); i++)
+ for (i = 0; i < (ARR_LEN (uni->attr.ua.members)); i++)
if (uni->attr.ua.members[i] == member) {
for(; i < (ARR_LEN (uni->attr.ua.members))-1; i++)
uni->attr.ua.members[i] = uni->attr.ua.members[i+1];
current_ir_graph = rem;
res->attr.aa.element_type = element_type;
- new_entity(res, mangle_u(name, id_from_str("elem_ent", 8)), element_type);
+ new_entity(res, mangle_u(name, new_id_from_chars("elem_ent", 8)), element_type);
return res;
}
new_Const(mode_Iu, new_tarval_from_long (upper_bound, mode_Iu)));
current_ir_graph = rem;
}
-int has_array_lower_bound (type *array, int dimension) {
+int has_array_lower_bound (type *array, int dimension) {
assert(array && (array->type_op == type_array));
return (get_irn_op(array->attr.aa.lower_bound[dimension]) != op_Unknown);
}
-ir_node * get_array_lower_bound (type *array, int dimension) {
+ir_node *get_array_lower_bound (type *array, int dimension) {
assert(array && (array->type_op == type_array));
return array->attr.aa.lower_bound[dimension];
}
+long get_array_lower_bound_int (type *array, int dimension) {
+ ir_node *node;
+ assert(array && (array->type_op == type_array));
+ node = array->attr.aa.lower_bound[dimension];
+ assert(get_irn_op(node) == op_Const);
+ return get_tarval_long(get_Const_tarval(node));
+}
int has_array_upper_bound (type *array, int dimension) {
assert(array && (array->type_op == type_array));
return (get_irn_op(array->attr.aa.upper_bound[dimension]) != op_Unknown);
assert(array && (array->type_op == type_array));
return array->attr.aa.upper_bound[dimension];
}
+long get_array_upper_bound_int (type *array, int dimension) {
+ ir_node *node;
+ assert(array && (array->type_op == type_array));
+ node = array->attr.aa.upper_bound[dimension];
+ assert(get_irn_op(node) == op_Const);
+ return get_tarval_long(get_Const_tarval(node));
+}
void set_array_order (type *array, int dimension, int order) {
assert(array && (array->type_op == type_array));
else
{
assert(0 && "need struct, union or class to get a member");
- res=NULL;
+ res = NULL;
}
return res;
return (is_class_type(tp) || is_struct_type(tp) ||
is_array_type(tp) || is_union_type(tp));
}
-
-
-#ifdef DEBUG_libfirm
-int dump_node_opcode(FILE *F, ir_node *n); /* from irdump.c */
-
-void dump_type (type *tp) {
- int i;
-
- printf("%s type %s (%ld)", get_tpop_name(get_type_tpop(tp)), get_type_name(tp), get_type_nr(tp));
-
- switch (get_type_tpop_code(tp)) {
-
- case tpo_class:
- printf("\n members: ");
- for (i = 0; i < get_class_n_members(tp); ++i) {
- entity *mem = get_class_member(tp, i);
- printf("\n (%3d) %s:\t %s",
- get_entity_offset_bits(mem), get_type_name(get_entity_type(mem)), get_entity_name(mem));
- }
- printf("\n supertypes: ");
- for (i = 0; i < get_class_n_supertypes(tp); ++i) {
- type *stp = get_class_supertype(tp, i);
- printf("\n %s", get_type_name(stp));
- }
- printf("\n subtypes: ");
- for (i = 0; i < get_class_n_subtypes(tp); ++i) {
- type *stp = get_class_subtype(tp, i);
- printf("\n %s", get_type_name(stp));
- }
-
- printf("\n peculiarity: %s", get_peculiarity_string(get_class_peculiarity(tp)));
- break;
-
- case tpo_union:
- case tpo_struct:
- printf("\n members: ");
- for (i = 0; i < get_compound_n_members(tp); ++i) {
- entity *mem = get_compound_member(tp, i);
- printf("\n (%3d) %s:\t %s",
- get_entity_offset_bits(mem), get_type_name(get_entity_type(mem)), get_entity_name(mem));
- }
- break;
-
- case tpo_pointer: {
- type *tt = get_pointer_points_to_type(tp);
-
- printf("\n points to %s (%ld)", get_type_name(tt), get_type_nr(tt));
- } break;
-
- default:
- printf(": details not implemented\n");
- }
- printf("\n\n");
-}
-#else /* DEBUG_libfirm */
-void dump_type (type *tp) {}
-#endif /* DEBUG_libfirm */