X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type.c;h=df0b7593944535f6257e7171ff578f7903631bff;hb=d5d4d38e55242a48a872a4b556f256e4ccdf8915;hp=92f571c246902d6042e0e6311b774a461933afbb;hpb=2ef7b77e92bd93fa2e3d487b91a24f55d299cdd7;p=cparser diff --git a/type.c b/type.c index 92f571c..df0b759 100644 --- a/type.c +++ b/type.c @@ -33,14 +33,12 @@ #include "warning.h" #include "diagnostic.h" #include "printer.h" -#include "driver/firm_cmdline.h" /** The default calling convention. */ cc_kind_t default_calling_convention = CC_CDECL; -static struct obstack _type_obst; -struct obstack *type_obst = &_type_obst; -static bool print_implicit_array_size = false; +static struct obstack type_obst; +static bool print_implicit_array_size = false; static void intern_print_type_pre(const type_t *type); static void intern_print_type_post(const type_t *type); @@ -69,6 +67,7 @@ static size_t get_type_struct_size(type_kind_t kind) [TYPE_ENUM] = sizeof(enum_type_t), [TYPE_FUNCTION] = sizeof(function_type_t), [TYPE_POINTER] = sizeof(pointer_type_t), + [TYPE_REFERENCE] = sizeof(reference_type_t), [TYPE_ARRAY] = sizeof(array_type_t), [TYPE_TYPEDEF] = sizeof(typedef_type_t), [TYPE_TYPEOF] = sizeof(typeof_type_t), @@ -81,8 +80,8 @@ static size_t get_type_struct_size(type_kind_t kind) type_t *allocate_type_zero(type_kind_t kind) { - size_t size = get_type_struct_size(kind); - type_t *res = obstack_alloc(type_obst, size); + size_t const size = get_type_struct_size(kind); + type_t *const res = obstack_alloc(&type_obst, size); memset(res, 0, size); res->base.kind = kind; @@ -184,7 +183,7 @@ static atomic_type_properties_t atomic_type_properties[ATOMIC_TYPE_LAST+1] = { | ATOMIC_TYPE_FLAG_SIGNED, }, [ATOMIC_TYPE_LONG_DOUBLE] = { - .size = 12, + .size = (unsigned) -1, /* will be filled in later */ .alignment = (unsigned) -1, .flags = ATOMIC_TYPE_FLAG_FLOAT | ATOMIC_TYPE_FLAG_ARITHMETIC | ATOMIC_TYPE_FLAG_SIGNED, @@ -192,9 +191,14 @@ static atomic_type_properties_t atomic_type_properties[ATOMIC_TYPE_LAST+1] = { /* complex and imaginary types are set in init_types */ }; +static inline bool is_po2(unsigned x) +{ + return (x & (x-1)) == 0; +} + void init_types(void) { - obstack_init(type_obst); + obstack_init(&type_obst); atomic_type_properties_t *props = atomic_type_properties; @@ -235,9 +239,14 @@ void init_types(void) props[ATOMIC_TYPE_LONGLONG].alignment = 8; props[ATOMIC_TYPE_ULONGLONG].alignment = 8; } - if (force_long_double_size > 0) { - props[ATOMIC_TYPE_LONG_DOUBLE].size = force_long_double_size; - props[ATOMIC_TYPE_LONG_DOUBLE].alignment = force_long_double_size; + + if (long_double_size > 0) { + props[ATOMIC_TYPE_LONG_DOUBLE].size = long_double_size; + if (is_po2(long_double_size)) { + props[ATOMIC_TYPE_LONG_DOUBLE].alignment = long_double_size; + } + } else { + props[ATOMIC_TYPE_LONG_DOUBLE] = props[ATOMIC_TYPE_DOUBLE]; } /* TODO: make this configurable for platforms which do not use byte sized @@ -249,7 +258,7 @@ void init_types(void) void exit_types(void) { - obstack_free(type_obst, NULL); + obstack_free(&type_obst, NULL); } void print_type_qualifiers(type_qualifiers_t const qualifiers, QualifierSeparators const q) @@ -416,11 +425,11 @@ static void print_function_type_post(const function_type_t *type, } else { print_string(", "); } - const type_t *const type = parameter->declaration.type; - if (type == NULL) { + const type_t *const param_type = parameter->declaration.type; + if (param_type == NULL) { print_string(parameter->base.symbol->string); } else { - print_type_ext(type, parameter->base.symbol, NULL); + print_type_ext(param_type, parameter->base.symbol, NULL); } } } @@ -565,9 +574,6 @@ void print_enum_definition(const enum_t *enume) /* skip the implicit cast */ expression_t *expression = entry->enum_value.value; - if (expression->kind == EXPR_UNARY_CAST_IMPLICIT) { - expression = expression->unary.value; - } print_expression(expression); } print_string(",\n"); @@ -804,7 +810,7 @@ type_t *duplicate_type(const type_t *type) { size_t size = get_type_struct_size(type->kind); - type_t *copy = obstack_alloc(type_obst, size); + type_t *const copy = obstack_alloc(&type_obst, size); memcpy(copy, type, size); copy->base.firm_type = NULL; @@ -846,7 +852,7 @@ type_t *get_qualified_type(type_t *orig_type, type_qualifiers_t const qual) copy = duplicate_type(type); copy->array.element_type = qual_element_type; } else if (is_type_valid(type)) { - if ((type->base.qualifiers & qual) == qual) + if ((type->base.qualifiers & qual) == (int)qual) return orig_type; copy = duplicate_type(type); @@ -1533,7 +1539,7 @@ type_t *identify_new_type(type_t *type) { type_t *result = typehash_insert(type); if (result != type) { - obstack_free(type_obst, type); + obstack_free(&type_obst, type); } return result; } @@ -1546,10 +1552,7 @@ type_t *identify_new_type(type_t *type) */ type_t *make_atomic_type(atomic_type_kind_t akind, type_qualifiers_t qualifiers) { - type_t *type = obstack_alloc(type_obst, sizeof(atomic_type_t)); - memset(type, 0, sizeof(atomic_type_t)); - - type->kind = TYPE_ATOMIC; + type_t *const type = allocate_type_zero(TYPE_ATOMIC); type->base.qualifiers = qualifiers; type->atomic.akind = akind; @@ -1564,10 +1567,7 @@ type_t *make_atomic_type(atomic_type_kind_t akind, type_qualifiers_t qualifiers) */ type_t *make_complex_type(atomic_type_kind_t akind, type_qualifiers_t qualifiers) { - type_t *type = obstack_alloc(type_obst, sizeof(complex_type_t)); - memset(type, 0, sizeof(complex_type_t)); - - type->kind = TYPE_COMPLEX; + type_t *const type = allocate_type_zero(TYPE_COMPLEX); type->base.qualifiers = qualifiers; type->complex.akind = akind; @@ -1582,10 +1582,7 @@ type_t *make_complex_type(atomic_type_kind_t akind, type_qualifiers_t qualifiers */ type_t *make_imaginary_type(atomic_type_kind_t akind, type_qualifiers_t qualifiers) { - type_t *type = obstack_alloc(type_obst, sizeof(imaginary_type_t)); - memset(type, 0, sizeof(imaginary_type_t)); - - type->kind = TYPE_IMAGINARY; + type_t *const type = allocate_type_zero(TYPE_IMAGINARY); type->base.qualifiers = qualifiers; type->imaginary.akind = akind; @@ -1600,10 +1597,7 @@ type_t *make_imaginary_type(atomic_type_kind_t akind, type_qualifiers_t qualifie */ type_t *make_pointer_type(type_t *points_to, type_qualifiers_t qualifiers) { - type_t *type = obstack_alloc(type_obst, sizeof(pointer_type_t)); - memset(type, 0, sizeof(pointer_type_t)); - - type->kind = TYPE_POINTER; + type_t *const type = allocate_type_zero(TYPE_POINTER); type->base.qualifiers = qualifiers; type->pointer.points_to = points_to; type->pointer.base_variable = NULL; @@ -1618,11 +1612,8 @@ type_t *make_pointer_type(type_t *points_to, type_qualifiers_t qualifiers) */ type_t *make_reference_type(type_t *refers_to) { - type_t *type = obstack_alloc(type_obst, sizeof(reference_type_t)); - memset(type, 0, sizeof(reference_type_t)); - - type->kind = TYPE_REFERENCE; - type->base.qualifiers = 0; + type_t *const type = allocate_type_zero(TYPE_REFERENCE); + type->base.qualifiers = TYPE_QUALIFIER_NONE; type->reference.refers_to = refers_to; return identify_new_type(type); @@ -1638,10 +1629,7 @@ type_t *make_reference_type(type_t *refers_to) type_t *make_based_pointer_type(type_t *points_to, type_qualifiers_t qualifiers, variable_t *variable) { - type_t *type = obstack_alloc(type_obst, sizeof(pointer_type_t)); - memset(type, 0, sizeof(pointer_type_t)); - - type->kind = TYPE_POINTER; + type_t *const type = allocate_type_zero(TYPE_POINTER); type->base.qualifiers = qualifiers; type->pointer.points_to = points_to; type->pointer.base_variable = variable; @@ -1653,10 +1641,7 @@ type_t *make_based_pointer_type(type_t *points_to, type_t *make_array_type(type_t *element_type, size_t size, type_qualifiers_t qualifiers) { - type_t *type = obstack_alloc(type_obst, sizeof(array_type_t)); - memset(type, 0, sizeof(array_type_t)); - - type->kind = TYPE_ARRAY; + type_t *const type = allocate_type_zero(TYPE_ARRAY); type->base.qualifiers = qualifiers; type->array.element_type = element_type; type->array.size = size; @@ -1784,14 +1769,11 @@ void layout_struct_type(compound_type_t *type) } } + source_position_t const *const pos = &compound->base.source_position; if (need_pad) { - if (warning.padded) { - warningf(&compound->base.source_position, "'%T' needs padding", - type); - } - } else if (compound->packed && warning.packed) { - warningf(&compound->base.source_position, - "superfluous packed attribute on '%T'", type); + warningf(WARN_PADDED, pos, "'%T' needs padding", type); + } else if (compound->packed) { + warningf(WARN_PACKED, pos, "superfluous packed attribute on '%T'", type); } compound->size = offset; @@ -1833,10 +1815,9 @@ void layout_union_type(compound_type_t *type) compound->alignment = alignment; } -static function_parameter_t *allocate_parameter(type_t *const type) +function_parameter_t *allocate_parameter(type_t *const type) { - function_parameter_t *const param - = obstack_alloc(type_obst, sizeof(*param)); + function_parameter_t *const param = obstack_alloc(&type_obst, sizeof(*param)); memset(param, 0, sizeof(*param)); param->type = type; return param; @@ -1902,15 +1883,11 @@ type_t *make_function_type(type_t *return_type, int n_types, type->function.modifiers |= modifiers; type->function.linkage = LINKAGE_C; - function_parameter_t *last = NULL; + function_parameter_t **anchor = &type->function.parameters; for (int i = 0; i < n_types; ++i) { function_parameter_t *parameter = allocate_parameter(argument_types[i]); - if (last == NULL) { - type->function.parameters = parameter; - } else { - last->next = parameter; - } - last = parameter; + *anchor = parameter; + anchor = ¶meter->next; } return identify_new_type(type);