X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type.c;h=56e0af5fafba024e5bbd748f5da52f4eb1e10f43;hb=e6d2de0a709adcb6b34f9a77f9a3a8944a3e0cf6;hp=5c3da0064b8bd5af147464d8f0b35cd7403ce26e;hpb=e4c3d741547cee4625f336ab1e8045ccb8be9332;p=cparser

diff --git a/type.c b/type.c
index 5c3da00..56e0af5 100644
--- a/type.c
+++ b/type.c
@@ -1,23 +1,179 @@
+/*
+ * This file is part of cparser.
+ * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ *
+ * 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 <config.h>
 
 #include <stdio.h>
 #include <assert.h>
+
 #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;
 static FILE            *out;
 struct obstack         *type_obst                 = &_type_obst;
 static int              type_visited              = 0;
-static bool             print_implicit_array_size = true;
+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_LONG_DOUBLE].alignment = 4;
+	props[ATOMIC_TYPE_LONGLONG].alignment    = 4;
+	props[ATOMIC_TYPE_ULONGLONG].alignment   = 4;
+
+	props[ATOMIC_TYPE_BOOL] = props[ATOMIC_TYPE_UINT];
 }
 
 void exit_types(void)
@@ -37,24 +193,32 @@ void inc_type_visited(void)
 
 void print_type_qualifiers(type_qualifiers_t qualifiers)
 {
-	if(qualifiers & TYPE_QUALIFIER_CONST)    fputs("const ",    out);
-	if(qualifiers & TYPE_QUALIFIER_VOLATILE) fputs("volatile ", out);
-	if(qualifiers & TYPE_QUALIFIER_RESTRICT) fputs("restrict ", out);
+	int first = 1;
+	if (qualifiers & TYPE_QUALIFIER_CONST) {
+		fputs(" const" + first,    out);
+		first = 0;
+	}
+	if (qualifiers & TYPE_QUALIFIER_VOLATILE) {
+		fputs(" volatile" + first, out);
+		first = 0;
+	}
+	if (qualifiers & TYPE_QUALIFIER_RESTRICT) {
+		fputs(" restrict" + first, out);
+		first = 0;
+	}
 }
 
 /**
- * Prints the name of a atomic type.
+ * Prints the name of an atomic type kinds.
  *
- * @param type  The type.
+ * @param kind  The type kind.
  */
 static
-void print_atomic_type(const atomic_type_t *type)
+void print_atomic_kinds(atomic_type_kind_t kind)
 {
-	print_type_qualifiers(type->type.qualifiers);
-
-	const char *s;
-	switch(type->akind) {
-	case ATOMIC_TYPE_INVALID:     s = "INVALIDATOMIC";      break;
+	const char *s = "INVALIDATOMIC";
+	switch(kind) {
+	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;
@@ -71,11 +235,52 @@ void print_atomic_type(const atomic_type_t *type)
 	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;
 	}
 	fputs(s, out);
 }
 
+/**
+ * Prints the name of an atomic type.
+ *
+ * @param type  The type.
+ */
+static
+void print_atomic_type(const atomic_type_t *type)
+{
+	print_type_qualifiers(type->base.qualifiers);
+	if (type->base.qualifiers != 0)
+		fputc(' ', out);
+	print_atomic_kinds(type->akind);
+}
+
+/**
+ * Prints the name of a complex type.
+ *
+ * @param type  The type.
+ */
+static
+void print_complex_type(const complex_type_t *type)
+{
+	int empty = type->base.qualifiers == 0;
+	print_type_qualifiers(type->base.qualifiers);
+	fputs(" _Complex " + empty, out);
+	print_atomic_kinds(type->akind);
+}
+
+/**
+ * Prints the name of an imaginary type.
+ *
+ * @param type  The type.
+ */
+static
+void print_imaginary_type(const imaginary_type_t *type)
+{
+	int empty = type->base.qualifiers == 0;
+	print_type_qualifiers(type->base.qualifiers);
+	fputs(" _Imaginary " + empty, out);
+	print_atomic_kinds(type->akind);
+}
+
 /**
  * Print the first part (the prefix) of a type.
  *
@@ -84,12 +289,32 @@ 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);
+	if (type->base.qualifiers != 0)
+		fputc(' ', out);
+
 
 	intern_print_type_pre(type->return_type, false);
 
-	/* don't emit braces if we're the toplevel type... */
-	if(!top)
+	switch (type->calling_convention) {
+	case CC_CDECL:
+		fputs("__cdecl ", out);
+		break;
+	case CC_STDCALL:
+		fputs("__stdcall ", out);
+		break;
+	case CC_FASTCALL:
+		fputs("__fastcall ", out);
+		break;
+	case CC_THISCALL:
+		fputs("__thiscall ", out);
+		break;
+	case CC_DEFAULT:
+		break;
+	}
+
+	/* don't emit parenthesis if we're the toplevel type... */
+	if (!top)
 		fputc('(', out);
 }
 
@@ -102,19 +327,17 @@ static void print_function_type_pre(const function_type_t *type, bool top)
 static void print_function_type_post(const function_type_t *type,
                                      const scope_t *scope, bool top)
 {
-	intern_print_type_post(type->return_type, false);
-	/* don't emit braces if we're the toplevel type... */
-	if(!top)
+	/* don't emit parenthesis if we're the toplevel type... */
+	if (!top)
 		fputc(')', out);
 
 	fputc('(', out);
-
-	int first = 1;
-	if(scope == NULL) {
+	bool first = true;
+	if (scope == NULL) {
 		function_parameter_t *parameter = type->parameters;
 		for( ; parameter != NULL; parameter = parameter->next) {
-			if(first) {
-				first = 0;
+			if (first) {
+				first = false;
 			} else {
 				fputs(", ", out);
 			}
@@ -123,8 +346,8 @@ static void print_function_type_post(const function_type_t *type,
 	} else {
 		declaration_t *parameter = scope->declarations;
 		for( ; parameter != NULL; parameter = parameter->next) {
-			if(first) {
-				first = 0;
+			if (first) {
+				first = false;
 			} else {
 				fputs(", ", out);
 			}
@@ -132,18 +355,20 @@ static void print_function_type_post(const function_type_t *type,
 			               &parameter->scope);
 		}
 	}
-	if(type->variadic) {
-		if(first) {
-			first = 0;
+	if (type->variadic) {
+		if (first) {
+			first = false;
 		} else {
 			fputs(", ", out);
 		}
 		fputs("...", out);
 	}
-	if(first && !type->unspecified_parameters) {
+	if (first && !type->unspecified_parameters) {
 		fputs("void", out);
 	}
 	fputc(')', out);
+
+	intern_print_type_post(type->return_type, false);
 }
 
 /**
@@ -155,7 +380,9 @@ 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);
+	if (type->base.qualifiers != 0)
+		fputc(' ', out);
 }
 
 /**
@@ -186,13 +413,15 @@ static void print_array_type_pre(const array_type_t *type)
 static void print_array_type_post(const array_type_t *type)
 {
 	fputc('[', out);
-	if(type->is_static) {
+	if (type->is_static) {
 		fputs("static ", out);
 	}
-	print_type_qualifiers(type->type.qualifiers);
-	if(type->size != NULL
+	print_type_qualifiers(type->base.qualifiers);
+	if (type->base.qualifiers != 0)
+		fputc(' ', out);
+	if (type->size_expression != NULL
 			&& (print_implicit_array_size || !type->has_implicit_size)) {
-		print_expression(type->size);
+		print_expression(type->size_expression);
 	}
 	fputc(']', out);
 	intern_print_type_post(type->element_type, false);
@@ -206,8 +435,8 @@ static void print_array_type_post(const array_type_t *type)
 static void print_bitfield_type_post(const bitfield_type_t *type)
 {
 	fputs(" : ", out);
-	print_expression(type->size);
-	intern_print_type_post(type->base, false);
+	print_expression(type->size_expression);
+	intern_print_type_post(type->base_type, false);
 }
 
 /**
@@ -227,9 +456,15 @@ void print_enum_definition(const declaration_t *declaration)
 
 		print_indent();
 		fprintf(out, "%s", entry->symbol->string);
-		if(entry->init.initializer != NULL) {
+		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");
 	}
@@ -246,12 +481,13 @@ void print_enum_definition(const declaration_t *declaration)
  */
 static void print_type_enum(const enum_type_t *type)
 {
-	print_type_qualifiers(type->type.qualifiers);
-	fputs("enum ", out);
+	int empty = type->base.qualifiers == 0;
+	print_type_qualifiers(type->base.qualifiers);
+	fputs(" enum " + empty, out);
 
 	declaration_t *declaration = type->declaration;
 	symbol_t      *symbol      = declaration->symbol;
-	if(symbol != NULL) {
+	if (symbol != NULL) {
 		fputs(symbol->string, out);
 	} else {
 		print_enum_definition(declaration);
@@ -287,18 +523,19 @@ void print_compound_definition(const declaration_t *declaration)
  */
 static void print_compound_type(const compound_type_t *type)
 {
-	print_type_qualifiers(type->type.qualifiers);
+	int empty = type->base.qualifiers == 0;
+	print_type_qualifiers(type->base.qualifiers);
 
-	if(type->type.kind == TYPE_COMPOUND_STRUCT) {
-		fputs("struct ", out);
+	if (type->base.kind == TYPE_COMPOUND_STRUCT) {
+		fputs(" struct " + empty, out);
 	} else {
-		assert(type->type.kind == TYPE_COMPOUND_UNION);
-		fputs("union ", out);
+		assert(type->base.kind == TYPE_COMPOUND_UNION);
+		fputs(" union " + empty, out);
 	}
 
 	declaration_t *declaration = type->declaration;
 	symbol_t      *symbol      = declaration->symbol;
-	if(symbol != NULL) {
+	if (symbol != NULL) {
 		fputs(symbol->string, out);
 	} else {
 		print_compound_definition(declaration);
@@ -312,7 +549,9 @@ 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);
+	if (type->base.qualifiers != 0)
+		fputc(' ', out);
 	fputs(type->declaration->symbol->string, out);
 }
 
@@ -324,7 +563,7 @@ static void print_typedef_type_pre(const typedef_type_t *const type)
 static void print_typeof_type_pre(const typeof_type_t *const type)
 {
 	fputs("typeof(", out);
-	if(type->expression != NULL) {
+	if (type->expression != NULL) {
 		assert(type->typeof_type == NULL);
 		print_expression(type->expression);
 	} else {
@@ -344,6 +583,7 @@ static void intern_print_type_pre(const type_t *const type, const bool top)
 	switch(type->kind) {
 	case TYPE_ERROR:
 		fputs("<error>", out);
+		return;
 	case TYPE_INVALID:
 		fputs("<invalid>", out);
 		return;
@@ -353,6 +593,12 @@ static void intern_print_type_pre(const type_t *const type, const bool top)
 	case TYPE_ATOMIC:
 		print_atomic_type(&type->atomic);
 		return;
+	case TYPE_COMPLEX:
+		print_complex_type(&type->complex);
+		return;
+	case TYPE_IMAGINARY:
+		print_imaginary_type(&type->imaginary);
+		return;
 	case TYPE_COMPOUND_STRUCT:
 	case TYPE_COMPOUND_UNION:
 		print_compound_type(&type->compound);
@@ -367,7 +613,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);
@@ -406,6 +652,8 @@ static void intern_print_type_post(const type_t *const type, const bool top)
 	case TYPE_ERROR:
 	case TYPE_INVALID:
 	case TYPE_ATOMIC:
+	case TYPE_COMPLEX:
+	case TYPE_IMAGINARY:
 	case TYPE_ENUM:
 	case TYPE_COMPOUND_STRUCT:
 	case TYPE_COMPOUND_UNION:
@@ -429,17 +677,17 @@ void print_type(const type_t *const type)
 void print_type_ext(const type_t *const type, const symbol_t *symbol,
                     const scope_t *scope)
 {
-	if(type == NULL) {
+	if (type == NULL) {
 		fputs("nil type", out);
 		return;
 	}
 
 	intern_print_type_pre(type, true);
-	if(symbol != NULL) {
+	if (symbol != NULL) {
 		fputc(' ', out);
 		fputs(symbol->string, out);
 	}
-	if(type->kind == TYPE_FUNCTION) {
+	if (type->kind == TYPE_FUNCTION) {
 		print_function_type_post(&type->function, scope, true);
 	} else {
 		intern_print_type_post(type, true);
@@ -455,6 +703,8 @@ static size_t get_type_size(const type_t *type)
 {
 	switch(type->kind) {
 	case TYPE_ATOMIC:          return sizeof(atomic_type_t);
+	case TYPE_COMPLEX:         return sizeof(complex_type_t);
+	case TYPE_IMAGINARY:       return sizeof(imaginary_type_t);
 	case TYPE_COMPOUND_STRUCT:
 	case TYPE_COMPOUND_UNION:  return sizeof(compound_type_t);
 	case TYPE_ENUM:            return sizeof(enum_type_t);
@@ -497,20 +747,54 @@ type_t *duplicate_type(const type_t *type)
  */
 type_t *get_unqualified_type(type_t *type)
 {
-	if(type->base.qualifiers == TYPE_QUALIFIER_NONE)
+	assert(!is_typeref(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) {
+	if (result != unqualified_type) {
 		obstack_free(type_obst, unqualified_type);
 	}
 
 	return result;
 }
 
+type_t *get_qualified_type(type_t *orig_type, type_qualifiers_t const qual)
+{
+	type_t *type = skip_typeref(orig_type);
+
+	type_t *copy;
+	if (is_type_array(type)) {
+		/* For array types the element type has to be adjusted */
+		type_t *element_type      = type->array.element_type;
+		type_t *qual_element_type = get_qualified_type(element_type, qual);
+
+		if (qual_element_type == element_type)
+			return orig_type;
+
+		copy                     = duplicate_type(type);
+		copy->array.element_type = qual_element_type;
+	} else if (is_type_valid(type)) {
+		if ((type->base.qualifiers & qual) == qual)
+			return orig_type;
+
+		copy                   = duplicate_type(type);
+		copy->base.qualifiers |= qual;
+	} else {
+		return type;
+	}
+
+	type = typehash_insert(copy);
+	if (type != copy)
+		obstack_free(type_obst, copy);
+
+	return type;
+}
+
 /**
  * Check if a type is valid.
  *
@@ -522,6 +806,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.
  *
@@ -532,29 +823,27 @@ bool is_type_integer(const type_t *type)
 {
 	assert(!is_typeref(type));
 
-	if(type->kind == TYPE_ENUM)
+	if (type->kind == TYPE_ENUM)
+		return true;
+	if (type->kind == TYPE_BITFIELD)
 		return true;
 
-	if(type->kind != TYPE_ATOMIC)
+	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);
+}
+
+/**
+ * Returns true if the given type is an enum type.
+ *
+ * @param type  The type to check.
+ * @return True if type is an enum type.
+ */
+bool is_type_enum(const type_t *type)
+{
+	assert(!is_typeref(type));
+	return type->kind == TYPE_ENUM;
 }
 
 /**
@@ -567,25 +856,26 @@ bool is_type_float(const type_t *type)
 {
 	assert(!is_typeref(type));
 
-	if(type->kind != TYPE_ATOMIC)
+	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 test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_FLOAT);
+}
+
+/**
+ * Returns true if the given type is an complex type.
+ *
+ * @param type  The type to check.
+ * @return True if type is a complex type.
+ */
+bool is_type_complex(const type_t *type)
+{
+	assert(!is_typeref(type));
+
+	if (type->kind != TYPE_ATOMIC)
 		return false;
-	}
+
+	return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_COMPLEX);
 }
 
 /**
@@ -599,48 +889,15 @@ bool is_type_signed(const type_t *type)
 	assert(!is_typeref(type));
 
 	/* enum types are int for now */
-	if(type->kind == TYPE_ENUM)
-		return true;
-
-	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
+	if (type->kind == TYPE_ENUM)
 		return true;
+	if (type->kind == TYPE_BITFIELD)
+		return is_type_signed(type->bitfield.base_type);
 
-	case ATOMIC_TYPE_BOOL:
-	case ATOMIC_TYPE_UCHAR:
-	case ATOMIC_TYPE_USHORT:
-	case ATOMIC_TYPE_UINT:
-	case ATOMIC_TYPE_ULONG:
-	case ATOMIC_TYPE_ULONGLONG:
+	if (type->kind != TYPE_ATOMIC)
 		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);
 }
 
 /**
@@ -653,13 +910,31 @@ 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))
+	switch(type->kind) {
+	case TYPE_BITFIELD:
+	case TYPE_ENUM:
 		return true;
+	case TYPE_ATOMIC:
+		return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_ARITHMETIC);
+	case TYPE_COMPLEX:
+		return test_atomic_type_flag(type->complex.akind, ATOMIC_TYPE_FLAG_ARITHMETIC);
+	case TYPE_IMAGINARY:
+		return test_atomic_type_flag(type->imaginary.akind, ATOMIC_TYPE_FLAG_ARITHMETIC);
+	default:
+		return false;
+	}
+}
 
-	return false;
+/**
+ * Returns true if the given type is an integer or float type.
+ *
+ * @param type  The type to check.
+ * @return True if type is an integer or float type.
+ */
+bool is_type_real(const type_t *type)
+{
+	/* 6.2.5 (17) */
+	return is_type_integer(type) || is_type_float(type);
 }
 
 /**
@@ -675,7 +950,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);
@@ -696,23 +971,29 @@ bool is_type_incomplete(const type_t *type)
 	case TYPE_COMPOUND_UNION: {
 		const compound_type_t *compound_type = &type->compound;
 		declaration_t         *declaration   = compound_type->declaration;
-		return !declaration->init.is_defined;
+		return !declaration->init.complete;
 	}
 	case TYPE_ENUM: {
 		const enum_type_t *enum_type   = &type->enumt;
 		declaration_t     *declaration = enum_type->declaration;
-		return !declaration->init.is_defined;
+		return !declaration->init.complete;
 	}
-	case TYPE_BITFIELD:
-	case TYPE_FUNCTION:
-		return true;
 
 	case TYPE_ARRAY:
-		return type->array.size == NULL;
+		return type->array.size_expression == NULL
+			&& !type->array.size_constant;
 
 	case TYPE_ATOMIC:
 		return type->atomic.akind == ATOMIC_TYPE_VOID;
 
+	case TYPE_COMPLEX:
+		return type->complex.akind == ATOMIC_TYPE_VOID;
+
+	case TYPE_IMAGINARY:
+		return type->imaginary.akind == ATOMIC_TYPE_VOID;
+
+	case TYPE_BITFIELD:
+	case TYPE_FUNCTION:
 	case TYPE_POINTER:
 	case TYPE_BUILTIN:
 	case TYPE_ERROR:
@@ -728,6 +1009,11 @@ bool is_type_incomplete(const type_t *type)
 	panic("invalid type found");
 }
 
+bool is_type_object(const type_t *type)
+{
+	return !is_type_function(type) && !is_type_incomplete(type);
+}
+
 /**
  * Check if two function types are compatible.
  */
@@ -739,11 +1025,14 @@ static bool function_types_compatible(const function_type_t *func1,
 	if (!types_compatible(ret1, ret2))
 		return false;
 
+	if (func1->calling_convention != func2->calling_convention)
+		return false;
+
 	/* can parameters be compared? */
-	if(func1->unspecified_parameters || func2->unspecified_parameters)
+	if (func1->unspecified_parameters || func2->unspecified_parameters)
 		return true;
 
-	if(func1->variadic != func2->variadic)
+	if (func1->variadic != func2->variadic)
 		return false;
 
 	/* TODO: handling of unspecified parameters not correct yet */
@@ -751,7 +1040,7 @@ static bool function_types_compatible(const function_type_t *func1,
 	/* all argument types must be compatible */
 	function_parameter_t *parameter1 = func1->parameters;
 	function_parameter_t *parameter2 = func2->parameters;
-	for( ; parameter1 != NULL && parameter2 != NULL;
+	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);
@@ -759,11 +1048,11 @@ static bool function_types_compatible(const function_type_t *func1,
 		parameter1_type = get_unqualified_type(parameter1_type);
 		parameter2_type = get_unqualified_type(parameter2_type);
 
-		if(!types_compatible(parameter1_type, parameter2_type))
+		if (!types_compatible(parameter1_type, parameter2_type))
 			return false;
 	}
 	/* same number of arguments? */
-	if(parameter1 != NULL || parameter2 != NULL)
+	if (parameter1 != NULL || parameter2 != NULL)
 		return false;
 
 	return true;
@@ -777,15 +1066,13 @@ static bool array_types_compatible(const array_type_t *array1,
 {
 	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))
+	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;
 }
 
 /**
@@ -797,19 +1084,26 @@ bool types_compatible(const type_t *type1, const type_t *type2)
 	assert(!is_typeref(type2));
 
 	/* shortcut: the same type is always compatible */
-	if(type1 == type2)
+	if (type1 == type2)
+		return true;
+
+	if (!is_type_valid(type1) || !is_type_valid(type2))
 		return true;
 
-	if(type1->base.qualifiers != type2->base.qualifiers)
+	if (type1->base.qualifiers != type2->base.qualifiers)
 		return false;
-	if(type1->kind != type2->kind)
+	if (type1->kind != type2->kind)
 		return false;
 
-	switch(type1->kind) {
+	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_COMPLEX:
+		return type1->complex.akind == type2->complex.akind;
+	case TYPE_IMAGINARY:
+		return type1->imaginary.akind == type2->imaginary.akind;
 	case TYPE_ARRAY:
 		return array_types_compatible(&type1->array, &type2->array);
 
@@ -845,35 +1139,23 @@ bool types_compatible(const type_t *type1, const type_t *type2)
 	return false;
 }
 
-/**
- * Check if two pointer types are compatible.
- */
-bool pointers_compatible(const type_t *type1, const type_t *type2)
-{
-	assert(!is_typeref(type1));
-	assert(!is_typeref(type2));
-
-	assert(type1->kind == TYPE_POINTER);
-	assert(type2->kind == TYPE_POINTER);
-	/* TODO */
-	return true;
-}
-
 /**
  * Skip all typerefs and return the underlying type.
  */
 type_t *skip_typeref(type_t *type)
 {
-	unsigned qualifiers = TYPE_QUALIFIER_NONE;
+	type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE;
+	type_modifiers_t  modifiers  = TYPE_MODIFIER_NONE;
 
-	while(true) {
-		switch(type->kind) {
+	while (true) {
+		switch (type->kind) {
 		case TYPE_ERROR:
 			return type;
 		case TYPE_TYPEDEF: {
 			qualifiers |= type->base.qualifiers;
+			modifiers  |= type->base.modifiers;
 			const typedef_type_t *typedef_type = &type->typedeft;
-			if(typedef_type->resolved_type != NULL) {
+			if (typedef_type->resolved_type != NULL) {
 				type = typedef_type->resolved_type;
 				break;
 			}
@@ -882,7 +1164,7 @@ type_t *skip_typeref(type_t *type)
 		}
 		case TYPE_TYPEOF: {
 			const typeof_type_t *typeof_type = &type->typeoft;
-			if(typeof_type->typeof_type != NULL) {
+			if (typeof_type->typeof_type != NULL) {
 				type = typeof_type->typeof_type;
 			} else {
 				type = typeof_type->expression->base.type;
@@ -895,9 +1177,21 @@ type_t *skip_typeref(type_t *type)
 		break;
 	}
 
-	if (qualifiers != TYPE_QUALIFIER_NONE) {
-		type_t *const copy     = duplicate_type(type);
-		copy->base.qualifiers |= qualifiers;
+	if (qualifiers != TYPE_QUALIFIER_NONE || modifiers != TYPE_MODIFIER_NONE) {
+		type_t *const copy = duplicate_type(type);
+
+		/* for const with typedefed array type the element type has to be
+		 * adjusted */
+		if (is_type_array(copy)) {
+			type_t *element_type           = copy->array.element_type;
+			element_type                   = duplicate_type(element_type);
+			element_type->base.qualifiers |= qualifiers;
+			element_type->base.modifiers  |= modifiers;
+			copy->array.element_type       = element_type;
+		} else {
+			copy->base.qualifiers |= qualifiers;
+			copy->base.modifiers  |= modifiers;
+		}
 
 		type = typehash_insert(copy);
 		if (type != copy) {
@@ -908,6 +1202,136 @@ type_t *skip_typeref(type_t *type)
 	return type;
 }
 
+type_qualifiers_t get_type_qualifier(const type_t *type, bool skip_array_type) {
+	type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE;
+
+	while (true) {
+		switch (type->base.kind) {
+		case TYPE_ERROR:
+			return TYPE_QUALIFIER_NONE;
+		case TYPE_TYPEDEF:
+			qualifiers |= type->base.qualifiers;
+			const typedef_type_t *typedef_type = &type->typedeft;
+			if (typedef_type->resolved_type != NULL)
+				type = typedef_type->resolved_type;
+			else
+				type = typedef_type->declaration->type;
+			continue;
+		case TYPE_TYPEOF: {
+			const typeof_type_t *typeof_type = &type->typeoft;
+			if (typeof_type->typeof_type != NULL) {
+				type = typeof_type->typeof_type;
+			} else {
+				type = typeof_type->expression->base.type;
+			}
+			continue;
+		}
+		case TYPE_ARRAY:
+			if (skip_array_type) {
+				type = type->array.element_type;
+				continue;
+			}
+			break;
+		default:
+			break;
+		}
+		break;
+	}
+	return type->base.qualifiers | qualifiers;
+}
+
+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.
@@ -915,7 +1339,7 @@ type_t *skip_typeref(type_t *type)
 static type_t *identify_new_type(type_t *type)
 {
 	type_t *result = typehash_insert(type);
-	if(result != type) {
+	if (result != type) {
 		obstack_free(type_obst, type);
 	}
 	return result;
@@ -927,14 +1351,54 @@ static type_t *identify_new_type(type_t *type)
  * @param akind       The kind of the atomic type.
  * @param qualifiers  Type qualifiers for the new type.
  */
-type_t *make_atomic_type(atomic_type_kind_t atype, type_qualifiers_t qualifiers)
+type_t *make_atomic_type(atomic_type_kind_t akind, type_qualifiers_t qualifiers)
 {
 	type_t *type = obstack_alloc(type_obst, sizeof(atomic_type_t));
 	memset(type, 0, sizeof(atomic_type_t));
 
 	type->kind            = TYPE_ATOMIC;
+	type->base.size       = get_atomic_type_size(akind);
+	type->base.alignment  = get_atomic_type_alignment(akind);
+	type->base.qualifiers = qualifiers;
+	type->atomic.akind    = akind;
+
+	return identify_new_type(type);
+}
+
+/**
+ * Creates a new complex type.
+ *
+ * @param akind       The kind of the atomic type.
+ * @param qualifiers  Type qualifiers for the new type.
+ */
+type_t *make_complex_type(atomic_type_kind_t akind, type_qualifiers_t qualifiers)
+{
+	type_t *type = obstack_alloc(type_obst, sizeof(complex_type_t));
+	memset(type, 0, sizeof(complex_type_t));
+
+	type->kind            = TYPE_COMPLEX;
+	type->base.qualifiers = qualifiers;
+	type->base.alignment  = get_atomic_type_alignment(akind);
+	type->complex.akind   = akind;
+
+	return identify_new_type(type);
+}
+
+/**
+ * Creates a new imaginary type.
+ *
+ * @param akind       The kind of the atomic type.
+ * @param qualifiers  Type qualifiers for the new type.
+ */
+type_t *make_imaginary_type(atomic_type_kind_t akind, type_qualifiers_t qualifiers)
+{
+	type_t *type = obstack_alloc(type_obst, sizeof(imaginary_type_t));
+	memset(type, 0, sizeof(imaginary_type_t));
+
+	type->kind            = TYPE_IMAGINARY;
 	type->base.qualifiers = qualifiers;
-	type->atomic.akind    = atype;
+	type->base.alignment  = get_atomic_type_alignment(akind);
+	type->imaginary.akind = akind;
 
 	return identify_new_type(type);
 }
@@ -942,7 +1406,7 @@ type_t *make_atomic_type(atomic_type_kind_t atype, type_qualifiers_t qualifiers)
 /**
  * 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)
@@ -952,11 +1416,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.
  */