X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Ftype.c;h=d5227482e94e7c507fe154d56531409f204c2562;hb=52f5575dc678a5f7f1b3a078dcc46b1cdbaf5182;hp=6215886e9b612d5846e7c9723b26a2d5c04fb552;hpb=9ab8019961f7cb404418142844ab5c14cb99e8b7;p=libfirm diff --git a/ir/tr/type.c b/ir/tr/type.c index 6215886e9..d5227482e 100644 --- a/ir/tr/type.c +++ b/ir/tr/type.c @@ -1,5 +1,5 @@ /* - * 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. * @@ -58,6 +58,8 @@ #include "irhooks.h" #include "irtools.h" #include "entity_t.h" +#include "error.h" +#include "dbginfo.h" #include "array.h" @@ -74,7 +76,8 @@ ir_type *get_code_type(void) } ir_type *firm_unknown_type; -ir_type *get_unknown_type(void) { +ir_type *get_unknown_type(void) +{ return firm_unknown_type; } @@ -82,36 +85,45 @@ ir_type *get_unknown_type(void) { static ident *value_params_suffix = NULL; static ident *value_ress_suffix = NULL; -/** The default calling convention for method types. */ -static unsigned default_cc_mask; - -unsigned get_default_cc_mask(void) +void ir_init_type(void) { - return default_cc_mask; -} - -void firm_init_type(dbg_info *builtin_db, unsigned def_cc_mask) -{ - default_cc_mask = def_cc_mask; value_params_suffix = new_id_from_str(VALUE_PARAMS_SUFFIX); value_ress_suffix = new_id_from_str(VALUE_RESS_SUFFIX); /* construct none and unknown type. */ - firm_none_type = new_type(tpop_none, mode_BAD, new_id_from_str("type_none"), builtin_db); + firm_none_type = new_type(tpop_none, mode_BAD, NULL); set_type_size_bytes(firm_none_type, 0); set_type_state (firm_none_type, layout_fixed); remove_irp_type(firm_none_type); - firm_code_type = new_type(tpop_code, mode_ANY, new_id_from_str("type_code"), builtin_db); + firm_code_type = new_type(tpop_code, mode_ANY, NULL); set_type_state(firm_code_type, layout_fixed); remove_irp_type(firm_code_type); - firm_unknown_type = new_type(tpop_unknown, mode_ANY, new_id_from_str("type_unknown"), builtin_db); + firm_unknown_type = new_type(tpop_unknown, mode_ANY, NULL); set_type_size_bytes(firm_unknown_type, 0); set_type_state (firm_unknown_type, layout_fixed); remove_irp_type(firm_unknown_type); } +void ir_finish_type(void) +{ + if (firm_none_type != NULL) { + free_type(firm_none_type); + firm_none_type = NULL; + } + if (firm_code_type != NULL) { + free_type(firm_code_type); + firm_code_type = NULL; + } + if (firm_unknown_type != NULL) { + free_type(firm_unknown_type); + firm_unknown_type = NULL; + } + value_params_suffix = NULL; + value_ress_suffix = NULL; +} + /** the global type visited flag */ ir_visited_t firm_type_visited; @@ -130,24 +142,19 @@ void (inc_master_type_visited)(void) _inc_master_type_visited(); } -ir_type *new_type(const tp_op *type_op, ir_mode *mode, ident *name, - dbg_info *db) +ir_type *new_type(const tp_op *type_op, ir_mode *mode, type_dbg_info *db) { ir_type *res; - int node_size; - - assert(type_op != type_id); - assert(!id_contains_char(name, ' ') && "type name should not contain spaces"); + size_t node_size; node_size = offsetof(ir_type, attr) + type_op->attr_size; - res = xmalloc(node_size); + res = (ir_type*)xmalloc(node_size); memset(res, 0, node_size); res->kind = k_type; res->type_op = type_op; res->mode = mode; - res->name = name; - res->visibility = visibility_external_allocated; + res->visibility = ir_visibility_external; res->flags = tf_none; res->size = 0; res->align = 0; @@ -245,16 +252,6 @@ void set_type_mode(ir_type *tp, ir_mode *mode) assert(0 && "setting a mode is NOT allowed for this type"); } -ident *(get_type_ident)(const ir_type *tp) -{ - return _get_type_ident(tp); -} - -void (set_type_ident)(ir_type *tp, ident* id) -{ - _set_type_ident(tp, id); -} - /* Outputs a unique number for this node */ long get_type_nr(const ir_type *tp) { @@ -266,12 +263,6 @@ long get_type_nr(const ir_type *tp) #endif } -const char *get_type_name(const ir_type *tp) -{ - assert(tp && tp->kind == k_type); - return (get_id_str(tp->name)); -} - unsigned (get_type_size_bytes)(const ir_type *tp) { return _get_type_size_bytes(tp); @@ -312,7 +303,7 @@ unsigned get_type_alignment_bytes(ir_type *tp) else if (is_Array_type(tp)) align = get_type_alignment_bytes(get_array_element_type(tp)); else if (is_compound_type(tp)) { - int i, n = get_compound_n_members(tp); + size_t i, n = get_compound_n_members(tp); align = 0; for (i = 0; i < n; ++i) { @@ -367,46 +358,42 @@ void set_type_state(ir_type *tp, ir_type_state state) /* Just a correctness check: */ if (state == layout_fixed) { - int i; + size_t i; switch (get_type_tpop_code(tp)) { case tpo_class: if (tp != get_glob_type()) { - int n_mem = get_class_n_members(tp); + size_t n_mem = get_class_n_members(tp); for (i = 0; i < n_mem; i++) { - assert(get_entity_offset(get_class_member(tp, i)) > -1); - /* TR ?? - assert(is_Method_type(get_entity_type(get_class_member(tp, i))) || - (get_entity_allocation(get_class_member(tp, i)) == allocation_automatic)); - */ + ir_entity *entity = get_class_member(tp, i); + if (is_Method_type(get_entity_type(entity))) + continue; + assert(get_entity_offset(entity) > -1); } } break; case tpo_struct: for (i = 0; i < get_struct_n_members(tp); i++) { assert(get_entity_offset(get_struct_member(tp, i)) > -1); - assert((get_entity_allocation(get_struct_member(tp, i)) == allocation_automatic)); } break; case tpo_union: - /* ?? */ break; case tpo_array: - /* ?? - Check order? - Assure that only innermost dimension is dynamic? */ break; - case tpo_enumeration: + case tpo_enumeration: { #ifndef NDEBUG - assert(get_type_mode != NULL); - for (i = get_enumeration_n_enums(tp) - 1; i >= 0; --i) { + size_t n_enums = get_enumeration_n_enums(tp); + assert(get_type_mode(tp) != NULL); + for (i = 0; i < n_enums; ++i) { ir_enum_const *ec = get_enumeration_const(tp, i); - tarval *tv = get_enumeration_value(ec); + ir_tarval *tv = get_enumeration_value(ec); assert(tv != NULL && tv != tarval_bad); } #endif break; + } default: break; - } /* switch (tp) */ + } } if (state == layout_fixed) tp->flags |= tf_layout_fixed; @@ -439,12 +426,12 @@ int (type_not_visited)(const ir_type *tp) return _type_not_visited(tp); } -dbg_info *(get_type_dbg_info)(const ir_type *tp) +type_dbg_info *(get_type_dbg_info)(const ir_type *tp) { return _get_type_dbg_info(tp); } -void (set_type_dbg_info)(ir_type *tp, dbg_info *db) +void (set_type_dbg_info)(ir_type *tp, type_dbg_info *db) { _set_type_dbg_info(tp, db); } @@ -459,12 +446,13 @@ int equal_type(ir_type *typ1, ir_type *typ2) { ir_entity **m; ir_type **t; - int i, j; + size_t i; + size_t j; if (typ1 == typ2) return 1; if ((get_type_tpop_code(typ1) != get_type_tpop_code(typ2)) || - (get_type_ident(typ1) != get_type_ident(typ2)) || + typ1->name != typ2->name || (get_type_mode(typ1) != get_type_mode(typ2)) || (get_type_state(typ1) != get_type_state(typ2))) return 0; @@ -500,7 +488,7 @@ int equal_type(ir_type *typ1, ir_type *typ2) ir_type *t1 = get_class_supertype(typ1, i); for (j = 0; j < get_class_n_supertypes(typ2); j++) { ir_type *t2 = get_class_supertype(typ2, j); - if (get_type_ident(t2) == get_type_ident(t1)) + if (t2->name == t1->name) t[i] = t2; } } @@ -530,7 +518,8 @@ int equal_type(ir_type *typ1, ir_type *typ2) break; case tpo_method: { - int n_param1, n_param2; + size_t n_param1; + size_t n_param2; if (get_method_variadicity(typ1) != get_method_variadicity(typ2)) return 0; if (get_method_n_ress(typ1) != get_method_n_ress(typ2)) return 0; @@ -580,7 +569,7 @@ int equal_type(ir_type *typ1, ir_type *typ2) return 0; if (!equal_type(get_array_element_type(typ1), get_array_element_type(typ2))) return 0; - for(i = 0; i < get_array_n_dimensions(typ1); i++) { + for (i = 0; i < get_array_n_dimensions(typ1); i++) { if (get_array_lower_bound(typ1, i) != get_array_lower_bound(typ2, i) || get_array_upper_bound(typ1, i) != get_array_upper_bound(typ2, i)) return 0; @@ -609,14 +598,16 @@ int equal_type(ir_type *typ1, ir_type *typ2) int smaller_type(ir_type *st, ir_type *lt) { ir_entity **m; - int i, j, n_st_members; + size_t i; + size_t j; + size_t n_st_members; if (st == lt) return 1; if (get_type_tpop_code(st) != get_type_tpop_code(lt)) return 0; - switch(get_type_tpop_code(st)) { + switch (get_type_tpop_code(st)) { case tpo_class: return is_SubClass_of(st, lt); @@ -629,7 +620,7 @@ int smaller_type(ir_type *st, ir_type *lt) /* First sort the members of lt */ for (i = 0; i < n_st_members; ++i) { ir_entity *se = get_struct_member(st, i); - int n = get_struct_n_members(lt); + size_t n = get_struct_n_members(lt); for (j = 0; j < n; ++j) { ir_entity *le = get_struct_member(lt, j); if (get_entity_name(le) == get_entity_name(se)) @@ -644,7 +635,7 @@ int smaller_type(ir_type *st, ir_type *lt) break; case tpo_method: { - int n_param1, n_param2; + size_t n_param1, n_param2; /** FIXME: is this still 1? */ if (get_method_variadicity(st) != get_method_variadicity(lt)) return 0; @@ -679,7 +670,7 @@ int smaller_type(ir_type *st, ir_type *lt) /* First sort the members of lt */ for (i = 0; i < n_st_members; ++i) { ir_entity *se = get_union_member(st, i); - int n = get_union_n_members(lt); + size_t n = get_union_n_members(lt); for (j = 0; j < n; ++j) { ir_entity *le = get_union_member(lt, j); if (get_entity_name(le) == get_entity_name(se)) @@ -711,12 +702,12 @@ int smaller_type(ir_type *st, ir_type *lt) get_type_size_bytes(set) != get_type_size_bytes(let)) return 0; } - for(i = 0; i < get_array_n_dimensions(st); i++) { + for (i = 0; i < get_array_n_dimensions(st); i++) { if (get_array_lower_bound(lt, i)) - if(get_array_lower_bound(st, i) != get_array_lower_bound(lt, i)) + if (get_array_lower_bound(st, i) != get_array_lower_bound(lt, i)) return 0; if (get_array_upper_bound(lt, i)) - if(get_array_upper_bound(st, i) != get_array_upper_bound(lt, i)) + if (get_array_upper_bound(st, i) != get_array_upper_bound(lt, i)) return 0; } } break; @@ -741,11 +732,12 @@ int smaller_type(ir_type *st, ir_type *lt) } -ir_type *new_d_type_class(ident *name, dbg_info *db) +ir_type *new_d_type_class(ident *name, type_dbg_info *db) { ir_type *res; - res = new_type(type_class, NULL, name, db); + res = new_type(type_class, NULL, db); + res->name = name; res->attr.ca.members = NEW_ARR_F (ir_entity *, 0); res->attr.ca.subtypes = NEW_ARR_F (ir_type *, 0); @@ -761,15 +753,16 @@ ir_type *new_d_type_class(ident *name, dbg_info *db) ir_type *new_type_class(ident *name) { - return new_d_type_class (name, NULL); + return new_d_type_class(name, NULL); } void free_class_entities(ir_type *clss) { - int i; + size_t i; assert(clss && (clss->type_op == type_class)); - for (i = get_class_n_members(clss) - 1; i >= 0; --i) - free_entity(get_class_member(clss, i)); + /* we must iterate backward here */ + for (i = get_class_n_members(clss); i > 0;) + free_entity(get_class_member(clss, --i)); /* do NOT free the type info here. It belongs to another class */ } @@ -781,72 +774,67 @@ void free_class_attrs(ir_type *clss) DEL_ARR_F(clss->attr.ca.supertypes); } -void add_class_member(ir_type *clss, ir_entity *member) +ident *get_class_ident(const ir_type *clss) +{ + assert(clss->type_op == type_class); + return clss->name; +} + +const char *get_class_name(const ir_type *clss) +{ + if (get_class_ident(clss) == NULL) + return NULL; + return get_id_str(get_class_ident(clss)); +} + +static void add_class_member(ir_type *clss, ir_entity *member) { assert(clss && (clss->type_op == type_class)); assert(clss != get_entity_type(member) && "recursive type"); - assert(get_type_state(clss) != layout_fixed); ARR_APP1 (ir_entity *, clss->attr.ca.members, member); } -int (get_class_n_members)(const ir_type *clss) +size_t (get_class_n_members)(const ir_type *clss) { return _get_class_n_members(clss); } -int get_class_member_index(const ir_type *clss, ir_entity *mem) +size_t get_class_member_index(const ir_type *clss, ir_entity *mem) { - int i, n; + size_t i, n; assert(clss && (clss->type_op == type_class)); - for (i = 0, n = get_class_n_members(clss); i < n; ++i) + for (i = 0, n = get_class_n_members(clss); i < n; ++i) { if (get_class_member(clss, i) == mem) return i; - return -1; + } + return INVALID_MEMBER_INDEX; } -ir_entity *(get_class_member)(const ir_type *clss, int pos) +ir_entity *(get_class_member)(const ir_type *clss, size_t pos) { return _get_class_member(clss, pos); } ir_entity *get_class_member_by_name(ir_type *clss, ident *name) { - int i, n_mem; + size_t i, n_mem; assert(clss && (clss->type_op == type_class)); n_mem = get_class_n_members(clss); for (i = 0; i < n_mem; ++i) { ir_entity *mem = get_class_member(clss, i); - if (get_entity_ident(mem) == name) return mem; + if (get_entity_ident(mem) == name) + return mem; } return NULL; } -void set_class_member(ir_type *clss, ir_entity *member, int pos) +static void remove_class_member(ir_type *clss, ir_entity *member) { + size_t i; assert(clss && (clss->type_op == type_class)); - assert(pos >= 0 && pos < get_class_n_members(clss)); - clss->attr.ca.members[pos] = member; -} - -void set_class_members(ir_type *clss, ir_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(ir_entity *, 0); - for (i = 0; i < arity; ++i) { - set_entity_owner(members[i], clss); - ARR_APP1(ir_entity *, clss->attr.ca.members, members[i]); - } -} - -void remove_class_member(ir_type *clss, ir_entity *member) -{ - int i; - assert(clss && (clss->type_op == type_class)); - for (i = 0; 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++) + for (; i < ARR_LEN(clss->attr.ca.members) - 1; ++i) clss->attr.ca.members[i] = clss->attr.ca.members[i + 1]; ARR_SETLEN(ir_entity*, clss->attr.ca.members, ARR_LEN(clss->attr.ca.members) - 1); break; @@ -856,113 +844,120 @@ void remove_class_member(ir_type *clss, ir_entity *member) void add_class_subtype(ir_type *clss, ir_type *subtype) { - int i; - assert(clss && (clss->type_op == type_class)); + size_t i; + assert(clss->type_op == type_class); ARR_APP1 (ir_type *, clss->attr.ca.subtypes, subtype); - for (i = 0; i < get_class_n_supertypes(subtype); i++) + for (i = 0; i < get_class_n_supertypes(subtype); i++) { if (get_class_supertype(subtype, i) == clss) /* Class already registered */ return; - ARR_APP1(ir_type *, subtype->attr.ca.supertypes, clss); + } + ARR_APP1(ir_type *, subtype->attr.ca.supertypes, clss); } -int get_class_n_subtypes(const ir_type *clss) +size_t get_class_n_subtypes(const ir_type *clss) { - assert(clss && (clss->type_op == type_class)); - return (ARR_LEN (clss->attr.ca.subtypes)); + assert(clss->type_op == type_class); + return ARR_LEN (clss->attr.ca.subtypes); } -ir_type *get_class_subtype(ir_type *clss, int pos) +ir_type *get_class_subtype(ir_type *clss, size_t pos) { - assert(clss && (clss->type_op == type_class)); - assert(pos >= 0 && pos < get_class_n_subtypes(clss)); - return clss->attr.ca.subtypes[pos] = skip_tid(clss->attr.ca.subtypes[pos]); + assert(clss->type_op == type_class); + assert(pos < get_class_n_subtypes(clss)); + return clss->attr.ca.subtypes[pos]; } -int get_class_subtype_index(ir_type *clss, const ir_type *subclass) +size_t get_class_subtype_index(ir_type *clss, const ir_type *subclass) { - int i, n_subtypes = get_class_n_subtypes(clss); + size_t i, n_subtypes = get_class_n_subtypes(clss); assert(is_Class_type(subclass)); for (i = 0; i < n_subtypes; ++i) { - if (get_class_subtype(clss, i) == subclass) return i; + if (get_class_subtype(clss, i) == subclass) + return i; } - return -1; + return (size_t)-1; } -void set_class_subtype(ir_type *clss, ir_type *subtype, int pos) +void set_class_subtype(ir_type *clss, ir_type *subtype, size_t pos) { - assert(clss && (clss->type_op == type_class)); - assert(pos >= 0 && pos < get_class_n_subtypes(clss)); + assert(clss->type_op == type_class); + assert(pos < get_class_n_subtypes(clss)); clss->attr.ca.subtypes[pos] = subtype; } void remove_class_subtype(ir_type *clss, ir_type *subtype) { - int i; + size_t i; assert(clss && (clss->type_op == type_class)); - for (i = 0; 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++) + for (; i < ARR_LEN(clss->attr.ca.subtypes) - 1; ++i) clss->attr.ca.subtypes[i] = clss->attr.ca.subtypes[i+1]; - ARR_SETLEN(ir_entity*, clss->attr.ca.subtypes, ARR_LEN(clss->attr.ca.subtypes) - 1); + ARR_SETLEN(ir_type*, clss->attr.ca.subtypes, ARR_LEN(clss->attr.ca.subtypes) - 1); break; } + } } void add_class_supertype(ir_type *clss, ir_type *supertype) { - int i; + size_t i; + size_t n; assert(clss && (clss->type_op == type_class)); assert(supertype && (supertype -> type_op == type_class)); ARR_APP1 (ir_type *, clss->attr.ca.supertypes, supertype); - for (i = get_class_n_subtypes(supertype) - 1; i >= 0; --i) + for (i = 0, n = get_class_n_subtypes(supertype); i < n; ++i) { if (get_class_subtype(supertype, i) == clss) /* Class already registered */ return; + } ARR_APP1(ir_type *, supertype->attr.ca.subtypes, clss); } -int get_class_n_supertypes(const ir_type *clss) +size_t get_class_n_supertypes(const ir_type *clss) { - assert(clss && (clss->type_op == type_class)); + assert(clss->type_op == type_class); return ARR_LEN(clss->attr.ca.supertypes); } -int get_class_supertype_index(ir_type *clss, ir_type *super_clss) +size_t get_class_supertype_index(ir_type *clss, ir_type *super_clss) { - int i, n_supertypes = get_class_n_supertypes(clss); + size_t i, n_supertypes = get_class_n_supertypes(clss); assert(super_clss && (super_clss->type_op == type_class)); - for (i = 0; i < n_supertypes; i++) + for (i = 0; i < n_supertypes; i++) { if (get_class_supertype(clss, i) == super_clss) return i; - return -1; + } + return (size_t)-1; } -ir_type *get_class_supertype(ir_type *clss, int pos) +ir_type *get_class_supertype(ir_type *clss, size_t pos) { - assert(clss && (clss->type_op == type_class)); - assert(pos >= 0 && pos < get_class_n_supertypes(clss)); - return clss->attr.ca.supertypes[pos] = skip_tid(clss->attr.ca.supertypes[pos]); + assert(clss->type_op == type_class); + assert(pos < get_class_n_supertypes(clss)); + return clss->attr.ca.supertypes[pos]; } -void set_class_supertype(ir_type *clss, ir_type *supertype, int pos) +void set_class_supertype(ir_type *clss, ir_type *supertype, size_t pos) { - assert(clss && (clss->type_op == type_class)); - assert(pos >= 0 && pos < get_class_n_supertypes(clss)); + assert(clss->type_op == type_class); + assert(pos < get_class_n_supertypes(clss)); clss->attr.ca.supertypes[pos] = supertype; } void remove_class_supertype(ir_type *clss, ir_type *supertype) { - int i; + size_t i; assert(clss && (clss->type_op == type_class)); - for (i = 0; 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++) + for (; i < ARR_LEN(clss->attr.ca.supertypes) - 1; ++i) clss->attr.ca.supertypes[i] = clss->attr.ca.supertypes[i+1]; - ARR_SETLEN(ir_entity*, clss->attr.ca.supertypes, ARR_LEN(clss->attr.ca.supertypes) - 1); + ARR_SETLEN(ir_type*, clss->attr.ca.supertypes, ARR_LEN(clss->attr.ca.supertypes) - 1); break; } + } } ir_entity *get_class_type_info(const ir_type *clss) @@ -977,18 +972,6 @@ void set_class_type_info(ir_type *clss, ir_entity *ent) ent->repr_class = clss; } -const char *get_peculiarity_name(ir_peculiarity p) -{ -#define X(a) case a: return #a - switch (p) { - X(peculiarity_description); - X(peculiarity_inherited); - X(peculiarity_existent); - } -#undef X - return "invalid peculiarity"; -} - ir_peculiarity get_class_peculiarity(const ir_type *clss) { assert(clss && (clss->type_op == type_class)); @@ -1065,14 +1048,16 @@ void set_class_mode(ir_type *tp, ir_mode *mode) tp->mode = mode; } -void set_class_size(ir_type *tp, unsigned size) { +void set_class_size(ir_type *tp, unsigned size) +{ tp->size = size; } -ir_type *new_d_type_struct(ident *name, dbg_info *db) +ir_type *new_d_type_struct(ident *name, type_dbg_info *db) { - ir_type *res = new_type(type_struct, NULL, name, db); + ir_type *res = new_type(type_struct, NULL, db); + res->name = name; res->attr.sa.members = NEW_ARR_F(ir_entity *, 0); hook_new_type(res); @@ -1086,10 +1071,11 @@ ir_type *new_type_struct(ident *name) void free_struct_entities(ir_type *strct) { - int i; + size_t i; assert(strct && (strct->type_op == type_struct)); - for (i = get_struct_n_members(strct)-1; i >= 0; --i) - free_entity(get_struct_member(strct, i)); + /* we must iterate backward here */ + for (i = get_struct_n_members(strct); i > 0;) + free_entity(get_struct_member(strct, --i)); } void free_struct_attrs(ir_type *strct) @@ -1098,57 +1084,63 @@ void free_struct_attrs(ir_type *strct) DEL_ARR_F(strct->attr.sa.members); } -int get_struct_n_members(const ir_type *strct) +ident *get_struct_ident(const ir_type *strct) { - assert(strct && (strct->type_op == type_struct)); + assert(strct->type_op == type_struct); + return strct->name; +} + +const char *get_struct_name(const ir_type *strct) +{ + if (get_struct_ident(strct) == NULL) + return NULL; + return get_id_str(get_struct_ident(strct)); +} + +size_t get_struct_n_members(const ir_type *strct) +{ + assert(strct->type_op == type_struct); return ARR_LEN(strct->attr.sa.members); } -void add_struct_member(ir_type *strct, ir_entity *member) +static void add_struct_member(ir_type *strct, ir_entity *member) { assert(strct && (strct->type_op == type_struct)); assert(get_type_tpop(get_entity_type(member)) != type_method); assert(strct != get_entity_type(member) && "recursive type"); - assert(get_type_state(strct) != layout_fixed); ARR_APP1 (ir_entity *, strct->attr.sa.members, member); } -ir_entity *get_struct_member(const ir_type *strct, int pos) +ir_entity *get_struct_member(const ir_type *strct, size_t pos) { assert(strct && (strct->type_op == type_struct)); - assert(pos >= 0 && pos < get_struct_n_members(strct)); + assert(pos < get_struct_n_members(strct)); return strct->attr.sa.members[pos]; } -int get_struct_member_index(const ir_type *strct, ir_entity *mem) +size_t get_struct_member_index(const ir_type *strct, ir_entity *mem) { - int i, n; + size_t i, n; assert(strct && (strct->type_op == type_struct)); - for (i = 0, n = get_struct_n_members(strct); i < n; ++i) + for (i = 0, n = get_struct_n_members(strct); i < n; ++i) { if (get_struct_member(strct, i) == mem) return i; - return -1; -} - -void set_struct_member(ir_type *strct, int pos, ir_entity *member) -{ - 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] = member; + } + return (size_t)-1; } -void remove_struct_member(ir_type *strct, ir_entity *member) +static void remove_struct_member(ir_type *strct, ir_entity *member) { - int i; + size_t i; assert(strct && (strct->type_op == type_struct)); - for (i = 0; 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++) + for (; i < ARR_LEN(strct->attr.sa.members) - 1; ++i) strct->attr.sa.members[i] = strct->attr.sa.members[i+1]; ARR_SETLEN(ir_entity*, strct->attr.sa.members, ARR_LEN(strct->attr.sa.members) - 1); break; } + } } int (is_Struct_type)(const ir_type *strct) @@ -1179,34 +1171,35 @@ void set_struct_size(ir_type *tp, unsigned size) * @param len number of fields * @param tps array of field types with length len */ -static ir_type *build_value_type(ident *name, int len, tp_ent_pair *tps) +static ir_type *build_value_type(char const* name, size_t len, tp_ent_pair *tps) { - int i; - ir_type *res = new_type_struct(name); + size_t i; + ir_type *res = new_type_struct(new_id_from_str(name)); res->flags |= tf_value_param_type; /* Remove type from type list. Must be treated differently than other types. */ remove_irp_type(res); - for (i = 0; i < len; i++) { + for (i = 0; i < len; ++i) { ident *id = tps[i].param_name; /* use res as default if corresponding type is not yet set. */ ir_type *elt_type = tps[i].tp ? tps[i].tp : res; /* use the parameter name if specified */ - if (! id) - id = id_mangle_u(name, get_type_ident(elt_type)); + if (id == NULL) { + id = new_id_from_str("elt"); + } tps[i].ent = new_entity(res, id, elt_type); set_entity_allocation(tps[i].ent, allocation_parameter); } return res; } -ir_type *new_d_type_method(ident *name, int n_param, int n_res, dbg_info *db) +ir_type *new_d_type_method(size_t n_param, size_t n_res, type_dbg_info *db) { ir_type *res; assert((get_mode_size_bits(mode_P_code) % 8 == 0) && "unorthodox modes not implemented"); - res = new_type(type_method, mode_P_code, name, db); + res = new_type(type_method, mode_P_code, db); res->flags |= tf_layout_fixed; res->size = get_mode_size_bytes(mode_P_code); res->attr.ma.n_params = n_param; @@ -1218,36 +1211,31 @@ ir_type *new_d_type_method(ident *name, int n_param, int n_res, dbg_info *db) res->attr.ma.variadicity = variadicity_non_variadic; res->attr.ma.first_variadic_param = -1; res->attr.ma.additional_properties = mtp_no_property; - res->attr.ma.irg_calling_conv = default_cc_mask; hook_new_type(res); return res; } -ir_type *new_type_method(ident *name, int n_param, int n_res) +ir_type *new_type_method(size_t n_param, size_t n_res) { - return new_d_type_method(name, n_param, n_res, NULL); + return new_d_type_method(n_param, n_res, NULL); } -ir_type *clone_type_method(ir_type *tp, ident *prefix) +ir_type *clone_type_method(ir_type *tp) { ir_type *res; - ident *name; ir_mode *mode; - int n_params, n_res; - dbg_info *db; + size_t n_params; + size_t n_res; + type_dbg_info *db; assert(is_Method_type(tp)); - name = tp->name; - if (prefix != NULL) - name = id_mangle(prefix, name); - mode = tp->mode; n_params = tp->attr.ma.n_params; n_res = tp->attr.ma.n_res; db = tp->dbi; - res = new_type(type_method, mode, name, db); + res = new_type(type_method, mode, db); res->flags = tp->flags; res->assoc_type = tp->assoc_type; @@ -1291,25 +1279,25 @@ void free_method_attrs(ir_type *method) } } -int (get_method_n_params)(const ir_type *method) +size_t (get_method_n_params)(const ir_type *method) { return _get_method_n_params(method); } -ir_type *get_method_param_type(ir_type *method, int pos) +ir_type *get_method_param_type(ir_type *method, size_t pos) { ir_type *res; - assert(method && (method->type_op == type_method)); - assert(pos >= 0 && pos < get_method_n_params(method)); + assert(method->type_op == type_method); + assert(pos < get_method_n_params(method)); res = method->attr.ma.params[pos].tp; assert(res != NULL && "empty method param type"); - return method->attr.ma.params[pos].tp = skip_tid(res); + return res; } -void set_method_param_type(ir_type *method, int pos, ir_type *tp) +void set_method_param_type(ir_type *method, size_t pos, ir_type *tp) { - assert(method && (method->type_op == type_method)); - assert(pos >= 0 && pos < get_method_n_params(method)); + assert(method->type_op == type_method); + assert(pos < get_method_n_params(method)); method->attr.ma.params[pos].tp = tp; /* If information constructed set pass-by-value representation. */ if (method->attr.ma.value_params) { @@ -1318,35 +1306,34 @@ void set_method_param_type(ir_type *method, int pos, ir_type *tp) } } -ident *get_method_param_ident(ir_type *method, int pos) +ident *get_method_param_ident(ir_type *method, size_t pos) { - assert(method && (method->type_op == type_method)); - assert(pos >= 0 && pos < get_method_n_params(method)); + assert(method->type_op == type_method); + assert(pos < get_method_n_params(method)); return method->attr.ma.params[pos].param_name; } -const char *get_method_param_name(ir_type *method, int pos) +const char *get_method_param_name(ir_type *method, size_t pos) { ident *id = get_method_param_ident(method, pos); return id ? get_id_str(id) : NULL; } -void set_method_param_ident(ir_type *method, int pos, ident *id) +void set_method_param_ident(ir_type *method, size_t pos, ident *id) { - assert(method && (method->type_op == type_method)); - assert(pos >= 0 && pos < get_method_n_params(method)); + assert(method->type_op == type_method); + assert(pos < get_method_n_params(method)); method->attr.ma.params[pos].param_name = id; } -ir_entity *get_method_value_param_ent(ir_type *method, int pos) +ir_entity *get_method_value_param_ent(ir_type *method, size_t pos) { assert(method && (method->type_op == type_method)); - assert(pos >= 0 && pos < get_method_n_params(method)); + assert(pos < get_method_n_params(method)); if (!method->attr.ma.value_params) { /* parameter value type not created yet, build */ - method->attr.ma.value_params - = build_value_type(id_mangle_u(get_type_ident(method), value_params_suffix), + method->attr.ma.value_params = build_value_type("", get_method_n_params(method), method->attr.ma.params); } /* @@ -1360,7 +1347,8 @@ ir_entity *get_method_value_param_ent(ir_type *method, int pos) void set_method_value_param_type(ir_type *method, ir_type *tp) { - int i, n; + size_t i; + size_t n; assert(method && (method->type_op == type_method)); assert(is_value_param_type(tp)); @@ -1381,25 +1369,25 @@ ir_type *get_method_value_param_type(const ir_type *method) return method->attr.ma.value_params; } -int (get_method_n_ress)(const ir_type *method) +size_t (get_method_n_ress)(const ir_type *method) { return _get_method_n_ress(method); } -ir_type *get_method_res_type(ir_type *method, int pos) +ir_type *get_method_res_type(ir_type *method, size_t pos) { ir_type *res; - assert(method && (method->type_op == type_method)); - assert(pos >= 0 && pos < get_method_n_ress(method)); + assert(method->type_op == type_method); + assert(pos < get_method_n_ress(method)); res = method->attr.ma.res_type[pos].tp; assert(res != NULL && "empty method return type"); - return method->attr.ma.res_type[pos].tp = skip_tid(res); + return res; } -void set_method_res_type(ir_type *method, int pos, ir_type *tp) +void set_method_res_type(ir_type *method, size_t pos, ir_type *tp) { - assert(method && (method->type_op == type_method)); - assert(pos >= 0 && pos < get_method_n_ress(method)); + assert(method->type_op == type_method); + assert(pos < get_method_n_ress(method)); /* set the result ir_type */ method->attr.ma.res_type[pos].tp = tp; /* If information constructed set pass-by-value representation. */ @@ -1409,15 +1397,14 @@ void set_method_res_type(ir_type *method, int pos, ir_type *tp) } } -ir_entity *get_method_value_res_ent(ir_type *method, int pos) +ir_entity *get_method_value_res_ent(ir_type *method, size_t pos) { - assert(method && (method->type_op == type_method)); - assert(pos >= 0 && pos < get_method_n_ress(method)); + assert(method->type_op == type_method); + assert(pos < get_method_n_ress(method)); if (!method->attr.ma.value_ress) { /* result value type not created yet, build */ - method->attr.ma.value_ress - = build_value_type(id_mangle_u(get_type_ident(method), value_ress_suffix), + method->attr.ma.value_ress = build_value_type("", get_method_n_ress(method), method->attr.ma.res_type); } /* @@ -1432,7 +1419,7 @@ ir_entity *get_method_value_res_ent(ir_type *method, int pos) ir_type *get_method_value_res_type(const ir_type *method) { - assert(method && (method->type_op == type_method)); + assert(method->type_op == type_method); return method->attr.ma.value_ress; } @@ -1460,40 +1447,40 @@ void set_method_variadicity(ir_type *method, ir_variadicity vari) method->attr.ma.variadicity = vari; } -int get_method_first_variadic_param_index(const ir_type *method) +size_t get_method_first_variadic_param_index(const ir_type *method) { - assert(method && (method->type_op == type_method)); + assert(method->type_op == type_method); if (method->attr.ma.variadicity == variadicity_non_variadic) - return -1; + return (size_t)-1; - if (method->attr.ma.first_variadic_param == -1) + if (method->attr.ma.first_variadic_param == (size_t)-1) return get_method_n_params(method); return method->attr.ma.first_variadic_param; } -void set_method_first_variadic_param_index(ir_type *method, int index) +void set_method_first_variadic_param_index(ir_type *method, size_t index) { - assert(method && (method->type_op == type_method)); - assert(index >= 0 && index <= get_method_n_params(method)); + assert(method->type_op == type_method); + assert(index <= get_method_n_params(method)); method->attr.ma.first_variadic_param = index; } -unsigned (get_method_additional_properties)(const ir_type *method) +mtp_additional_properties (get_method_additional_properties)(const ir_type *method) { return _get_method_additional_properties(method); } -void (set_method_additional_properties)(ir_type *method, unsigned mask) +void (set_method_additional_properties)(ir_type *method, mtp_additional_properties mask) { _set_method_additional_properties(method, mask); } -void (set_method_additional_property)(ir_type *method, - mtp_additional_property flag) +void (add_method_additional_properties)(ir_type *method, + mtp_additional_properties flag) { - _set_method_additional_property(method, flag); + _add_method_additional_properties(method, flag); } unsigned (get_method_calling_convention)(const ir_type *method) @@ -1528,9 +1515,10 @@ int (is_Method_type)(const ir_type *method) } -ir_type *new_d_type_union(ident *name, dbg_info *db) +ir_type *new_d_type_union(ident *name, type_dbg_info *db) { - ir_type *res = new_type(type_union, NULL, name, db); + ir_type *res = new_type(type_union, NULL, db); + res->name = name; res->attr.ua.members = NEW_ARR_F(ir_entity *, 0); hook_new_type(res); @@ -1544,64 +1532,70 @@ ir_type *new_type_union(ident *name) void free_union_entities(ir_type *uni) { - int i; + size_t i; assert(uni && (uni->type_op == type_union)); - for (i = get_union_n_members(uni) - 1; i >= 0; --i) - free_entity(get_union_member(uni, i)); + /* we must iterate backward here */ + for (i = get_union_n_members(uni); i > 0;) + free_entity(get_union_member(uni, --i)); } -void free_union_attrs (ir_type *uni) +void free_union_attrs(ir_type *uni) { assert(uni && (uni->type_op == type_union)); DEL_ARR_F(uni->attr.ua.members); } -int get_union_n_members(const ir_type *uni) +ident *get_union_ident(const ir_type *uni) { - assert(uni && (uni->type_op == type_union)); + assert(uni->type_op == type_union); + return uni->name; +} + +const char *get_union_name(const ir_type *uni) +{ + if (get_union_ident(uni) == NULL) + return NULL; + return get_id_str(get_union_ident(uni)); +} + +size_t get_union_n_members(const ir_type *uni) +{ + assert(uni->type_op == type_union); return ARR_LEN(uni->attr.ua.members); } -void add_union_member(ir_type *uni, ir_entity *member) +static void add_union_member(ir_type *uni, ir_entity *member) { - assert(uni && (uni->type_op == type_union)); + assert(uni->type_op == type_union); assert(uni != get_entity_type(member) && "recursive type"); - assert(get_type_state(uni) != layout_fixed); ARR_APP1(ir_entity *, uni->attr.ua.members, member); } -ir_entity *get_union_member(const ir_type *uni, int pos) +ir_entity *get_union_member(const ir_type *uni, size_t pos) { - assert(uni && (uni->type_op == type_union)); - assert(pos >= 0 && pos < get_union_n_members(uni)); + assert(uni->type_op == type_union); + assert(pos < get_union_n_members(uni)); return uni->attr.ua.members[pos]; } -int get_union_member_index(const ir_type *uni, ir_entity *mem) +size_t get_union_member_index(const ir_type *uni, ir_entity *mem) { - int i, n; + size_t i, n; assert(uni && (uni->type_op == type_union)); for (i = 0, n = get_union_n_members(uni); i < n; ++i) { if (get_union_member(uni, i) == mem) return i; } - return -1; -} - -void set_union_member(ir_type *uni, int pos, ir_entity *member) -{ - assert(uni && (uni->type_op == type_union)); - assert(pos >= 0 && pos < get_union_n_members(uni)); - uni->attr.ua.members[pos] = member; + return (size_t)-1; } -void remove_union_member(ir_type *uni, ir_entity *member) +static void remove_union_member(ir_type *uni, ir_entity *member) { - int i; + size_t i; assert(uni && (uni->type_op == type_union)); - for (i = 0; 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++) + for (; i < ARR_LEN(uni->attr.ua.members) - 1; i++) uni->attr.ua.members[i] = uni->attr.ua.members[i+1]; ARR_SETLEN(ir_entity*, uni->attr.ua.members, ARR_LEN(uni->attr.ua.members) - 1); break; @@ -1621,40 +1615,41 @@ void set_union_size(ir_type *tp, unsigned size) -ir_type *new_d_type_array(ident *name, int n_dimensions, ir_type *element_type, - dbg_info *db) +ir_type *new_d_type_array(int n_dimensions, ir_type *element_type, + type_dbg_info *db) { ir_type *res; int i; ir_node *unk; - ir_graph *rem = current_ir_graph; + ir_graph *irg = get_const_code_irg(); assert(!is_Method_type(element_type)); - res = new_type(type_array, NULL, name, db); + res = new_type(type_array, NULL, db); res->attr.aa.n_dimensions = n_dimensions; res->attr.aa.lower_bound = XMALLOCNZ(ir_node*, n_dimensions); res->attr.aa.upper_bound = XMALLOCNZ(ir_node*, n_dimensions); res->attr.aa.order = XMALLOCNZ(int, n_dimensions); - current_ir_graph = get_const_code_irg(); - unk = new_Unknown(mode_Iu); + unk = new_r_Unknown(irg, mode_Iu); for (i = 0; i < n_dimensions; i++) { res->attr.aa.lower_bound[i] = res->attr.aa.upper_bound[i] = unk; res->attr.aa.order[i] = i; } - current_ir_graph = rem; res->attr.aa.element_type = element_type; - new_entity(res, id_mangle_u(name, new_id_from_chars("elem_ent", 8)), element_type); + res->attr.aa.element_ent + = new_entity(NULL, new_id_from_chars("elem_ent", 8), element_type); + res->attr.aa.element_ent->owner = res; + hook_new_type(res); return res; } -ir_type *new_type_array(ident *name, int n_dimensions, ir_type *element_type) +ir_type *new_type_array(int n_dimensions, ir_type *element_type) { - return new_d_type_array(name, n_dimensions, element_type, NULL); + return new_d_type_array(n_dimensions, element_type, NULL); } void free_array_automatic_entities(ir_type *array) @@ -1663,94 +1658,89 @@ void free_array_automatic_entities(ir_type *array) free_entity(get_array_element_entity(array)); } -void free_array_entities (ir_type *array) +void free_array_entities(ir_type *array) { (void) array; - assert(array && (array->type_op == type_array)); + assert(array->type_op == type_array); } -void free_array_attrs (ir_type *array) +void free_array_attrs(ir_type *array) { - assert(array && (array->type_op == type_array)); + assert(array->type_op == type_array); free(array->attr.aa.lower_bound); free(array->attr.aa.upper_bound); free(array->attr.aa.order); } /* manipulate private fields of array ir_type */ -int get_array_n_dimensions (const ir_type *array) +size_t get_array_n_dimensions(const ir_type *array) { - assert(array && (array->type_op == type_array)); + assert(array->type_op == type_array); return array->attr.aa.n_dimensions; } -void set_array_bounds(ir_type *array, int dimension, ir_node *lower_bound, +void set_array_bounds(ir_type *array, size_t dimension, ir_node *lower_bound, ir_node *upper_bound) { assert(array && (array->type_op == type_array)); assert(lower_bound && "lower_bound node may not be NULL."); assert(upper_bound && "upper_bound node may not be NULL."); - assert(dimension < array->attr.aa.n_dimensions && dimension >= 0); + assert(dimension < array->attr.aa.n_dimensions); array->attr.aa.lower_bound[dimension] = lower_bound; array->attr.aa.upper_bound[dimension] = upper_bound; } -void set_array_bounds_int(ir_type *array, int dimension, int lower_bound, +void set_array_bounds_int(ir_type *array, size_t dimension, int lower_bound, int upper_bound) { - ir_graph *rem = current_ir_graph; - current_ir_graph = get_const_code_irg(); + ir_graph *irg = get_const_code_irg(); set_array_bounds(array, dimension, - new_Const_long(mode_Iu, lower_bound), - new_Const_long(mode_Iu, upper_bound)); - current_ir_graph = rem; + new_r_Const_long(irg, mode_Iu, lower_bound), + new_r_Const_long(irg, mode_Iu, upper_bound)); } -void set_array_lower_bound(ir_type *array, int dimension, ir_node *lower_bound) +void set_array_lower_bound(ir_type *array, size_t dimension, + ir_node *lower_bound) { assert(array && (array->type_op == type_array)); assert(lower_bound && "lower_bound node may not be NULL."); array->attr.aa.lower_bound[dimension] = lower_bound; } -void set_array_lower_bound_int(ir_type *array, int dimension, int lower_bound) +void set_array_lower_bound_int(ir_type *array, size_t dimension, int lower_bound) { - ir_graph *rem = current_ir_graph; - current_ir_graph = get_const_code_irg(); + ir_graph *irg = get_const_code_irg(); set_array_lower_bound(array, dimension, - new_Const_long(mode_Iu, lower_bound)); - current_ir_graph = rem; + new_r_Const_long(irg, mode_Iu, lower_bound)); } -void set_array_upper_bound(ir_type *array, int dimension, ir_node *upper_bound) +void set_array_upper_bound(ir_type *array, size_t dimension, ir_node *upper_bound) { assert(array && (array->type_op == type_array)); assert(upper_bound && "upper_bound node may not be NULL."); array->attr.aa.upper_bound[dimension] = upper_bound; } -void set_array_upper_bound_int(ir_type *array, int dimension, int upper_bound) +void set_array_upper_bound_int(ir_type *array, size_t dimension, int upper_bound) { - ir_graph *rem = current_ir_graph; - current_ir_graph = get_const_code_irg(); + ir_graph *irg = get_const_code_irg(); set_array_upper_bound(array, dimension, - new_Const_long(mode_Iu, upper_bound)); - current_ir_graph = rem; + new_r_Const_long(irg, mode_Iu, upper_bound)); } -int has_array_lower_bound(const ir_type *array, int dimension) +int has_array_lower_bound(const ir_type *array, size_t dimension) { assert(array && (array->type_op == type_array)); return !is_Unknown(array->attr.aa.lower_bound[dimension]); } -ir_node *get_array_lower_bound(const ir_type *array, int dimension) +ir_node *get_array_lower_bound(const ir_type *array, size_t dimension) { assert(array && (array->type_op == type_array)); return array->attr.aa.lower_bound[dimension]; } -long get_array_lower_bound_int(const ir_type *array, int dimension) +long get_array_lower_bound_int(const ir_type *array, size_t dimension) { ir_node *node; assert(array && (array->type_op == type_array)); @@ -1759,19 +1749,19 @@ long get_array_lower_bound_int(const ir_type *array, int dimension) return get_tarval_long(get_Const_tarval(node)); } -int has_array_upper_bound(const ir_type *array, int dimension) +int has_array_upper_bound(const ir_type *array, size_t dimension) { assert(array && (array->type_op == type_array)); return !is_Unknown(array->attr.aa.upper_bound[dimension]); } -ir_node *get_array_upper_bound(const ir_type *array, int dimension) +ir_node *get_array_upper_bound(const ir_type *array, size_t dimension) { assert(array && (array->type_op == type_array)); return array->attr.aa.upper_bound[dimension]; } -long get_array_upper_bound_int(const ir_type *array, int dimension) +long get_array_upper_bound_int(const ir_type *array, size_t dimension) { ir_node *node; assert(array && (array->type_op == type_array)); @@ -1780,29 +1770,29 @@ long get_array_upper_bound_int(const ir_type *array, int dimension) return get_tarval_long(get_Const_tarval(node)); } -void set_array_order(ir_type *array, int dimension, int order) +void set_array_order(ir_type *array, size_t dimension, int order) { assert(array && (array->type_op == type_array)); array->attr.aa.order[dimension] = order; } -int get_array_order(const ir_type *array, int dimension) +int get_array_order(const ir_type *array, size_t dimension) { assert(array && (array->type_op == type_array)); return array->attr.aa.order[dimension]; } -int find_array_dimension(const ir_type *array, int order) +size_t find_array_dimension(const ir_type *array, int order) { - int dim; + size_t dim; - assert(array && (array->type_op == type_array)); + assert(array->type_op == type_array); for (dim = 0; dim < array->attr.aa.n_dimensions; ++dim) { if (array->attr.aa.order[dim] == order) return dim; } - return -1; + return (size_t)-1; } void set_array_element_type(ir_type *array, ir_type *tp) @@ -1812,10 +1802,10 @@ void set_array_element_type(ir_type *array, ir_type *tp) array->attr.aa.element_type = tp; } -ir_type *get_array_element_type(ir_type *array) +ir_type *get_array_element_type(const ir_type *array) { assert(array && (array->type_op == type_array)); - return array->attr.aa.element_type = skip_tid(array->attr.aa.element_type); + return array->attr.aa.element_type; } void set_array_element_entity(ir_type *array, ir_entity *ent) @@ -1844,18 +1834,18 @@ void set_array_size(ir_type *tp, unsigned size) } -ir_type *new_d_type_enumeration(ident *name, int n_enums, dbg_info *db) +ir_type *new_d_type_enumeration(ident *name, size_t n_enums, type_dbg_info *db) { ir_type *res; - assert(n_enums >= 0); - res = new_type(type_enumeration, NULL, name, db); + res = new_type(type_enumeration, NULL, db); + res->name = name; res->attr.ea.enumer = NEW_ARR_F(ir_enum_const, n_enums); hook_new_type(res); return res; } -ir_type *new_type_enumeration(ident *name, int n_enums) +ir_type *new_type_enumeration(ident *name, size_t n_enums) { return new_d_type_enumeration(name, n_enums, NULL); } @@ -1863,34 +1853,47 @@ ir_type *new_type_enumeration(ident *name, int n_enums) void free_enumeration_entities(ir_type *enumeration) { (void) enumeration; - assert(enumeration && (enumeration->type_op == type_enumeration)); + assert(enumeration->type_op == type_enumeration); } void free_enumeration_attrs(ir_type *enumeration) { - assert(enumeration && (enumeration->type_op == type_enumeration)); + assert(enumeration->type_op == type_enumeration); DEL_ARR_F(enumeration->attr.ea.enumer); } -int get_enumeration_n_enums(const ir_type *enumeration) +ident *get_enumeration_ident(const ir_type *enumeration) +{ + assert(enumeration->type_op == type_enumeration); + return enumeration->name; +} + +const char *get_enumeration_name(const ir_type *enumeration) +{ + if (get_enumeration_ident(enumeration) == NULL) + return NULL; + return get_id_str(get_enumeration_ident(enumeration)); +} + +size_t get_enumeration_n_enums(const ir_type *enumeration) { - assert(enumeration && (enumeration->type_op == type_enumeration)); + assert(enumeration->type_op == type_enumeration); return ARR_LEN(enumeration->attr.ea.enumer); } -void set_enumeration_const(ir_type *enumeration, int pos, ident *nameid, - tarval *con) +void set_enumeration_const(ir_type *enumeration, size_t pos, ident *nameid, + ir_tarval *con) { - assert(0 <= pos && pos < ARR_LEN(enumeration->attr.ea.enumer)); + assert(pos < ARR_LEN(enumeration->attr.ea.enumer)); enumeration->attr.ea.enumer[pos].nameid = nameid; enumeration->attr.ea.enumer[pos].value = con; enumeration->attr.ea.enumer[pos].owner = enumeration; } -ir_enum_const *get_enumeration_const(const ir_type *enumeration, int pos) +ir_enum_const *get_enumeration_const(const ir_type *enumeration, size_t pos) { - assert(enumeration && (enumeration->type_op == type_enumeration)); - assert(pos >= 0 && pos < get_enumeration_n_enums(enumeration)); + assert(enumeration->type_op == type_enumeration); + assert(pos < get_enumeration_n_enums(enumeration)); return &enumeration->attr.ea.enumer[pos]; } @@ -1899,12 +1902,12 @@ ir_type *get_enumeration_owner(const ir_enum_const *enum_cnst) return enum_cnst->owner; } -void set_enumeration_value(ir_enum_const *enum_cnst, tarval *con) +void set_enumeration_value(ir_enum_const *enum_cnst, ir_tarval *con) { enum_cnst->value = con; } -tarval *get_enumeration_value(const ir_enum_const *enum_cnst) +ir_tarval *get_enumeration_value(const ir_enum_const *enum_cnst) { return enum_cnst->value; } @@ -1914,12 +1917,12 @@ void set_enumeration_nameid(ir_enum_const *enum_cnst, ident *id) enum_cnst->nameid = id; } -ident *get_enumeration_nameid(const ir_enum_const *enum_cnst) +ident *get_enumeration_const_nameid(const ir_enum_const *enum_cnst) { return enum_cnst->nameid; } -const char *get_enumeration_name(const ir_enum_const *enum_cnst) +const char *get_enumeration_const_name(const ir_enum_const *enum_cnst) { return get_id_str(enum_cnst->nameid); } @@ -1941,13 +1944,18 @@ void set_enumeration_mode(ir_type *tp, ir_mode *mode) -ir_type *new_d_type_pointer(ident *name, ir_type *points_to, ir_mode *ptr_mode, - dbg_info *db) +ir_type *new_d_type_pointer(ir_type *points_to, type_dbg_info *db) { ir_type *res; + ir_mode *mode; + + if (is_Method_type(points_to) || is_code_type(points_to)) { + mode = mode_P_code; + } else { + mode = mode_P_data; + } - assert(mode_is_reference(ptr_mode)); - res = new_type(type_pointer, ptr_mode, name, db); + res = new_type(type_pointer, mode, db); res->attr.pa.points_to = points_to; assert((get_mode_size_bits(res->mode) % 8 == 0) && "unorthodox modes not implemented"); res->size = get_mode_size_bytes(res->mode); @@ -1956,9 +1964,9 @@ ir_type *new_d_type_pointer(ident *name, ir_type *points_to, ir_mode *ptr_mode, return res; } -ir_type *new_type_pointer(ident *name, ir_type *points_to, ir_mode *ptr_mode) +ir_type *new_type_pointer(ir_type *points_to) { - return new_d_type_pointer(name, points_to, ptr_mode, NULL); + return new_d_type_pointer(points_to, NULL); } void free_pointer_entities(ir_type *pointer) @@ -1979,10 +1987,10 @@ void set_pointer_points_to_type(ir_type *pointer, ir_type *tp) pointer->attr.pa.points_to = tp; } -ir_type *get_pointer_points_to_type(ir_type *pointer) +ir_type *get_pointer_points_to_type(const ir_type *pointer) { assert(pointer && (pointer->type_op == type_pointer)); - return pointer->attr.pa.points_to = skip_tid(pointer->attr.pa.points_to); + return pointer->attr.pa.points_to; } int (is_Pointer_type)(const ir_type *pointer) @@ -2002,7 +2010,7 @@ void set_pointer_mode(ir_type *tp, ir_mode *mode) ir_type *find_pointer_type_to_type(ir_type *tp) { - int i, n = get_irp_n_types(); + size_t i, n = get_irp_n_types(); for (i = 0; i < n; ++i) { ir_type *found = get_irp_type(i); if (is_Pointer_type(found) && get_pointer_points_to_type(found) == tp) @@ -2013,9 +2021,9 @@ ir_type *find_pointer_type_to_type(ir_type *tp) -ir_type *new_d_type_primitive(ident *name, ir_mode *mode, dbg_info *db) +ir_type *new_d_type_primitive(ir_mode *mode, type_dbg_info *db) { - ir_type *res = new_type(type_primitive, mode, name, db); + ir_type *res = new_type(type_primitive, mode, db); res->size = get_mode_size_bytes(mode); res->flags |= tf_layout_fixed; res->attr.ba.base_type = NULL; @@ -2023,9 +2031,9 @@ ir_type *new_d_type_primitive(ident *name, ir_mode *mode, dbg_info *db) return res; } -ir_type *new_type_primitive(ident *name, ir_mode *mode) +ir_type *new_type_primitive(ir_mode *mode) { - return new_d_type_primitive(name, mode, NULL); + return new_d_type_primitive(mode, NULL); } int (is_Primitive_type)(const ir_type *primitive) @@ -2043,7 +2051,7 @@ void set_primitive_mode(ir_type *tp, ir_mode *mode) tp->mode = mode; } -ir_type *get_primitive_base_type(ir_type *tp) +ir_type *get_primitive_base_type(const ir_type *tp) { assert(is_Primitive_type(tp)); return tp->attr.ba.base_type; @@ -2062,51 +2070,67 @@ int (is_atomic_type)(const ir_type *tp) return _is_atomic_type(tp); } -int get_compound_n_members(const ir_type *tp) +size_t get_compound_n_members(const ir_type *tp) { - const tp_op *op = get_type_tpop(tp); - int res = 0; - - if (op->ops.get_n_members) - res = op->ops.get_n_members(tp); - else - assert(0 && "no member count for this type"); - - return res; + const tp_op *op = get_type_tpop(tp); + return op->ops.get_n_members(tp); } -ir_entity *get_compound_member(const ir_type *tp, int pos) +ir_entity *get_compound_member(const ir_type *tp, size_t pos) { const tp_op *op = get_type_tpop(tp); - ir_entity *res = NULL; + return op->ops.get_member(tp, pos); +} - if (op->ops.get_member) - res = op->ops.get_member(tp, pos); - else - assert(0 && "no members in this type"); +size_t get_compound_member_index(const ir_type *tp, ir_entity *member) +{ + const tp_op *op = get_type_tpop(tp); + return op->ops.get_member_index(tp, member); +} - return res; +int is_compound_type(const ir_type *tp) +{ + assert(tp->kind == k_type); + return tp->type_op->flags & TP_OP_FLAG_COMPOUND; } -int get_compound_member_index(const ir_type *tp, ir_entity *member) +ident *get_compound_ident(const ir_type *tp) { - const tp_op *op = get_type_tpop(tp); - int index = -1; + assert(is_compound_type(tp)); + return tp->name; +} - if (op->ops.get_member_index) - index = op->ops.get_member_index(tp, member); - else - assert(0 && "no members in this type"); +const char *get_compound_name(const ir_type *tp) +{ + if (get_compound_ident(tp) == NULL) + return NULL; + return get_id_str(get_compound_ident(tp)); +} - return index; +void remove_compound_member(ir_type *compound, ir_entity *entity) +{ + switch (get_type_tpop_code(compound)) { + case tpo_class: remove_class_member(compound, entity); break; + case tpo_struct: remove_struct_member(compound, entity); break; + case tpo_union: remove_union_member(compound, entity); break; + default: + panic("argument for remove_compound_member not a compound type"); + } } -int is_compound_type(const ir_type *tp) +void add_compound_member(ir_type *compound, ir_entity *entity) { - assert(tp && tp->kind == k_type); - return tp->type_op->flags & TP_OP_FLAG_COMPOUND; + switch (get_type_tpop_code(compound)) { + case tpo_class: add_class_member(compound, entity); break; + case tpo_struct: add_struct_member(compound, entity); break; + case tpo_union: add_union_member(compound, entity); break; + default: + panic("argument for add_compound_member not a compound type"); + } } + + int is_code_type(const ir_type *tp) { assert(tp && tp->kind == k_type); @@ -2128,9 +2152,9 @@ int is_lowered_type(const ir_type *tp) return tp->flags & tf_lowered_type; } -ir_type *new_type_value(ident *name) +ir_type *new_type_value(void) { - ir_type *res = new_type_struct(name); + ir_type *res = new_type_struct(new_id_from_str("")); res->flags |= tf_value_param_type; @@ -2140,9 +2164,9 @@ ir_type *new_type_value(ident *name) return res; } -ir_type *new_type_frame(ident *name) +ir_type *new_type_frame(void) { - ir_type *res = new_type_class(name); + ir_type *res = new_type_class(new_id_from_str("")); res->flags |= tf_frame_type; @@ -2158,13 +2182,13 @@ ir_type *new_type_frame(ident *name) ir_type *clone_frame_type(ir_type *type) { ir_type *res; - int i, n; + size_t i, n; assert(is_frame_type(type)); /* the entity link resource should be allocated if this function is called */ assert(irp_resources_reserved(irp) & IR_RESOURCE_ENTITY_LINK); - res = new_type_frame(type->name); + res = new_type_frame(); for (i = 0, n = get_class_n_members(type); i < n; ++i) { ir_entity *ent = get_class_member(type, i); ir_entity *nent = copy_entity_own(ent, res); @@ -2192,6 +2216,43 @@ void set_default_size(ir_type *tp, unsigned size) tp->size = size; } +void default_layout_compound_type(ir_type *type) +{ + size_t i; + size_t n = get_compound_n_members(type); + int size = 0; + unsigned align_all = 1; + + for (i = 0; i < n; ++i) { + ir_entity *entity = get_compound_member(type, i); + ir_type *entity_type = get_entity_type(entity); + unsigned align; + unsigned misalign; + + if (is_Method_type(entity_type)) + continue; + + assert(get_type_state(entity_type) == layout_fixed); + align = get_type_alignment_bytes(entity_type); + align_all = align > align_all ? align : align_all; + misalign = (align ? size % align : 0); + size += (misalign ? align - misalign : 0); + + set_entity_offset(entity, size); + if (!is_Union_type(type)) { + size += get_type_size_bytes(entity_type); + } + } + if (align_all > 0 && size % align_all) { + size += align_all - (size % align_all); + } + if (align_all > get_type_alignment_bytes(type)) { + set_type_alignment_bytes(type, align_all); + } + set_type_size_bytes(type, size); + set_type_state(type, layout_fixed); +} + ir_entity *frame_alloc_area(ir_type *frame_type, int size, unsigned alignment, int at_start) { @@ -2200,7 +2261,7 @@ ir_entity *frame_alloc_area(ir_type *frame_type, int size, unsigned alignment, ident *name; char buf[32]; unsigned frame_align; - int i, offset, frame_size; + int offset, frame_size; static unsigned area_cnt = 0; static ir_type *a_byte = NULL; @@ -2210,7 +2271,7 @@ ir_entity *frame_alloc_area(ir_type *frame_type, int size, unsigned alignment, set_type_state(frame_type, layout_undefined); if (! a_byte) - a_byte = new_type_primitive(new_id_from_chars("byte", 4), mode_Bu); + a_byte = new_type_primitive(mode_Bu); snprintf(buf, sizeof(buf), "area%u", area_cnt++); name = new_id_from_str(buf); @@ -2219,14 +2280,15 @@ ir_entity *frame_alloc_area(ir_type *frame_type, int size, unsigned alignment, frame_align = get_type_alignment_bytes(frame_type); size = (size + frame_align - 1) & ~(frame_align - 1); - tp = new_type_array(id_mangle_u(get_type_ident(frame_type), name), 1, a_byte); + tp = new_type_array(1, a_byte); set_array_bounds_int(tp, 0, 0, size); set_type_alignment_bytes(tp, alignment); frame_size = get_type_size_bytes(frame_type); if (at_start) { + size_t i, n; /* fix all offsets so far */ - for (i = get_class_n_members(frame_type) - 1; i >= 0; --i) { + for (i = 0, n = get_class_n_members(frame_type); i < n; ++i) { ir_entity *ent = get_class_member(frame_type, i); set_entity_offset(ent, get_entity_offset(ent) + size); @@ -2257,3 +2319,75 @@ ir_entity *frame_alloc_area(ir_type *frame_type, int size, unsigned alignment, set_type_state(frame_type, layout_fixed); return area; } + +void ir_print_type(char *buffer, size_t buffer_size, const ir_type *type) +{ + ident *id; + int p; + type_dbg_info *tdbgi = get_type_dbg_info(type); + if (tdbgi != NULL) { + ir_retrieve_type_dbg_info(buffer, buffer_size, tdbgi); + return; + } + + /* we have to construct some name... */ + switch (get_type_tpop_code(type)) { + case tpo_uninitialized: + break; + case tpo_code: + snprintf(buffer, buffer_size, "code"); + return; + + case tpo_class: + id = get_class_ident(type); + snprintf(buffer, buffer_size, "class '%s'", get_id_str(id)); + return; + + case tpo_struct: + id = get_struct_ident(type); + snprintf(buffer, buffer_size, "struct '%s'", get_id_str(id)); + return; + + case tpo_union: + id = get_union_ident(type); + snprintf(buffer, buffer_size, "union '%s'", get_id_str(id)); + return; + + case tpo_enumeration: + id = get_enumeration_ident(type); + snprintf(buffer, buffer_size, "enumeration '%s'", get_id_str(id)); + return; + + case tpo_unknown: + snprintf(buffer, buffer_size, "unknown type"); + return; + + case tpo_pointer: + p = snprintf(buffer, buffer_size, "pointer to "); + buffer += p; + buffer_size -= p; + ir_print_type(buffer, buffer_size, get_pointer_points_to_type(type)); + return; + + case tpo_array: + p = snprintf(buffer, buffer_size, "array of "); + buffer += p; + buffer_size -= p; + ir_print_type(buffer, buffer_size, get_array_element_type(type)); + return; + + case tpo_primitive: + id = get_mode_ident(get_type_mode(type)); + snprintf(buffer, buffer_size, "%s", get_id_str(id)); + return; + + case tpo_none: + snprintf(buffer, buffer_size, "none"); + return; + case tpo_method: + /* TODO: we should print argument and return types here... */ + snprintf(buffer, buffer_size, "method type"); + return; + } + snprintf(buffer, buffer_size, "invalid type"); +}