X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Ftype.c;h=3844b1b39013a31022ca798c07ad98e1522a73e0;hb=4524bf07ed17f358412754a50a76e7db852160b3;hp=85d96e08aeb58fbe4124f34b3a2fad5c5584d2fe;hpb=1a3b7d363474ab544c13093a2f0b578718d37c7a;p=libfirm diff --git a/ir/tr/type.c b/ir/tr/type.c index 85d96e08a..3844b1b39 100644 --- a/ir/tr/type.c +++ b/ir/tr/type.c @@ -152,7 +152,6 @@ ir_type *new_type(const tp_op *type_op, ir_mode *mode, type_dbg_info *db) res->visit = 0; res->link = NULL; res->dbi = db; - res->assoc_type = NULL; #ifdef DEBUG_libfirm res->nr = get_irp_new_node_nr(); #endif /* defined DEBUG_libfirm */ @@ -325,7 +324,7 @@ void set_type_alignment_bytes(ir_type *tp, unsigned align) const char *get_type_state_name(ir_type_state s) { -#define X(a) case a: return #a; +#define X(a) case a: return #a switch (s) { X(layout_undefined); X(layout_fixed); @@ -1142,34 +1141,6 @@ void set_struct_size(ir_type *tp, unsigned size) tp->size = size; } - -/** - * Lazy construction of value argument / result representation. - * Constructs a struct type and its member. The types of the members - * are passed in the argument list. - * - * @param name name of the type constructed - * @param len number of fields - * @param tps array of field types with length len - */ -static ir_type *build_value_type(char const* name, size_t len, tp_ent_pair *tps) -{ - 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) { - ident *id = new_id_from_str("elt"); - - /* use res as default if corresponding type is not yet set. */ - ir_type *elt_type = tps[i].tp ? tps[i].tp : res; - 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(size_t n_param, size_t n_res, type_dbg_info *db) { ir_type *res; @@ -1180,7 +1151,6 @@ ir_type *new_d_type_method(size_t n_param, size_t n_res, type_dbg_info *db) res->size = get_mode_size_bytes(mode_P_code); res->attr.ma.n_params = n_param; 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 = XMALLOCNZ(tp_ent_pair, n_res); res->attr.ma.variadicity = variadicity_non_variadic; @@ -1212,12 +1182,11 @@ ir_type *clone_type_method(ir_type *tp) res = new_type(type_method, mode, db); res->flags = tp->flags; - res->assoc_type = tp->assoc_type; + res->higher_type = tp->higher_type; res->size = tp->size; res->attr.ma.n_params = n_params; 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 = 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])); @@ -1239,12 +1208,6 @@ void free_method_attrs(ir_type *method) assert(method && (method->type_op == type_method)); free(method->attr.ma.params); free(method->attr.ma.res_type); - /* cannot free it yet, type could be cloned ... - if (method->attr.ma.value_params) { - free_type_entities(method->attr.ma.value_params); - free_type(method->attr.ma.value_params); - } - */ } size_t (get_method_n_params)(const ir_type *method) @@ -1252,7 +1215,7 @@ 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, size_t pos) +ir_type *get_method_param_type(const ir_type *method, size_t pos) { ir_type *res; assert(method->type_op == type_method); @@ -1267,54 +1230,6 @@ void set_method_param_type(ir_type *method, size_t pos, ir_type *tp) 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) { - assert(get_method_n_params(method) == get_struct_n_members(method->attr.ma.value_params)); - set_entity_type(get_struct_member(method->attr.ma.value_params, pos), tp); - } -} - -ir_entity *get_method_value_param_ent(ir_type *method, size_t pos) -{ - assert(method && (method->type_op == type_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("", - get_method_n_params(method), method->attr.ma.params); - } - /* - * build_value_type() sets the method->attr.ma.value_params type as default if - * no type is set! - */ - assert((get_entity_type(method->attr.ma.params[pos].ent) != method->attr.ma.value_params) - && "param type not yet set"); - return method->attr.ma.params[pos].ent; -} - -void set_method_value_param_type(ir_type *method, ir_type *tp) -{ - size_t i; - size_t n; - - assert(method && (method->type_op == type_method)); - assert(is_value_param_type(tp)); - assert(get_method_n_params(method) == get_struct_n_members(tp)); - - method->attr.ma.value_params = tp; - - n = get_struct_n_members(tp); - for (i = 0; i < n; i++) { - ir_entity *ent = get_struct_member(tp, i); - method->attr.ma.params[i].ent = ent; - } -} - -ir_type *get_method_value_param_type(const ir_type *method) -{ - assert(method && (method->type_op == type_method)); - return method->attr.ma.value_params; } size_t (get_method_n_ress)(const ir_type *method) @@ -1322,7 +1237,7 @@ 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, size_t pos) +ir_type *get_method_res_type(const ir_type *method, size_t pos) { ir_type *res; assert(method->type_op == type_method); @@ -1513,11 +1428,11 @@ void set_union_size(ir_type *tp, unsigned size) -ir_type *new_d_type_array(int n_dimensions, ir_type *element_type, +ir_type *new_d_type_array(size_t n_dimensions, ir_type *element_type, type_dbg_info *db) { ir_type *res; - int i; + size_t i; ir_node *unk; ir_graph *irg = get_const_code_irg(); @@ -1527,7 +1442,7 @@ ir_type *new_d_type_array(int n_dimensions, ir_type *element_type, 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); + res->attr.aa.order = XMALLOCNZ(size_t, n_dimensions); unk = new_r_Unknown(irg, mode_Iu); for (i = 0; i < n_dimensions; i++) { @@ -1545,7 +1460,7 @@ ir_type *new_d_type_array(int n_dimensions, ir_type *element_type, return res; } -ir_type *new_type_array(int n_dimensions, ir_type *element_type) +ir_type *new_type_array(size_t n_dimensions, ir_type *element_type) { return new_d_type_array(n_dimensions, element_type, NULL); } @@ -1668,19 +1583,19 @@ long get_array_upper_bound_int(const ir_type *array, size_t dimension) return get_tarval_long(get_Const_tarval(node)); } -void set_array_order(ir_type *array, size_t dimension, int order) +void set_array_order(ir_type *array, size_t dimension, size_t order) { assert(array && (array->type_op == type_array)); array->attr.aa.order[dimension] = order; } -int get_array_order(const ir_type *array, size_t dimension) +size_t get_array_order(const ir_type *array, size_t dimension) { assert(array && (array->type_op == type_array)); return array->attr.aa.order[dimension]; } -size_t find_array_dimension(const ir_type *array, int order) +size_t find_array_dimension(const ir_type *array, size_t order) { size_t dim; @@ -2040,28 +1955,6 @@ int is_frame_type(const ir_type *tp) return tp->flags & tf_frame_type; } -int is_value_param_type(const ir_type *tp) -{ - return tp->flags & tf_value_param_type; -} - -int is_lowered_type(const ir_type *tp) -{ - return tp->flags & tf_lowered_type; -} - -ir_type *new_type_value(void) -{ - ir_type *res = new_type_struct(new_id_from_str("")); - - res->flags |= tf_value_param_type; - - /* Remove type from type list. Must be treated differently than other types. */ - remove_irp_type(res); - - return res; -} - ir_type *new_type_frame(void) { ir_type *res = new_type_class(new_id_from_str("")); @@ -2084,7 +1977,7 @@ ir_type *clone_frame_type(ir_type *type) 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); + assert(irp_resources_reserved(irp) & IRP_RESOURCE_ENTITY_LINK); res = new_type_frame(); for (i = 0, n = get_class_n_members(type); i < n; ++i) { @@ -2096,19 +1989,6 @@ ir_type *clone_frame_type(ir_type *type) return res; } -void set_lowered_type(ir_type *tp, ir_type *lowered_type) -{ - assert(is_type(tp) && is_type(lowered_type)); - lowered_type->flags |= tf_lowered_type; - tp->assoc_type = lowered_type; - lowered_type->assoc_type = tp; -} - -ir_type *get_associated_type(const ir_type *tp) -{ - return tp->assoc_type; -} - void set_default_size(ir_type *tp, unsigned size) { tp->size = size; @@ -2181,6 +2061,7 @@ ir_entity *frame_alloc_area(ir_type *frame_type, int size, unsigned alignment, tp = new_type_array(1, a_byte); set_array_bounds_int(tp, 0, 0, size); set_type_alignment_bytes(tp, alignment); + set_type_size_bytes(tp, size); frame_size = get_type_size_bytes(frame_type); if (at_start) {