X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type.c;h=0c697ef1dc3d2fc1c5c443d9fbab86dc8c9d8b83;hb=10842603c042d3c62f128519d6356b3817b6a0db;hp=8b728d7c45a046b8626cdab9b893afc9c1605ec1;hpb=89bf0f3486f20eaaf7233bd473ab994d9ceb569d;p=cparser diff --git a/type.c b/type.c index 8b728d7..0c697ef 100644 --- a/type.c +++ b/type.c @@ -33,25 +33,16 @@ #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. * @@ -61,16 +52,13 @@ 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_BITFIELD] = sizeof(bitfield_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_BUILTIN] = sizeof(builtin_type_t), [TYPE_TYPEDEF] = sizeof(typedef_type_t), [TYPE_TYPEOF] = sizeof(typeof_type_t), }; @@ -82,8 +70,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; @@ -93,179 +81,173 @@ 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 = 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; - /* 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; - } - 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; + 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; } - - /* 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) { - obstack_free(type_obst, NULL); + obstack_free(&type_obst, NULL); } 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" + sep); + print_string(&" const"[sep]); sep = 0; } if (qualifiers & TYPE_QUALIFIER_VOLATILE) { - print_string(" volatile" + sep); + print_string(&" volatile"[sep]); sep = 0; } if (qualifiers & TYPE_QUALIFIER_RESTRICT) { - print_string(" restrict" + sep); + print_string(&" restrict"[sep]); sep = 0; } if (sep == 0 && q & QUAL_SEP_END) @@ -275,7 +257,6 @@ void print_type_qualifiers(type_qualifiers_t const qualifiers, QualifierSeparato const char *get_atomic_kind_name(atomic_type_kind_t kind) { switch(kind) { - case ATOMIC_TYPE_INVALID: break; case ATOMIC_TYPE_VOID: return "void"; case ATOMIC_TYPE_WCHAR_T: return "wchar_t"; case ATOMIC_TYPE_BOOL: return c_mode & _CXX ? "bool" : "_Bool"; @@ -324,7 +305,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"); @@ -336,7 +317,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 "); @@ -351,9 +332,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\" "); @@ -394,7 +372,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; @@ -417,11 +395,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); } } } @@ -436,7 +414,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); } @@ -458,7 +436,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); } @@ -471,7 +449,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); } @@ -486,7 +464,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('&'); } /** @@ -498,7 +476,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); } @@ -519,7 +497,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 "); } @@ -528,27 +506,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 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. - * - * @param declaration The enum's type declaration. - */ void print_enum_definition(const enum_t *enume) { print_string("{\n"); @@ -563,20 +524,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; - if (expression->kind == EXPR_UNARY_CAST_IMPLICIT) { - expression = expression->unary.value; - } - print_expression(expression); + print_expression(entry->enum_value.value); } print_string(",\n"); } change_indent(-1); print_indent(); - print_string("}"); + print_char('}'); } /** @@ -586,7 +541,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; @@ -598,9 +553,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"); @@ -613,12 +565,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__))"); } @@ -627,18 +579,13 @@ void print_compound_definition(const compound_t *compound) /** * Prints a compound type. * + * @param kind The name of the compound kind. * @param type The compound type. */ -static void print_compound_type(const compound_type_t *type) +static void print_compound_type(char const *const kind, compound_type_t const *const type) { print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END); - - if (type->base.kind == TYPE_COMPOUND_STRUCT) { - print_string("struct "); - } else { - assert(type->base.kind == TYPE_COMPOUND_UNION); - print_string("union "); - } + print_string(kind); compound_t *compound = type->compound; symbol_t *symbol = compound->base.symbol; @@ -673,7 +620,7 @@ static void print_typeof_type_pre(const typeof_type_t *const type) } else { print_type(type->typeof_type); } - print_string(")"); + print_char(')'); } /** @@ -684,52 +631,19 @@ static void print_typeof_type_pre(const typeof_type_t *const type) static void intern_print_type_pre(const type_t *const type) { switch(type->kind) { - case TYPE_ERROR: - print_string(""); - return; - case TYPE_INVALID: - print_string(""); - return; - case TYPE_ENUM: - print_type_enum(&type->enumt); - return; - case TYPE_ATOMIC: - print_atomic_type(&type->atomic); - return; - case TYPE_COMPLEX: - print_complex_type(&type->complex); - return; - case TYPE_IMAGINARY: - print_imaginary_type(&type->imaginary); - 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; - case TYPE_POINTER: - print_pointer_type_pre(&type->pointer); - return; - 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; - case TYPE_TYPEDEF: - print_typedef_type_pre(&type->typedeft); - return; - case TYPE_TYPEOF: - print_typeof_type_pre(&type->typeoft); - return; + case TYPE_ARRAY: print_array_type_pre( &type->array); return; + case TYPE_ATOMIC: print_atomic_type( &type->atomic); return; + case TYPE_COMPLEX: print_complex_type( &type->atomic); return; + case TYPE_COMPOUND_STRUCT: print_compound_type("struct ", &type->compound); return; + case TYPE_COMPOUND_UNION: print_compound_type("union ", &type->compound); return; + case TYPE_ENUM: print_type_enum( &type->enumt); return; + case TYPE_ERROR: print_string(""); return; + case TYPE_FUNCTION: print_function_type_pre( &type->function); return; + case TYPE_IMAGINARY: print_imaginary_type( &type->atomic); return; + case TYPE_POINTER: print_pointer_type_pre( &type->pointer); return; + case TYPE_REFERENCE: print_reference_type_pre( &type->reference); return; + case TYPE_TYPEDEF: print_typedef_type_pre( &type->typedeft); return; + case TYPE_TYPEOF: print_typeof_type_pre( &type->typeoft); return; } print_string("unknown"); } @@ -754,29 +668,19 @@ 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; } } -/** - * Prints a type. - * - * @param type The type. - */ void print_type(const type_t *const type) { print_type_ext(type, NULL, NULL); @@ -787,7 +691,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) { @@ -797,31 +701,16 @@ 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); - type_t *copy = obstack_alloc(type_obst, size); - memcpy(copy, type, size); + type_t *const copy = obstack_copy(&type_obst, type, size); copy->base.firm_type = NULL; 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)); @@ -851,7 +740,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); @@ -863,17 +752,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) { @@ -881,45 +759,24 @@ 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)); if (type->kind == TYPE_ENUM) return true; - if (type->kind == TYPE_BITFIELD) - return true; - if (type->kind != TYPE_ATOMIC) return false; 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)); @@ -930,12 +787,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)); @@ -946,12 +797,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)); @@ -959,77 +804,44 @@ 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; 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)); 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; } } -/** - * 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)); - 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); } -/** - * 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)); @@ -1048,27 +860,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"); @@ -1079,14 +883,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. */ @@ -1159,9 +955,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)); @@ -1171,66 +964,48 @@ bool types_compatible(const type_t *type1, const type_t *type2) if (type1 == type2) return true; - if (!is_type_valid(type1) || !is_type_valid(type2)) - return true; - - if (type1->base.qualifiers != type2->base.qualifiers) - return false; - if (type1->kind != type2->kind) - return false; - - switch (type1->kind) { - 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_ARRAY: - return array_types_compatible(&type1->array, &type2->array); - - case TYPE_POINTER: { - const type_t *const to1 = skip_typeref(type1->pointer.points_to); - const type_t *const to2 = skip_typeref(type2->pointer.points_to); - return types_compatible(to1, to2); - } - - case TYPE_REFERENCE: { - const type_t *const to1 = skip_typeref(type1->reference.refers_to); - const type_t *const to2 = skip_typeref(type2->reference.refers_to); - return types_compatible(to1, to2); - } + if (type1->base.qualifiers == type2->base.qualifiers && + type1->kind == type2->kind) { + switch (type1->kind) { + case TYPE_FUNCTION: + return function_types_compatible(&type1->function, &type2->function); + case TYPE_ATOMIC: + case TYPE_IMAGINARY: + case TYPE_COMPLEX: + return type1->atomic.akind == type2->atomic.akind; + case TYPE_ARRAY: + return array_types_compatible(&type1->array, &type2->array); - case TYPE_COMPOUND_STRUCT: - case TYPE_COMPOUND_UNION: { + case TYPE_POINTER: { + const type_t *const to1 = skip_typeref(type1->pointer.points_to); + const type_t *const to2 = skip_typeref(type2->pointer.points_to); + return types_compatible(to1, to2); + } + case TYPE_REFERENCE: { + const type_t *const to1 = skip_typeref(type1->reference.refers_to); + const type_t *const to2 = skip_typeref(type2->reference.refers_to); + return types_compatible(to1, to2); + } - break; - } - case TYPE_ENUM: - case TYPE_BUILTIN: - /* TODO: not implemented */ - break; + case TYPE_COMPOUND_STRUCT: + case TYPE_COMPOUND_UNION: + 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_ENUM: + /* TODO: not implemented */ + break; - 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?!?"); + case TYPE_ERROR: + /* Hmm, the error type should be compatible to all other types */ + return true; + case TYPE_TYPEDEF: + case TYPE_TYPEOF: + panic("typerefs not skipped in compatible types?!?"); + } } - /* TODO: incomplete */ - return false; + return !is_type_valid(type1) || !is_type_valid(type2); } /** @@ -1288,47 +1063,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") */ + return 1; /* strange GNU extensions: sizeof(function) == 1 */ 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"); } @@ -1336,37 +1098,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); @@ -1376,19 +1128,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: @@ -1402,22 +1162,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"); } @@ -1473,26 +1226,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). */ @@ -1502,7 +1235,7 @@ atomic_type_kind_t find_signed_int_atomic_type_kind_for_size(unsigned size) assert(size < 32); atomic_type_kind_t kind = kinds[size]; - if (kind == ATOMIC_TYPE_INVALID) { + if (kind == (atomic_type_kind_t)0) { static const atomic_type_kind_t possible_kinds[] = { ATOMIC_TYPE_SCHAR, ATOMIC_TYPE_SHORT, @@ -1530,7 +1263,7 @@ atomic_type_kind_t find_unsigned_int_atomic_type_kind_for_size(unsigned size) assert(size < 32); atomic_type_kind_t kind = kinds[size]; - if (kind == ATOMIC_TYPE_INVALID) { + if (kind == (atomic_type_kind_t)0) { static const atomic_type_kind_t possible_kinds[] = { ATOMIC_TYPE_UCHAR, ATOMIC_TYPE_USHORT, @@ -1557,7 +1290,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; } @@ -1570,10 +1303,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; @@ -1586,14 +1316,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); } @@ -1604,14 +1332,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); } @@ -1624,10 +1350,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; @@ -1642,11 +1365,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); @@ -1662,10 +1382,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; @@ -1677,10 +1394,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; @@ -1701,18 +1415,16 @@ static entity_t *pack_bitfield_members(il_size_t *struct_offset, for (member = first; member != NULL; member = member->base.next) { if (member->kind != ENTITY_COMPOUND_MEMBER) continue; - - type_t *type = member->declaration.type; - if (type->kind != TYPE_BITFIELD) + if (!member->compound_member.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; @@ -1756,6 +1468,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; @@ -1763,25 +1476,20 @@ 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 (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; @@ -1797,6 +1505,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; } @@ -1808,19 +1517,15 @@ 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; compound->alignment = alignment; - compound->layouted = true; } void layout_union_type(compound_type_t *type) @@ -1830,6 +1535,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; @@ -1839,7 +1547,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; @@ -1847,7 +1555,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; } @@ -1857,17 +1565,16 @@ 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; } 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); @@ -1876,25 +1583,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); @@ -1902,16 +1613,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); @@ -1926,15 +1639,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); @@ -1948,6 +1657,6 @@ void dbg_type(const type_t *type) { print_to_file(stderr); print_type(type); - print_string("\n"); + print_char('\n'); fflush(stderr); }