X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Ftype.c;h=869bc792e11428ae72f3f863358f561edc808184;hb=429d687f06baeeb63d04750f846d39e55fb62343;hp=8d2494df9d80b86fd2771799ae0883e874667e51;hpb=1ce363f80e6a204d4011f85813362d9bd1d0e7e4;p=libfirm diff --git a/ir/tr/type.c b/ir/tr/type.c index 8d2494df9..869bc792e 100644 --- a/ir/tr/type.c +++ b/ir/tr/type.c @@ -45,9 +45,7 @@ * @see type_t.h type tpop */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_STRING_H # include @@ -110,11 +108,11 @@ void firm_init_type(dbg_info *builtin_db, unsigned def_cc_mask) { } /** the global type visited flag */ -unsigned long firm_type_visited; +ir_visited_t firm_type_visited; -void (set_master_type_visited)(unsigned long val) { _set_master_type_visited(val); } -unsigned long (get_master_type_visited)(void) { return _get_master_type_visited(); } -void (inc_master_type_visited)(void) { _inc_master_type_visited(); } +void (set_master_type_visited)(ir_visited_t val) { _set_master_type_visited(val); } +ir_visited_t (get_master_type_visited)(void) { return _get_master_type_visited(); } +void (inc_master_type_visited)(void) { _inc_master_type_visited(); } /* * Creates a new type representation. @@ -423,11 +421,11 @@ set_type_state(ir_type *tp, ir_type_state state) { tp->flags &= ~tf_layout_fixed; } -unsigned long (get_type_visited)(const ir_type *tp) { +ir_visited_t (get_type_visited)(const ir_type *tp) { return _get_type_visited(tp); } -void (set_type_visited)(ir_type *tp, unsigned long num) { +void (set_type_visited)(ir_type *tp, ir_visited_t num) { _set_type_visited(tp, num); } @@ -480,8 +478,7 @@ int equal_type(ir_type *typ1, ir_type *typ2) { if (get_class_n_supertypes(typ1) != get_class_n_supertypes(typ2)) return 0; if (get_class_peculiarity(typ1) != get_class_peculiarity(typ2)) return 0; /** Compare the members **/ - m = alloca(sizeof(ir_entity *) * get_class_n_members(typ1)); - memset(m, 0, sizeof(ir_entity *) * get_class_n_members(typ1)); + m = ALLOCANZ(ir_entity*, get_class_n_members(typ1)); /* First sort the members of typ2 */ for (i = 0; i < get_class_n_members(typ1); i++) { ir_entity *e1 = get_class_member(typ1, i); @@ -497,8 +494,7 @@ int equal_type(ir_type *typ1, ir_type *typ2) { return 0; } /** Compare the supertypes **/ - t = alloca(sizeof(ir_entity *) * get_class_n_supertypes(typ1)); - memset(t, 0, sizeof(ir_entity *) * get_class_n_supertypes(typ1)); + t = ALLOCANZ(ir_type*, get_class_n_supertypes(typ1)); /* First sort the supertypes of typ2 */ for (i = 0; i < get_class_n_supertypes(typ1); i++) { ir_type *t1 = get_class_supertype(typ1, i); @@ -517,8 +513,7 @@ int equal_type(ir_type *typ1, ir_type *typ2) { case tpo_struct: if (get_struct_n_members(typ1) != get_struct_n_members(typ2)) return 0; - m = alloca(sizeof(ir_entity *) * get_struct_n_members(typ1)); - memset(m, 0, sizeof(ir_entity *) * get_struct_n_members(typ1)); + m = ALLOCANZ(ir_entity*, get_struct_n_members(typ1)); /* First sort the members of lt */ for (i = 0; i < get_struct_n_members(typ1); i++) { ir_entity *e1 = get_struct_member(typ1, i); @@ -565,8 +560,7 @@ int equal_type(ir_type *typ1, ir_type *typ2) { case tpo_union: if (get_union_n_members(typ1) != get_union_n_members(typ2)) return 0; - m = alloca(sizeof(ir_entity *) * get_union_n_members(typ1)); - memset(m, 0, sizeof(ir_entity *) * get_union_n_members(typ1)); + m = ALLOCANZ(ir_entity*, get_union_n_members(typ1)); /* First sort the members of lt */ for (i = 0; i < get_union_n_members(typ1); i++) { ir_entity *e1 = get_union_member(typ1, i); @@ -633,8 +627,7 @@ int smaller_type(ir_type *st, ir_type *lt) { if (n_st_members != get_struct_n_members(lt)) return 0; - m = alloca(sizeof(ir_entity *) * n_st_members); - memset(m, 0, sizeof(ir_entity *) * n_st_members); + m = ALLOCANZ(ir_entity*, n_st_members); /* First sort the members of lt */ for (i = 0; i < n_st_members; ++i) { ir_entity *se = get_struct_member(st, i); @@ -684,8 +677,7 @@ int smaller_type(ir_type *st, ir_type *lt) { case tpo_union: n_st_members = get_union_n_members(st); if (n_st_members != get_union_n_members(lt)) return 0; - m = alloca(sizeof(ir_entity *) * n_st_members); - memset(m, 0, sizeof(ir_entity *) * n_st_members); + m = ALLOCANZ(ir_entity*, n_st_members); /* First sort the members of lt */ for (i = 0; i < n_st_members; ++i) { ir_entity *se = get_union_member(st, i); @@ -796,6 +788,7 @@ void free_class_attrs(ir_type *clss) { 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); } @@ -1091,6 +1084,7 @@ 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); } @@ -1184,15 +1178,15 @@ build_value_type(ident *name, int len, tp_ent_pair *tps) { ir_type *new_d_type_method(ident *name, int n_param, int n_res, dbg_info *db) { ir_type *res; - assert((get_mode_size_bytes(mode_P_code) != -1) && "unorthodox modes not implemented"); + 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->flags |= tf_layout_fixed; res->size = get_mode_size_bytes(mode_P_code); res->attr.ma.n_params = n_param; - res->attr.ma.params = xcalloc(n_param, sizeof(res->attr.ma.params[0])); + res->attr.ma.params = XMALLOCNZ(tp_ent_pair, n_param); res->attr.ma.value_params = NULL; res->attr.ma.n_res = n_res; - res->attr.ma.res_type = xcalloc(n_res, sizeof(res->attr.ma.res_type[0])); + res->attr.ma.res_type = XMALLOCNZ(tp_ent_pair, n_res); res->attr.ma.value_ress = NULL; res->attr.ma.variadicity = variadicity_non_variadic; res->attr.ma.first_variadic_param = -1; @@ -1228,13 +1222,14 @@ ir_type *clone_type_method(ir_type *tp, ident *prefix) { res = new_type(type_method, mode, name, db); res->flags = tp->flags; + res->assoc_type = tp->assoc_type; res->size = tp->size; res->attr.ma.n_params = n_params; - res->attr.ma.params = xcalloc(n_params, sizeof(res->attr.ma.params[0])); + res->attr.ma.params = XMALLOCN(tp_ent_pair, n_params); memcpy(res->attr.ma.params, tp->attr.ma.params, n_params * sizeof(res->attr.ma.params[0])); res->attr.ma.value_params = tp->attr.ma.value_params; res->attr.ma.n_res = n_res; - res->attr.ma.res_type = xcalloc(n_res, sizeof(res->attr.ma.res_type[0])); + res->attr.ma.res_type = XMALLOCN(tp_ent_pair, n_res); memcpy(res->attr.ma.res_type, tp->attr.ma.res_type, n_res * sizeof(res->attr.ma.res_type[0])); res->attr.ma.value_ress = tp->attr.ma.value_ress; res->attr.ma.variadicity = tp->attr.ma.variadicity; @@ -1532,6 +1527,7 @@ int get_union_n_members(const ir_type *uni) { void add_union_member(ir_type *uni, ir_entity *member) { assert(uni && (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); } @@ -1593,9 +1589,9 @@ ir_type *new_d_type_array(ident *name, int n_dimensions, ir_type *element_type, res = new_type(type_array, NULL, name, db); res->attr.aa.n_dimensions = n_dimensions; - res->attr.aa.lower_bound = xcalloc(n_dimensions, sizeof(*res->attr.aa.lower_bound)); - res->attr.aa.upper_bound = xcalloc(n_dimensions, sizeof(*res->attr.aa.upper_bound)); - res->attr.aa.order = xcalloc(n_dimensions, sizeof(*res->attr.aa.order)); + 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); @@ -1689,7 +1685,7 @@ void set_array_upper_bound_int(ir_type *array, int dimension, int upper_bound) { int has_array_lower_bound(const ir_type *array, int dimension) { assert(array && (array->type_op == type_array)); - return (get_irn_op(array->attr.aa.lower_bound[dimension]) != op_Unknown); + return !is_Unknown(array->attr.aa.lower_bound[dimension]); } ir_node *get_array_lower_bound(const ir_type *array, int dimension) { @@ -1701,13 +1697,13 @@ long get_array_lower_bound_int(const ir_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); + assert(is_Const(node)); return get_tarval_long(get_Const_tarval(node)); } int has_array_upper_bound(const ir_type *array, int dimension) { assert(array && (array->type_op == type_array)); - return get_irn_op(array->attr.aa.upper_bound[dimension]) != op_Unknown; + return !is_Unknown(array->attr.aa.upper_bound[dimension]); } ir_node *get_array_upper_bound(const ir_type *array, int dimension) { @@ -1719,7 +1715,7 @@ long get_array_upper_bound_int(const ir_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); + assert(is_Const(node)); return get_tarval_long(get_Const_tarval(node)); } @@ -1857,7 +1853,7 @@ int (is_Enumeration_type)(const ir_type *enumeration) { void set_enumeration_mode(ir_type *tp, ir_mode *mode) { assert(mode_is_int(mode) && "Modes of enumerations must be integers"); /* For pointer and enumeration size depends on the mode, but only byte size allowed. */ - assert((get_mode_size_bits(mode) & 7) == 0 && "unorthodox modes not implemented"); + assert((get_mode_size_bits(mode) % 8) == 0 && "unorthodox modes not implemented"); tp->size = get_mode_size_bytes(mode); tp->mode = mode; @@ -1874,7 +1870,7 @@ ir_type *new_d_type_pointer(ident *name, ir_type *points_to, ir_mode *ptr_mode, assert(mode_is_reference(ptr_mode)); res = new_type(type_pointer, ptr_mode, name, db); res->attr.pa.points_to = points_to; - assert((get_mode_size_bytes(res->mode) != -1) && "unorthodox modes not implemented"); + assert((get_mode_size_bits(res->mode) % 8 == 0) && "unorthodox modes not implemented"); res->size = get_mode_size_bytes(res->mode); res->flags |= tf_layout_fixed; hook_new_type(res); @@ -2065,6 +2061,23 @@ ir_type *new_type_frame(ident *name) { return res; } +/* Makes a clone of a frame type. */ +ir_type *clone_frame_type(ir_type *type) { + ir_type *res; + int i, n; + + assert(is_frame_type(type)); + + res = new_type_frame(type->name); + 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); + set_entity_link(ent, nent); + set_entity_link(nent, ent); + } + return res; +} + /* Sets a lowered type for a type. This sets both associations. */ void set_lowered_type(ir_type *tp, ir_type *lowered_type) { assert(is_type(tp) && is_type(lowered_type)); @@ -2104,6 +2117,7 @@ ir_entity *frame_alloc_area(ir_type *frame_type, int size, unsigned alignment, i assert(is_frame_type(frame_type)); assert(get_type_state(frame_type) == layout_fixed); assert(get_type_alignment_bytes(frame_type) > 0); + set_type_state(frame_type, layout_undefined); if (! a_byte) a_byte = new_type_primitive(new_id_from_chars("byte", 4), mode_Bu); @@ -2130,6 +2144,13 @@ ir_entity *frame_alloc_area(ir_type *frame_type, int size, unsigned alignment, i /* calculate offset and new type size */ offset = 0; frame_size += size; + + /* increase size to match alignment... */ + if (alignment > frame_align) { + frame_align = alignment; + set_type_alignment_bytes(frame_type, frame_align); + frame_size = (frame_size + frame_align - 1) & ~(frame_align - 1); + } } else { /* calculate offset and new type size */ offset = (frame_size + alignment - 1) & ~(alignment - 1); @@ -2142,5 +2163,7 @@ ir_entity *frame_alloc_area(ir_type *frame_type, int size, unsigned alignment, i /* mark this entity as compiler generated */ set_entity_compiler_generated(area, 1); + + set_type_state(frame_type, layout_fixed); return area; }