X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type_hash.c;h=49fd88edce1cce166f9201ee6290c9ed30b6d8bb;hb=9e9141455d9e7a9028d7ffa1d5656b1e9bb25c74;hp=03b9f02dfd734057b4ada950ef1abd7b64be91f1;hpb=fd16b92f058181088a385c3224c8814831c006d3;p=cparser

diff --git a/type_hash.c b/type_hash.c
index 03b9f02..49fd88e 100644
--- a/type_hash.c
+++ b/type_hash.c
@@ -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 */
 
@@ -53,6 +56,22 @@ static unsigned hash_atomic_type(const atomic_type_t *type)
 	return result;
 }
 
+static unsigned hash_complex_type(const complex_type_t *type)
+{
+	unsigned some_prime = 27644437;
+	unsigned result     = type->akind * some_prime;
+
+	return result;
+}
+
+static unsigned hash_imaginary_type(const imaginary_type_t *type)
+{
+	unsigned some_prime = 27644437;
+	unsigned result     = type->akind * some_prime;
+
+	return result;
+}
+
 static unsigned hash_pointer_type(const pointer_type_t *type)
 {
 	return hash_ptr(type->points_to);
@@ -75,10 +94,11 @@ 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->calling_convention;
 
 	return result;
 }
@@ -98,7 +118,7 @@ static unsigned hash_typeof_type(const typeof_type_t *type)
 
 static unsigned hash_bitfield_type(const bitfield_type_t *type)
 {
-	unsigned result  = hash_ptr(type->base);
+	unsigned result  = hash_ptr(type->base_type);
 	result          ^= 27172145;
 
 	return result;
@@ -108,7 +128,7 @@ 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;
@@ -117,6 +137,12 @@ static unsigned hash_type(const type_t *type)
 	case TYPE_ATOMIC:
 		hash = hash_atomic_type(&type->atomic);
 		break;
+	case TYPE_COMPLEX:
+		hash = hash_complex_type(&type->complex);
+		break;
+	case TYPE_IMAGINARY:
+		hash = hash_imaginary_type(&type->imaginary);
+		break;
 	case TYPE_ENUM:
 		hash = hash_enum_type(&type->enumt);
 		break;
@@ -154,7 +180,19 @@ static unsigned hash_type(const type_t *type)
 }
 
 static bool atomic_types_equal(const atomic_type_t *type1,
-                               const atomic_type_t *type2)
+							   const atomic_type_t *type2)
+{
+	return type1->akind == type2->akind;
+}
+
+static bool complex_types_equal(const complex_type_t *type1,
+							    const complex_type_t *type2)
+{
+	return type1->akind == type2->akind;
+}
+
+static bool imaginary_types_equal(const imaginary_type_t *type1,
+							      const imaginary_type_t *type2)
 {
 	return type1->akind == type2->akind;
 }
@@ -162,24 +200,26 @@ static bool atomic_types_equal(const atomic_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)
 		return false;
-	if(type1->variadic != type2->variadic)
+	if (type1->unspecified_parameters != type2->unspecified_parameters)
 		return false;
-	if(type1->unspecified_parameters != type2->unspecified_parameters)
+	if (type1->kr_style_parameters != type2->kr_style_parameters)
 		return false;
-	if(type1->kr_style_parameters != type2->kr_style_parameters)
+	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;
@@ -194,18 +234,18 @@ static bool pointer_types_equal(const pointer_type_t *type1,
 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... */
@@ -240,9 +280,9 @@ static bool typedef_types_equal(const typedef_type_t *type1,
 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;
@@ -251,7 +291,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 != type2->base)
+	if (type1->base_type != type2->base_type)
 		return false;
 	/* TODO: compare size expression */
 	return false;
@@ -259,14 +299,16 @@ 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)
 		return false;
-	if(type1->base.qualifiers != type2->base.qualifiers)
+	if (type1->base.modifiers != type2->base.modifiers)
 		return false;
 
-	switch(type1->kind) {
+	switch (type1->kind) {
 	case TYPE_ERROR:
 		/* Hmm, the error type is never equal */
 		return false;
@@ -274,6 +316,10 @@ static bool types_equal(const type_t *type1, const type_t *type2)
 		return false;
 	case TYPE_ATOMIC:
 		return atomic_types_equal(&type1->atomic, &type2->atomic);
+	case TYPE_COMPLEX:
+		return complex_types_equal(&type1->complex, &type2->complex);
+	case TYPE_IMAGINARY:
+		return imaginary_types_equal(&type1->imaginary, &type2->imaginary);
 	case TYPE_ENUM:
 		return enum_types_equal(&type1->enumt, &type2->enumt);
 	case TYPE_COMPOUND_STRUCT:
@@ -317,6 +363,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"