X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Ftype.c;h=b1ab7f60373d73d4ef4994533b981d29644c8ff1;hb=dd4cd761ab637d4488c7e29f49843b1b02366acf;hp=df55dd98050d257ab7b2ecaac059736eb5031cbc;hpb=85b0963d011005262ec2a258bb97950c6191c9b8;p=libfirm diff --git a/ir/tr/type.c b/ir/tr/type.c index df55dd980..b1ab7f603 100644 --- a/ir/tr/type.c +++ b/ir/tr/type.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -110,11 +110,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 +423,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); } @@ -796,6 +796,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 +1092,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,7 +1186,7 @@ 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); @@ -1207,26 +1209,34 @@ ir_type *new_type_method(ident *name, int n_param, int n_res) { } /* clone an existing method type */ -ir_type *clone_type_method(ir_type *tp) { +ir_type *clone_type_method(ir_type *tp, ident *prefix) { ir_type *res; ident *name; + ir_mode *mode; int n_params, n_res; dbg_info *db; assert(is_Method_type(tp)); - name = tp->name; + name = tp->name; + if (prefix != NULL) + name = 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_P_code, name, db); + 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])); 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])); 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; @@ -1525,6 +1535,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); } @@ -1682,7 +1693,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) { @@ -1694,13 +1705,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) { @@ -1712,7 +1723,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)); } @@ -1850,7 +1861,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; @@ -1867,7 +1878,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); @@ -2058,6 +2069,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)); @@ -2085,56 +2113,65 @@ void set_default_size(ir_type *tp, unsigned size) { * The frame type must have already an fixed layout. */ ir_entity *frame_alloc_area(ir_type *frame_type, int size, unsigned alignment, int at_start) { - ir_entity *area; - ir_type *tp; - ident *name; - char buf[32]; - unsigned frame_align; - int i, offset, frame_size; - static unsigned area_cnt = 0; - static ir_type *a_byte = NULL; - - assert(is_frame_type(frame_type)); - assert(get_type_state(frame_type) == layout_fixed); - assert(get_type_alignment_bytes(frame_type) > 0); - - if (! a_byte) - a_byte = new_type_primitive(new_id_from_chars("byte", 4), mode_Bu); - - snprintf(buf, sizeof(buf), "area%u", area_cnt++); - name = new_id_from_str(buf); - - /* align the size */ - frame_align = get_type_alignment_bytes(frame_type); - size = (size + frame_align - 1) & ~(frame_align - 1); - - tp = new_type_array(mangle_u(get_type_ident(frame_type), name), 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) { - /* fix all offsets so far */ - for (i = get_class_n_members(frame_type) - 1; i >= 0; --i) { - ir_entity *ent = get_class_member(frame_type, i); - - set_entity_offset(ent, get_entity_offset(ent) + size); - } - /* calculate offset and new type size */ - offset = 0; - frame_size += size; - } - else { - /* calculate offset and new type size */ - offset = (frame_size + alignment - 1) & ~(alignment - 1); - frame_size = offset + size; - } - - area = new_entity(frame_type, name, tp); - set_entity_offset(area, offset); - set_type_size_bytes(frame_type, frame_size); - - /* mark this entity as compiler generated */ - set_entity_compiler_generated(area, 1); - return area; + ir_entity *area; + ir_type *tp; + ident *name; + char buf[32]; + unsigned frame_align; + int i, offset, frame_size; + static unsigned area_cnt = 0; + static ir_type *a_byte = NULL; + + 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); + + snprintf(buf, sizeof(buf), "area%u", area_cnt++); + name = new_id_from_str(buf); + + /* align the size */ + frame_align = get_type_alignment_bytes(frame_type); + size = (size + frame_align - 1) & ~(frame_align - 1); + + tp = new_type_array(mangle_u(get_type_ident(frame_type), name), 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) { + /* fix all offsets so far */ + for (i = get_class_n_members(frame_type) - 1; i >= 0; --i) { + ir_entity *ent = get_class_member(frame_type, i); + + set_entity_offset(ent, get_entity_offset(ent) + size); + } + /* 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); + frame_size = offset + size; + } + + area = new_entity(frame_type, name, tp); + set_entity_offset(area, offset); + set_type_size_bytes(frame_type, frame_size); + + /* mark this entity as compiler generated */ + set_entity_compiler_generated(area, 1); + + set_type_state(frame_type, layout_fixed); + return area; }