X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type_hash.c;h=369c76a158df310060c9e2fe7bffe99f68118362;hb=2318f89b43538d07bf531d950e97de33962b574d;hp=175bab480557f85b49d1d30574b24e76c6d37041;hpb=f4ba96ac16e62370ded3eb1ee80f4ee39cdddbaa;p=cparser diff --git a/type_hash.c b/type_hash.c index 175bab4..369c76a 100644 --- a/type_hash.c +++ b/type_hash.c @@ -1,6 +1,6 @@ /* * This file is part of cparser. - * Copyright (C) 2007-2008 Matthias Braun + * Copyright (C) 2007-2009 Matthias Braun * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -36,6 +36,9 @@ #undef HashSetIterator #undef HashSet +typedef struct type_hash_iterator_t type_hash_iterator_t; +typedef struct type_hash_t type_hash_t; + /* TODO: ^= is a bad way of combining hashes since most addresses are very * similar */ @@ -71,7 +74,12 @@ static unsigned hash_imaginary_type(const imaginary_type_t *type) static unsigned hash_pointer_type(const pointer_type_t *type) { - return hash_ptr(type->points_to); + return hash_ptr(type->points_to) ^ hash_ptr(type->base_variable); +} + +static unsigned hash_reference_type(const reference_type_t *type) +{ + return hash_ptr(type->refers_to); } static unsigned hash_array_type(const array_type_t *type) @@ -81,27 +89,28 @@ static unsigned hash_array_type(const array_type_t *type) static unsigned hash_compound_type(const compound_type_t *type) { - return hash_ptr(type->declaration); + return hash_ptr(type->compound); } -static unsigned hash_type(const type_t *type); - static unsigned hash_function_type(const function_type_t *type) { unsigned result = hash_ptr(type->return_type); function_parameter_t *parameter = type->parameters; - while(parameter != NULL) { + while (parameter != NULL) { result ^= hash_ptr(parameter->type); parameter = parameter->next; } + result += type->modifiers; + result += type->linkage; + result += type->calling_convention; return result; } static unsigned hash_enum_type(const enum_type_t *type) { - return hash_ptr(type->declaration); + return hash_ptr(type->enume); } static unsigned hash_typeof_type(const typeof_type_t *type) @@ -124,10 +133,9 @@ static unsigned hash_type(const type_t *type) { unsigned hash = 0; - switch(type->kind) { + switch (type->kind) { case TYPE_INVALID: panic("internalizing void or invalid types not possible"); - return 0; case TYPE_ERROR: return 0; case TYPE_ATOMIC: @@ -152,6 +160,9 @@ static unsigned hash_type(const type_t *type) case TYPE_POINTER: hash = hash_pointer_type(&type->pointer); break; + case TYPE_REFERENCE: + hash = hash_reference_type(&type->reference); + break; case TYPE_ARRAY: hash = hash_array_type(&type->array); break; @@ -159,7 +170,7 @@ static unsigned hash_type(const type_t *type) hash = hash_ptr(type->builtin.symbol); break; case TYPE_TYPEDEF: - hash = hash_ptr(type->typedeft.declaration); + hash = hash_ptr(type->typedeft.typedefe); break; case TYPE_TYPEOF: hash = hash_typeof_type(&type->typeoft); @@ -196,24 +207,30 @@ static bool imaginary_types_equal(const imaginary_type_t *type1, static bool function_types_equal(const function_type_t *type1, const function_type_t *type2) { - if(type1->return_type != type2->return_type) + if (type1->return_type != type2->return_type) return false; - if(type1->variadic != type2->variadic) + if (type1->variadic != type2->variadic) return false; - if(type1->unspecified_parameters != type2->unspecified_parameters) + if (type1->unspecified_parameters != type2->unspecified_parameters) return false; - if(type1->kr_style_parameters != type2->kr_style_parameters) + if (type1->kr_style_parameters != type2->kr_style_parameters) + return false; + if (type1->linkage != type2->linkage) + return false; + if (type1->modifiers != type2->modifiers) + return false; + if (type1->calling_convention != type2->calling_convention) return false; function_parameter_t *param1 = type1->parameters; function_parameter_t *param2 = type2->parameters; - while(param1 != NULL && param2 != NULL) { - if(param1->type != param2->type) + while (param1 != NULL && param2 != NULL) { + if (param1->type != param2->type) return false; param1 = param1->next; param2 = param2->next; } - if(param1 != NULL || param2 != NULL) + if (param1 != NULL || param2 != NULL) return false; return true; @@ -222,24 +239,31 @@ static bool function_types_equal(const function_type_t *type1, static bool pointer_types_equal(const pointer_type_t *type1, const pointer_type_t *type2) { - return type1->points_to == type2->points_to; + return type1->points_to == type2->points_to && + type1->base_variable == type2->base_variable; +} + +static bool reference_types_equal(const reference_type_t *type1, + const reference_type_t *type2) +{ + return type1->refers_to == type2->refers_to; } static bool array_types_equal(const array_type_t *type1, const array_type_t *type2) { - if(type1->element_type != type2->element_type) + if (type1->element_type != type2->element_type) return false; - if(type1->is_variable != type2->is_variable) + if (type1->is_variable != type2->is_variable) return false; - if(type1->is_static != type2->is_static) + if (type1->is_static != type2->is_static) return false; - if(type1->size_constant != type2->size_constant) + if (type1->size_constant != type2->size_constant) return false; /* never identify vla types, because we need them for caching calculated * sizes later in ast2firm */ - if(type1->is_vla || type2->is_vla) + if (type1->is_vla || type2->is_vla) return false; /* TODO: compare size expressions for equality... */ @@ -256,27 +280,27 @@ static bool builtin_types_equal(const builtin_type_t *type1, static bool compound_types_equal(const compound_type_t *type1, const compound_type_t *type2) { - return type1->declaration == type2->declaration; + return type1->compound == type2->compound; } static bool enum_types_equal(const enum_type_t *type1, const enum_type_t *type2) { - return type1->declaration == type2->declaration; + return type1->enume == type2->enume; } static bool typedef_types_equal(const typedef_type_t *type1, const typedef_type_t *type2) { - return type1->declaration == type2->declaration; + return type1->typedefe == type2->typedefe; } static bool typeof_types_equal(const typeof_type_t *type1, const typeof_type_t *type2) { - if(type1->expression != type2->expression) + if (type1->expression != type2->expression) return false; - if(type1->typeof_type != type2->typeof_type) + if (type1->typeof_type != type2->typeof_type) return false; return true; @@ -285,7 +309,7 @@ static bool typeof_types_equal(const typeof_type_t *type1, static bool bitfield_types_equal(const bitfield_type_t *type1, const bitfield_type_t *type2) { - if(type1->base_type != type2->base_type) + if (type1->base_type != type2->base_type) return false; /* TODO: compare size expression */ return false; @@ -293,14 +317,14 @@ static bool bitfield_types_equal(const bitfield_type_t *type1, static bool types_equal(const type_t *type1, const type_t *type2) { - if(type1 == type2) + if (type1 == type2) return true; - if(type1->kind != type2->kind) + if (type1->kind != type2->kind) return false; - if(type1->base.qualifiers != type2->base.qualifiers) + if (type1->base.qualifiers != type2->base.qualifiers) return false; - switch(type1->kind) { + switch (type1->kind) { case TYPE_ERROR: /* Hmm, the error type is never equal */ return false; @@ -321,6 +345,8 @@ static bool types_equal(const type_t *type1, const type_t *type2) return function_types_equal(&type1->function, &type2->function); case TYPE_POINTER: return pointer_types_equal(&type1->pointer, &type2->pointer); + case TYPE_REFERENCE: + return reference_types_equal(&type1->reference, &type2->reference); case TYPE_ARRAY: return array_types_equal(&type1->array, &type2->array); case TYPE_BUILTIN: @@ -355,6 +381,7 @@ static bool types_equal(const type_t *type1, const type_t *type2) #define hashset_iterator_init typehash_iterator_init #define hashset_iterator_next typehash_iterator_next #define hashset_remove_iterator typehash_remove_iterator +#define SCALAR_RETURN #include "adt/hashset.c"