X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type.c;h=df0b7593944535f6257e7171ff578f7903631bff;hb=b00408fc909b04714fcbfbc79985c70b5bedeb66;hp=6d0d1e6b9be0833bbb6aeaf55ea34d045da0e3e3;hpb=dce3e35c33077407be27b932c27b377fd5ad304f;p=cparser

diff --git a/type.c b/type.c
index 6d0d1e6..df0b759 100644
--- a/type.c
+++ b/type.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of cparser.
- * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ * Copyright (C) 2007-2009 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
@@ -23,19 +23,25 @@
 #include <assert.h>
 
 #include "type_t.h"
+#include "types.h"
+#include "entity_t.h"
 #include "symbol_t.h"
 #include "type_hash.h"
 #include "adt/error.h"
+#include "adt/util.h"
 #include "lang_features.h"
+#include "warning.h"
+#include "diagnostic.h"
+#include "printer.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 = false;
+/** The default calling convention. */
+cc_kind_t default_calling_convention = CC_CDECL;
 
-static void intern_print_type_pre(const type_t *type, bool top);
-static void intern_print_type_post(const type_t *type, bool top);
+static struct obstack type_obst;
+static bool           print_implicit_array_size = false;
+
+static void intern_print_type_pre(const type_t *type);
+static void intern_print_type_post(const type_t *type);
 
 typedef struct atomic_type_properties_t atomic_type_properties_t;
 struct atomic_type_properties_t {
@@ -44,6 +50,47 @@ struct atomic_type_properties_t {
 	unsigned   flags;             /**< type flags from atomic_type_flag_t */
 };
 
+/**
+ * Returns the size of a type node.
+ *
+ * @param kind  the type kind
+ */
+static size_t get_type_struct_size(type_kind_t kind)
+{
+	static const size_t sizes[] = {
+		[TYPE_ATOMIC]          = sizeof(atomic_type_t),
+		[TYPE_COMPLEX]         = sizeof(complex_type_t),
+		[TYPE_IMAGINARY]       = sizeof(imaginary_type_t),
+		[TYPE_BITFIELD]        = sizeof(bitfield_type_t),
+		[TYPE_COMPOUND_STRUCT] = sizeof(compound_type_t),
+		[TYPE_COMPOUND_UNION]  = sizeof(compound_type_t),
+		[TYPE_ENUM]            = sizeof(enum_type_t),
+		[TYPE_FUNCTION]        = sizeof(function_type_t),
+		[TYPE_POINTER]         = sizeof(pointer_type_t),
+		[TYPE_REFERENCE]       = sizeof(reference_type_t),
+		[TYPE_ARRAY]           = sizeof(array_type_t),
+		[TYPE_TYPEDEF]         = sizeof(typedef_type_t),
+		[TYPE_TYPEOF]          = sizeof(typeof_type_t),
+	};
+	assert(lengthof(sizes) == (int)TYPE_TYPEOF + 1);
+	assert(kind <= TYPE_TYPEOF);
+	assert(sizes[kind] != 0);
+	return sizes[kind];
+}
+
+type_t *allocate_type_zero(type_kind_t kind)
+{
+	size_t  const size = get_type_struct_size(kind);
+	type_t *const res  = obstack_alloc(&type_obst, size);
+	memset(res, 0, size);
+	res->base.kind = kind;
+
+	return res;
+}
+
+/**
+ * Properties of atomic types.
+ */
 static atomic_type_properties_t atomic_type_properties[ATOMIC_TYPE_LAST+1] = {
 	//ATOMIC_TYPE_INVALID = 0,
 	[ATOMIC_TYPE_VOID] = {
@@ -51,6 +98,12 @@ static atomic_type_properties_t atomic_type_properties[ATOMIC_TYPE_LAST+1] = {
 		.alignment  = 0,
 		.flags      = ATOMIC_TYPE_FLAG_NONE
 	},
+	[ATOMIC_TYPE_WCHAR_T] = {
+		.size       = (unsigned)-1,
+		.alignment  = (unsigned)-1,
+		/* signed flag will be set when known */
+		.flags      = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC,
+	},
 	[ATOMIC_TYPE_CHAR] = {
 		.size       = 1,
 		.alignment  = 1,
@@ -130,7 +183,7 @@ static atomic_type_properties_t atomic_type_properties[ATOMIC_TYPE_LAST+1] = {
 		              | ATOMIC_TYPE_FLAG_SIGNED,
 	},
 	[ATOMIC_TYPE_LONG_DOUBLE] = {
-		.size       = 12,
+		.size       = (unsigned) -1, /* will be filled in later */
 		.alignment  = (unsigned) -1,
 		.flags      = ATOMIC_TYPE_FLAG_FLOAT | ATOMIC_TYPE_FLAG_ARITHMETIC
 		              | ATOMIC_TYPE_FLAG_SIGNED,
@@ -138,18 +191,24 @@ static atomic_type_properties_t atomic_type_properties[ATOMIC_TYPE_LAST+1] = {
 	/* complex and imaginary types are set in init_types */
 };
 
+static inline bool is_po2(unsigned x)
+{
+	return (x & (x-1)) == 0;
+}
+
 void init_types(void)
 {
-	obstack_init(type_obst);
+	obstack_init(&type_obst);
 
 	atomic_type_properties_t *props = atomic_type_properties;
 
-	if(char_is_signed) {
+	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;
+	/* long is always 32bit on windows */
+	unsigned long_size  = c_mode & _MS ? 4 : (machine_size < 64 ? 4 : 8);
 	unsigned llong_size = machine_size < 32 ? 4 : 8;
 
 	props[ATOMIC_TYPE_INT].size            = int_size;
@@ -167,35 +226,83 @@ void init_types(void)
 
 	/* 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;
+	if (machine_size <= 32) {
+		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;
+	} else {
+		props[ATOMIC_TYPE_FLOAT].alignment       = 4;
+		props[ATOMIC_TYPE_DOUBLE].alignment      = 8;
+		props[ATOMIC_TYPE_LONG_DOUBLE].alignment = 8;
+		props[ATOMIC_TYPE_LONGLONG].alignment    = 8;
+		props[ATOMIC_TYPE_ULONGLONG].alignment   = 8;
+	}
 
-	props[ATOMIC_TYPE_BOOL] = props[ATOMIC_TYPE_UINT];
-}
+	if (long_double_size > 0) {
+		props[ATOMIC_TYPE_LONG_DOUBLE].size      = long_double_size;
+		if (is_po2(long_double_size)) {
+			props[ATOMIC_TYPE_LONG_DOUBLE].alignment = long_double_size;
+		}
+	} else {
+		props[ATOMIC_TYPE_LONG_DOUBLE] = props[ATOMIC_TYPE_DOUBLE];
+	}
 
-void exit_types(void)
-{
-	obstack_free(type_obst, NULL);
+	/* TODO: make this configurable for platforms which do not use byte sized
+	 * bools. */
+	props[ATOMIC_TYPE_BOOL] = props[ATOMIC_TYPE_UCHAR];
+
+	props[ATOMIC_TYPE_WCHAR_T] = props[wchar_atomic_kind];
 }
 
-void type_set_output(FILE *stream)
+void exit_types(void)
 {
-	out = stream;
+	obstack_free(&type_obst, NULL);
 }
 
-void inc_type_visited(void)
+void print_type_qualifiers(type_qualifiers_t const qualifiers, QualifierSeparators const q)
 {
-	type_visited++;
+	size_t sep = q & QUAL_SEP_START ? 0 : 1;
+	if (qualifiers & TYPE_QUALIFIER_CONST) {
+		print_string(" const" + sep);
+		sep = 0;
+	}
+	if (qualifiers & TYPE_QUALIFIER_VOLATILE) {
+		print_string(" volatile" + sep);
+		sep = 0;
+	}
+	if (qualifiers & TYPE_QUALIFIER_RESTRICT) {
+		print_string(" restrict" + sep);
+		sep = 0;
+	}
+	if (sep == 0 && q & QUAL_SEP_END)
+		print_char(' ');
 }
 
-void print_type_qualifiers(type_qualifiers_t qualifiers)
+const char *get_atomic_kind_name(atomic_type_kind_t kind)
 {
-	if(qualifiers & TYPE_QUALIFIER_CONST)    fputs("const ",    out);
-	if(qualifiers & TYPE_QUALIFIER_VOLATILE) fputs("volatile ", out);
-	if(qualifiers & TYPE_QUALIFIER_RESTRICT) fputs("restrict ", out);
+	switch(kind) {
+	case ATOMIC_TYPE_INVALID: break;
+	case ATOMIC_TYPE_VOID:        return "void";
+	case ATOMIC_TYPE_WCHAR_T:     return "wchar_t";
+	case ATOMIC_TYPE_BOOL:        return c_mode & _CXX ? "bool" : "_Bool";
+	case ATOMIC_TYPE_CHAR:        return "char";
+	case ATOMIC_TYPE_SCHAR:       return "signed char";
+	case ATOMIC_TYPE_UCHAR:       return "unsigned char";
+	case ATOMIC_TYPE_INT:         return "int";
+	case ATOMIC_TYPE_UINT:        return "unsigned int";
+	case ATOMIC_TYPE_SHORT:       return "short";
+	case ATOMIC_TYPE_USHORT:      return "unsigned short";
+	case ATOMIC_TYPE_LONG:        return "long";
+	case ATOMIC_TYPE_ULONG:       return "unsigned long";
+	case ATOMIC_TYPE_LONGLONG:    return "long long";
+	case ATOMIC_TYPE_ULONGLONG:   return "unsigned long long";
+	case ATOMIC_TYPE_LONG_DOUBLE: return "long double";
+	case ATOMIC_TYPE_FLOAT:       return "float";
+	case ATOMIC_TYPE_DOUBLE:      return "double";
+	}
+	return "INVALIDATOMIC";
 }
 
 /**
@@ -203,30 +310,10 @@ void print_type_qualifiers(type_qualifiers_t qualifiers)
  *
  * @param kind  The type kind.
  */
-static
-void print_atomic_kinds(atomic_type_kind_t kind)
+static void print_atomic_kinds(atomic_type_kind_t kind)
 {
-	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;
-	case ATOMIC_TYPE_SCHAR:       s = "signed char";        break;
-	case ATOMIC_TYPE_UCHAR:       s = "unsigned char";      break;
-	case ATOMIC_TYPE_INT:         s = "int";                break;
-	case ATOMIC_TYPE_UINT:        s = "unsigned int";       break;
-	case ATOMIC_TYPE_SHORT:       s = "short";              break;
-	case ATOMIC_TYPE_USHORT:      s = "unsigned short";     break;
-	case ATOMIC_TYPE_LONG:        s = "long";               break;
-	case ATOMIC_TYPE_ULONG:       s = "unsigned long";      break;
-	case ATOMIC_TYPE_LONGLONG:    s = "long long";          break;
-	case ATOMIC_TYPE_ULONGLONG:   s = "unsigned long long"; break;
-	case ATOMIC_TYPE_LONG_DOUBLE: s = "long double";        break;
-	case ATOMIC_TYPE_FLOAT:       s = "float";              break;
-	case ATOMIC_TYPE_DOUBLE:      s = "double";             break;
-	}
-	fputs(s, out);
+	const char *s = get_atomic_kind_name(kind);
+	print_string(s);
 }
 
 /**
@@ -234,10 +321,9 @@ void print_atomic_kinds(atomic_type_kind_t kind)
  *
  * @param type  The type.
  */
-static
-void print_atomic_type(const atomic_type_t *type)
+static void print_atomic_type(const atomic_type_t *type)
 {
-	print_type_qualifiers(type->base.qualifiers);
+	print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END);
 	print_atomic_kinds(type->akind);
 }
 
@@ -246,11 +332,10 @@ void print_atomic_type(const atomic_type_t *type)
  *
  * @param type  The type.
  */
-static
-void print_complex_type(const complex_type_t *type)
+static void print_complex_type(const complex_type_t *type)
 {
-	print_type_qualifiers(type->base.qualifiers);
-	fputs("_Complex ", out);
+	print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END);
+	print_string("_Complex");
 	print_atomic_kinds(type->akind);
 }
 
@@ -259,11 +344,10 @@ void print_complex_type(const complex_type_t *type)
  *
  * @param type  The type.
  */
-static
-void print_imaginary_type(const imaginary_type_t *type)
+static void print_imaginary_type(const imaginary_type_t *type)
 {
-	print_type_qualifiers(type->base.qualifiers);
-	fputs("_Imaginary ", out);
+	print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END);
+	print_string("_Imaginary ");
 	print_atomic_kinds(type->akind);
 }
 
@@ -271,70 +355,98 @@ void print_imaginary_type(const imaginary_type_t *type)
  * Print the first part (the prefix) of a type.
  *
  * @param type   The type to print.
- * @param top    true, if this is the top type, false if it's an embedded type.
  */
-static void print_function_type_pre(const function_type_t *type, bool top)
+static void print_function_type_pre(const function_type_t *type)
 {
-	print_type_qualifiers(type->base.qualifiers);
+	switch (type->linkage) {
+		case LINKAGE_INVALID:
+			break;
+
+		case LINKAGE_C:
+			if (c_mode & _CXX)
+				print_string("extern \"C\" ");
+			break;
 
-	intern_print_type_pre(type->return_type, false);
+		case LINKAGE_CXX:
+			if (!(c_mode & _CXX))
+				print_string("extern \"C++\" ");
+			break;
+	}
 
-	/* don't emit braces if we're the toplevel type... */
-	if(!top)
-		fputc('(', out);
+	print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END);
+
+	intern_print_type_pre(type->return_type);
+
+	cc_kind_t cc = type->calling_convention;
+restart:
+	switch (cc) {
+	case CC_CDECL:    print_string(" __cdecl");    break;
+	case CC_STDCALL:  print_string(" __stdcall");  break;
+	case CC_FASTCALL: print_string(" __fastcall"); break;
+	case CC_THISCALL: print_string(" __thiscall"); break;
+	case CC_DEFAULT:
+		if (default_calling_convention != CC_CDECL) {
+			/* show the default calling convention if its not cdecl */
+			cc = default_calling_convention;
+			goto restart;
+		}
+		break;
+	}
 }
 
 /**
  * Print the second part (the postfix) of a type.
  *
  * @param type   The type to print.
- * @param top    true, if this is the top type, false if it's an embedded type.
  */
 static void print_function_type_post(const function_type_t *type,
-                                     const scope_t *scope, bool top)
+                                     const scope_t *parameters)
 {
-	intern_print_type_post(type->return_type, false);
-	/* don't emit braces if we're the toplevel type... */
-	if(!top)
-		fputc(')', out);
-
-	fputc('(', out);
-
+	print_string("(");
 	bool first = true;
-	if(scope == NULL) {
+	if (parameters == NULL) {
 		function_parameter_t *parameter = type->parameters;
 		for( ; parameter != NULL; parameter = parameter->next) {
-			if(first) {
+			if (first) {
 				first = false;
 			} else {
-				fputs(", ", out);
+				print_string(", ");
 			}
 			print_type(parameter->type);
 		}
 	} else {
-		declaration_t *parameter = scope->declarations;
-		for( ; parameter != NULL; parameter = parameter->next) {
-			if(first) {
+		entity_t *parameter = parameters->entities;
+		for (; parameter != NULL; parameter = parameter->base.next) {
+			if (parameter->kind != ENTITY_PARAMETER)
+				continue;
+
+			if (first) {
 				first = false;
 			} else {
-				fputs(", ", out);
+				print_string(", ");
+			}
+			const type_t *const param_type = parameter->declaration.type;
+			if (param_type == NULL) {
+				print_string(parameter->base.symbol->string);
+			} else {
+				print_type_ext(param_type, parameter->base.symbol, NULL);
 			}
-			print_type_ext(parameter->type, parameter->symbol,
-			               &parameter->scope);
 		}
 	}
-	if(type->variadic) {
-		if(first) {
+	if (type->variadic) {
+		if (first) {
 			first = false;
 		} else {
-			fputs(", ", out);
+			print_string(", ");
 		}
-		fputs("...", out);
+		print_string("...");
 	}
-	if(first && !type->unspecified_parameters) {
-		fputs("void", out);
+	if (first && !type->unspecified_parameters) {
+		print_string("void");
 	}
-	fputc(')', out);
+	print_string(")");
+
+	intern_print_type_post(type->return_type);
 }
 
 /**
@@ -344,9 +456,18 @@ 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, false);
-	fputs("*", out);
-	print_type_qualifiers(type->base.qualifiers);
+	type_t const *const points_to = type->points_to;
+	intern_print_type_pre(points_to);
+	if (points_to->kind == TYPE_ARRAY || points_to->kind == TYPE_FUNCTION)
+		print_string(" (");
+	variable_t *const variable = type->base_variable;
+	if (variable != NULL) {
+		print_string(" __based(");
+		print_string(variable->base.base.symbol->string);
+		print_string(") ");
+	}
+	print_string("*");
+	print_type_qualifiers(type->base.qualifiers, QUAL_SEP_START);
 }
 
 /**
@@ -356,7 +477,37 @@ static void print_pointer_type_pre(const pointer_type_t *type)
  */
 static void print_pointer_type_post(const pointer_type_t *type)
 {
-	intern_print_type_post(type->points_to, false);
+	type_t const *const points_to = type->points_to;
+	if (points_to->kind == TYPE_ARRAY || points_to->kind == TYPE_FUNCTION)
+		print_string(")");
+	intern_print_type_post(points_to);
+}
+
+/**
+ * Prints the prefix part of a reference type.
+ *
+ * @param type   The reference type.
+ */
+static void print_reference_type_pre(const reference_type_t *type)
+{
+	type_t const *const refers_to = type->refers_to;
+	intern_print_type_pre(refers_to);
+	if (refers_to->kind == TYPE_ARRAY || refers_to->kind == TYPE_FUNCTION)
+		print_string(" (");
+	print_string("&");
+}
+
+/**
+ * Prints the postfix part of a reference type.
+ *
+ * @param type   The reference type.
+ */
+static void print_reference_type_post(const reference_type_t *type)
+{
+	type_t const *const refers_to = type->refers_to;
+	if (refers_to->kind == TYPE_ARRAY || refers_to->kind == TYPE_FUNCTION)
+		print_string(")");
+	intern_print_type_post(refers_to);
 }
 
 /**
@@ -366,7 +517,7 @@ static void print_pointer_type_post(const pointer_type_t *type)
  */
 static void print_array_type_pre(const array_type_t *type)
 {
-	intern_print_type_pre(type->element_type, false);
+	intern_print_type_pre(type->element_type);
 }
 
 /**
@@ -376,17 +527,17 @@ 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) {
-		fputs("static ", out);
+	print_string("[");
+	if (type->is_static) {
+		print_string("static ");
 	}
-	print_type_qualifiers(type->base.qualifiers);
-	if(type->size_expression != NULL
+	print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END);
+	if (type->size_expression != NULL
 			&& (print_implicit_array_size || !type->has_implicit_size)) {
 		print_expression(type->size_expression);
 	}
-	fputc(']', out);
-	intern_print_type_post(type->element_type, false);
+	print_string("]");
+	intern_print_type_post(type->element_type);
 }
 
 /**
@@ -396,9 +547,9 @@ 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_type, false);
+	print_string(" : ");
+	print_expression(type->size_expression);
+	intern_print_type_post(type->base_type);
 }
 
 /**
@@ -406,34 +557,31 @@ static void print_bitfield_type_post(const bitfield_type_t *type)
  *
  * @param declaration  The enum's type declaration.
  */
-void print_enum_definition(const declaration_t *declaration)
+void print_enum_definition(const enum_t *enume)
 {
-	fputs("{\n", out);
+	print_string("{\n");
 
 	change_indent(1);
 
-	declaration_t *entry = declaration->next;
-	for( ; entry != NULL && entry->storage_class == STORAGE_CLASS_ENUM_ENTRY;
-	       entry = entry->next) {
+	entity_t *entry = enume->base.next;
+	for( ; entry != NULL && entry->kind == ENTITY_ENUM_VALUE;
+	       entry = entry->base.next) {
 
 		print_indent();
-		fprintf(out, "%s", entry->symbol->string);
-		if(entry->init.initializer != NULL) {
-			fprintf(out, " = ");
+		print_string(entry->base.symbol->string);
+		if (entry->enum_value.value != NULL) {
+			print_string(" = ");
 
 			/* skip the implicit cast */
-			expression_t *expression = entry->init.enum_value;
-			if(expression->kind == EXPR_UNARY_CAST_IMPLICIT) {
-				expression = expression->unary.value;
-			}
+			expression_t *expression = entry->enum_value.value;
 			print_expression(expression);
 		}
-		fprintf(out, ",\n");
+		print_string(",\n");
 	}
 
 	change_indent(-1);
 	print_indent();
-	fputs("}", out);
+	print_string("}");
 }
 
 /**
@@ -443,38 +591,42 @@ void print_enum_definition(const declaration_t *declaration)
  */
 static void print_type_enum(const enum_type_t *type)
 {
-	print_type_qualifiers(type->base.qualifiers);
-	fputs("enum ", out);
+	print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END);
+	print_string("enum ");
 
-	declaration_t *declaration = type->declaration;
-	symbol_t      *symbol      = declaration->symbol;
-	if(symbol != NULL) {
-		fputs(symbol->string, out);
+	enum_t   *enume  = type->enume;
+	symbol_t *symbol = enume->base.symbol;
+	if (symbol != NULL) {
+		print_string(symbol->string);
 	} else {
-		print_enum_definition(declaration);
+		print_enum_definition(enume);
 	}
 }
 
 /**
  * Print the compound part of a compound type.
- *
- * @param declaration  The declaration of the compound type.
  */
-void print_compound_definition(const declaration_t *declaration)
+void print_compound_definition(const compound_t *compound)
 {
-	fputs("{\n", out);
+	print_string("{\n");
 	change_indent(1);
 
-	declaration_t *iter = declaration->scope.declarations;
-	for( ; iter != NULL; iter = iter->next) {
+	entity_t *entity = compound->members.entities;
+	for( ; entity != NULL; entity = entity->base.next) {
+		if (entity->kind != ENTITY_COMPOUND_MEMBER)
+			continue;
+
 		print_indent();
-		print_declaration(iter);
-		fputc('\n', out);
+		print_entity(entity);
+		print_string("\n");
 	}
 
 	change_indent(-1);
 	print_indent();
-	fputs("}", out);
+	print_string("}");
+	if (compound->modifiers & DM_TRANSPARENT_UNION) {
+		print_string("__attribute__((__transparent_union__))");
+	}
 }
 
 /**
@@ -484,21 +636,21 @@ void print_compound_definition(const declaration_t *declaration)
  */
 static void print_compound_type(const compound_type_t *type)
 {
-	print_type_qualifiers(type->base.qualifiers);
+	print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END);
 
-	if(type->base.kind == TYPE_COMPOUND_STRUCT) {
-		fputs("struct ", out);
+	if (type->base.kind == TYPE_COMPOUND_STRUCT) {
+		print_string("struct ");
 	} else {
 		assert(type->base.kind == TYPE_COMPOUND_UNION);
-		fputs("union ", out);
+		print_string("union ");
 	}
 
-	declaration_t *declaration = type->declaration;
-	symbol_t      *symbol      = declaration->symbol;
-	if(symbol != NULL) {
-		fputs(symbol->string, out);
+	compound_t *compound = type->compound;
+	symbol_t   *symbol   = compound->base.symbol;
+	if (symbol != NULL) {
+		print_string(symbol->string);
 	} else {
-		print_compound_definition(declaration);
+		print_compound_definition(compound);
 	}
 }
 
@@ -509,8 +661,8 @@ 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->base.qualifiers);
-	fputs(type->declaration->symbol->string, out);
+	print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END);
+	print_string(type->typedefe->base.symbol->string);
 }
 
 /**
@@ -520,29 +672,28 @@ 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) {
-		assert(type->typeof_type == NULL);
+	print_string("typeof(");
+	if (type->expression != NULL) {
 		print_expression(type->expression);
 	} else {
 		print_type(type->typeof_type);
 	}
-	fputc(')', out);
+	print_string(")");
 }
 
 /**
  * Prints the prefix part of a type.
  *
  * @param type   The type.
- * @param top    true if we print the toplevel type, false else.
  */
-static void intern_print_type_pre(const type_t *const type, const bool top)
+static void intern_print_type_pre(const type_t *const type)
 {
 	switch(type->kind) {
 	case TYPE_ERROR:
-		fputs("<error>", out);
+		print_string("<error>");
+		return;
 	case TYPE_INVALID:
-		fputs("<invalid>", out);
+		print_string("<invalid>");
 		return;
 	case TYPE_ENUM:
 		print_type_enum(&type->enumt);
@@ -560,17 +711,17 @@ static void intern_print_type_pre(const type_t *const type, const bool top)
 	case TYPE_COMPOUND_UNION:
 		print_compound_type(&type->compound);
 		return;
-	case TYPE_BUILTIN:
-		fputs(type->builtin.symbol->string, out);
-		return;
 	case TYPE_FUNCTION:
-		print_function_type_pre(&type->function, top);
+		print_function_type_pre(&type->function);
 		return;
 	case TYPE_POINTER:
 		print_pointer_type_pre(&type->pointer);
 		return;
+	case TYPE_REFERENCE:
+		print_reference_type_pre(&type->reference);
+		return;
 	case TYPE_BITFIELD:
-		intern_print_type_pre(type->bitfield.base_type, top);
+		intern_print_type_pre(type->bitfield.base_type);
 		return;
 	case TYPE_ARRAY:
 		print_array_type_pre(&type->array);
@@ -582,24 +733,26 @@ static void intern_print_type_pre(const type_t *const type, const bool top)
 		print_typeof_type_pre(&type->typeoft);
 		return;
 	}
-	fputs("unknown", out);
+	print_string("unknown");
 }
 
 /**
  * Prints the postfix part of a type.
  *
  * @param type   The type.
- * @param top    true if we print the toplevel type, false else.
  */
-static void intern_print_type_post(const type_t *const type, const bool top)
+static void intern_print_type_post(const type_t *const type)
 {
 	switch(type->kind) {
 	case TYPE_FUNCTION:
-		print_function_type_post(&type->function, NULL, top);
+		print_function_type_post(&type->function, NULL);
 		return;
 	case TYPE_POINTER:
 		print_pointer_type_post(&type->pointer);
 		return;
+	case TYPE_REFERENCE:
+		print_reference_type_post(&type->reference);
+		return;
 	case TYPE_ARRAY:
 		print_array_type_post(&type->array);
 		return;
@@ -614,7 +767,6 @@ static void intern_print_type_post(const type_t *const type, const bool top)
 	case TYPE_ENUM:
 	case TYPE_COMPOUND_STRUCT:
 	case TYPE_COMPOUND_UNION:
-	case TYPE_BUILTIN:
 	case TYPE_TYPEOF:
 	case TYPE_TYPEDEF:
 		break;
@@ -632,50 +784,18 @@ 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)
+                    const scope_t *parameters)
 {
-	if(type == NULL) {
-		fputs("nil type", out);
-		return;
+	intern_print_type_pre(type);
+	if (symbol != NULL) {
+		print_string(" ");
+		print_string(symbol->string);
 	}
-
-	intern_print_type_pre(type, true);
-	if(symbol != NULL) {
-		fputc(' ', out);
-		fputs(symbol->string, out);
-	}
-	if(type->kind == TYPE_FUNCTION) {
-		print_function_type_post(&type->function, scope, true);
+	if (type->kind == TYPE_FUNCTION) {
+		print_function_type_post(&type->function, parameters);
 	} else {
-		intern_print_type_post(type, true);
-	}
-}
-
-/**
- * Return the size of a type AST node.
- *
- * @param type  The type.
- */
-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);
-	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_ERROR:           panic("error type found");
-	case TYPE_INVALID:         panic("invalid type found");
+		intern_print_type_post(type);
 	}
-	panic("unknown type found");
 }
 
 /**
@@ -688,10 +808,11 @@ static size_t get_type_size(const type_t *type)
  */
 type_t *duplicate_type(const type_t *type)
 {
-	size_t size = get_type_size(type);
+	size_t size = get_type_struct_size(type->kind);
 
-	type_t *copy = obstack_alloc(type_obst, size);
+	type_t *const copy = obstack_alloc(&type_obst, size);
 	memcpy(copy, type, size);
+	copy->base.firm_type = NULL;
 
 	return copy;
 }
@@ -704,18 +825,43 @@ 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) {
-		obstack_free(type_obst, unqualified_type);
+	return identify_new_type(unqualified_type);
+}
+
+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) == (int)qual)
+			return orig_type;
+
+		copy                   = duplicate_type(type);
+		copy->base.qualifiers |= qual;
+	} else {
+		return type;
 	}
 
-	return result;
+	return identify_new_type(copy);
 }
 
 /**
@@ -746,17 +892,29 @@ 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)
+	if (type->kind == TYPE_BITFIELD)
 		return true;
 
-	if(type->kind != TYPE_ATOMIC)
+	if (type->kind != TYPE_ATOMIC)
 		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;
+}
+
 /**
  * Returns true if the given type is an floating point type.
  *
@@ -767,12 +925,28 @@ bool is_type_float(const type_t *type)
 {
 	assert(!is_typeref(type));
 
-	if(type->kind != TYPE_ATOMIC)
+	if (type->kind != TYPE_ATOMIC)
 		return false;
 
 	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);
+}
+
 /**
  * Returns true if the given type is a signed type.
  *
@@ -784,12 +958,12 @@ bool is_type_signed(const type_t *type)
 	assert(!is_typeref(type));
 
 	/* enum types are int for now */
-	if(type->kind == TYPE_ENUM)
+	if (type->kind == TYPE_ENUM)
 		return true;
-	if(type->kind == TYPE_BITFIELD)
+	if (type->kind == TYPE_BITFIELD)
 		return is_type_signed(type->bitfield.base_type);
 
-	if(type->kind != TYPE_ATOMIC)
+	if (type->kind != TYPE_ATOMIC)
 		return false;
 
 	return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_SIGNED);
@@ -820,11 +994,16 @@ bool is_type_arithmetic(const type_t *type)
 	}
 }
 
+/**
+ * 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)
-		|| (type->kind == TYPE_ATOMIC && is_type_float(type));
+	/* 6.2.5 (17) */
+	return is_type_integer(type) || is_type_float(type);
 }
 
 /**
@@ -837,11 +1016,8 @@ bool is_type_scalar(const type_t *type)
 {
 	assert(!is_typeref(type));
 
-	switch (type->kind) {
-		case TYPE_POINTER: return true;
-		case TYPE_BUILTIN: return is_type_scalar(type->builtin.real_type);
-		default:           break;
-	}
+	if (type->kind == TYPE_POINTER)
+		return true;
 
 	return is_type_arithmetic(type);
 }
@@ -860,14 +1036,10 @@ bool is_type_incomplete(const type_t *type)
 	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.complete;
-	}
-	case TYPE_ENUM: {
-		const enum_type_t *enum_type   = &type->enumt;
-		declaration_t     *declaration = enum_type->declaration;
-		return !declaration->init.complete;
+		return !compound_type->compound->complete;
 	}
+	case TYPE_ENUM:
+		return false;
 
 	case TYPE_ARRAY:
 		return type->array.size_expression == NULL
@@ -885,7 +1057,7 @@ bool is_type_incomplete(const type_t *type)
 	case TYPE_BITFIELD:
 	case TYPE_FUNCTION:
 	case TYPE_POINTER:
-	case TYPE_BUILTIN:
+	case TYPE_REFERENCE:
 	case TYPE_ERROR:
 		return false;
 
@@ -915,13 +1087,27 @@ static bool function_types_compatible(const function_type_t *func1,
 	if (!types_compatible(ret1, ret2))
 		return false;
 
-	/* can parameters be compared? */
-	if (func1->unspecified_parameters || func2->unspecified_parameters)
-		return true;
+	if (func1->linkage != func2->linkage)
+		return false;
+
+	cc_kind_t cc1 = func1->calling_convention;
+	if (cc1 == CC_DEFAULT)
+		cc1 = default_calling_convention;
+	cc_kind_t cc2 = func2->calling_convention;
+	if (cc2 == CC_DEFAULT)
+		cc2 = default_calling_convention;
+
+	if (cc1 != cc2)
+		return false;
 
 	if (func1->variadic != func2->variadic)
 		return false;
 
+	/* can parameters be compared? */
+	if ((func1->unspecified_parameters && !func1->kr_style_parameters)
+			|| (func2->unspecified_parameters && !func2->kr_style_parameters))
+		return true;
+
 	/* TODO: handling of unspecified parameters not correct yet */
 
 	/* all argument types must be compatible */
@@ -953,10 +1139,10 @@ 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_constant || !array2->size_constant)
+	if (!array1->size_constant || !array2->size_constant)
 		return true;
 
 	return array1->size == array2->size;
@@ -971,15 +1157,18 @@ 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(type1->base.qualifiers != type2->base.qualifiers)
+	if (!is_type_valid(type1) || !is_type_valid(type2))
+		return true;
+
+	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:
@@ -997,10 +1186,19 @@ bool types_compatible(const type_t *type1, const type_t *type2)
 		return types_compatible(to1, to2);
 	}
 
+	case TYPE_REFERENCE: {
+		const type_t *const to1 = skip_typeref(type1->reference.refers_to);
+		const type_t *const to2 = skip_typeref(type2->reference.refers_to);
+		return types_compatible(to1, to2);
+	}
+
 	case TYPE_COMPOUND_STRUCT:
-	case TYPE_COMPOUND_UNION:
+	case TYPE_COMPOUND_UNION: {
+
+
+		break;
+	}
 	case TYPE_ENUM:
-	case TYPE_BUILTIN:
 		/* TODO: not implemented */
 		break;
 
@@ -1023,52 +1221,32 @@ 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);
-	(void) type1;
-	(void) type2;
-	/* 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;
 
-	while(true) {
-		switch(type->kind) {
+	while (true) {
+		switch (type->kind) {
 		case TYPE_ERROR:
 			return type;
 		case TYPE_TYPEDEF: {
 			qualifiers |= type->base.qualifiers;
+
 			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;
 			}
-			type = typedef_type->declaration->type;
+			type = typedef_type->typedefe->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;
-			}
+		case TYPE_TYPEOF:
+			qualifiers |= type->base.qualifiers;
+			type        = type->typeoft.typeof_type;
 			continue;
-		}
 		default:
 			break;
 		}
@@ -1089,15 +1267,176 @@ type_t *skip_typeref(type_t *type)
 			copy->base.qualifiers |= qualifiers;
 		}
 
-		type = typehash_insert(copy);
-		if (type != copy) {
-			obstack_free(type_obst, copy);
-		}
+		type = identify_new_type(copy);
 	}
 
 	return type;
 }
 
+unsigned get_type_size(type_t *type)
+{
+	switch (type->kind) {
+	case TYPE_INVALID:
+		break;
+	case TYPE_ERROR:
+		return 0;
+	case TYPE_ATOMIC:
+		return get_atomic_type_size(type->atomic.akind);
+	case TYPE_COMPLEX:
+		return get_atomic_type_size(type->complex.akind) * 2;
+	case TYPE_IMAGINARY:
+		return get_atomic_type_size(type->imaginary.akind);
+	case TYPE_COMPOUND_UNION:
+		layout_union_type(&type->compound);
+		return type->compound.compound->size;
+	case TYPE_COMPOUND_STRUCT:
+		layout_struct_type(&type->compound);
+		return type->compound.compound->size;
+	case TYPE_ENUM:
+		return get_atomic_type_size(type->enumt.akind);
+	case TYPE_FUNCTION:
+		return 0; /* non-const (but "address-const") */
+	case TYPE_REFERENCE:
+	case TYPE_POINTER:
+		/* TODO: make configurable by backend */
+		return 4;
+	case TYPE_ARRAY: {
+		/* TODO: correct if element_type is aligned? */
+		il_size_t element_size = get_type_size(type->array.element_type);
+		return type->array.size * element_size;
+	}
+	case TYPE_BITFIELD:
+		return 0;
+	case TYPE_TYPEDEF:
+		return get_type_size(type->typedeft.typedefe->type);
+	case TYPE_TYPEOF:
+		if (type->typeoft.typeof_type) {
+			return get_type_size(type->typeoft.typeof_type);
+		} else {
+			return get_type_size(type->typeoft.expression->base.type);
+		}
+	}
+	panic("invalid type in get_type_size");
+}
+
+unsigned get_type_alignment(type_t *type)
+{
+	switch (type->kind) {
+	case TYPE_INVALID:
+		break;
+	case TYPE_ERROR:
+		return 0;
+	case TYPE_ATOMIC:
+		return get_atomic_type_alignment(type->atomic.akind);
+	case TYPE_COMPLEX:
+		return get_atomic_type_alignment(type->complex.akind);
+	case TYPE_IMAGINARY:
+		return get_atomic_type_alignment(type->imaginary.akind);
+	case TYPE_COMPOUND_UNION:
+		layout_union_type(&type->compound);
+		return type->compound.compound->alignment;
+	case TYPE_COMPOUND_STRUCT:
+		layout_struct_type(&type->compound);
+		return type->compound.compound->alignment;
+	case TYPE_ENUM:
+		return get_atomic_type_alignment(type->enumt.akind);
+	case TYPE_FUNCTION:
+		/* what is correct here? */
+		return 4;
+	case TYPE_REFERENCE:
+	case TYPE_POINTER:
+		/* TODO: make configurable by backend */
+		return 4;
+	case TYPE_ARRAY:
+		return get_type_alignment(type->array.element_type);
+	case TYPE_BITFIELD:
+		return 0;
+	case TYPE_TYPEDEF: {
+		il_alignment_t alignment
+			= get_type_alignment(type->typedeft.typedefe->type);
+		if (type->typedeft.typedefe->alignment > alignment)
+			alignment = type->typedeft.typedefe->alignment;
+
+		return alignment;
+	}
+	case TYPE_TYPEOF:
+		if (type->typeoft.typeof_type) {
+			return get_type_alignment(type->typeoft.typeof_type);
+		} else {
+			return get_type_alignment(type->typeoft.expression->base.type);
+		}
+	}
+	panic("invalid type in get_type_alignment");
+}
+
+decl_modifiers_t get_type_modifiers(const type_t *type)
+{
+	switch(type->kind) {
+	case TYPE_INVALID:
+	case TYPE_ERROR:
+		break;
+	case TYPE_COMPOUND_STRUCT:
+	case TYPE_COMPOUND_UNION:
+		return type->compound.compound->modifiers;
+	case TYPE_FUNCTION:
+		return type->function.modifiers;
+	case TYPE_ENUM:
+	case TYPE_ATOMIC:
+	case TYPE_COMPLEX:
+	case TYPE_IMAGINARY:
+	case TYPE_REFERENCE:
+	case TYPE_POINTER:
+	case TYPE_BITFIELD:
+	case TYPE_ARRAY:
+		return 0;
+	case TYPE_TYPEDEF: {
+		decl_modifiers_t modifiers = type->typedeft.typedefe->modifiers;
+		modifiers |= get_type_modifiers(type->typedeft.typedefe->type);
+		return modifiers;
+	}
+	case TYPE_TYPEOF:
+		if (type->typeoft.typeof_type) {
+			return get_type_modifiers(type->typeoft.typeof_type);
+		} else {
+			return get_type_modifiers(type->typeoft.expression->base.type);
+		}
+	}
+	panic("invalid type found in get_type_modifiers");
+}
+
+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->typedefe->type;
+			continue;
+		case TYPE_TYPEOF:
+			type = type->typeoft.typeof_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);
@@ -1118,9 +1457,9 @@ unsigned get_atomic_type_flags(atomic_type_kind_t kind)
 
 atomic_type_kind_t get_intptr_kind(void)
 {
-	if(machine_size <= 32)
+	if (machine_size <= 32)
 		return ATOMIC_TYPE_INT;
-	else if(machine_size <= 64)
+	else if (machine_size <= 64)
 		return ATOMIC_TYPE_LONG;
 	else
 		return ATOMIC_TYPE_LONGLONG;
@@ -1128,9 +1467,9 @@ atomic_type_kind_t get_intptr_kind(void)
 
 atomic_type_kind_t get_uintptr_kind(void)
 {
-	if(machine_size <= 32)
+	if (machine_size <= 32)
 		return ATOMIC_TYPE_UINT;
-	else if(machine_size <= 64)
+	else if (machine_size <= 64)
 		return ATOMIC_TYPE_ULONG;
 	else
 		return ATOMIC_TYPE_ULONGLONG;
@@ -1139,12 +1478,13 @@ atomic_type_kind_t get_uintptr_kind(void)
 /**
  * Find the atomic type kind representing a given size (signed).
  */
-atomic_type_kind_t find_signed_int_atomic_type_kind_for_size(unsigned size) {
+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) {
+	if (kind == ATOMIC_TYPE_INVALID) {
 		static const atomic_type_kind_t possible_kinds[] = {
 			ATOMIC_TYPE_SCHAR,
 			ATOMIC_TYPE_SHORT,
@@ -1152,8 +1492,8 @@ atomic_type_kind_t find_signed_int_atomic_type_kind_for_size(unsigned size) {
 			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) {
+		for (size_t i = 0; i < lengthof(possible_kinds); ++i) {
+			if (get_atomic_type_size(possible_kinds[i]) == size) {
 				kind = possible_kinds[i];
 				break;
 			}
@@ -1166,12 +1506,13 @@ atomic_type_kind_t find_signed_int_atomic_type_kind_for_size(unsigned size) {
 /**
  * Find the atomic type kind representing a given size (signed).
  */
-atomic_type_kind_t find_unsigned_int_atomic_type_kind_for_size(unsigned size) {
+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) {
+	if (kind == ATOMIC_TYPE_INVALID) {
 		static const atomic_type_kind_t possible_kinds[] = {
 			ATOMIC_TYPE_UCHAR,
 			ATOMIC_TYPE_USHORT,
@@ -1179,8 +1520,8 @@ atomic_type_kind_t find_unsigned_int_atomic_type_kind_for_size(unsigned size) {
 			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) {
+		for (size_t i = 0; i < lengthof(possible_kinds); ++i) {
+			if (get_atomic_type_size(possible_kinds[i]) == size) {
 				kind = possible_kinds[i];
 				break;
 			}
@@ -1194,11 +1535,11 @@ atomic_type_kind_t find_unsigned_int_atomic_type_kind_for_size(unsigned size) {
  * Hash the given type and return the "singleton" version
  * of it.
  */
-static type_t *identify_new_type(type_t *type)
+type_t *identify_new_type(type_t *type)
 {
 	type_t *result = typehash_insert(type);
-	if(result != type) {
-		obstack_free(type_obst, type);
+	if (result != type) {
+		obstack_free(&type_obst, type);
 	}
 	return result;
 }
@@ -1211,12 +1552,8 @@ static type_t *identify_new_type(type_t *type)
  */
 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_t *const type = allocate_type_zero(TYPE_ATOMIC);
 	type->base.qualifiers = qualifiers;
-	type->base.alignment  = get_atomic_type_alignment(akind);
 	type->atomic.akind    = akind;
 
 	return identify_new_type(type);
@@ -1230,12 +1567,8 @@ type_t *make_atomic_type(atomic_type_kind_t akind, type_qualifiers_t qualifiers)
  */
 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_t *const type = allocate_type_zero(TYPE_COMPLEX);
 	type->base.qualifiers = qualifiers;
-	type->base.alignment  = get_atomic_type_alignment(akind);
 	type->complex.akind   = akind;
 
 	return identify_new_type(type);
@@ -1249,12 +1582,8 @@ type_t *make_complex_type(atomic_type_kind_t akind, type_qualifiers_t qualifiers
  */
 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_t *const type = allocate_type_zero(TYPE_IMAGINARY);
 	type->base.qualifiers = qualifiers;
-	type->base.alignment  = get_atomic_type_alignment(akind);
 	type->imaginary.akind = akind;
 
 	return identify_new_type(type);
@@ -1268,26 +1597,52 @@ type_t *make_imaginary_type(atomic_type_kind_t akind, type_qualifiers_t qualifie
  */
 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_t *const type = allocate_type_zero(TYPE_POINTER);
+	type->base.qualifiers       = qualifiers;
+	type->pointer.points_to     = points_to;
+	type->pointer.base_variable = NULL;
+
+	return identify_new_type(type);
+}
+
+/**
+ * Creates a new reference type.
+ *
+ * @param refers_to   The referred-to type for the new type.
+ */
+type_t *make_reference_type(type_t *refers_to)
+{
+	type_t *const type = allocate_type_zero(TYPE_REFERENCE);
+	type->base.qualifiers     = TYPE_QUALIFIER_NONE;
+	type->reference.refers_to = refers_to;
+
+	return identify_new_type(type);
+}
 
-	type->kind              = TYPE_POINTER;
-	type->base.qualifiers   = qualifiers;
-	type->base.alignment    = 0;
-	type->pointer.points_to = points_to;
+/**
+ * Creates a new based pointer type.
+ *
+ * @param points_to   The points-to type for the new type.
+ * @param qualifiers  Type qualifiers for the new type.
+ * @param variable    The based variable
+ */
+type_t *make_based_pointer_type(type_t *points_to,
+								type_qualifiers_t qualifiers, variable_t *variable)
+{
+	type_t *const type = allocate_type_zero(TYPE_POINTER);
+	type->base.qualifiers       = qualifiers;
+	type->pointer.points_to     = points_to;
+	type->pointer.base_variable = variable;
 
 	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_t *const type = allocate_type_zero(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;
@@ -1295,16 +1650,257 @@ type_t *make_array_type(type_t *element_type, size_t size,
 	return identify_new_type(type);
 }
 
+static entity_t *pack_bitfield_members(il_size_t *struct_offset,
+                                       il_alignment_t *struct_alignment,
+									   bool packed, entity_t *first)
+{
+	il_size_t      offset     = *struct_offset;
+	il_alignment_t alignment  = *struct_alignment;
+	size_t         bit_offset = 0;
+
+	entity_t *member;
+	for (member = first; member != NULL; member = member->base.next) {
+		if (member->kind != ENTITY_COMPOUND_MEMBER)
+			continue;
+
+		type_t *type = member->declaration.type;
+		if (type->kind != TYPE_BITFIELD)
+			break;
+
+		type_t *base_type = skip_typeref(type->bitfield.base_type);
+		il_alignment_t base_alignment = get_type_alignment(base_type);
+		il_alignment_t alignment_mask = base_alignment-1;
+		if (base_alignment > alignment)
+			alignment = base_alignment;
+
+		size_t bit_size = type->bitfield.bit_size;
+		if (!packed) {
+			bit_offset += (offset & alignment_mask) * BITS_PER_BYTE;
+			offset     &= ~alignment_mask;
+			size_t base_size = get_type_size(base_type) * BITS_PER_BYTE;
+
+			if (bit_offset + bit_size > base_size || bit_size == 0) {
+				offset    += (bit_offset+BITS_PER_BYTE-1) / BITS_PER_BYTE;
+				offset     = (offset + base_alignment-1) & ~alignment_mask;
+				bit_offset = 0;
+			}
+		}
+
+		if (byte_order_big_endian) {
+			size_t base_size = get_type_size(base_type) * BITS_PER_BYTE;
+			member->compound_member.offset     = offset & ~alignment_mask;
+			member->compound_member.bit_offset = base_size - bit_offset - bit_size;
+		} else {
+			member->compound_member.offset     = offset;
+			member->compound_member.bit_offset = bit_offset;
+		}
+
+		bit_offset += bit_size;
+		offset     += bit_offset / BITS_PER_BYTE;
+		bit_offset %= BITS_PER_BYTE;
+	}
+
+	if (bit_offset > 0)
+		offset += 1;
+
+	*struct_offset    = offset;
+	*struct_alignment = alignment;
+	return member;
+}
+
+void layout_struct_type(compound_type_t *type)
+{
+	assert(type->compound != NULL);
+
+	compound_t *compound = type->compound;
+	if (!compound->complete)
+		return;
+	if (type->compound->layouted)
+		return;
+
+	il_size_t      offset    = 0;
+	il_alignment_t alignment = compound->alignment;
+	bool           need_pad  = false;
+
+	entity_t *entry = compound->members.entities;
+	while (entry != NULL) {
+		if (entry->kind != ENTITY_COMPOUND_MEMBER) {
+			entry = entry->base.next;
+			continue;
+		}
+
+		type_t *m_type  = entry->declaration.type;
+		type_t *skipped = skip_typeref(m_type);
+		if (! is_type_valid(skipped)) {
+			entry = entry->base.next;
+			continue;
+		}
+
+		if (skipped->kind == TYPE_BITFIELD) {
+			entry = pack_bitfield_members(&offset, &alignment,
+			                              compound->packed, entry);
+			continue;
+		}
+
+		il_alignment_t m_alignment = get_type_alignment(m_type);
+		if (m_alignment > alignment)
+			alignment = m_alignment;
+
+		if (!compound->packed) {
+			il_size_t new_offset = (offset + m_alignment-1) & -m_alignment;
+
+			if (new_offset > offset) {
+				need_pad = true;
+				offset   = new_offset;
+			}
+		}
+
+		entry->compound_member.offset = offset;
+		offset += get_type_size(m_type);
+
+		entry = entry->base.next;
+	}
+
+	if (!compound->packed) {
+		il_size_t new_offset = (offset + alignment-1) & -alignment;
+		if (new_offset > offset) {
+			need_pad = true;
+			offset   = new_offset;
+		}
+	}
+
+	source_position_t const *const pos = &compound->base.source_position;
+	if (need_pad) {
+		warningf(WARN_PADDED, pos, "'%T' needs padding", type);
+	} else if (compound->packed) {
+		warningf(WARN_PACKED, pos, "superfluous packed attribute on '%T'", type);
+	}
+
+	compound->size      = offset;
+	compound->alignment = alignment;
+	compound->layouted  = true;
+}
+
+void layout_union_type(compound_type_t *type)
+{
+	assert(type->compound != NULL);
+
+	compound_t *compound = type->compound;
+	if (! compound->complete)
+		return;
+
+	il_size_t      size      = 0;
+	il_alignment_t alignment = compound->alignment;
+
+	entity_t *entry = compound->members.entities;
+	for (; entry != NULL; entry = entry->base.next) {
+		if (entry->kind != ENTITY_COMPOUND_MEMBER)
+			continue;
+
+		type_t *m_type = entry->declaration.type;
+		if (! is_type_valid(skip_typeref(m_type)))
+			continue;
+
+		entry->compound_member.offset = 0;
+		il_size_t m_size = get_type_size(m_type);
+		if (m_size > size)
+			size = m_size;
+		il_alignment_t m_alignment = get_type_alignment(m_type);
+		if (m_alignment > alignment)
+			alignment = m_alignment;
+	}
+	size = (size + alignment - 1) & -alignment;
+
+	compound->size      = size;
+	compound->alignment = alignment;
+}
+
+function_parameter_t *allocate_parameter(type_t *const type)
+{
+	function_parameter_t *const param = obstack_alloc(&type_obst, sizeof(*param));
+	memset(param, 0, sizeof(*param));
+	param->type = type;
+	return param;
+}
+
+type_t *make_function_2_type(type_t *return_type, type_t *argument_type1,
+                             type_t *argument_type2)
+{
+	function_parameter_t *const parameter2 = allocate_parameter(argument_type2);
+	function_parameter_t *const parameter1 = allocate_parameter(argument_type1);
+	parameter1->next = parameter2;
+
+	type_t *type               = allocate_type_zero(TYPE_FUNCTION);
+	type->function.return_type = return_type;
+	type->function.parameters  = parameter1;
+	type->function.linkage     = LINKAGE_C;
+
+	return identify_new_type(type);
+}
+
+type_t *make_function_1_type(type_t *return_type, type_t *argument_type)
+{
+	function_parameter_t *const parameter = allocate_parameter(argument_type);
+
+	type_t *type               = allocate_type_zero(TYPE_FUNCTION);
+	type->function.return_type = return_type;
+	type->function.parameters  = parameter;
+	type->function.linkage     = LINKAGE_C;
+
+	return identify_new_type(type);
+}
+
+type_t *make_function_1_type_variadic(type_t *return_type,
+                                      type_t *argument_type)
+{
+	function_parameter_t *const parameter = allocate_parameter(argument_type);
+
+	type_t *type               = allocate_type_zero(TYPE_FUNCTION);
+	type->function.return_type = return_type;
+	type->function.parameters  = parameter;
+	type->function.variadic    = true;
+	type->function.linkage     = LINKAGE_C;
+
+	return identify_new_type(type);
+}
+
+type_t *make_function_0_type(type_t *return_type)
+{
+	type_t *type               = allocate_type_zero(TYPE_FUNCTION);
+	type->function.return_type = return_type;
+	type->function.parameters  = NULL;
+	type->function.linkage     = LINKAGE_C;
+
+	return identify_new_type(type);
+}
+
+type_t *make_function_type(type_t *return_type, int n_types,
+                           type_t *const *argument_types,
+						   decl_modifiers_t modifiers)
+{
+	type_t *type               = allocate_type_zero(TYPE_FUNCTION);
+	type->function.return_type = return_type;
+	type->function.modifiers  |= modifiers;
+	type->function.linkage     = LINKAGE_C;
+
+	function_parameter_t **anchor = &type->function.parameters;
+	for (int i = 0; i < n_types; ++i) {
+		function_parameter_t *parameter = allocate_parameter(argument_types[i]);
+		*anchor = parameter;
+		anchor  = &parameter->next;
+	}
+
+	return identify_new_type(type);
+}
+
 /**
  * Debug helper. Prints the given type to stdout.
  */
 static __attribute__((unused))
 void dbg_type(const type_t *type)
 {
-	FILE *old_out = out;
-	out = stderr;
+	print_to_file(stderr);
 	print_type(type);
-	puts("\n");
+	print_string("\n");
 	fflush(stderr);
-	out = old_out;
 }