X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type.c;h=ac34d3d166fa1377ade876976452aed2b0eed5d1;hb=85945a39423eb8c8f2c735372146a5eabdb6efa6;hp=97f38a8c40409ec2839dc28c6e81664eb293bda9;hpb=2a4e7fc4037503c1af6b1ef6c765905800c1c857;p=cparser diff --git a/type.c b/type.c index 97f38a8..ac34d3d 100644 --- a/type.c +++ b/type.c @@ -26,6 +26,7 @@ #include "symbol_t.h" #include "type_hash.h" #include "adt/error.h" +#include "lang_features.h" static struct obstack _type_obst; static FILE *out; @@ -36,9 +37,143 @@ static bool print_implicit_array_size = false; static void intern_print_type_pre(const type_t *type, bool top); static void intern_print_type_post(const type_t *type, bool top); +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 */ +}; + +static atomic_type_properties_t atomic_type_properties[ATOMIC_TYPE_LAST+1] = { + //ATOMIC_TYPE_INVALID = 0, + [ATOMIC_TYPE_VOID] = { + .size = 0, + .alignment = 0, + .flags = ATOMIC_TYPE_FLAG_NONE + }, + [ATOMIC_TYPE_CHAR] = { + .size = 1, + .alignment = 1, + /* signed flag will be set when known */ + .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC, + }, + [ATOMIC_TYPE_SCHAR] = { + .size = 1, + .alignment = 1, + .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC + | ATOMIC_TYPE_FLAG_SIGNED, + }, + [ATOMIC_TYPE_UCHAR] = { + .size = 1, + .alignment = 1, + .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC, + }, + [ATOMIC_TYPE_SHORT] = { + .size = 2, + .alignment = 2, + .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC + | ATOMIC_TYPE_FLAG_SIGNED + }, + [ATOMIC_TYPE_USHORT] = { + .size = 2, + .alignment = 2, + .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC, + }, + [ATOMIC_TYPE_INT] = { + .size = (unsigned) -1, + .alignment = (unsigned) -1, + .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC + | ATOMIC_TYPE_FLAG_SIGNED, + }, + [ATOMIC_TYPE_UINT] = { + .size = (unsigned) -1, + .alignment = (unsigned) -1, + .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC, + }, + [ATOMIC_TYPE_LONG] = { + .size = (unsigned) -1, + .alignment = (unsigned) -1, + .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC + | ATOMIC_TYPE_FLAG_SIGNED, + }, + [ATOMIC_TYPE_ULONG] = { + .size = (unsigned) -1, + .alignment = (unsigned) -1, + .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC, + }, + [ATOMIC_TYPE_LONGLONG] = { + .size = (unsigned) -1, + .alignment = (unsigned) -1, + .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC + | ATOMIC_TYPE_FLAG_SIGNED, + }, + [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, + .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC, + }, + [ATOMIC_TYPE_FLOAT] = { + .size = 4, + .alignment = (unsigned) -1, + .flags = ATOMIC_TYPE_FLAG_FLOAT | ATOMIC_TYPE_FLAG_ARITHMETIC + | ATOMIC_TYPE_FLAG_SIGNED, + }, + [ATOMIC_TYPE_DOUBLE] = { + .size = 8, + .alignment = (unsigned) -1, + .flags = ATOMIC_TYPE_FLAG_FLOAT | ATOMIC_TYPE_FLAG_ARITHMETIC + | ATOMIC_TYPE_FLAG_SIGNED, + }, + [ATOMIC_TYPE_LONG_DOUBLE] = { + .size = 12, + .alignment = (unsigned) -1, + .flags = ATOMIC_TYPE_FLAG_FLOAT | ATOMIC_TYPE_FLAG_ARITHMETIC + | ATOMIC_TYPE_FLAG_SIGNED, + }, + /* complex and imaginary types are set in init_types */ +}; + void init_types(void) { 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; + } + + unsigned int_size = machine_size < 32 ? 2 : 4; + unsigned long_size = machine_size < 64 ? 4 : 8; + unsigned llong_size = machine_size < 32 ? 4 : 8; + + props[ATOMIC_TYPE_INT].size = int_size; + props[ATOMIC_TYPE_INT].alignment = int_size; + props[ATOMIC_TYPE_UINT].size = int_size; + props[ATOMIC_TYPE_UINT].alignment = int_size; + props[ATOMIC_TYPE_LONG].size = long_size; + props[ATOMIC_TYPE_LONG].alignment = long_size; + props[ATOMIC_TYPE_ULONG].size = long_size; + props[ATOMIC_TYPE_ULONG].alignment = long_size; + props[ATOMIC_TYPE_LONGLONG].size = llong_size; + props[ATOMIC_TYPE_LONGLONG].alignment = llong_size; + props[ATOMIC_TYPE_ULONGLONG].size = llong_size; + props[ATOMIC_TYPE_ULONGLONG].alignment = llong_size; + + /* TODO: backend specific, need a way to query the backend for this. + * The following are good settings for x86 */ + props[ATOMIC_TYPE_FLOAT].alignment = 4; + props[ATOMIC_TYPE_DOUBLE].alignment = 4; + props[ATOMIC_TYPE_LONG_DOUBLE].alignment = 4; + props[ATOMIC_TYPE_LONGLONG].alignment = 4; + props[ATOMIC_TYPE_ULONGLONG].alignment = 4; + + props[ATOMIC_TYPE_BOOL] = props[ATOMIC_TYPE_UINT]; } void exit_types(void) @@ -64,18 +199,16 @@ void print_type_qualifiers(type_qualifiers_t qualifiers) } /** - * Prints the name of a atomic type. + * Prints the name of an atomic type kinds. * - * @param type The type. + * @param kind The type kind. */ static -void print_atomic_type(const atomic_type_t *type) +void print_atomic_kinds(atomic_type_kind_t kind) { - print_type_qualifiers(type->type.qualifiers); - - const char *s; - switch(type->akind) { - case ATOMIC_TYPE_INVALID: s = "INVALIDATOMIC"; break; + const char *s = "INVALIDATOMIC"; + switch(kind) { + case ATOMIC_TYPE_INVALID: break; case ATOMIC_TYPE_VOID: s = "void"; break; case ATOMIC_TYPE_BOOL: s = "_Bool"; break; case ATOMIC_TYPE_CHAR: s = "char"; break; @@ -92,11 +225,48 @@ void print_atomic_type(const atomic_type_t *type) case ATOMIC_TYPE_LONG_DOUBLE: s = "long double"; break; case ATOMIC_TYPE_FLOAT: s = "float"; break; case ATOMIC_TYPE_DOUBLE: s = "double"; break; - default: s = "UNKNOWNATOMIC"; break; } fputs(s, out); } +/** + * Prints the name of an atomic type. + * + * @param type The type. + */ +static +void print_atomic_type(const atomic_type_t *type) +{ + print_type_qualifiers(type->base.qualifiers); + print_atomic_kinds(type->akind); +} + +/** + * Prints the name of a complex type. + * + * @param type The type. + */ +static +void print_complex_type(const complex_type_t *type) +{ + print_type_qualifiers(type->base.qualifiers); + fputs("_Complex ", out); + print_atomic_kinds(type->akind); +} + +/** + * Prints the name of an imaginary type. + * + * @param type The type. + */ +static +void print_imaginary_type(const imaginary_type_t *type) +{ + print_type_qualifiers(type->base.qualifiers); + fputs("_Imaginary ", out); + print_atomic_kinds(type->akind); +} + /** * Print the first part (the prefix) of a type. * @@ -105,7 +275,7 @@ void print_atomic_type(const atomic_type_t *type) */ static void print_function_type_pre(const function_type_t *type, bool top) { - print_type_qualifiers(type->type.qualifiers); + print_type_qualifiers(type->base.qualifiers); intern_print_type_pre(type->return_type, false); @@ -130,12 +300,12 @@ static void print_function_type_post(const function_type_t *type, fputc('(', out); - int first = 1; + bool first = true; if(scope == NULL) { function_parameter_t *parameter = type->parameters; for( ; parameter != NULL; parameter = parameter->next) { if(first) { - first = 0; + first = false; } else { fputs(", ", out); } @@ -145,7 +315,7 @@ static void print_function_type_post(const function_type_t *type, declaration_t *parameter = scope->declarations; for( ; parameter != NULL; parameter = parameter->next) { if(first) { - first = 0; + first = false; } else { fputs(", ", out); } @@ -155,7 +325,7 @@ static void print_function_type_post(const function_type_t *type, } if(type->variadic) { if(first) { - first = 0; + first = false; } else { fputs(", ", out); } @@ -176,7 +346,7 @@ static void print_pointer_type_pre(const pointer_type_t *type) { intern_print_type_pre(type->points_to, false); fputs("*", out); - print_type_qualifiers(type->type.qualifiers); + print_type_qualifiers(type->base.qualifiers); } /** @@ -210,7 +380,7 @@ static void print_array_type_post(const array_type_t *type) if(type->is_static) { fputs("static ", out); } - print_type_qualifiers(type->type.qualifiers); + print_type_qualifiers(type->base.qualifiers); if(type->size_expression != NULL && (print_implicit_array_size || !type->has_implicit_size)) { print_expression(type->size_expression); @@ -228,7 +398,7 @@ static void print_bitfield_type_post(const bitfield_type_t *type) { fputs(" : ", out); print_expression(type->size); - intern_print_type_post(type->base, false); + intern_print_type_post(type->base_type, false); } /** @@ -273,7 +443,7 @@ void print_enum_definition(const declaration_t *declaration) */ static void print_type_enum(const enum_type_t *type) { - print_type_qualifiers(type->type.qualifiers); + print_type_qualifiers(type->base.qualifiers); fputs("enum ", out); declaration_t *declaration = type->declaration; @@ -314,12 +484,12 @@ void print_compound_definition(const declaration_t *declaration) */ static void print_compound_type(const compound_type_t *type) { - print_type_qualifiers(type->type.qualifiers); + print_type_qualifiers(type->base.qualifiers); - if(type->type.kind == TYPE_COMPOUND_STRUCT) { + if(type->base.kind == TYPE_COMPOUND_STRUCT) { fputs("struct ", out); } else { - assert(type->type.kind == TYPE_COMPOUND_UNION); + assert(type->base.kind == TYPE_COMPOUND_UNION); fputs("union ", out); } @@ -339,7 +509,7 @@ static void print_compound_type(const compound_type_t *type) */ static void print_typedef_type_pre(const typedef_type_t *const type) { - print_type_qualifiers(type->type.qualifiers); + print_type_qualifiers(type->base.qualifiers); fputs(type->declaration->symbol->string, out); } @@ -380,6 +550,12 @@ static void intern_print_type_pre(const type_t *const type, const bool top) 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); @@ -394,7 +570,7 @@ static void intern_print_type_pre(const type_t *const type, const bool top) print_pointer_type_pre(&type->pointer); return; case TYPE_BITFIELD: - intern_print_type_pre(type->bitfield.base, top); + intern_print_type_pre(type->bitfield.base_type, top); return; case TYPE_ARRAY: print_array_type_pre(&type->array); @@ -433,6 +609,8 @@ static void intern_print_type_post(const type_t *const type, const bool top) 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: @@ -482,6 +660,8 @@ static size_t get_type_size(const type_t *type) { switch(type->kind) { case TYPE_ATOMIC: return sizeof(atomic_type_t); + case TYPE_COMPLEX: return sizeof(complex_type_t); + case TYPE_IMAGINARY: return sizeof(imaginary_type_t); case TYPE_COMPOUND_STRUCT: case TYPE_COMPOUND_UNION: return sizeof(compound_type_t); case TYPE_ENUM: return sizeof(enum_type_t); @@ -549,6 +729,13 @@ 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) +{ + assert(kind <= ATOMIC_TYPE_LAST); + return (atomic_type_properties[kind].flags & flag) != 0; +} + /** * Returns true if the given type is an integer type. * @@ -561,27 +748,13 @@ bool is_type_integer(const type_t *type) if(type->kind == TYPE_ENUM) return true; + if(type->kind == TYPE_BITFIELD) + return true; if(type->kind != TYPE_ATOMIC) return false; - switch(type->atomic.akind) { - case ATOMIC_TYPE_BOOL: - case ATOMIC_TYPE_CHAR: - case ATOMIC_TYPE_SCHAR: - case ATOMIC_TYPE_UCHAR: - case ATOMIC_TYPE_SHORT: - case ATOMIC_TYPE_USHORT: - case ATOMIC_TYPE_INT: - case ATOMIC_TYPE_UINT: - case ATOMIC_TYPE_LONG: - case ATOMIC_TYPE_ULONG: - case ATOMIC_TYPE_LONGLONG: - case ATOMIC_TYPE_ULONGLONG: - return true; - default: - return false; - } + return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_INTEGER); } /** @@ -597,22 +770,7 @@ bool is_type_float(const type_t *type) if(type->kind != TYPE_ATOMIC) return false; - switch(type->atomic.akind) { - case ATOMIC_TYPE_FLOAT: - case ATOMIC_TYPE_DOUBLE: - case ATOMIC_TYPE_LONG_DOUBLE: -#ifdef PROVIDE_COMPLEX - case ATOMIC_TYPE_FLOAT_COMPLEX: - case ATOMIC_TYPE_DOUBLE_COMPLEX: - case ATOMIC_TYPE_LONG_DOUBLE_COMPLEX: - case ATOMIC_TYPE_FLOAT_IMAGINARY: - case ATOMIC_TYPE_DOUBLE_IMAGINARY: - case ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY: -#endif - return true; - default: - return false; - } + return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_FLOAT); } /** @@ -628,46 +786,13 @@ 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; - switch(type->atomic.akind) { - case ATOMIC_TYPE_CHAR: - case ATOMIC_TYPE_SCHAR: - case ATOMIC_TYPE_SHORT: - case ATOMIC_TYPE_INT: - case ATOMIC_TYPE_LONG: - case ATOMIC_TYPE_LONGLONG: - case ATOMIC_TYPE_FLOAT: - case ATOMIC_TYPE_DOUBLE: - case ATOMIC_TYPE_LONG_DOUBLE: -#ifdef PROVIDE_COMPLEX - case ATOMIC_TYPE_FLOAT_COMPLEX: - case ATOMIC_TYPE_DOUBLE_COMPLEX: - case ATOMIC_TYPE_LONG_DOUBLE_COMPLEX: - case ATOMIC_TYPE_FLOAT_IMAGINARY: - case ATOMIC_TYPE_DOUBLE_IMAGINARY: - case ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY: -#endif - return true; - - case ATOMIC_TYPE_BOOL: - case ATOMIC_TYPE_UCHAR: - case ATOMIC_TYPE_USHORT: - case ATOMIC_TYPE_UINT: - case ATOMIC_TYPE_ULONG: - case ATOMIC_TYPE_ULONGLONG: - return false; - - case ATOMIC_TYPE_VOID: - case ATOMIC_TYPE_INVALID: - case ATOMIC_TYPE_LAST: - return false; - } - - panic("invalid atomic type found"); - return false; + return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_SIGNED); } /** @@ -680,13 +805,19 @@ bool is_type_arithmetic(const type_t *type) { assert(!is_typeref(type)); - if(type->kind == TYPE_BITFIELD) - return true; - - if(is_type_integer(type) || is_type_float(type)) + switch(type->kind) { + case TYPE_BITFIELD: + case TYPE_ENUM: return true; - - return false; + 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); + default: + return false; + } } /** @@ -702,7 +833,7 @@ bool is_type_scalar(const type_t *type) switch (type->kind) { case TYPE_POINTER: return true; case TYPE_BUILTIN: return is_type_scalar(type->builtin.real_type); - default: break; + default: break; } return is_type_arithmetic(type); @@ -723,23 +854,29 @@ bool is_type_incomplete(const type_t *type) case TYPE_COMPOUND_UNION: { const compound_type_t *compound_type = &type->compound; declaration_t *declaration = compound_type->declaration; - return !declaration->init.is_defined; + return !declaration->init.complete; } case TYPE_ENUM: { const enum_type_t *enum_type = &type->enumt; declaration_t *declaration = enum_type->declaration; - return !declaration->init.is_defined; + return !declaration->init.complete; } - case TYPE_BITFIELD: - case TYPE_FUNCTION: - return true; case TYPE_ARRAY: - return type->array.size_expression == NULL; + return type->array.size_expression == NULL + && !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_BITFIELD: + case TYPE_FUNCTION: case TYPE_POINTER: case TYPE_BUILTIN: case TYPE_ERROR: @@ -767,10 +904,10 @@ static bool function_types_compatible(const function_type_t *func1, return false; /* can parameters be compared? */ - if(func1->unspecified_parameters || func2->unspecified_parameters) + if (func1->unspecified_parameters || func2->unspecified_parameters) return true; - if(func1->variadic != func2->variadic) + if (func1->variadic != func2->variadic) return false; /* TODO: handling of unspecified parameters not correct yet */ @@ -778,7 +915,7 @@ static bool function_types_compatible(const function_type_t *func1, /* all argument types must be compatible */ function_parameter_t *parameter1 = func1->parameters; function_parameter_t *parameter2 = func2->parameters; - for( ; parameter1 != NULL && parameter2 != NULL; + for ( ; parameter1 != NULL && parameter2 != NULL; parameter1 = parameter1->next, parameter2 = parameter2->next) { type_t *parameter1_type = skip_typeref(parameter1->type); type_t *parameter2_type = skip_typeref(parameter2->type); @@ -786,11 +923,11 @@ static bool function_types_compatible(const function_type_t *func1, parameter1_type = get_unqualified_type(parameter1_type); parameter2_type = get_unqualified_type(parameter2_type); - if(!types_compatible(parameter1_type, parameter2_type)) + if (!types_compatible(parameter1_type, parameter2_type)) return false; } /* same number of arguments? */ - if(parameter1 != NULL || parameter2 != NULL) + if (parameter1 != NULL || parameter2 != NULL) return false; return true; @@ -835,6 +972,10 @@ bool types_compatible(const type_t *type1, const type_t *type2) 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); @@ -935,6 +1076,98 @@ type_t *skip_typeref(type_t *type) return type; } +unsigned get_atomic_type_size(atomic_type_kind_t kind) +{ + assert(kind <= ATOMIC_TYPE_LAST); + return atomic_type_properties[kind].size; +} + +unsigned get_atomic_type_alignment(atomic_type_kind_t kind) +{ + assert(kind <= ATOMIC_TYPE_LAST); + return atomic_type_properties[kind].alignment; +} + +unsigned get_atomic_type_flags(atomic_type_kind_t kind) +{ + assert(kind <= ATOMIC_TYPE_LAST); + 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). + */ +atomic_type_kind_t find_signed_int_atomic_type_kind_for_size(unsigned size) { + static atomic_type_kind_t kinds[32]; + + assert(size < 32); + atomic_type_kind_t kind = kinds[size]; + if(kind == ATOMIC_TYPE_INVALID) { + static const atomic_type_kind_t possible_kinds[] = { + ATOMIC_TYPE_SCHAR, + ATOMIC_TYPE_SHORT, + ATOMIC_TYPE_INT, + ATOMIC_TYPE_LONG, + ATOMIC_TYPE_LONGLONG + }; + for(unsigned i = 0; i < sizeof(possible_kinds)/sizeof(possible_kinds[0]); ++i) { + if(get_atomic_type_size(possible_kinds[i]) == size) { + kind = possible_kinds[i]; + break; + } + } + kinds[size] = kind; + } + return kind; +} + +/** + * Find the atomic type kind representing a given size (signed). + */ +atomic_type_kind_t find_unsigned_int_atomic_type_kind_for_size(unsigned size) { + static atomic_type_kind_t kinds[32]; + + assert(size < 32); + atomic_type_kind_t kind = kinds[size]; + if(kind == ATOMIC_TYPE_INVALID) { + static const atomic_type_kind_t possible_kinds[] = { + ATOMIC_TYPE_UCHAR, + ATOMIC_TYPE_USHORT, + ATOMIC_TYPE_UINT, + ATOMIC_TYPE_ULONG, + ATOMIC_TYPE_ULONGLONG + }; + for(unsigned i = 0; i < sizeof(possible_kinds)/sizeof(possible_kinds[0]); ++i) { + if(get_atomic_type_size(possible_kinds[i]) == size) { + kind = possible_kinds[i]; + break; + } + } + kinds[size] = kind; + } + return kind; +} + /** * Hash the given type and return the "singleton" version * of it. @@ -954,17 +1187,53 @@ static type_t *identify_new_type(type_t *type) * @param akind The kind of the atomic type. * @param qualifiers Type qualifiers for the new type. */ -type_t *make_atomic_type(atomic_type_kind_t atype, type_qualifiers_t qualifiers) +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->base.qualifiers = qualifiers; - type->base.alignment = 0; - type->atomic.akind = atype; + type->base.alignment = get_atomic_type_alignment(akind); + type->atomic.akind = akind; + + return identify_new_type(type); +} + +/** + * Creates a new complex type. + * + * @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 *type = obstack_alloc(type_obst, sizeof(complex_type_t)); + memset(type, 0, sizeof(complex_type_t)); + + type->kind = TYPE_COMPLEX; + type->base.qualifiers = qualifiers; + type->base.alignment = get_atomic_type_alignment(akind); + type->complex.akind = akind; + + return identify_new_type(type); +} - /* TODO: set the aligmnent depending on the atype here */ +/** + * Creates a new imaginary type. + * + * @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 *type = obstack_alloc(type_obst, sizeof(imaginary_type_t)); + memset(type, 0, sizeof(imaginary_type_t)); + + type->kind = TYPE_IMAGINARY; + type->base.qualifiers = qualifiers; + type->base.alignment = get_atomic_type_alignment(akind); + type->imaginary.akind = akind; return identify_new_type(type); } @@ -972,7 +1241,7 @@ type_t *make_atomic_type(atomic_type_kind_t atype, type_qualifiers_t qualifiers) /** * Creates a new pointer type. * - * @param points_to The points-to type for teh new type. + * @param points_to The points-to type for the new type. * @param qualifiers Type qualifiers for the new type. */ type_t *make_pointer_type(type_t *points_to, type_qualifiers_t qualifiers)