X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type.c;h=2bcc56c8c5ff920b312c43ae67bbb6aa7cc13e27;hb=9f84f8eb0cb393885efd87a52d539413f7dae2ee;hp=a3e48329f0ee0127d425e26564ed51e8503324dc;hpb=c1f09ffd706bd46c9785ccb187da54536f566e2e;p=cparser diff --git a/type.c b/type.c index a3e4832..2bcc56c 100644 --- a/type.c +++ b/type.c @@ -1,22 +1,194 @@ +/* + * This file is part of cparser. + * Copyright (C) 2007-2008 Matthias Braun + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ #include #include #include + #include "type_t.h" +#include "symbol_t.h" #include "type_hash.h" #include "adt/error.h" +#include "lang_features.h" static struct obstack _type_obst; -struct obstack *type_obst = &_type_obst; static FILE *out; -static int type_visited = 0; +struct obstack *type_obst = &_type_obst; +static int type_visited = 0; +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_LONGLONG].alignment = 4; + props[ATOMIC_TYPE_ULONGLONG].alignment = 4; + + props[ATOMIC_TYPE_BOOL] = props[ATOMIC_TYPE_UINT]; + + /* initialize complex/imaginary types */ + props[ATOMIC_TYPE_FLOAT_COMPLEX] = props[ATOMIC_TYPE_FLOAT]; + props[ATOMIC_TYPE_FLOAT_COMPLEX].flags |= ATOMIC_TYPE_FLAG_COMPLEX; + props[ATOMIC_TYPE_FLOAT_COMPLEX].size *= 2; + props[ATOMIC_TYPE_DOUBLE_COMPLEX] = props[ATOMIC_TYPE_DOUBLE]; + props[ATOMIC_TYPE_DOUBLE_COMPLEX].flags |= ATOMIC_TYPE_FLAG_COMPLEX; + props[ATOMIC_TYPE_DOUBLE_COMPLEX].size *= 2; + props[ATOMIC_TYPE_LONG_DOUBLE_COMPLEX] + = props[ATOMIC_TYPE_LONG_DOUBLE]; + props[ATOMIC_TYPE_LONG_DOUBLE_COMPLEX].flags |= ATOMIC_TYPE_FLAG_COMPLEX; + props[ATOMIC_TYPE_LONG_DOUBLE_COMPLEX].size *= 2; + + props[ATOMIC_TYPE_FLOAT_IMAGINARY] = props[ATOMIC_TYPE_FLOAT]; + props[ATOMIC_TYPE_DOUBLE_IMAGINARY] = props[ATOMIC_TYPE_DOUBLE]; + props[ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY] = props[ATOMIC_TYPE_LONG_DOUBLE]; } void exit_types(void) @@ -49,28 +221,33 @@ void print_type_qualifiers(type_qualifiers_t qualifiers) static void print_atomic_type(const atomic_type_t *type) { - print_type_qualifiers(type->type.qualifiers); - - const char *s; - switch(type->akind) { - case ATOMIC_TYPE_INVALID: s = "INVALIDATOMIC"; break; - case ATOMIC_TYPE_VOID: s = "void"; break; - case ATOMIC_TYPE_BOOL: s = "_Bool"; break; - case ATOMIC_TYPE_CHAR: s = "char"; break; - case ATOMIC_TYPE_SCHAR: s = "signed char"; break; - case ATOMIC_TYPE_UCHAR: s = "unsigned char"; break; - case ATOMIC_TYPE_INT: s = "int"; break; - case ATOMIC_TYPE_UINT: s = "unsigned int"; break; - case ATOMIC_TYPE_SHORT: s = "short"; break; - case ATOMIC_TYPE_USHORT: s = "unsigned short"; break; - case ATOMIC_TYPE_LONG: s = "long"; break; - case ATOMIC_TYPE_ULONG: s = "unsigned long"; break; - case ATOMIC_TYPE_LONGLONG: s = "long long"; break; - case ATOMIC_TYPE_ULONGLONG: s = "unsigned long long"; break; - 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; + print_type_qualifiers(type->base.qualifiers); + + const char *s = "INVALIDATOMIC"; + switch((atomic_type_kind_t) type->akind) { + 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; + case ATOMIC_TYPE_SCHAR: s = "signed char"; break; + case ATOMIC_TYPE_UCHAR: s = "unsigned char"; break; + case ATOMIC_TYPE_INT: s = "int"; break; + case ATOMIC_TYPE_UINT: s = "unsigned int"; break; + case ATOMIC_TYPE_SHORT: s = "short"; break; + case ATOMIC_TYPE_USHORT: s = "unsigned short"; break; + case ATOMIC_TYPE_LONG: s = "long"; break; + case ATOMIC_TYPE_ULONG: s = "unsigned long"; break; + case ATOMIC_TYPE_LONGLONG: s = "long long"; break; + case ATOMIC_TYPE_ULONGLONG: s = "unsigned long long"; break; + case ATOMIC_TYPE_LONG_DOUBLE: s = "long double"; break; + case ATOMIC_TYPE_FLOAT: s = "float"; break; + case ATOMIC_TYPE_DOUBLE: s = "double"; break; + case ATOMIC_TYPE_FLOAT_COMPLEX: s = "_Complex float"; break; + case ATOMIC_TYPE_DOUBLE_COMPLEX: s = "_Complex float"; break; + case ATOMIC_TYPE_LONG_DOUBLE_COMPLEX: s = "_Complex float"; break; + case ATOMIC_TYPE_FLOAT_IMAGINARY: s = "_Imaginary float"; break; + case ATOMIC_TYPE_DOUBLE_IMAGINARY: s = "_Imaginary float"; break; + case ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY: s = "_Imaginary float"; break; } fputs(s, out); } @@ -83,7 +260,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); @@ -154,7 +331,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); } /** @@ -188,9 +365,10 @@ static void print_array_type_post(const array_type_t *type) if(type->is_static) { fputs("static ", out); } - print_type_qualifiers(type->type.qualifiers); - if(type->size != NULL) { - print_expression(type->size); + print_type_qualifiers(type->base.qualifiers); + if(type->size_expression != NULL + && (print_implicit_array_size || !type->has_implicit_size)) { + print_expression(type->size_expression); } fputc(']', out); intern_print_type_post(type->element_type, false); @@ -205,7 +383,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); } /** @@ -227,7 +405,13 @@ void print_enum_definition(const declaration_t *declaration) fprintf(out, "%s", entry->symbol->string); if(entry->init.initializer != NULL) { fprintf(out, " = "); - print_expression(entry->init.enum_value); + + /* skip the implicit cast */ + expression_t *expression = entry->init.enum_value; + if(expression->kind == EXPR_UNARY_CAST_IMPLICIT) { + expression = expression->unary.value; + } + print_expression(expression); } fprintf(out, ",\n"); } @@ -244,7 +428,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; @@ -285,12 +469,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); } @@ -310,7 +494,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); } @@ -365,7 +549,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); @@ -520,6 +704,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. * @@ -536,23 +727,7 @@ bool is_type_integer(const type_t *type) 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); } /** @@ -568,22 +743,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); } /** @@ -603,42 +763,7 @@ bool is_type_signed(const type_t *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); } /** @@ -651,13 +776,12 @@ 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)) + if(type->kind == TYPE_BITFIELD || type->kind == TYPE_ENUM) return true; + if(type->kind != TYPE_ATOMIC) + return false; - return false; + return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_ARITHMETIC); } /** @@ -673,7 +797,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); @@ -706,7 +830,7 @@ bool is_type_incomplete(const type_t *type) return true; case TYPE_ARRAY: - return type->array.size == NULL; + return type->array.size_expression == NULL; case TYPE_ATOMIC: return type->atomic.akind == ATOMIC_TYPE_VOID; @@ -778,12 +902,10 @@ static bool array_types_compatible(const array_type_t *array1, if(!types_compatible(element_type1, element_type2)) return false; - if(array1->size != NULL && array2->size != NULL) { - /* TODO: check if size expression evaluate to the same value - * if they are constant */ - } + if(!array1->size_constant || !array2->size_constant) + return true; - return true; + return array1->size == array2->size; } /** @@ -853,6 +975,8 @@ bool pointers_compatible(const type_t *type1, const type_t *type2) assert(type1->kind == TYPE_POINTER); assert(type2->kind == TYPE_POINTER); + (void) type1; + (void) type2; /* TODO */ return true; } @@ -906,6 +1030,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. @@ -932,15 +1148,18 @@ type_t *make_atomic_type(atomic_type_kind_t atype, type_qualifiers_t qualifiers) type->kind = TYPE_ATOMIC; type->base.qualifiers = qualifiers; + type->base.alignment = 0; type->atomic.akind = atype; + /* TODO: set the alignment depending on the atype here */ + return identify_new_type(type); } /** * 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) @@ -950,11 +1169,28 @@ type_t *make_pointer_type(type_t *points_to, type_qualifiers_t qualifiers) type->kind = TYPE_POINTER; type->base.qualifiers = qualifiers; + type->base.alignment = 0; type->pointer.points_to = points_to; return identify_new_type(type); } +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->base.qualifiers = qualifiers; + type->base.alignment = 0; + type->array.element_type = element_type; + type->array.size = size; + type->array.size_constant = true; + + return identify_new_type(type); +} + /** * Debug helper. Prints the given type to stdout. */