X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type.c;h=46cb071d0c0c286316b59a67cfb18af9984f312a;hb=71a57e47071dbc23a47ef771936b8333c5f6d758;hp=de4738dd0d3705566974afefe37d4c890ac80d44;hpb=1b580cf22ca849edc62afa24304ff0432954877a;p=cparser diff --git a/type.c b/type.c index de4738d..46cb071 100644 --- a/type.c +++ b/type.c @@ -33,190 +33,225 @@ #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); -typedef struct atomic_type_properties_t atomic_type_properties_t; -struct atomic_type_properties_t { - unsigned size; /**< type size in bytes */ - unsigned alignment; /**< type alignment in bytes */ - unsigned flags; /**< type flags from atomic_type_flag_t */ -}; +/** + * Returns the size of a type node. + * + * @param kind the type kind + */ +static size_t get_type_struct_size(type_kind_t kind) +{ + static const size_t sizes[] = { + [TYPE_ATOMIC] = sizeof(atomic_type_t), + [TYPE_COMPOUND_STRUCT] = sizeof(compound_type_t), + [TYPE_COMPOUND_UNION] = sizeof(compound_type_t), + [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), + }; + assert(lengthof(sizes) == (int)TYPE_TYPEOF + 1); + assert(kind <= TYPE_TYPEOF); + assert(sizes[kind] != 0); + return sizes[kind]; +} + +type_t *allocate_type_zero(type_kind_t kind) +{ + 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; + + return res; +} /** * Properties of atomic types. */ -static atomic_type_properties_t atomic_type_properties[ATOMIC_TYPE_LAST+1] = { - //ATOMIC_TYPE_INVALID = 0, +atomic_type_properties_t atomic_type_properties[ATOMIC_TYPE_LAST+1] = { [ATOMIC_TYPE_VOID] = { - .size = 0, - .alignment = 0, - .flags = ATOMIC_TYPE_FLAG_NONE - }, - [ATOMIC_TYPE_WCHAR_T] = { - .size = (unsigned)-1, - .alignment = (unsigned)-1, - /* signed flag will be set when known */ - .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC, + .size = 0, + .alignment = 0, + .flags = ATOMIC_TYPE_FLAG_NONE, + .rank = 0, }, - [ATOMIC_TYPE_CHAR] = { + [ATOMIC_TYPE_BOOL] = { .size = 1, .alignment = 1, - /* signed flag will be set when known */ .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC, + .rank = 1, + }, + [ATOMIC_TYPE_CHAR] = { + .size = 1, + .alignment = 1, + .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC, + .rank = 2, }, [ATOMIC_TYPE_SCHAR] = { - .size = 1, - .alignment = 1, - .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC - | ATOMIC_TYPE_FLAG_SIGNED, + .size = 1, + .alignment = 1, + .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC + | ATOMIC_TYPE_FLAG_SIGNED, + .rank = 2, }, [ATOMIC_TYPE_UCHAR] = { - .size = 1, - .alignment = 1, - .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC, + .size = 1, + .alignment = 1, + .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC, + .rank = 2, }, [ATOMIC_TYPE_SHORT] = { .size = 2, .alignment = 2, .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC - | ATOMIC_TYPE_FLAG_SIGNED + | ATOMIC_TYPE_FLAG_SIGNED, + .rank = 3, }, [ATOMIC_TYPE_USHORT] = { .size = 2, .alignment = 2, .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC, + .rank = 3, }, [ATOMIC_TYPE_INT] = { .size = (unsigned) -1, .alignment = (unsigned) -1, .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC | ATOMIC_TYPE_FLAG_SIGNED, + .rank = 4, }, [ATOMIC_TYPE_UINT] = { .size = (unsigned) -1, .alignment = (unsigned) -1, .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC, + .rank = 4, }, [ATOMIC_TYPE_LONG] = { .size = (unsigned) -1, .alignment = (unsigned) -1, .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC | ATOMIC_TYPE_FLAG_SIGNED, + .rank = 5, }, [ATOMIC_TYPE_ULONG] = { .size = (unsigned) -1, .alignment = (unsigned) -1, .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC, + .rank = 5, }, [ATOMIC_TYPE_LONGLONG] = { - .size = (unsigned) -1, - .alignment = (unsigned) -1, + .size = 8, + .alignment = 8, .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC | ATOMIC_TYPE_FLAG_SIGNED, + .rank = 6, }, [ATOMIC_TYPE_ULONGLONG] = { - .size = (unsigned) -1, - .alignment = (unsigned) -1, - .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC, - }, - [ATOMIC_TYPE_BOOL] = { - .size = (unsigned) -1, - .alignment = (unsigned) -1, + .size = 8, + .alignment = 8, .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC, + .rank = 6, }, [ATOMIC_TYPE_FLOAT] = { .size = 4, - .alignment = (unsigned) -1, + .alignment = 4, .flags = ATOMIC_TYPE_FLAG_FLOAT | ATOMIC_TYPE_FLAG_ARITHMETIC | ATOMIC_TYPE_FLAG_SIGNED, + .rank = 0, }, [ATOMIC_TYPE_DOUBLE] = { .size = 8, - .alignment = (unsigned) -1, + .alignment = 8, .flags = ATOMIC_TYPE_FLAG_FLOAT | ATOMIC_TYPE_FLAG_ARITHMETIC | ATOMIC_TYPE_FLAG_SIGNED, + .rank = 0, }, - [ATOMIC_TYPE_LONG_DOUBLE] = { - .size = 12, - .alignment = (unsigned) -1, - .flags = ATOMIC_TYPE_FLAG_FLOAT | ATOMIC_TYPE_FLAG_ARITHMETIC - | ATOMIC_TYPE_FLAG_SIGNED, + [ATOMIC_TYPE_WCHAR_T] = { + .size = (unsigned)-1, + .alignment = (unsigned)-1, + .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC, + .rank = (unsigned)-1, }, - /* complex and imaginary types are set in init_types */ +}; +atomic_type_properties_t pointer_properties = { + .size = 4, + .alignment = 4, + .flags = ATOMIC_TYPE_FLAG_NONE, }; -void init_types(void) +static inline bool is_po2(unsigned x) { - obstack_init(type_obst); + return (x & (x-1)) == 0; +} + +void init_types(unsigned machine_size) +{ + obstack_init(&type_obst); atomic_type_properties_t *props = atomic_type_properties; - if (char_is_signed) { - props[ATOMIC_TYPE_CHAR].flags |= ATOMIC_TYPE_FLAG_SIGNED; - } + /* atempt to set some sane defaults based on machine size */ unsigned int_size = machine_size < 32 ? 2 : 4; unsigned long_size = machine_size < 64 ? 4 : 8; - unsigned llong_size = machine_size < 32 ? 4 : 8; - - props[ATOMIC_TYPE_INT].size = int_size; - props[ATOMIC_TYPE_INT].alignment = int_size; - props[ATOMIC_TYPE_UINT].size = int_size; - props[ATOMIC_TYPE_UINT].alignment = int_size; - props[ATOMIC_TYPE_LONG].size = long_size; - props[ATOMIC_TYPE_LONG].alignment = long_size; - props[ATOMIC_TYPE_ULONG].size = long_size; - props[ATOMIC_TYPE_ULONG].alignment = long_size; - props[ATOMIC_TYPE_LONGLONG].size = llong_size; - props[ATOMIC_TYPE_LONGLONG].alignment = llong_size; - props[ATOMIC_TYPE_ULONGLONG].size = llong_size; - props[ATOMIC_TYPE_ULONGLONG].alignment = llong_size; - - /* TODO: backend specific, need a way to query the backend for this. - * The following are good settings for x86 */ - props[ATOMIC_TYPE_FLOAT].alignment = 4; - props[ATOMIC_TYPE_DOUBLE].alignment = 4; - props[ATOMIC_TYPE_LONG_DOUBLE].alignment = 4; - props[ATOMIC_TYPE_LONGLONG].alignment = 4; - props[ATOMIC_TYPE_ULONGLONG].alignment = 4; - if (firm_opt.os_support == OS_SUPPORT_MACHO) { - props[ATOMIC_TYPE_LONG_DOUBLE].size = 16; - props[ATOMIC_TYPE_LONG_DOUBLE].alignment = 16; - } - - /* TODO: make this configurable for platforms which do not use byte sized - * bools. */ - props[ATOMIC_TYPE_BOOL] = props[ATOMIC_TYPE_UCHAR]; - props[ATOMIC_TYPE_WCHAR_T] = props[wchar_atomic_kind]; + props[ATOMIC_TYPE_INT].size = int_size; + props[ATOMIC_TYPE_INT].alignment = int_size; + props[ATOMIC_TYPE_UINT].size = int_size; + props[ATOMIC_TYPE_UINT].alignment = int_size; + props[ATOMIC_TYPE_LONG].size = long_size; + props[ATOMIC_TYPE_LONG].alignment = long_size; + props[ATOMIC_TYPE_ULONG].size = long_size; + props[ATOMIC_TYPE_ULONG].alignment = long_size; + + pointer_properties.size = long_size; + pointer_properties.alignment = long_size; + pointer_properties.struct_alignment = long_size; + + props[ATOMIC_TYPE_LONG_DOUBLE] = props[ATOMIC_TYPE_DOUBLE]; + props[ATOMIC_TYPE_WCHAR_T] = props[ATOMIC_TYPE_INT]; + + /* set struct alignments to the same value as alignment */ + for (size_t i = 0; i != lengthof(atomic_type_properties); ++i) { + props[i].struct_alignment = props[i].alignment; + } } void exit_types(void) { - obstack_free(type_obst, NULL); + obstack_free(&type_obst, NULL); } -void print_type_qualifiers(type_qualifiers_t qualifiers) +void print_type_qualifiers(type_qualifiers_t const qualifiers, QualifierSeparators const q) { + size_t sep = q & QUAL_SEP_START ? 0 : 1; if (qualifiers & TYPE_QUALIFIER_CONST) { - print_string("const "); + print_string(" const" + sep); + sep = 0; } if (qualifiers & TYPE_QUALIFIER_VOLATILE) { - print_string("volatile "); + print_string(" volatile" + sep); + sep = 0; } if (qualifiers & TYPE_QUALIFIER_RESTRICT) { - print_string("restrict "); + print_string(" restrict" + sep); + sep = 0; } + if (sep == 0 && q & QUAL_SEP_END) + print_char(' '); } const char *get_atomic_kind_name(atomic_type_kind_t kind) @@ -262,7 +297,7 @@ static void print_atomic_kinds(atomic_type_kind_t kind) */ static void print_atomic_type(const atomic_type_t *type) { - print_type_qualifiers(type->base.qualifiers); + print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END); print_atomic_kinds(type->akind); } @@ -271,9 +306,9 @@ static void print_atomic_type(const atomic_type_t *type) * * @param type The type. */ -static void print_complex_type(const complex_type_t *type) +static void print_complex_type(const atomic_type_t *type) { - print_type_qualifiers(type->base.qualifiers); + print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END); print_string("_Complex"); print_atomic_kinds(type->akind); } @@ -283,9 +318,9 @@ static void print_complex_type(const complex_type_t *type) * * @param type The type. */ -static void print_imaginary_type(const imaginary_type_t *type) +static void print_imaginary_type(const atomic_type_t *type) { - print_type_qualifiers(type->base.qualifiers); + print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END); print_string("_Imaginary "); print_atomic_kinds(type->akind); } @@ -298,9 +333,6 @@ static void print_imaginary_type(const imaginary_type_t *type) static void print_function_type_pre(const function_type_t *type) { switch (type->linkage) { - case LINKAGE_INVALID: - break; - case LINKAGE_C: if (c_mode & _CXX) print_string("extern \"C\" "); @@ -312,7 +344,7 @@ static void print_function_type_pre(const function_type_t *type) break; } - print_type_qualifiers(type->base.qualifiers); + print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END); intern_print_type_pre(type->return_type); @@ -364,11 +396,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); } } } @@ -406,10 +438,7 @@ static void print_pointer_type_pre(const pointer_type_t *type) print_string(") "); } print_string("*"); - type_qualifiers_t const qual = type->base.qualifiers; - if (qual != 0) - print_string(" "); - print_type_qualifiers(qual); + print_type_qualifiers(type->base.qualifiers, QUAL_SEP_START); } /** @@ -473,7 +502,7 @@ static void print_array_type_post(const array_type_t *type) if (type->is_static) { print_string("static "); } - print_type_qualifiers(type->base.qualifiers); + print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END); if (type->size_expression != NULL && (print_implicit_array_size || !type->has_implicit_size)) { print_expression(type->size_expression); @@ -482,18 +511,6 @@ static void print_array_type_post(const array_type_t *type) intern_print_type_post(type->element_type); } -/** - * Prints the postfix part of a bitfield type. - * - * @param type The array type. - */ -static void print_bitfield_type_post(const bitfield_type_t *type) -{ - print_string(" : "); - print_expression(type->size_expression); - intern_print_type_post(type->base_type); -} - /** * Prints an enum definition. * @@ -516,9 +533,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"); @@ -536,7 +550,7 @@ void print_enum_definition(const enum_t *enume) */ static void print_type_enum(const enum_type_t *type) { - print_type_qualifiers(type->base.qualifiers); + print_type_qualifiers(type->base.base.qualifiers, QUAL_SEP_END); print_string("enum "); enum_t *enume = type->enume; @@ -581,7 +595,7 @@ void print_compound_definition(const compound_t *compound) */ static void print_compound_type(const compound_type_t *type) { - print_type_qualifiers(type->base.qualifiers); + print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END); if (type->base.kind == TYPE_COMPOUND_STRUCT) { print_string("struct "); @@ -606,7 +620,7 @@ static void print_compound_type(const compound_type_t *type) */ static void print_typedef_type_pre(const typedef_type_t *const type) { - print_type_qualifiers(type->base.qualifiers); + print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END); print_string(type->typedefe->base.symbol->string); } @@ -637,9 +651,6 @@ static void intern_print_type_pre(const type_t *const type) case TYPE_ERROR: print_string(""); return; - case TYPE_INVALID: - print_string(""); - return; case TYPE_ENUM: print_type_enum(&type->enumt); return; @@ -647,18 +658,15 @@ static void intern_print_type_pre(const type_t *const type) print_atomic_type(&type->atomic); return; case TYPE_COMPLEX: - print_complex_type(&type->complex); + print_complex_type(&type->atomic); return; case TYPE_IMAGINARY: - print_imaginary_type(&type->imaginary); + print_imaginary_type(&type->atomic); return; case TYPE_COMPOUND_STRUCT: case TYPE_COMPOUND_UNION: print_compound_type(&type->compound); return; - case TYPE_BUILTIN: - print_string(type->builtin.symbol->string); - return; case TYPE_FUNCTION: print_function_type_pre(&type->function); return; @@ -668,9 +676,6 @@ static void intern_print_type_pre(const type_t *const type) case TYPE_REFERENCE: print_reference_type_pre(&type->reference); return; - case TYPE_BITFIELD: - intern_print_type_pre(type->bitfield.base_type); - return; case TYPE_ARRAY: print_array_type_pre(&type->array); return; @@ -704,18 +709,13 @@ static void intern_print_type_post(const type_t *const type) case TYPE_ARRAY: print_array_type_post(&type->array); return; - case TYPE_BITFIELD: - print_bitfield_type_post(&type->bitfield); - return; case TYPE_ERROR: - case TYPE_INVALID: case TYPE_ATOMIC: case TYPE_COMPLEX: case TYPE_IMAGINARY: case TYPE_ENUM: case TYPE_COMPOUND_STRUCT: case TYPE_COMPOUND_UNION: - case TYPE_BUILTIN: case TYPE_TYPEOF: case TYPE_TYPEDEF: break; @@ -735,11 +735,6 @@ void print_type(const type_t *const type) void print_type_ext(const type_t *const type, const symbol_t *symbol, const scope_t *parameters) { - if (type == NULL) { - print_string("nil type"); - return; - } - intern_print_type_pre(type); if (symbol != NULL) { print_string(" "); @@ -752,34 +747,6 @@ void print_type_ext(const type_t *const type, const symbol_t *symbol, } } -/** - * Return the size of a type AST node. - * - * @param type The type. - */ -static size_t get_type_struct_size(const type_t *type) -{ - switch(type->kind) { - case TYPE_ATOMIC: return sizeof(atomic_type_t); - case TYPE_COMPLEX: return sizeof(complex_type_t); - case TYPE_IMAGINARY: return sizeof(imaginary_type_t); - case TYPE_COMPOUND_STRUCT: - case TYPE_COMPOUND_UNION: return sizeof(compound_type_t); - case TYPE_ENUM: return sizeof(enum_type_t); - case TYPE_FUNCTION: return sizeof(function_type_t); - case TYPE_POINTER: return sizeof(pointer_type_t); - case TYPE_REFERENCE: return sizeof(reference_type_t); - case TYPE_ARRAY: return sizeof(array_type_t); - case TYPE_BUILTIN: return sizeof(builtin_type_t); - case TYPE_TYPEDEF: return sizeof(typedef_type_t); - case TYPE_TYPEOF: return sizeof(typeof_type_t); - case TYPE_BITFIELD: return sizeof(bitfield_type_t); - case TYPE_ERROR: panic("error type found"); - case TYPE_INVALID: panic("invalid type found"); - } - panic("unknown type found"); -} - /** * Duplicates a type. * @@ -790,9 +757,9 @@ static size_t get_type_struct_size(const type_t *type) */ type_t *duplicate_type(const type_t *type) { - size_t size = get_type_struct_size(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; @@ -834,7 +801,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); @@ -846,17 +813,6 @@ type_t *get_qualified_type(type_t *orig_type, type_qualifiers_t const qual) return identify_new_type(copy); } -/** - * Check if a type is valid. - * - * @param type The type to check. - * @return true if type represents a valid type. - */ -bool type_valid(const type_t *type) -{ - return type->kind != TYPE_INVALID; -} - static bool test_atomic_type_flag(atomic_type_kind_t kind, atomic_type_flag_t flag) { @@ -876,9 +832,6 @@ bool is_type_integer(const type_t *type) if (type->kind == TYPE_ENUM) return true; - if (type->kind == TYPE_BITFIELD) - return true; - if (type->kind != TYPE_ATOMIC) return false; @@ -942,9 +895,6 @@ bool is_type_signed(const type_t *type) /* enum types are int for now */ if (type->kind == TYPE_ENUM) return true; - if (type->kind == TYPE_BITFIELD) - return is_type_signed(type->bitfield.base_type); - if (type->kind != TYPE_ATOMIC) return false; @@ -962,15 +912,12 @@ bool is_type_arithmetic(const type_t *type) assert(!is_typeref(type)); switch(type->kind) { - case TYPE_BITFIELD: case TYPE_ENUM: return true; case TYPE_ATOMIC: - return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_ARITHMETIC); case TYPE_COMPLEX: - return test_atomic_type_flag(type->complex.akind, ATOMIC_TYPE_FLAG_ARITHMETIC); case TYPE_IMAGINARY: - return test_atomic_type_flag(type->imaginary.akind, ATOMIC_TYPE_FLAG_ARITHMETIC); + return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_ARITHMETIC); default: return false; } @@ -998,11 +945,8 @@ bool is_type_scalar(const type_t *type) { assert(!is_typeref(type)); - switch (type->kind) { - case TYPE_POINTER: return true; - case TYPE_BUILTIN: return is_type_scalar(type->builtin.real_type); - default: break; - } + if (type->kind == TYPE_POINTER) + return true; return is_type_arithmetic(type); } @@ -1031,27 +975,19 @@ bool is_type_incomplete(const type_t *type) && !type->array.size_constant; case TYPE_ATOMIC: - return type->atomic.akind == ATOMIC_TYPE_VOID; - - case TYPE_COMPLEX: - return type->complex.akind == ATOMIC_TYPE_VOID; - case TYPE_IMAGINARY: - return type->imaginary.akind == ATOMIC_TYPE_VOID; + case TYPE_COMPLEX: + return type->atomic.akind == ATOMIC_TYPE_VOID; - case TYPE_BITFIELD: case TYPE_FUNCTION: case TYPE_POINTER: case TYPE_REFERENCE: - case TYPE_BUILTIN: case TYPE_ERROR: return false; case TYPE_TYPEDEF: case TYPE_TYPEOF: panic("is_type_incomplete called without typerefs skipped"); - case TYPE_INVALID: - break; } panic("invalid type found"); @@ -1062,14 +998,6 @@ bool is_type_object(const type_t *type) return !is_type_function(type) && !is_type_incomplete(type); } -bool is_builtin_va_list(type_t *type) -{ - type_t *tp = skip_typeref(type); - - return tp->kind == type_valist->kind && - tp->builtin.symbol == type_valist->builtin.symbol; -} - /** * Check if two function types are compatible. */ @@ -1166,11 +1094,9 @@ bool types_compatible(const type_t *type1, const type_t *type2) case TYPE_FUNCTION: return function_types_compatible(&type1->function, &type2->function); case TYPE_ATOMIC: - return type1->atomic.akind == type2->atomic.akind; - case TYPE_COMPLEX: - return type1->complex.akind == type2->complex.akind; case TYPE_IMAGINARY: - return type1->imaginary.akind == type2->imaginary.akind; + case TYPE_COMPLEX: + return type1->atomic.akind == type2->atomic.akind; case TYPE_ARRAY: return array_types_compatible(&type1->array, &type2->array); @@ -1188,31 +1114,20 @@ bool types_compatible(const type_t *type1, const type_t *type2) case TYPE_COMPOUND_STRUCT: case TYPE_COMPOUND_UNION: { - - break; } case TYPE_ENUM: - case TYPE_BUILTIN: /* TODO: not implemented */ break; - case TYPE_BITFIELD: - /* not sure if this makes sense or is even needed, implement it if you - * really need it! */ - panic("type compatibility check for bitfield type"); - case TYPE_ERROR: /* Hmm, the error type should be compatible to all other types */ return true; - case TYPE_INVALID: - panic("invalid type found in compatible types"); case TYPE_TYPEDEF: case TYPE_TYPEOF: panic("typerefs not skipped in compatible types?!?"); } - /* TODO: incomplete */ return false; } @@ -1271,47 +1186,34 @@ type_t *skip_typeref(type_t *type) unsigned get_type_size(type_t *type) { switch (type->kind) { - case TYPE_INVALID: - break; case TYPE_ERROR: return 0; case TYPE_ATOMIC: + case TYPE_IMAGINARY: + case TYPE_ENUM: return get_atomic_type_size(type->atomic.akind); case TYPE_COMPLEX: - return get_atomic_type_size(type->complex.akind) * 2; - case TYPE_IMAGINARY: - return get_atomic_type_size(type->imaginary.akind); + return get_atomic_type_size(type->atomic.akind) * 2; case TYPE_COMPOUND_UNION: layout_union_type(&type->compound); return type->compound.compound->size; case TYPE_COMPOUND_STRUCT: layout_struct_type(&type->compound); return type->compound.compound->size; - case TYPE_ENUM: - return get_atomic_type_size(type->enumt.akind); case TYPE_FUNCTION: return 0; /* non-const (but "address-const") */ case TYPE_REFERENCE: case TYPE_POINTER: - /* TODO: make configurable by backend */ - return 4; + return pointer_properties.size; case TYPE_ARRAY: { /* TODO: correct if element_type is aligned? */ il_size_t element_size = get_type_size(type->array.element_type); return type->array.size * element_size; } - case TYPE_BITFIELD: - return 0; - case TYPE_BUILTIN: - return get_type_size(type->builtin.real_type); case TYPE_TYPEDEF: return get_type_size(type->typedeft.typedefe->type); case TYPE_TYPEOF: - if (type->typeoft.typeof_type) { - return get_type_size(type->typeoft.typeof_type); - } else { - return get_type_size(type->typeoft.expression->base.type); - } + return get_type_size(type->typeoft.typeof_type); } panic("invalid type in get_type_size"); } @@ -1319,37 +1221,27 @@ unsigned get_type_size(type_t *type) unsigned get_type_alignment(type_t *type) { switch (type->kind) { - case TYPE_INVALID: - break; case TYPE_ERROR: return 0; case TYPE_ATOMIC: - return get_atomic_type_alignment(type->atomic.akind); - case TYPE_COMPLEX: - return get_atomic_type_alignment(type->complex.akind); case TYPE_IMAGINARY: - return get_atomic_type_alignment(type->imaginary.akind); + case TYPE_COMPLEX: + case TYPE_ENUM: + return get_atomic_type_alignment(type->atomic.akind); case TYPE_COMPOUND_UNION: layout_union_type(&type->compound); return type->compound.compound->alignment; case TYPE_COMPOUND_STRUCT: layout_struct_type(&type->compound); return type->compound.compound->alignment; - case TYPE_ENUM: - return get_atomic_type_alignment(type->enumt.akind); case TYPE_FUNCTION: - /* what is correct here? */ - return 4; + /* gcc says 1 here... */ + return 1; case TYPE_REFERENCE: case TYPE_POINTER: - /* TODO: make configurable by backend */ - return 4; + return pointer_properties.alignment; case TYPE_ARRAY: return get_type_alignment(type->array.element_type); - case TYPE_BITFIELD: - return 0; - case TYPE_BUILTIN: - return get_type_alignment(type->builtin.real_type); case TYPE_TYPEDEF: { il_alignment_t alignment = get_type_alignment(type->typedeft.typedefe->type); @@ -1359,19 +1251,27 @@ unsigned get_type_alignment(type_t *type) return alignment; } case TYPE_TYPEOF: - if (type->typeoft.typeof_type) { - return get_type_alignment(type->typeoft.typeof_type); - } else { - return get_type_alignment(type->typeoft.expression->base.type); - } + return get_type_alignment(type->typeoft.typeof_type); } panic("invalid type in get_type_alignment"); } +/** + * get alignment of a type when used inside a compound. + * Some ABIs are broken and alignment inside a compound is different from + * recommended alignment of a type + */ +static unsigned get_type_alignment_compound(type_t *const type) +{ + assert(!is_typeref(type)); + if (type->kind == TYPE_ATOMIC) + return atomic_type_properties[type->atomic.akind].struct_alignment; + return get_type_alignment(type); +} + decl_modifiers_t get_type_modifiers(const type_t *type) { switch(type->kind) { - case TYPE_INVALID: case TYPE_ERROR: break; case TYPE_COMPOUND_STRUCT: @@ -1385,22 +1285,15 @@ decl_modifiers_t get_type_modifiers(const type_t *type) case TYPE_IMAGINARY: case TYPE_REFERENCE: case TYPE_POINTER: - case TYPE_BITFIELD: case TYPE_ARRAY: return 0; - case TYPE_BUILTIN: - return get_type_modifiers(type->builtin.real_type); case TYPE_TYPEDEF: { decl_modifiers_t modifiers = type->typedeft.typedefe->modifiers; modifiers |= get_type_modifiers(type->typedeft.typedefe->type); return modifiers; } case TYPE_TYPEOF: - if (type->typeoft.typeof_type) { - return get_type_modifiers(type->typeoft.typeof_type); - } else { - return get_type_modifiers(type->typeoft.expression->base.type); - } + return get_type_modifiers(type->typeoft.typeof_type); } panic("invalid type found in get_type_modifiers"); } @@ -1456,26 +1349,6 @@ unsigned get_atomic_type_flags(atomic_type_kind_t kind) return atomic_type_properties[kind].flags; } -atomic_type_kind_t get_intptr_kind(void) -{ - if (machine_size <= 32) - return ATOMIC_TYPE_INT; - else if (machine_size <= 64) - return ATOMIC_TYPE_LONG; - else - return ATOMIC_TYPE_LONGLONG; -} - -atomic_type_kind_t get_uintptr_kind(void) -{ - if (machine_size <= 32) - return ATOMIC_TYPE_UINT; - else if (machine_size <= 64) - return ATOMIC_TYPE_ULONG; - else - return ATOMIC_TYPE_ULONGLONG; -} - /** * Find the atomic type kind representing a given size (signed). */ @@ -1540,7 +1413,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; } @@ -1553,10 +1426,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; @@ -1569,14 +1439,12 @@ type_t *make_atomic_type(atomic_type_kind_t akind, type_qualifiers_t qualifiers) * @param akind The kind of the atomic type. * @param qualifiers Type qualifiers for the new type. */ -type_t *make_complex_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; + type->atomic.akind = akind; return identify_new_type(type); } @@ -1587,14 +1455,12 @@ type_t *make_complex_type(atomic_type_kind_t akind, type_qualifiers_t qualifiers * @param akind The kind of the atomic type. * @param qualifiers Type qualifiers for the new type. */ -type_t *make_imaginary_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; + type->atomic.akind = akind; return identify_new_type(type); } @@ -1607,10 +1473,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; @@ -1625,11 +1488,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); @@ -1645,10 +1505,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; @@ -1660,10 +1517,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; @@ -1683,19 +1537,17 @@ static entity_t *pack_bitfield_members(il_size_t *struct_offset, entity_t *member; for (member = first; member != NULL; member = member->base.next) { if (member->kind != ENTITY_COMPOUND_MEMBER) + continue; + if (!member->compound_member.bitfield) break; - type_t *type = member->declaration.type; - if (type->kind != TYPE_BITFIELD) - break; - - type_t *base_type = skip_typeref(type->bitfield.base_type); - il_alignment_t base_alignment = get_type_alignment(base_type); + type_t *const base_type = skip_typeref(member->declaration.type); + il_alignment_t base_alignment = get_type_alignment_compound(base_type); il_alignment_t alignment_mask = base_alignment-1; if (base_alignment > alignment) alignment = base_alignment; - size_t bit_size = type->bitfield.bit_size; + size_t bit_size = member->compound_member.bit_size; if (!packed) { bit_offset += (offset & alignment_mask) * BITS_PER_BYTE; offset &= ~alignment_mask; @@ -1708,8 +1560,14 @@ static entity_t *pack_bitfield_members(il_size_t *struct_offset, } } - member->compound_member.offset = offset; - member->compound_member.bit_offset = bit_offset; + if (byte_order_big_endian) { + size_t base_size = get_type_size(base_type) * BITS_PER_BYTE; + member->compound_member.offset = offset & ~alignment_mask; + member->compound_member.bit_offset = base_size - bit_offset - bit_size; + } else { + member->compound_member.offset = offset; + member->compound_member.bit_offset = bit_offset; + } bit_offset += bit_size; offset += bit_offset / BITS_PER_BYTE; @@ -1721,14 +1579,9 @@ static entity_t *pack_bitfield_members(il_size_t *struct_offset, *struct_offset = offset; *struct_alignment = alignment; - return member; } -/** - * Finish the construction of a struct type by calculating its size, offsets, - * alignment. - */ void layout_struct_type(compound_type_t *type) { assert(type->compound != NULL); @@ -1750,20 +1603,19 @@ void layout_struct_type(compound_type_t *type) continue; } - type_t *m_type = entry->declaration.type; - type_t *skipped = skip_typeref(m_type); - if (! is_type_valid(skipped)) { + type_t *const m_type = skip_typeref(entry->declaration.type); + if (!is_type_valid(m_type)) { entry = entry->base.next; continue; } - if (skipped->kind == TYPE_BITFIELD) { + if (entry->compound_member.bitfield) { entry = pack_bitfield_members(&offset, &alignment, compound->packed, entry); continue; } - il_alignment_t m_alignment = get_type_alignment(m_type); + il_alignment_t m_alignment = get_type_alignment_compound(m_type); if (m_alignment > alignment) alignment = m_alignment; @@ -1790,14 +1642,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; @@ -1805,10 +1654,6 @@ void layout_struct_type(compound_type_t *type) compound->layouted = true; } -/** - * Finish the construction of an union type by calculating - * its size and alignment. - */ void layout_union_type(compound_type_t *type) { assert(type->compound != NULL); @@ -1825,7 +1670,7 @@ void layout_union_type(compound_type_t *type) if (entry->kind != ENTITY_COMPOUND_MEMBER) continue; - type_t *m_type = entry->declaration.type; + type_t *m_type = skip_typeref(entry->declaration.type); if (! is_type_valid(skip_typeref(m_type))) continue; @@ -1833,7 +1678,7 @@ void layout_union_type(compound_type_t *type) il_size_t m_size = get_type_size(m_type); if (m_size > size) size = m_size; - il_alignment_t m_alignment = get_type_alignment(m_type); + il_alignment_t m_alignment = get_type_alignment_compound(m_type); if (m_alignment > alignment) alignment = m_alignment; } @@ -1843,6 +1688,90 @@ void layout_union_type(compound_type_t *type) compound->alignment = alignment; } +function_parameter_t *allocate_parameter(type_t *const type) +{ + function_parameter_t *const param = obstack_alloc(&type_obst, sizeof(*param)); + memset(param, 0, sizeof(*param)); + param->type = type; + return param; +} + +type_t *make_function_2_type(type_t *return_type, type_t *argument_type1, + type_t *argument_type2, decl_modifiers_t modifiers) +{ + function_parameter_t *const parameter2 = allocate_parameter(argument_type2); + function_parameter_t *const parameter1 = allocate_parameter(argument_type1); + parameter1->next = parameter2; + + type_t *type = allocate_type_zero(TYPE_FUNCTION); + type->function.return_type = return_type; + type->function.parameters = parameter1; + type->function.modifiers |= modifiers; + type->function.linkage = LINKAGE_C; + + return identify_new_type(type); +} + +type_t *make_function_1_type(type_t *return_type, type_t *argument_type, + decl_modifiers_t modifiers) +{ + function_parameter_t *const parameter = allocate_parameter(argument_type); + + type_t *type = allocate_type_zero(TYPE_FUNCTION); + type->function.return_type = return_type; + type->function.parameters = parameter; + type->function.modifiers |= modifiers; + type->function.linkage = LINKAGE_C; + + return identify_new_type(type); +} + +type_t *make_function_1_type_variadic(type_t *return_type, + type_t *argument_type, + decl_modifiers_t modifiers) +{ + function_parameter_t *const parameter = allocate_parameter(argument_type); + + type_t *type = allocate_type_zero(TYPE_FUNCTION); + type->function.return_type = return_type; + type->function.parameters = parameter; + type->function.variadic = true; + type->function.modifiers |= modifiers; + type->function.linkage = LINKAGE_C; + + return identify_new_type(type); +} + +type_t *make_function_0_type(type_t *return_type, decl_modifiers_t modifiers) +{ + type_t *type = allocate_type_zero(TYPE_FUNCTION); + type->function.return_type = return_type; + type->function.parameters = NULL; + type->function.modifiers |= modifiers; + type->function.linkage = LINKAGE_C; + + return identify_new_type(type); +} + +type_t *make_function_type(type_t *return_type, int n_types, + type_t *const *argument_types, + decl_modifiers_t modifiers) +{ + type_t *type = allocate_type_zero(TYPE_FUNCTION); + type->function.return_type = return_type; + type->function.modifiers |= modifiers; + type->function.linkage = LINKAGE_C; + + function_parameter_t **anchor = &type->function.parameters; + for (int i = 0; i < n_types; ++i) { + function_parameter_t *parameter = allocate_parameter(argument_types[i]); + *anchor = parameter; + anchor = ¶meter->next; + } + + return identify_new_type(type); +} + /** * Debug helper. Prints the given type to stdout. */