X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type.c;h=da737e50492a98a359bffd8de5ea81bd589635e7;hb=22dabd638cc982416589af0073382fcb4197f72f;hp=c2484b87ca1787ce41c443d39b017c89ea94d85a;hpb=58558497dcf35ed589188c87600576b58d7c237d;p=cparser diff --git a/type.c b/type.c index c2484b8..da737e5 100644 --- a/type.c +++ b/type.c @@ -52,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), @@ -85,80 +83,107 @@ type_t *allocate_type_zero(type_kind_t kind) */ atomic_type_properties_t atomic_type_properties[ATOMIC_TYPE_LAST+1] = { [ATOMIC_TYPE_VOID] = { - .size = 0, - .alignment = 0, - .flags = ATOMIC_TYPE_FLAG_NONE + .size = 1, + .alignment = 1, + .flags = ATOMIC_TYPE_FLAG_NONE, + .rank = 0, }, - [ATOMIC_TYPE_WCHAR_T] = { - .size = (unsigned)-1, - .alignment = (unsigned)-1, - .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC, + [ATOMIC_TYPE_BOOL] = { + .size = 1, + .alignment = 1, + .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, + .rank = 2, }, [ATOMIC_TYPE_UCHAR] = { .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_BOOL] = { - .size = 1, - .alignment = 1, + [ATOMIC_TYPE_LONGLONG] = { + .size = 8, + .alignment = 8, + .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC + | ATOMIC_TYPE_FLAG_SIGNED, + .rank = 6, + }, + [ATOMIC_TYPE_ULONGLONG] = { + .size = 8, + .alignment = 8, .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC, + .rank = 6, }, [ATOMIC_TYPE_FLOAT] = { .size = 4, .alignment = 4, .flags = ATOMIC_TYPE_FLAG_FLOAT | ATOMIC_TYPE_FLAG_ARITHMETIC | ATOMIC_TYPE_FLAG_SIGNED, + .rank = 0, }, [ATOMIC_TYPE_DOUBLE] = { .size = 8, .alignment = 8, .flags = ATOMIC_TYPE_FLAG_FLOAT | ATOMIC_TYPE_FLAG_ARITHMETIC | ATOMIC_TYPE_FLAG_SIGNED, + .rank = 0, + }, + [ATOMIC_TYPE_WCHAR_T] = { + .size = (unsigned)-1, + .alignment = (unsigned)-1, + .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC, + .rank = (unsigned)-1, }, }; atomic_type_properties_t pointer_properties = { @@ -196,15 +221,11 @@ void init_types(unsigned machine_size) pointer_properties.alignment = long_size; pointer_properties.struct_alignment = long_size; - props[ATOMIC_TYPE_LONGLONG] = props[ATOMIC_TYPE_LONG]; - props[ATOMIC_TYPE_ULONGLONG] = props[ATOMIC_TYPE_ULONG]; 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 < sizeof(atomic_type_properties)/sizeof(atomic_type_properties[0]); - ++i) { + for (size_t i = 0; i != lengthof(atomic_type_properties); ++i) { props[i].struct_alignment = props[i].alignment; } } @@ -285,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"); @@ -297,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 "); @@ -312,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\" "); @@ -355,7 +373,7 @@ restart: static void print_function_type_post(const function_type_t *type, const scope_t *parameters) { - print_string("("); + print_char('('); bool first = true; if (parameters == NULL) { function_parameter_t *parameter = type->parameters; @@ -397,7 +415,7 @@ static void print_function_type_post(const function_type_t *type, if (first && !type->unspecified_parameters) { print_string("void"); } - print_string(")"); + print_char(')'); intern_print_type_post(type->return_type); } @@ -419,7 +437,7 @@ static void print_pointer_type_pre(const pointer_type_t *type) print_string(variable->base.base.symbol->string); print_string(") "); } - print_string("*"); + print_char('*'); print_type_qualifiers(type->base.qualifiers, QUAL_SEP_START); } @@ -432,7 +450,7 @@ static void print_pointer_type_post(const pointer_type_t *type) { type_t const *const points_to = type->points_to; if (points_to->kind == TYPE_ARRAY || points_to->kind == TYPE_FUNCTION) - print_string(")"); + print_char(')'); intern_print_type_post(points_to); } @@ -447,7 +465,7 @@ static void print_reference_type_pre(const reference_type_t *type) intern_print_type_pre(refers_to); if (refers_to->kind == TYPE_ARRAY || refers_to->kind == TYPE_FUNCTION) print_string(" ("); - print_string("&"); + print_char('&'); } /** @@ -459,7 +477,7 @@ static void print_reference_type_post(const reference_type_t *type) { type_t const *const refers_to = type->refers_to; if (refers_to->kind == TYPE_ARRAY || refers_to->kind == TYPE_FUNCTION) - print_string(")"); + print_char(')'); intern_print_type_post(refers_to); } @@ -480,7 +498,7 @@ static void print_array_type_pre(const array_type_t *type) */ static void print_array_type_post(const array_type_t *type) { - print_string("["); + print_char('['); if (type->is_static) { print_string("static "); } @@ -489,15 +507,10 @@ static void print_array_type_post(const array_type_t *type) && (print_implicit_array_size || !type->has_implicit_size)) { print_expression(type->size_expression); } - print_string("]"); + print_char(']'); 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"); @@ -512,17 +525,14 @@ 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"); } change_indent(-1); print_indent(); - print_string("}"); + print_char('}'); } /** @@ -532,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; @@ -544,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"); @@ -559,12 +566,12 @@ void print_compound_definition(const compound_t *compound) print_indent(); print_entity(entity); - print_string("\n"); + print_char('\n'); } change_indent(-1); print_indent(); - print_string("}"); + print_char('}'); if (compound->modifiers & DM_TRANSPARENT_UNION) { print_string("__attribute__((__transparent_union__))"); } @@ -619,7 +626,7 @@ static void print_typeof_type_pre(const typeof_type_t *const type) } else { print_type(type->typeof_type); } - print_string(")"); + print_char(')'); } /** @@ -633,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; @@ -643,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: @@ -695,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: @@ -708,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); @@ -723,7 +721,7 @@ void print_type_ext(const type_t *const type, const symbol_t *symbol, { intern_print_type_pre(type); if (symbol != NULL) { - print_string(" "); + print_char(' '); print_string(symbol->string); } if (type->kind == TYPE_FUNCTION) { @@ -733,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); @@ -752,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)); @@ -799,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) { @@ -817,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)); @@ -835,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)); @@ -863,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)); @@ -879,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)); @@ -898,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)); @@ -912,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)); @@ -950,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)); @@ -974,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: @@ -991,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"); @@ -1075,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)); @@ -1099,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); @@ -1130,8 +1036,6 @@ 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?!?"); @@ -1195,26 +1099,22 @@ 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") */ + return 1; /* strange GNU extensions: sizeof(function) == 1 */ case TYPE_REFERENCE: case TYPE_POINTER: return pointer_properties.size; @@ -1226,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"); } @@ -1238,24 +1134,19 @@ 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: /* gcc says 1 here... */ return 1; @@ -1273,17 +1164,19 @@ 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"); } -unsigned get_type_alignment_compound(type_t *type) +/** + * 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); @@ -1292,7 +1185,6 @@ unsigned get_type_alignment_compound(type_t *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: @@ -1314,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"); } @@ -1464,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); } @@ -1479,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); } @@ -1564,7 +1454,7 @@ static entity_t *pack_bitfield_members(il_size_t *struct_offset, if (!member->compound_member.bitfield) break; - type_t *base_type = member->declaration.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) @@ -1614,6 +1504,7 @@ void layout_struct_type(compound_type_t *type) return; if (type->compound->layouted) return; + compound->layouted = true; il_size_t offset = 0; il_alignment_t alignment = compound->alignment; @@ -1621,17 +1512,12 @@ void layout_struct_type(compound_type_t *type) entity_t *entry = compound->members.entities; while (entry != NULL) { - if (entry->kind != ENTITY_COMPOUND_MEMBER) { - entry = entry->base.next; - continue; - } + if (entry->kind != ENTITY_COMPOUND_MEMBER) + goto next; - type_t *m_type = entry->declaration.type; - type_t *skipped = skip_typeref(m_type); - if (! is_type_valid(skipped)) { - entry = entry->base.next; - continue; - } + type_t *const m_type = skip_typeref(entry->declaration.type); + if (!is_type_valid(m_type)) + goto next; if (entry->compound_member.bitfield) { entry = pack_bitfield_members(&offset, &alignment, @@ -1655,6 +1541,7 @@ void layout_struct_type(compound_type_t *type) entry->compound_member.offset = offset; offset += get_type_size(m_type); +next: entry = entry->base.next; } @@ -1675,7 +1562,6 @@ void layout_struct_type(compound_type_t *type) compound->size = offset; compound->alignment = alignment; - compound->layouted = true; } void layout_union_type(compound_type_t *type) @@ -1685,6 +1571,9 @@ void layout_union_type(compound_type_t *type) compound_t *compound = type->compound; if (! compound->complete) return; + if (compound->layouted) + return; + compound->layouted = true; il_size_t size = 0; il_alignment_t alignment = compound->alignment; @@ -1694,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; @@ -1721,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); @@ -1730,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); @@ -1756,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); @@ -1798,6 +1693,6 @@ void dbg_type(const type_t *type) { print_to_file(stderr); print_type(type); - print_string("\n"); + print_char('\n'); fflush(stderr); }