X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type.c;h=d4ad8b94afe52a7307af6b5d46632a6fba205d3f;hb=b3918a0deed6cf925866b6c076fade593e3db55d;hp=6c8e25ef57baae329b3d105bb41dab2ede986a11;hpb=8e32d3ef5acf95570f32c8f7a6c64e897170bdf6;p=cparser

diff --git a/type.c b/type.c
index 6c8e25e..d4ad8b9 100644
--- a/type.c
+++ b/type.c
@@ -10,10 +10,9 @@ static struct obstack   _type_obst;
 struct obstack         *type_obst = &_type_obst;
 static FILE            *out;
 static int              type_visited = 0;
-static bool             print_compound_entries;
 
-static void intern_print_type_pre(type_t *type);
-static void intern_print_type_post(type_t *type);
+static void intern_print_type_pre(const type_t *type, bool top);
+static void intern_print_type_post(const type_t *type, bool top);
 
 void init_types(void)
 {
@@ -30,11 +29,6 @@ void type_set_output(FILE *stream)
 	out = stream;
 }
 
-void set_print_compound_entries(bool enabled)
-{
-	print_compound_entries = enabled;
-}
-
 void inc_type_visited(void)
 {
 	type_visited++;
@@ -53,7 +47,7 @@ void print_atomic_type(const atomic_type_t *type)
 	print_type_qualifiers(type->type.qualifiers);
 
 	const char *s;
-	switch(type->atype) {
+	switch(type->akind) {
 	case ATOMIC_TYPE_INVALID:     s = "INVALIDATOMIC";      break;
 	case ATOMIC_TYPE_VOID:        s = "void";               break;
 	case ATOMIC_TYPE_BOOL:        s = "_Bool";              break;
@@ -76,22 +70,24 @@ void print_atomic_type(const atomic_type_t *type)
 	fputs(s, out);
 }
 
-static void print_function_type_pre(const function_type_t *type)
+static void print_function_type_pre(const function_type_t *type, bool top)
 {
 	print_type_qualifiers(type->type.qualifiers);
 
-	intern_print_type_pre(type->result_type);
+	intern_print_type_pre(type->return_type, false);
 
-	/* TODO: don't emit braces if we're the toplevel type... */
-	fputc('(', out);
+	/* don't emit braces if we're the toplevel type... */
+	if(!top)
+		fputc('(', out);
 }
 
 static void print_function_type_post(const function_type_t *type,
-                                     const context_t *context)
+                                     const context_t *context, bool top)
 {
-	/* TODO: don't emit braces if we're the toplevel type... */
-	intern_print_type_post(type->result_type);
-	fputc(')', out);
+	intern_print_type_post(type->return_type, false);
+	/* don't emit braces if we're the toplevel type... */
+	if(!top)
+		fputc(')', out);
 
 	fputc('(', out);
 
@@ -134,19 +130,19 @@ static void print_function_type_post(const function_type_t *type,
 
 static void print_pointer_type_pre(const pointer_type_t *type)
 {
-	intern_print_type_pre(type->points_to);
+	intern_print_type_pre(type->points_to, false);
 	fputs("*", out);
 	print_type_qualifiers(type->type.qualifiers);
 }
 
 static void print_pointer_type_post(const pointer_type_t *type)
 {
-	intern_print_type_post(type->points_to);
+	intern_print_type_post(type->points_to, false);
 }
 
 static void print_array_type_pre(const array_type_t *type)
 {
-	intern_print_type_pre(type->element_type);
+	intern_print_type_pre(type->element_type, false);
 }
 
 static void print_array_type_post(const array_type_t *type)
@@ -160,7 +156,14 @@ static void print_array_type_post(const array_type_t *type)
 		print_expression(type->size);
 	}
 	fputc(']', out);
-	intern_print_type_post(type->element_type);
+	intern_print_type_post(type->element_type, false);
+}
+
+static void print_bitfield_type_post(const bitfield_type_t *type)
+{
+	fputs(" : ", out);
+	print_expression(type->size);
+	intern_print_type_post(type->base, false);
 }
 
 void print_enum_definition(const declaration_t *declaration)
@@ -222,10 +225,10 @@ static void print_compound_type(const compound_type_t *type)
 {
 	print_type_qualifiers(type->type.qualifiers);
 
-	if(type->type.type == TYPE_COMPOUND_STRUCT) {
+	if(type->type.kind == TYPE_COMPOUND_STRUCT) {
 		fputs("struct ", out);
 	} else {
-		assert(type->type.type == TYPE_COMPOUND_UNION);
+		assert(type->type.kind == TYPE_COMPOUND_UNION);
 		fputs("union ", out);
 	}
 
@@ -238,12 +241,13 @@ static void print_compound_type(const compound_type_t *type)
 	}
 }
 
-static void print_typedef_type_pre(typedef_type_t *type)
+static void print_typedef_type_pre(const typedef_type_t *const type)
 {
+	print_type_qualifiers(type->type.qualifiers);
 	fputs(type->declaration->symbol->string, out);
 }
 
-static void print_typeof_type_pre(typeof_type_t *type)
+static void print_typeof_type_pre(const typeof_type_t *const type)
 {
 	fputs("typeof(", out);
 	if(type->expression != NULL) {
@@ -255,10 +259,9 @@ static void print_typeof_type_pre(typeof_type_t *type)
 	fputc(')', out);
 }
 
-static void intern_print_type_pre(type_t *type)
+static void intern_print_type_pre(const type_t *const type, const bool top)
 {
-	switch(type->type) {
-	case TYPE_COUNT:
+	switch(type->kind) {
 	case TYPE_INVALID:
 		fputs("invalid", out);
 		return;
@@ -276,11 +279,14 @@ static void intern_print_type_pre(type_t *type)
 		fputs(type->builtin.symbol->string, out);
 		return;
 	case TYPE_FUNCTION:
-		print_function_type_pre(&type->function);
+		print_function_type_pre(&type->function, top);
 		return;
 	case TYPE_POINTER:
 		print_pointer_type_pre(&type->pointer);
 		return;
+	case TYPE_BITFIELD:
+		intern_print_type_pre(type->bitfield.base, top);
+		return;
 	case TYPE_ARRAY:
 		print_array_type_pre(&type->array);
 		return;
@@ -294,11 +300,11 @@ static void intern_print_type_pre(type_t *type)
 	fputs("unknown", out);
 }
 
-static void intern_print_type_post(type_t *type)
+static void intern_print_type_post(const type_t *const type, const bool top)
 {
-	switch(type->type) {
+	switch(type->kind) {
 	case TYPE_FUNCTION:
-		print_function_type_post(&type->function, NULL);
+		print_function_type_post(&type->function, NULL, top);
 		return;
 	case TYPE_POINTER:
 		print_pointer_type_post(&type->pointer);
@@ -306,8 +312,10 @@ static void intern_print_type_post(type_t *type)
 	case TYPE_ARRAY:
 		print_array_type_post(&type->array);
 		return;
+	case TYPE_BITFIELD:
+		print_bitfield_type_post(&type->bitfield);
+		return;
 	case TYPE_INVALID:
-	case TYPE_COUNT:
 	case TYPE_ATOMIC:
 	case TYPE_ENUM:
 	case TYPE_COMPOUND_STRUCT:
@@ -319,12 +327,12 @@ static void intern_print_type_post(type_t *type)
 	}
 }
 
-void print_type(type_t *type)
+void print_type(const type_t *const type)
 {
 	print_type_ext(type, NULL, NULL);
 }
 
-void print_type_ext(type_t *type, const symbol_t *symbol,
+void print_type_ext(const type_t *const type, const symbol_t *symbol,
                     const context_t *context)
 {
 	if(type == NULL) {
@@ -332,34 +340,83 @@ void print_type_ext(type_t *type, const symbol_t *symbol,
 		return;
 	}
 
-	intern_print_type_pre(type);
+	intern_print_type_pre(type, true);
 	if(symbol != NULL) {
 		fputc(' ', out);
 		fputs(symbol->string, out);
 	}
-	if(type->type == TYPE_FUNCTION) {
-		print_function_type_post((const function_type_t*) type, context);
+	if(type->kind == TYPE_FUNCTION) {
+		print_function_type_post(&type->function, context, true);
 	} else {
-		intern_print_type_post(type);
+		intern_print_type_post(type, true);
+	}
+}
+
+static size_t get_type_size(type_t *type)
+{
+	switch(type->kind) {
+	case TYPE_ATOMIC:          return sizeof(atomic_type_t);
+	case TYPE_COMPOUND_STRUCT:
+	case TYPE_COMPOUND_UNION:  return sizeof(compound_type_t);
+	case TYPE_ENUM:            return sizeof(enum_type_t);
+	case TYPE_FUNCTION:        return sizeof(function_type_t);
+	case TYPE_POINTER:         return sizeof(pointer_type_t);
+	case TYPE_ARRAY:           return sizeof(array_type_t);
+	case TYPE_BUILTIN:         return sizeof(builtin_type_t);
+	case TYPE_TYPEDEF:         return sizeof(typedef_type_t);
+	case TYPE_TYPEOF:          return sizeof(typeof_type_t);
+	case TYPE_BITFIELD:        return sizeof(bitfield_type_t);
+	case TYPE_INVALID:         panic("invalid type found");
 	}
+	panic("unknown type found");
+}
+
+/**
+ * duplicates a type
+ * note that this does not produce a deep copy!
+ */
+type_t *duplicate_type(type_t *type)
+{
+	size_t size = get_type_size(type);
+
+	type_t *copy = obstack_alloc(type_obst, size);
+	memcpy(copy, type, size);
+
+	return copy;
+}
+
+type_t *get_unqualified_type(type_t *type)
+{
+	if(type->base.qualifiers == TYPE_QUALIFIER_NONE)
+		return type;
+
+	type_t *unqualified_type          = duplicate_type(type);
+	unqualified_type->base.qualifiers = TYPE_QUALIFIER_NONE;
+
+	type_t *result = typehash_insert(unqualified_type);
+	if(result != unqualified_type) {
+		obstack_free(type_obst, unqualified_type);
+	}
+
+	return result;
 }
 
 bool type_valid(const type_t *type)
 {
-	return type->type != TYPE_INVALID;
+	return type->kind != TYPE_INVALID;
 }
 
 bool is_type_integer(const type_t *type)
 {
 	assert(!is_typeref(type));
 
-	if(type->type == TYPE_ENUM)
+	if(type->kind == TYPE_ENUM)
 		return true;
 
-	if(type->type != TYPE_ATOMIC)
+	if(type->kind != TYPE_ATOMIC)
 		return false;
 
-	switch(type->atomic.atype) {
+	switch(type->atomic.akind) {
 	case ATOMIC_TYPE_BOOL:
 	case ATOMIC_TYPE_CHAR:
 	case ATOMIC_TYPE_SCHAR:
@@ -382,10 +439,10 @@ bool is_type_floating(const type_t *type)
 {
 	assert(!is_typeref(type));
 
-	if(type->type != TYPE_ATOMIC)
+	if(type->kind != TYPE_ATOMIC)
 		return false;
 
-	switch(type->atomic.atype) {
+	switch(type->atomic.akind) {
 	case ATOMIC_TYPE_FLOAT:
 	case ATOMIC_TYPE_DOUBLE:
 	case ATOMIC_TYPE_LONG_DOUBLE:
@@ -408,13 +465,13 @@ bool is_type_signed(const type_t *type)
 	assert(!is_typeref(type));
 
 	/* enum types are int for now */
-	if(type->type == TYPE_ENUM)
+	if(type->kind == TYPE_ENUM)
 		return true;
 
-	if(type->type != TYPE_ATOMIC)
+	if(type->kind != TYPE_ATOMIC)
 		return false;
 
-	switch(type->atomic.atype) {
+	switch(type->atomic.akind) {
 	case ATOMIC_TYPE_CHAR:
 	case ATOMIC_TYPE_SCHAR:
 	case ATOMIC_TYPE_SHORT:
@@ -442,8 +499,9 @@ bool is_type_signed(const type_t *type)
 	case ATOMIC_TYPE_ULONGLONG:
 		return false;
 
-	case ATOMIC_TYPE_INVALID:
 	case ATOMIC_TYPE_VOID:
+	case ATOMIC_TYPE_INVALID:
+	case ATOMIC_TYPE_LAST:
 		return false;
 	}
 
@@ -455,18 +513,24 @@ 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_floating(type))
-		return 1;
+		return true;
 
-	return 0;
+	return false;
 }
 
 bool is_type_scalar(const type_t *type)
 {
 	assert(!is_typeref(type));
 
-	if(type->type == TYPE_POINTER)
-		return 1;
+	switch (type->kind) {
+		case TYPE_POINTER: return true;
+		case TYPE_BUILTIN: return is_type_scalar(type->builtin.real_type);
+		default:            break;
+	}
 
 	return is_type_arithmetic(type);
 }
@@ -475,13 +539,14 @@ bool is_type_incomplete(const type_t *type)
 {
 	assert(!is_typeref(type));
 
-	switch(type->type) {
+	switch(type->kind) {
 	case TYPE_COMPOUND_STRUCT:
 	case TYPE_COMPOUND_UNION: {
 		const compound_type_t *compound_type = &type->compound;
 		declaration_t         *declaration   = compound_type->declaration;
 		return !declaration->init.is_defined;
 	}
+	case TYPE_BITFIELD:
 	case TYPE_FUNCTION:
 		return true;
 
@@ -489,15 +554,16 @@ bool is_type_incomplete(const type_t *type)
 		return type->array.size == NULL;
 
 	case TYPE_ATOMIC:
+		return type->atomic.akind == ATOMIC_TYPE_VOID;
+
 	case TYPE_POINTER:
 	case TYPE_ENUM:
+	case TYPE_BUILTIN:
 		return false;
 
 	case TYPE_TYPEDEF:
 	case TYPE_TYPEOF:
-	case TYPE_BUILTIN:
 		panic("is_type_incomplete called without typerefs skipped");
-	case TYPE_COUNT:
 	case TYPE_INVALID:
 		break;
 	}
@@ -505,74 +571,128 @@ bool is_type_incomplete(const type_t *type)
 	panic("invalid type found");
 }
 
-bool types_compatible(const type_t *type1, const type_t *type2)
+static bool function_types_compatible(const function_type_t *func1,
+                                      const function_type_t *func2)
 {
-	assert(!is_typeref(type1));
-	assert(!is_typeref(type2));
+	const type_t* const ret1 = skip_typeref(func1->return_type);
+	const type_t* const ret2 = skip_typeref(func2->return_type);
+	if (!types_compatible(ret1, ret2))
+		return false;
 
-	/* TODO: really incomplete */
-	if(type1 == type2)
+	/* can parameters be compared? */
+	if(func1->unspecified_parameters || func2->unspecified_parameters)
 		return true;
 
-	if(type1->type == TYPE_ATOMIC && type2->type == TYPE_ATOMIC) {
-		return type1->atomic.atype == type2->atomic.atype;
+	if(func1->variadic != func2->variadic)
+		return false;
+
+	/* TODO: handling of unspecified parameters not correct yet */
+
+	/* all argument types must be compatible */
+	function_parameter_t *parameter1 = func1->parameters;
+	function_parameter_t *parameter2 = func2->parameters;
+	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);
+
+		parameter1_type = get_unqualified_type(parameter1_type);
+		parameter2_type = get_unqualified_type(parameter2_type);
+
+		if(!types_compatible(parameter1_type, parameter2_type))
+			return false;
 	}
+	/* same number of arguments? */
+	if(parameter1 != NULL || parameter2 != NULL)
+		return false;
 
-	return false;
+	return true;
 }
 
-bool pointers_compatible(const type_t *type1, const type_t *type2)
+static bool array_types_compatible(const array_type_t *array1,
+                                   const array_type_t *array2)
 {
-	assert(!is_typeref(type1));
-	assert(!is_typeref(type2));
+	type_t *element_type1 = skip_typeref(array1->element_type);
+	type_t *element_type2 = skip_typeref(array2->element_type);
+	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 */
+	}
 
-	assert(type1->type == TYPE_POINTER);
-	assert(type2->type == TYPE_POINTER);
-	/* TODO */
 	return true;
 }
 
-static size_t get_type_size(type_t *type)
+bool types_compatible(const type_t *type1, const type_t *type2)
 {
-	switch(type->type) {
-	case TYPE_ATOMIC:          return sizeof(atomic_type_t); break;
+	assert(!is_typeref(type1));
+	assert(!is_typeref(type2));
+
+	/* shortcut: the same type is always compatible */
+	if(type1 == type2)
+		return true;
+
+	if(type1->base.qualifiers != type2->base.qualifiers)
+		return false;
+	if(type1->kind != type2->kind)
+		return false;
+
+	switch(type1->kind) {
+	case TYPE_FUNCTION:
+		return function_types_compatible(&type1->function, &type2->function);
+	case TYPE_ATOMIC:
+		return type1->atomic.akind == type2->atomic.akind;
+	case TYPE_ARRAY:
+		return array_types_compatible(&type1->array, &type2->array);
+
+	case TYPE_POINTER: {
+		const type_t *const to1 = skip_typeref(type1->pointer.points_to);
+		const type_t *const to2 = skip_typeref(type2->pointer.points_to);
+		return types_compatible(to1, to2);
+	}
+
 	case TYPE_COMPOUND_STRUCT:
-	case TYPE_COMPOUND_UNION:  return sizeof(compound_type_t); break;
-	case TYPE_ENUM:            return sizeof(enum_type_t); break;
-	case TYPE_FUNCTION:        return sizeof(function_type_t); break;
-	case TYPE_POINTER:         return sizeof(pointer_type_t); break;
-	case TYPE_ARRAY:           return sizeof(array_type_t); break;
-	case TYPE_BUILTIN:         return sizeof(builtin_type_t); break;
-	case TYPE_TYPEDEF:         return sizeof(typedef_type_t); break;
-	case TYPE_TYPEOF:          return sizeof(typeof_type_t); break;
-	case TYPE_COUNT:
-	case TYPE_INVALID:         panic("invalid type found"); break;
+	case TYPE_COMPOUND_UNION:
+	case TYPE_ENUM:
+	case TYPE_BUILTIN:
+		/* TODO: not implemented */
+		break;
+
+	case TYPE_BITFIELD:
+		/* not sure if this makes sense or is even needed, implement it if you
+		 * really need it! */
+		panic("type compatibility check for bitfield type");
+
+	case TYPE_INVALID:
+		panic("invalid type found in compatible types");
+	case TYPE_TYPEDEF:
+	case TYPE_TYPEOF:
+		panic("typerefs not skipped in compatible types?!?");
 	}
-	panic("unknown type found");
+
+	/* TODO: incomplete */
+	return false;
 }
 
-/**
- * duplicates a type
- * note that this does not produce a deep copy!
- */
-static type_t *duplicate_type(type_t *type)
+bool pointers_compatible(const type_t *type1, const type_t *type2)
 {
-	size_t size = get_type_size(type);
-
-	type_t *copy = obstack_alloc(type_obst, size);
-	memcpy(copy, type, size);
-
-	(void) duplicate_type;
+	assert(!is_typeref(type1));
+	assert(!is_typeref(type2));
 
-	return type;
+	assert(type1->kind == TYPE_POINTER);
+	assert(type2->kind == TYPE_POINTER);
+	/* TODO */
+	return true;
 }
 
 type_t *skip_typeref(type_t *type)
 {
-	unsigned qualifiers = type->base.qualifiers;
+	unsigned qualifiers = TYPE_QUALIFIER_NONE;
 
-	while(1) {
-		switch(type->type) {
+	while(true) {
+		switch(type->kind) {
 		case TYPE_TYPEDEF: {
 			qualifiers |= type->base.qualifiers;
 			const typedef_type_t *typedef_type = &type->typedeft;
@@ -588,21 +708,26 @@ type_t *skip_typeref(type_t *type)
 			if(typeof_type->typeof_type != NULL) {
 				type = typeof_type->typeof_type;
 			} else {
-				type = typeof_type->expression->datatype;
+				type = typeof_type->expression->base.datatype;
 			}
 			continue;
 		}
-		case TYPE_BUILTIN: {
-			const builtin_type_t *builtin_type = &type->builtin;
-			type = builtin_type->real_type;
-			continue;
-		}
 		default:
 			break;
 		}
 		break;
 	}
 
+	if (qualifiers != TYPE_QUALIFIER_NONE) {
+		type_t *const copy     = duplicate_type(type);
+		copy->base.qualifiers |= qualifiers;
+
+		type = typehash_insert(copy);
+		if (type != copy) {
+			obstack_free(type_obst, copy);
+		}
+	}
+
 	return type;
 }
 
@@ -617,14 +742,14 @@ static type_t *identify_new_type(type_t *type)
 	return result;
 }
 
-type_t *make_atomic_type(atomic_type_type_t atype, type_qualifiers_t qualifiers)
+type_t *make_atomic_type(atomic_type_kind_t atype, type_qualifiers_t qualifiers)
 {
 	type_t *type = obstack_alloc(type_obst, sizeof(atomic_type_t));
 	memset(type, 0, sizeof(atomic_type_t));
 
-	type->type            = TYPE_ATOMIC;
+	type->kind            = TYPE_ATOMIC;
 	type->base.qualifiers = qualifiers;
-	type->atomic.atype    = atype;
+	type->atomic.akind    = atype;
 
 	return identify_new_type(type);
 }
@@ -634,7 +759,7 @@ type_t *make_pointer_type(type_t *points_to, type_qualifiers_t qualifiers)
 	type_t *type = obstack_alloc(type_obst, sizeof(pointer_type_t));
 	memset(type, 0, sizeof(pointer_type_t));
 
-	type->type              = TYPE_POINTER;
+	type->kind              = TYPE_POINTER;
 	type->base.qualifiers   = qualifiers;
 	type->pointer.points_to = points_to;