X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type.c;h=8ba008d28ee529161ff1135d6608ad18e79388ba;hb=c38eb545c4d2f8835354f15c0a67fb2e8c28cc1e;hp=3ca2071aa90b168d12d908a7662c3ee9086bebac;hpb=57218f2f71b3eb4902a50e743e7bd12c00f46bef;p=cparser diff --git a/type.c b/type.c index 3ca2071..8ba008d 100644 --- a/type.c +++ b/type.c @@ -43,13 +43,6 @@ 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. * @@ -59,8 +52,6 @@ static size_t get_type_struct_size(type_kind_t kind) { static const size_t sizes[] = { [TYPE_ATOMIC] = sizeof(atomic_type_t), - [TYPE_COMPLEX] = sizeof(complex_type_t), - [TYPE_IMAGINARY] = sizeof(imaginary_type_t), [TYPE_COMPOUND_STRUCT] = sizeof(compound_type_t), [TYPE_COMPOUND_UNION] = sizeof(compound_type_t), [TYPE_ENUM] = sizeof(enum_type_t), @@ -90,104 +81,115 @@ type_t *allocate_type_zero(type_kind_t kind) /** * 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 = 1, + .alignment = 1, + .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 = (unsigned) -1, /* will be filled in later */ - .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, }; static inline bool is_po2(unsigned x) @@ -195,64 +197,37 @@ static inline bool is_po2(unsigned x) return (x & (x-1)) == 0; } -void init_types(void) +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; - /* long is always 32bit on windows */ - unsigned long_size = c_mode & _MS ? 4 : (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 */ - if (machine_size <= 32) { - 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; - } else { - props[ATOMIC_TYPE_FLOAT].alignment = 4; - props[ATOMIC_TYPE_DOUBLE].alignment = 8; - props[ATOMIC_TYPE_LONG_DOUBLE].alignment = 8; - props[ATOMIC_TYPE_LONGLONG].alignment = 8; - props[ATOMIC_TYPE_ULONGLONG].alignment = 8; + unsigned long_size = machine_size < 64 ? 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; + + 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; } - - 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 - * bools. */ - props[ATOMIC_TYPE_BOOL] = props[ATOMIC_TYPE_UCHAR]; - - props[ATOMIC_TYPE_WCHAR_T] = props[wchar_atomic_kind]; } void exit_types(void) @@ -331,7 +306,7 @@ 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, QUAL_SEP_END); print_string("_Complex"); @@ -343,7 +318,7 @@ 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, QUAL_SEP_END); print_string("_Imaginary "); @@ -358,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\" "); @@ -539,11 +511,6 @@ static void print_array_type_post(const array_type_t *type) intern_print_type_post(type->element_type); } -/** - * Prints an enum definition. - * - * @param declaration The enum's type declaration. - */ void print_enum_definition(const enum_t *enume) { print_string("{\n"); @@ -558,10 +525,7 @@ void print_enum_definition(const enum_t *enume) print_string(entry->base.symbol->string); if (entry->enum_value.value != NULL) { print_string(" = "); - - /* skip the implicit cast */ - expression_t *expression = entry->enum_value.value; - print_expression(expression); + print_expression(entry->enum_value.value); } print_string(",\n"); } @@ -578,7 +542,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, QUAL_SEP_END); + print_type_qualifiers(type->base.base.qualifiers, QUAL_SEP_END); print_string("enum "); enum_t *enume = type->enume; @@ -590,9 +554,6 @@ static void print_type_enum(const enum_type_t *type) } } -/** - * Print the compound part of a compound type. - */ void print_compound_definition(const compound_t *compound) { print_string("{\n"); @@ -679,9 +640,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; @@ -689,10 +647,10 @@ 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: @@ -741,7 +699,6 @@ static void intern_print_type_post(const type_t *const type) print_array_type_post(&type->array); return; case TYPE_ERROR: - case TYPE_INVALID: case TYPE_ATOMIC: case TYPE_COMPLEX: case TYPE_IMAGINARY: @@ -754,11 +711,6 @@ static void intern_print_type_post(const type_t *const type) } } -/** - * Prints a type. - * - * @param type The type. - */ void print_type(const type_t *const type) { print_type_ext(type, NULL, NULL); @@ -779,14 +731,6 @@ void print_type_ext(const type_t *const type, const symbol_t *symbol, } } -/** - * Duplicates a type. - * - * @param type The type to copy. - * @return A copy of the type. - * - * @note This does not produce a deep copy! - */ type_t *duplicate_type(const type_t *type) { size_t size = get_type_struct_size(type->kind); @@ -798,12 +742,6 @@ type_t *duplicate_type(const type_t *type) return copy; } -/** - * Returns the unqualified type of a given type. - * - * @param type The type. - * @returns The unqualified type. - */ type_t *get_unqualified_type(type_t *type) { assert(!is_typeref(type)); @@ -845,17 +783,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) { @@ -863,12 +790,6 @@ static bool test_atomic_type_flag(atomic_type_kind_t kind, return (atomic_type_properties[kind].flags & flag) != 0; } -/** - * Returns true if the given type is an integer type. - * - * @param type The type to check. - * @return True if type is an integer type. - */ bool is_type_integer(const type_t *type) { assert(!is_typeref(type)); @@ -881,24 +802,12 @@ bool is_type_integer(const type_t *type) return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_INTEGER); } -/** - * Returns true if the given type is an enum type. - * - * @param type The type to check. - * @return True if type is an enum type. - */ bool is_type_enum(const type_t *type) { assert(!is_typeref(type)); return type->kind == TYPE_ENUM; } -/** - * Returns true if the given type is an floating point type. - * - * @param type The type to check. - * @return True if type is a floating point type. - */ bool is_type_float(const type_t *type) { assert(!is_typeref(type)); @@ -909,12 +818,6 @@ bool is_type_float(const type_t *type) return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_FLOAT); } -/** - * Returns true if the given type is an complex type. - * - * @param type The type to check. - * @return True if type is a complex type. - */ bool is_type_complex(const type_t *type) { assert(!is_typeref(type)); @@ -925,12 +828,6 @@ bool is_type_complex(const type_t *type) return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_COMPLEX); } -/** - * Returns true if the given type is a signed type. - * - * @param type The type to check. - * @return True if type is a signed type. - */ bool is_type_signed(const type_t *type) { assert(!is_typeref(type)); @@ -944,12 +841,6 @@ bool is_type_signed(const type_t *type) return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_SIGNED); } -/** - * Returns true if the given type represents an arithmetic type. - * - * @param type The type to check. - * @return True if type represents an arithmetic type. - */ bool is_type_arithmetic(const type_t *type) { assert(!is_typeref(type)); @@ -958,34 +849,20 @@ bool is_type_arithmetic(const type_t *type) 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; } } -/** - * Returns true if the given type is an integer or float type. - * - * @param type The type to check. - * @return True if type is an integer or float type. - */ bool is_type_real(const type_t *type) { /* 6.2.5 (17) */ return is_type_integer(type) || is_type_float(type); } -/** - * Returns true if the given type represents a scalar type. - * - * @param type The type to check. - * @return True if type represents a scalar type. - */ bool is_type_scalar(const type_t *type) { assert(!is_typeref(type)); @@ -996,12 +873,6 @@ bool is_type_scalar(const type_t *type) return is_type_arithmetic(type); } -/** - * Check if a given type is incomplete. - * - * @param type The type to check. - * @return True if the given type is incomplete (ie. just forward). - */ bool is_type_incomplete(const type_t *type) { assert(!is_typeref(type)); @@ -1020,13 +891,9 @@ 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_FUNCTION: case TYPE_POINTER: @@ -1037,8 +904,6 @@ bool is_type_incomplete(const type_t *type) case TYPE_TYPEDEF: case TYPE_TYPEOF: panic("is_type_incomplete called without typerefs skipped"); - case TYPE_INVALID: - break; } panic("invalid type found"); @@ -1121,9 +986,6 @@ static bool array_types_compatible(const array_type_t *array1, return array1->size == array2->size; } -/** - * Check if two types are compatible. - */ bool types_compatible(const type_t *type1, const type_t *type2) { assert(!is_typeref(type1)); @@ -1145,11 +1007,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); @@ -1176,14 +1036,11 @@ bool types_compatible(const type_t *type1, const type_t *type2) 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; } @@ -1242,30 +1099,25 @@ 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); @@ -1274,11 +1126,7 @@ unsigned get_type_size(type_t *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"); } @@ -1286,31 +1134,25 @@ 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_TYPEDEF: { @@ -1322,19 +1164,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: @@ -1356,11 +1206,7 @@ decl_modifiers_t get_type_modifiers(const type_t *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"); } @@ -1416,26 +1262,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). */ @@ -1526,11 +1352,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 *const type = allocate_type_zero(TYPE_COMPLEX); type->base.qualifiers = qualifiers; - type->complex.akind = akind; + type->atomic.akind = akind; return identify_new_type(type); } @@ -1541,11 +1368,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 *const type = allocate_type_zero(TYPE_IMAGINARY); type->base.qualifiers = qualifiers; - type->imaginary.akind = akind; + type->atomic.akind = akind; return identify_new_type(type); } @@ -1626,8 +1454,8 @@ static entity_t *pack_bitfield_members(il_size_t *struct_offset, if (!member->compound_member.bitfield) break; - type_t *base_type = member->declaration.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; @@ -1688,9 +1516,8 @@ 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; } @@ -1701,7 +1528,7 @@ void layout_struct_type(compound_type_t *type) 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; @@ -1756,7 +1583,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; @@ -1764,7 +1591,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; } @@ -1783,7 +1610,7 @@ function_parameter_t *allocate_parameter(type_t *const type) } type_t *make_function_2_type(type_t *return_type, type_t *argument_type1, - type_t *argument_type2) + 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); @@ -1792,25 +1619,29 @@ type_t *make_function_2_type(type_t *return_type, type_t *argument_type1, 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) +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) + type_t *argument_type, + decl_modifiers_t modifiers) { function_parameter_t *const parameter = allocate_parameter(argument_type); @@ -1818,16 +1649,18 @@ type_t *make_function_1_type_variadic(type_t *return_type, 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) +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);