X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type_hash.c;h=03b9f02dfd734057b4ada950ef1abd7b64be91f1;hb=1fdfa1a53410af025a61d6f9c043e026b8bb1fd6;hp=fa935400cc933971772ec505cd1f1f5018aa692d;hpb=1c030e37ec4ee92e8ec7786dac4d41124099efbc;p=cparser diff --git a/type_hash.c b/type_hash.c index fa93540..03b9f02 100644 --- a/type_hash.c +++ b/type_hash.c @@ -1,3 +1,22 @@ +/* + * 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 @@ -29,7 +48,7 @@ static unsigned hash_ptr(const void *ptr) static unsigned hash_atomic_type(const atomic_type_t *type) { unsigned some_prime = 27644437; - unsigned result = type->atype * some_prime; + unsigned result = type->akind * some_prime; return result; } @@ -51,11 +70,11 @@ static unsigned hash_compound_type(const compound_type_t *type) static unsigned hash_type(const type_t *type); -static unsigned hash_method_type(const method_type_t *type) +static unsigned hash_function_type(const function_type_t *type) { - unsigned result = hash_ptr(type->result_type); + unsigned result = hash_ptr(type->return_type); - method_parameter_t *parameter = type->parameters; + function_parameter_t *parameter = type->parameters; while(parameter != NULL) { result ^= hash_ptr(parameter->type); parameter = parameter->next; @@ -77,46 +96,59 @@ static unsigned hash_typeof_type(const typeof_type_t *type) return result; } +static unsigned hash_bitfield_type(const bitfield_type_t *type) +{ + unsigned result = hash_ptr(type->base); + result ^= 27172145; + + return result; +} + static unsigned hash_type(const type_t *type) { unsigned hash = 0; - switch(type->type) { + switch(type->kind) { case TYPE_INVALID: panic("internalizing void or invalid types not possible"); return 0; + case TYPE_ERROR: + return 0; case TYPE_ATOMIC: - hash = hash_atomic_type((const atomic_type_t*) type); + hash = hash_atomic_type(&type->atomic); break; case TYPE_ENUM: - hash = hash_enum_type((const enum_type_t*) type); + hash = hash_enum_type(&type->enumt); break; case TYPE_COMPOUND_STRUCT: case TYPE_COMPOUND_UNION: - hash = hash_compound_type((const compound_type_t*) type); + hash = hash_compound_type(&type->compound); break; - case TYPE_METHOD: - hash = hash_method_type((const method_type_t*) type); + case TYPE_FUNCTION: + hash = hash_function_type(&type->function); break; case TYPE_POINTER: - hash = hash_pointer_type((const pointer_type_t*) type); + hash = hash_pointer_type(&type->pointer); break; case TYPE_ARRAY: - hash = hash_array_type((const array_type_t*) type); + hash = hash_array_type(&type->array); break; case TYPE_BUILTIN: - hash = hash_ptr(((const builtin_type_t*) type)->symbol); + hash = hash_ptr(type->builtin.symbol); break; case TYPE_TYPEDEF: - hash = hash_ptr(((const compound_type_t*) type)->declaration); + hash = hash_ptr(type->typedeft.declaration); break; case TYPE_TYPEOF: - hash = hash_typeof_type((const typeof_type_t*) type); + hash = hash_typeof_type(&type->typeoft); + break; + case TYPE_BITFIELD: + hash = hash_bitfield_type(&type->bitfield); break; } unsigned some_prime = 99991; - hash ^= some_prime * type->qualifiers; + hash ^= some_prime * type->base.qualifiers; return hash; } @@ -124,21 +156,23 @@ static unsigned hash_type(const type_t *type) static bool atomic_types_equal(const atomic_type_t *type1, const atomic_type_t *type2) { - return type1->atype == type2->atype; + return type1->akind == type2->akind; } -static bool method_types_equal(const method_type_t *type1, - const method_type_t *type2) +static bool function_types_equal(const function_type_t *type1, + const function_type_t *type2) { - if(type1->result_type != type2->result_type) + if(type1->return_type != type2->return_type) return false; if(type1->variadic != type2->variadic) return false; if(type1->unspecified_parameters != type2->unspecified_parameters) return false; + if(type1->kr_style_parameters != type2->kr_style_parameters) + return false; - method_parameter_t *param1 = type1->parameters; - method_parameter_t *param2 = type2->parameters; + function_parameter_t *param1 = type1->parameters; + function_parameter_t *param2 = type2->parameters; while(param1 != NULL && param2 != NULL) { if(param1->type != param2->type) return false; @@ -166,11 +200,17 @@ static bool array_types_equal(const array_type_t *type1, return false; if(type1->is_static != type2->is_static) return false; - /* TODO: compare expressions for equality... */ - if(type1->size != type2->size) + if(type1->size_constant != type2->size_constant) return false; - return true; + /* never identify vla types, because we need them for caching calculated + * sizes later in ast2firm */ + if(type1->is_vla || type2->is_vla) + return false; + + /* TODO: compare size expressions for equality... */ + + return false; } static bool builtin_types_equal(const builtin_type_t *type1, @@ -208,46 +248,51 @@ static bool typeof_types_equal(const typeof_type_t *type1, return true; } +static bool bitfield_types_equal(const bitfield_type_t *type1, + const bitfield_type_t *type2) +{ + if(type1->base != type2->base) + return false; + /* TODO: compare size expression */ + return false; +} + static bool types_equal(const type_t *type1, const type_t *type2) { if(type1 == type2) return true; - if(type1->type != type2->type) + if(type1->kind != type2->kind) return false; - if(type1->qualifiers != type2->qualifiers) + if(type1->base.qualifiers != type2->base.qualifiers) return false; - switch(type1->type) { + switch(type1->kind) { + case TYPE_ERROR: + /* Hmm, the error type is never equal */ + return false; case TYPE_INVALID: return false; case TYPE_ATOMIC: - return atomic_types_equal((const atomic_type_t*) type1, - (const atomic_type_t*) type2); + return atomic_types_equal(&type1->atomic, &type2->atomic); case TYPE_ENUM: - return enum_types_equal((const enum_type_t*) type1, - (const enum_type_t*) type2); + return enum_types_equal(&type1->enumt, &type2->enumt); case TYPE_COMPOUND_STRUCT: case TYPE_COMPOUND_UNION: - return compound_types_equal((const compound_type_t*) type1, - (const compound_type_t*) type2); - case TYPE_METHOD: - return method_types_equal((const method_type_t*) type1, - (const method_type_t*) type2); + return compound_types_equal(&type1->compound, &type2->compound); + case TYPE_FUNCTION: + return function_types_equal(&type1->function, &type2->function); case TYPE_POINTER: - return pointer_types_equal((const pointer_type_t*) type1, - (const pointer_type_t*) type2); + return pointer_types_equal(&type1->pointer, &type2->pointer); case TYPE_ARRAY: - return array_types_equal((const array_type_t*) type1, - (const array_type_t*) type2); + return array_types_equal(&type1->array, &type2->array); case TYPE_BUILTIN: - return builtin_types_equal((const builtin_type_t*) type1, - (const builtin_type_t*) type2); + return builtin_types_equal(&type1->builtin, &type2->builtin); case TYPE_TYPEOF: - return typeof_types_equal((const typeof_type_t*) type1, - (const typeof_type_t*) type2); + return typeof_types_equal(&type1->typeoft, &type2->typeoft); case TYPE_TYPEDEF: - return typedef_types_equal((const typedef_type_t*) type1, - (const typedef_type_t*) type2); + return typedef_types_equal(&type1->typedeft, &type2->typedeft); + case TYPE_BITFIELD: + return bitfield_types_equal(&type1->bitfield, &type2->bitfield); } abort();