Add the helper function create_Const_from_bool() to create 0/1 constant from a boolea...
[cparser] / type.c
diff --git a/type.c b/type.c
index 2bec838..67aee76 100644 (file)
--- 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
 #include "lang_features.h"
 #include "warning.h"
 #include "diagnostic.h"
+#include "printer.h"
+#include "driver/firm_cmdline.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 int              type_visited              = 0;
 static bool             print_implicit_array_size = false;
 
 static void intern_print_type_pre(const type_t *type);
@@ -49,6 +52,44 @@ 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_BUILTIN]         = sizeof(builtin_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.
  */
@@ -163,7 +204,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,11 +223,23 @@ 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;
+       }
+       if (force_long_double_size > 0) {
+               props[ATOMIC_TYPE_LONG_DOUBLE].size      = force_long_double_size;
+               props[ATOMIC_TYPE_LONG_DOUBLE].alignment = force_long_double_size;
+       }
 
        /* TODO: make this configurable for platforms which do not use byte sized
         * bools. */
@@ -199,30 +253,16 @@ void exit_types(void)
        obstack_free(type_obst, NULL);
 }
 
-void type_set_output(FILE *stream)
-{
-       out = stream;
-}
-
-void inc_type_visited(void)
-{
-       type_visited++;
-}
-
 void print_type_qualifiers(type_qualifiers_t qualifiers)
 {
-       int first = 1;
        if (qualifiers & TYPE_QUALIFIER_CONST) {
-               fputs(" const" + first,    out);
-               first = 0;
+               print_string("const ");
        }
        if (qualifiers & TYPE_QUALIFIER_VOLATILE) {
-               fputs(" volatile" + first, out);
-               first = 0;
+               print_string("volatile ");
        }
        if (qualifiers & TYPE_QUALIFIER_RESTRICT) {
-               fputs(" restrict" + first, out);
-               first = 0;
+               print_string("restrict ");
        }
 }
 
@@ -259,7 +299,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);
 }
 
 /**
@@ -270,8 +310,6 @@ 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_atomic_kinds(type->akind);
 }
 
@@ -280,12 +318,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_string("_Complex");
        print_atomic_kinds(type->akind);
 }
 
@@ -294,12 +330,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_string("_Imaginary ");
        print_atomic_kinds(type->akind);
 }
 
@@ -316,27 +350,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);
 
        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;
        }
 }
 
@@ -348,7 +388,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;
@@ -356,7 +396,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);
                }
@@ -369,11 +409,11 @@ 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);
+                               print_string(parameter->base.symbol->string);
                        } else {
                                print_type_ext(type, parameter->base.symbol, NULL);
                        }
@@ -383,14 +423,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);
 }
@@ -405,17 +445,17 @@ 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);
+       print_string("*");
        type_qualifiers_t const qual = type->base.qualifiers;
        if (qual != 0)
-               fputc(' ', out);
+               print_string(" ");
        print_type_qualifiers(qual);
 }
 
@@ -428,7 +468,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);
 }
 
@@ -442,8 +482,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("&");
 }
 
 /**
@@ -455,7 +495,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);
 }
 
@@ -476,18 +516,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);
        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);
 }
 
@@ -498,7 +536,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);
 }
@@ -510,7 +548,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);
 
@@ -519,9 +557,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;
@@ -530,12 +568,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("}");
 }
 
 /**
@@ -545,14 +583,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_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);
        }
@@ -563,7 +600,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;
@@ -573,14 +610,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__))");
        }
 }
 
@@ -591,20 +628,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);
 
        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);
        }
@@ -618,9 +654,7 @@ 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_string(type->typedefe->base.symbol->string);
 }
 
 /**
@@ -630,13 +664,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(")");
 }
 
 /**
@@ -648,10 +682,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);
@@ -670,7 +704,7 @@ static void intern_print_type_pre(const type_t *const type)
                print_compound_type(&type->compound);
                return;
        case TYPE_BUILTIN:
-               fputs(type->builtin.symbol->string, out);
+               print_string(type->builtin.symbol->string);
                return;
        case TYPE_FUNCTION:
                print_function_type_pre(&type->function);
@@ -694,7 +728,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");
 }
 
 /**
@@ -749,14 +783,14 @@ void print_type_ext(const type_t *const type, const symbol_t *symbol,
                     const scope_t *parameters)
 {
        if (type == NULL) {
-               fputs("nil type", out);
+               print_string("nil type");
                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);
@@ -765,34 +799,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.
  *
@@ -803,7 +809,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);
@@ -1012,9 +1018,9 @@ 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;
+       case TYPE_POINTER: return true;
+       case TYPE_BUILTIN: return is_type_scalar(type->builtin.real_type);
+       default:           break;
        }
 
        return is_type_arithmetic(type);
@@ -1097,16 +1103,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 */
@@ -1677,57 +1691,109 @@ 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 *size, bool packed,
-                                       type_t *type, size_t offset,
-                                                                          entity_t *first)
+static entity_t *pack_bitfield_members_big_endian(il_size_t *struct_offset,
+               il_alignment_t *struct_alignment, bool packed, entity_t *first)
 {
-       /* TODO: packed handling */
-       type_t *base_type      = skip_typeref(type->bitfield.base_type);
-       size_t  remaining_bits = get_type_size(base_type) * BITS_PER_BYTE;
-       size_t  bit_offset     = 0;
+       type_t        *current_base_type = NULL;
+       il_size_t      offset            = *struct_offset;
+       il_alignment_t alignment         = *struct_alignment;
+       size_t         bit_offset        = 0;
+
+       if (packed)
+               panic("packed bitfields on big-endian arch not supported yet");
 
        entity_t *member;
        for (member = first; member != NULL; member = member->base.next) {
-               /* TODO: make this an assert */
                if (member->kind != ENTITY_COMPOUND_MEMBER)
                        continue;
 
-               type_t *member_type = member->declaration.type;
-               if (member_type->kind != TYPE_BITFIELD)
+               type_t *type = member->declaration.type;
+               if (type->kind != TYPE_BITFIELD)
                        break;
-               size_t bit_size = member_type->bitfield.bit_size;
-               if (!packed) {
-                       if (base_type != NULL
-                           && skip_typeref(member_type->bitfield.base_type) != base_type)
-                               break;
-                       if (bit_size > remaining_bits)
-                               break;
+
+               size_t  bit_size  = type->bitfield.bit_size;
+               type_t *base_type = skip_typeref(type->bitfield.base_type);
+
+               /* see if we need to start a new "bucket" */
+               if (base_type != current_base_type || bit_size > bit_offset) {
+                       if (current_base_type != NULL)
+                               offset += get_type_size(current_base_type);
+
+                       current_base_type = 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;
+                       offset     = (offset + base_alignment-1) & ~alignment_mask;
+                       bit_offset = get_type_size(base_type) * BITS_PER_BYTE;
+                       assert(bit_offset >= bit_size);
                }
 
+               bit_offset -= bit_size;
                member->compound_member.offset     = offset;
                member->compound_member.bit_offset = bit_offset;
+       }
 
-               bit_offset += bit_size;
+       if (current_base_type != NULL)
+               offset += get_type_size(current_base_type);
 
-               /* 0-size members end current bucket. multiple 0-size buckets
-                * seem to not start-end multiple buckets */
-               if (bit_size == 0) {
-                       remaining_bits = 0;
-               } else {
-                       remaining_bits -= bit_size;
+       *struct_offset    = offset;
+       *struct_alignment = alignment;
+       return member;
+}
+
+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;
+                       }
                }
+
+               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;
        }
-       assert(member != first);
 
-       *size += (bit_offset + (BITS_PER_BYTE-1)) / BITS_PER_BYTE;
+       if (bit_offset > 0)
+               offset += 1;
 
+       *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);
@@ -1738,8 +1804,7 @@ void layout_struct_type(compound_type_t *type)
        if (type->compound->layouted)
                return;
 
-       il_size_t      offset;
-       il_size_t      size      = 0;
+       il_size_t      offset    = 0;
        il_alignment_t alignment = compound->alignment;
        bool           need_pad  = false;
 
@@ -1757,42 +1822,43 @@ void layout_struct_type(compound_type_t *type)
                        continue;
                }
 
-               type_t *base_type = m_type;
                if (skipped->kind == TYPE_BITFIELD) {
-                       base_type = m_type->bitfield.base_type;
+                       if (byte_order_big_endian) {
+                               entry = pack_bitfield_members_big_endian(&offset, &alignment,
+                                                                        compound->packed,
+                                                                        entry);
+                       } else {
+                               entry = pack_bitfield_members(&offset, &alignment,
+                                                             compound->packed, entry);
+                       }
+                       continue;
                }
 
-               il_alignment_t m_alignment = get_type_alignment(base_type);
-               il_size_t      m_size      = get_type_size(base_type);
+               il_alignment_t m_alignment = get_type_alignment(m_type);
                if (m_alignment > alignment)
                        alignment = m_alignment;
 
-               if (compound->packed) {
-                       offset = size;
-               } else {
-                       offset = (size + m_alignment - 1) & -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;
+                       }
                }
 
-               if (offset > size)
-                       need_pad = true;
+               entry->compound_member.offset = offset;
+               offset += get_type_size(m_type);
 
-               if (skipped->kind == TYPE_BITFIELD) {
-                       entry = pack_bitfield_members(&size, compound->packed,
-                                                     m_type, offset, entry);
-               } else {
-                       entry->compound_member.offset = offset;
-                       size                          = offset + m_size;
-
-                       entry = entry->base.next;
-               }
+               entry = entry->base.next;
        }
 
        if (!compound->packed) {
-               offset = (size + alignment - 1) & -alignment;
-               if (offset > size)
+               il_size_t new_offset = (offset + alignment-1) & -alignment;
+               if (new_offset > offset) {
                        need_pad = true;
-       } else {
-               offset = size;
+                       offset   = new_offset;
+               }
        }
 
        if (need_pad) {
@@ -1810,10 +1876,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);
@@ -1848,16 +1910,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;
 }