X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type.c;h=c877093ddb98ddcd3ea2c78cda539ac46b85e23f;hb=b84a9dd7e9ae5e072051e565b3f48fa84b4e1cab;hp=f2642f9084f3a924362d8c462db9aa232e87f03e;hpb=28540cdba01ec0c0e3038b792cb9daf0d44592c5;p=cparser

diff --git a/type.c b/type.c
index f2642f9..c877093 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
@@ -32,10 +32,12 @@
 #include "lang_features.h"
 #include "warning.h"
 #include "diagnostic.h"
-#include "driver/firm_cmdline.h"
+#include "printer.h"
+
+/** The default calling convention. */
+cc_kind_t default_calling_convention = CC_CDECL;
 
 static struct obstack   _type_obst;
-static FILE            *out;
 struct obstack         *type_obst                 = &_type_obst;
 static bool             print_implicit_array_size = false;
 
@@ -49,6 +51,43 @@ 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_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  size = get_type_struct_size(kind);
+	type_t *res  = obstack_alloc(type_obst, size);
+	memset(res, 0, size);
+	res->base.kind = kind;
+
+	return res;
+}
+
 /**
  * Properties of atomic types.
  */
@@ -144,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,
@@ -152,6 +191,11 @@ 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);
@@ -163,7 +207,8 @@ void init_types(void)
 	}
 
 	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;
@@ -181,14 +226,27 @@ 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 (firm_opt.os_support == OS_SUPPORT_MACHO) {
-		props[ATOMIC_TYPE_LONG_DOUBLE].size      = 16;
-		props[ATOMIC_TYPE_LONG_DOUBLE].alignment = 16;
+	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;
+	}
+
+	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];
 	}
 
 	/* TODO: make this configurable for platforms which do not use byte sized
@@ -203,26 +261,23 @@ void exit_types(void)
 	obstack_free(type_obst, NULL);
 }
 
-void type_set_output(FILE *stream)
-{
-	out = stream;
-}
-
-void print_type_qualifiers(type_qualifiers_t qualifiers)
+void print_type_qualifiers(type_qualifiers_t const qualifiers, QualifierSeparators const q)
 {
-	int first = 1;
+	size_t sep = q & QUAL_SEP_START ? 0 : 1;
 	if (qualifiers & TYPE_QUALIFIER_CONST) {
-		fputs(" const" + first,    out);
-		first = 0;
+		print_string(" const" + sep);
+		sep = 0;
 	}
 	if (qualifiers & TYPE_QUALIFIER_VOLATILE) {
-		fputs(" volatile" + first, out);
-		first = 0;
+		print_string(" volatile" + sep);
+		sep = 0;
 	}
 	if (qualifiers & TYPE_QUALIFIER_RESTRICT) {
-		fputs(" restrict" + first, out);
-		first = 0;
+		print_string(" restrict" + sep);
+		sep = 0;
 	}
+	if (sep == 0 && q & QUAL_SEP_END)
+		print_char(' ');
 }
 
 const char *get_atomic_kind_name(atomic_type_kind_t kind)
@@ -258,7 +313,7 @@ const char *get_atomic_kind_name(atomic_type_kind_t kind)
 static void print_atomic_kinds(atomic_type_kind_t kind)
 {
 	const char *s = get_atomic_kind_name(kind);
-	fputs(s, out);
+	print_string(s);
 }
 
 /**
@@ -268,9 +323,7 @@ static void print_atomic_kinds(atomic_type_kind_t kind)
  */
 static void print_atomic_type(const atomic_type_t *type)
 {
-	print_type_qualifiers(type->base.qualifiers);
-	if (type->base.qualifiers != 0)
-		fputc(' ', out);
+	print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END);
 	print_atomic_kinds(type->akind);
 }
 
@@ -279,12 +332,10 @@ static 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)
 {
-	int empty = type->base.qualifiers == 0;
-	print_type_qualifiers(type->base.qualifiers);
-	fputs(" _Complex " + empty, out);
+	print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END);
+	print_string("_Complex");
 	print_atomic_kinds(type->akind);
 }
 
@@ -293,12 +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)
 {
-	int empty = type->base.qualifiers == 0;
-	print_type_qualifiers(type->base.qualifiers);
-	fputs(" _Imaginary " + empty, out);
+	print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END);
+	print_string("_Imaginary ");
 	print_atomic_kinds(type->akind);
 }
 
@@ -315,27 +364,33 @@ static void print_function_type_pre(const function_type_t *type)
 
 		case LINKAGE_C:
 			if (c_mode & _CXX)
-				fputs("extern \"C\" ",   out);
+				print_string("extern \"C\" ");
 			break;
 
 		case LINKAGE_CXX:
 			if (!(c_mode & _CXX))
-				fputs("extern \"C++\" ", out);
+				print_string("extern \"C++\" ");
 			break;
 	}
 
-	print_type_qualifiers(type->base.qualifiers);
-	if (type->base.qualifiers != 0)
-		fputc(' ', out);
+	print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END);
 
 	intern_print_type_pre(type->return_type);
 
-	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;
+	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;
 	}
 }
 
@@ -347,7 +402,7 @@ static void print_function_type_pre(const function_type_t *type)
 static void print_function_type_post(const function_type_t *type,
                                      const scope_t *parameters)
 {
-	fputc('(', out);
+	print_string("(");
 	bool first = true;
 	if (parameters == NULL) {
 		function_parameter_t *parameter = type->parameters;
@@ -355,7 +410,7 @@ static void print_function_type_post(const function_type_t *type,
 			if (first) {
 				first = false;
 			} else {
-				fputs(", ", out);
+				print_string(", ");
 			}
 			print_type(parameter->type);
 		}
@@ -368,13 +423,13 @@ static void print_function_type_post(const function_type_t *type,
 			if (first) {
 				first = false;
 			} else {
-				fputs(", ", out);
+				print_string(", ");
 			}
-			const type_t *const type = parameter->declaration.type;
-			if (type == NULL) {
-				fputs(parameter->base.symbol->string, out);
+			const type_t *const param_type = parameter->declaration.type;
+			if (param_type == NULL) {
+				print_string(parameter->base.symbol->string);
 			} else {
-				print_type_ext(type, parameter->base.symbol, NULL);
+				print_type_ext(param_type, parameter->base.symbol, NULL);
 			}
 		}
 	}
@@ -382,14 +437,14 @@ static void print_function_type_post(const function_type_t *type,
 		if (first) {
 			first = false;
 		} else {
-			fputs(", ", out);
+			print_string(", ");
 		}
-		fputs("...", out);
+		print_string("...");
 	}
 	if (first && !type->unspecified_parameters) {
-		fputs("void", out);
+		print_string("void");
 	}
-	fputc(')', out);
+	print_string(")");
 
 	intern_print_type_post(type->return_type);
 }
@@ -404,18 +459,15 @@ static void print_pointer_type_pre(const pointer_type_t *type)
 	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)
-		fputs(" (", out);
+		print_string(" (");
 	variable_t *const variable = type->base_variable;
 	if (variable != NULL) {
-		fputs(" __based(", out);
-		fputs(variable->base.base.symbol->string, out);
-		fputs(") ", out);
+		print_string(" __based(");
+		print_string(variable->base.base.symbol->string);
+		print_string(") ");
 	}
-	fputc('*', out);
-	type_qualifiers_t const qual = type->base.qualifiers;
-	if (qual != 0)
-		fputc(' ', out);
-	print_type_qualifiers(qual);
+	print_string("*");
+	print_type_qualifiers(type->base.qualifiers, QUAL_SEP_START);
 }
 
 /**
@@ -427,7 +479,7 @@ static void print_pointer_type_post(const pointer_type_t *type)
 {
 	type_t const *const points_to = type->points_to;
 	if (points_to->kind == TYPE_ARRAY || points_to->kind == TYPE_FUNCTION)
-		fputc(')', out);
+		print_string(")");
 	intern_print_type_post(points_to);
 }
 
@@ -441,8 +493,8 @@ 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)
-		fputs(" (", out);
-	fputc('&', out);
+		print_string(" (");
+	print_string("&");
 }
 
 /**
@@ -454,7 +506,7 @@ 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)
-		fputc(')', out);
+		print_string(")");
 	intern_print_type_post(refers_to);
 }
 
@@ -475,18 +527,16 @@ static void print_array_type_pre(const array_type_t *type)
  */
 static void print_array_type_post(const array_type_t *type)
 {
-	fputc('[', out);
+	print_string("[");
 	if (type->is_static) {
-		fputs("static ", out);
+		print_string("static ");
 	}
-	print_type_qualifiers(type->base.qualifiers);
-	if (type->base.qualifiers != 0)
-		fputc(' ', out);
+	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);
+	print_string("]");
 	intern_print_type_post(type->element_type);
 }
 
@@ -497,7 +547,7 @@ 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_string(" : ");
 	print_expression(type->size_expression);
 	intern_print_type_post(type->base_type);
 }
@@ -509,7 +559,7 @@ static void print_bitfield_type_post(const bitfield_type_t *type)
  */
 void print_enum_definition(const enum_t *enume)
 {
-	fputs("{\n", out);
+	print_string("{\n");
 
 	change_indent(1);
 
@@ -518,9 +568,9 @@ void print_enum_definition(const enum_t *enume)
 	       entry = entry->base.next) {
 
 		print_indent();
-		fputs(entry->base.symbol->string, out);
+		print_string(entry->base.symbol->string);
 		if (entry->enum_value.value != NULL) {
-			fputs(" = ", out);
+			print_string(" = ");
 
 			/* skip the implicit cast */
 			expression_t *expression = entry->enum_value.value;
@@ -529,12 +579,12 @@ void print_enum_definition(const enum_t *enume)
 			}
 			print_expression(expression);
 		}
-		fputs(",\n", out);
+		print_string(",\n");
 	}
 
 	change_indent(-1);
 	print_indent();
-	fputc('}', out);
+	print_string("}");
 }
 
 /**
@@ -544,14 +594,13 @@ void print_enum_definition(const enum_t *enume)
  */
 static void print_type_enum(const enum_type_t *type)
 {
-	int empty = type->base.qualifiers == 0;
-	print_type_qualifiers(type->base.qualifiers);
-	fputs(" enum " + empty, out);
+	print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END);
+	print_string("enum ");
 
 	enum_t   *enume  = type->enume;
 	symbol_t *symbol = enume->base.symbol;
 	if (symbol != NULL) {
-		fputs(symbol->string, out);
+		print_string(symbol->string);
 	} else {
 		print_enum_definition(enume);
 	}
@@ -562,7 +611,7 @@ static void print_type_enum(const enum_type_t *type)
  */
 void print_compound_definition(const compound_t *compound)
 {
-	fputs("{\n", out);
+	print_string("{\n");
 	change_indent(1);
 
 	entity_t *entity = compound->members.entities;
@@ -572,14 +621,14 @@ void print_compound_definition(const compound_t *compound)
 
 		print_indent();
 		print_entity(entity);
-		fputc('\n', out);
+		print_string("\n");
 	}
 
 	change_indent(-1);
 	print_indent();
-	fputc('}', out);
+	print_string("}");
 	if (compound->modifiers & DM_TRANSPARENT_UNION) {
-		fputs("__attribute__((__transparent_union__))", out);
+		print_string("__attribute__((__transparent_union__))");
 	}
 }
 
@@ -590,20 +639,19 @@ void print_compound_definition(const compound_t *compound)
  */
 static void print_compound_type(const compound_type_t *type)
 {
-	int empty = type->base.qualifiers == 0;
-	print_type_qualifiers(type->base.qualifiers);
+	print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END);
 
 	if (type->base.kind == TYPE_COMPOUND_STRUCT) {
-		fputs(" struct " + empty, out);
+		print_string("struct ");
 	} else {
 		assert(type->base.kind == TYPE_COMPOUND_UNION);
-		fputs(" union " + empty, out);
+		print_string("union ");
 	}
 
 	compound_t *compound = type->compound;
 	symbol_t   *symbol   = compound->base.symbol;
 	if (symbol != NULL) {
-		fputs(symbol->string, out);
+		print_string(symbol->string);
 	} else {
 		print_compound_definition(compound);
 	}
@@ -616,10 +664,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);
-	if (type->base.qualifiers != 0)
-		fputc(' ', out);
-	fputs(type->typedefe->base.symbol->string, out);
+	print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END);
+	print_string(type->typedefe->base.symbol->string);
 }
 
 /**
@@ -629,13 +675,13 @@ 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);
+	print_string("typeof(");
 	if (type->expression != NULL) {
 		print_expression(type->expression);
 	} else {
 		print_type(type->typeof_type);
 	}
-	fputc(')', out);
+	print_string(")");
 }
 
 /**
@@ -647,10 +693,10 @@ 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);
@@ -668,9 +714,6 @@ static void intern_print_type_pre(const type_t *const type)
 	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);
 		return;
@@ -693,7 +736,7 @@ static void intern_print_type_pre(const type_t *const type)
 		print_typeof_type_pre(&type->typeoft);
 		return;
 	}
-	fputs("unknown", out);
+	print_string("unknown");
 }
 
 /**
@@ -727,7 +770,6 @@ static void intern_print_type_post(const type_t *const type)
 	case TYPE_ENUM:
 	case TYPE_COMPOUND_STRUCT:
 	case TYPE_COMPOUND_UNION:
-	case TYPE_BUILTIN:
 	case TYPE_TYPEOF:
 	case TYPE_TYPEDEF:
 		break;
@@ -747,15 +789,10 @@ void print_type(const type_t *const type)
 void print_type_ext(const type_t *const type, const symbol_t *symbol,
                     const scope_t *parameters)
 {
-	if (type == NULL) {
-		fputs("nil type", out);
-		return;
-	}
-
 	intern_print_type_pre(type);
 	if (symbol != NULL) {
-		fputc(' ', out);
-		fputs(symbol->string, out);
+		print_string(" ");
+		print_string(symbol->string);
 	}
 	if (type->kind == TYPE_FUNCTION) {
 		print_function_type_post(&type->function, parameters);
@@ -764,34 +801,6 @@ void print_type_ext(const type_t *const type, const symbol_t *symbol,
 	}
 }
 
-/**
- * Return the size of a type AST node.
- *
- * @param type  The type.
- */
-static size_t get_type_struct_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_REFERENCE:       return sizeof(reference_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");
-	}
-	panic("unknown type found");
-}
-
 /**
  * Duplicates a type.
  *
@@ -802,7 +811,7 @@ static size_t get_type_struct_size(const type_t *type)
  */
 type_t *duplicate_type(const type_t *type)
 {
-	size_t size = get_type_struct_size(type);
+	size_t size = get_type_struct_size(type->kind);
 
 	type_t *copy = obstack_alloc(type_obst, size);
 	memcpy(copy, type, size);
@@ -846,7 +855,7 @@ type_t *get_qualified_type(type_t *orig_type, type_qualifiers_t const qual)
 		copy                     = duplicate_type(type);
 		copy->array.element_type = qual_element_type;
 	} else if (is_type_valid(type)) {
-		if ((type->base.qualifiers & qual) == qual)
+		if ((type->base.qualifiers & qual) == (int)qual)
 			return orig_type;
 
 		copy                   = duplicate_type(type);
@@ -1010,11 +1019,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);
 }
@@ -1055,7 +1061,6 @@ bool is_type_incomplete(const type_t *type)
 	case TYPE_FUNCTION:
 	case TYPE_POINTER:
 	case TYPE_REFERENCE:
-	case TYPE_BUILTIN:
 	case TYPE_ERROR:
 		return false;
 
@@ -1074,14 +1079,6 @@ bool is_type_object(const type_t *type)
 	return !is_type_function(type) && !is_type_incomplete(type);
 }
 
-bool is_builtin_va_list(type_t *type)
-{
-	type_t *tp = skip_typeref(type);
-
-	return tp->kind == type_valist->kind &&
-	       tp->builtin.symbol == type_valist->builtin.symbol;
-}
-
 /**
  * Check if two function types are compatible.
  */
@@ -1096,16 +1093,24 @@ static bool function_types_compatible(const function_type_t *func1,
 	if (func1->linkage != func2->linkage)
 		return false;
 
-	if (func1->calling_convention != func2->calling_convention)
-		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;
 
-	/* can parameters be compared? */
-	if (func1->unspecified_parameters || func2->unspecified_parameters)
-		return true;
+	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 */
@@ -1197,7 +1202,6 @@ bool types_compatible(const type_t *type1, const type_t *type2)
 		break;
 	}
 	case TYPE_ENUM:
-	case TYPE_BUILTIN:
 		/* TODO: not implemented */
 		break;
 
@@ -1306,8 +1310,6 @@ unsigned get_type_size(type_t *type)
 	}
 	case TYPE_BITFIELD:
 		return 0;
-	case TYPE_BUILTIN:
-		return get_type_size(type->builtin.real_type);
 	case TYPE_TYPEDEF:
 		return get_type_size(type->typedeft.typedefe->type);
 	case TYPE_TYPEOF:
@@ -1352,8 +1354,6 @@ unsigned get_type_alignment(type_t *type)
 		return get_type_alignment(type->array.element_type);
 	case TYPE_BITFIELD:
 		return 0;
-	case TYPE_BUILTIN:
-		return get_type_alignment(type->builtin.real_type);
 	case TYPE_TYPEDEF: {
 		il_alignment_t alignment
 			= get_type_alignment(type->typedeft.typedefe->type);
@@ -1392,8 +1392,6 @@ decl_modifiers_t get_type_modifiers(const type_t *type)
 	case TYPE_BITFIELD:
 	case TYPE_ARRAY:
 		return 0;
-	case TYPE_BUILTIN:
-		return get_type_modifiers(type->builtin.real_type);
 	case TYPE_TYPEDEF: {
 		decl_modifiers_t modifiers = type->typedeft.typedefe->modifiers;
 		modifiers |= get_type_modifiers(type->typedeft.typedefe->type);
@@ -1687,7 +1685,7 @@ static entity_t *pack_bitfield_members(il_size_t *struct_offset,
 	entity_t *member;
 	for (member = first; member != NULL; member = member->base.next) {
 		if (member->kind != ENTITY_COMPOUND_MEMBER)
-			break;
+			continue;
 
 		type_t *type = member->declaration.type;
 		if (type->kind != TYPE_BITFIELD)
@@ -1712,8 +1710,14 @@ static entity_t *pack_bitfield_members(il_size_t *struct_offset,
 			}
 		}
 
-		member->compound_member.offset     = offset;
-		member->compound_member.bit_offset = bit_offset;
+		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;
@@ -1725,14 +1729,9 @@ static entity_t *pack_bitfield_members(il_size_t *struct_offset,
 
 	*struct_offset    = offset;
 	*struct_alignment = alignment;
-
 	return member;
 }
 
-/**
- * Finish the construction of a struct type by calculating its size, offsets,
- * alignment.
- */
 void layout_struct_type(compound_type_t *type)
 {
 	assert(type->compound != NULL);
@@ -1809,10 +1808,6 @@ void layout_struct_type(compound_type_t *type)
 	compound->layouted  = true;
 }
 
-/**
- * Finish the construction of an union type by calculating
- * its size and alignment.
- */
 void layout_union_type(compound_type_t *type)
 {
 	assert(type->compound != NULL);
@@ -1847,16 +1842,97 @@ void layout_union_type(compound_type_t *type)
 	compound->alignment = alignment;
 }
 
+static 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 *last  = NULL;
+	for (int i = 0; i < n_types; ++i) {
+		function_parameter_t *parameter = allocate_parameter(argument_types[i]);
+		if (last == NULL) {
+			type->function.parameters = parameter;
+		} else {
+			last->next = parameter;
+		}
+		last = parameter;
+	}
+
+	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;
 }