- 2009 patch
[cparser] / type.c
diff --git a/type.c b/type.c
index d5d4a01..667a912 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 <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 "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, bool top);
-static void intern_print_type_post(const type_t *type, bool top);
+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 {
@@ -46,6 +52,9 @@ struct atomic_type_properties_t {
        unsigned   flags;             /**< type flags from atomic_type_flag_t */
 };
 
+/**
+ * Properties of atomic types.
+ */
 static atomic_type_properties_t atomic_type_properties[ATOMIC_TYPE_LAST+1] = {
        //ATOMIC_TYPE_INVALID = 0,
        [ATOMIC_TYPE_VOID] = {
@@ -180,6 +189,10 @@ void init_types(void)
        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;
+       }
 
        /* TODO: make this configurable for platforms which do not use byte sized
         * bools. */
@@ -198,11 +211,6 @@ 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;
@@ -301,9 +309,8 @@ 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)
 {
        switch (type->linkage) {
                case LINKAGE_INVALID:
@@ -324,34 +331,33 @@ static void print_function_type_pre(const function_type_t *type, bool top)
        if (type->base.qualifiers != 0)
                fputc(' ', out);
 
-       intern_print_type_pre(type->return_type, false);
-
-       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;
+       intern_print_type_pre(type->return_type);
+
+       cc_kind_t cc = type->calling_convention;
+restart:
+       switch (cc) {
+       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:
+               if (default_calling_convention != CC_CDECL) {
+                       /* show the default calling convention if its not cdecl */
+                       cc = default_calling_convention;
+                       goto restart;
+               }
+               break;
        }
-
-       /* don't emit parenthesis if we're the toplevel type... */
-       if (!top)
-               fputc('(', out);
 }
 
 /**
  * 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 *parameters, bool top)
+                                     const scope_t *parameters)
 {
-       /* don't emit parenthesis if we're the toplevel type... */
-       if (!top)
-               fputc(')', out);
-
        fputc('(', out);
        bool first = true;
        if (parameters == NULL) {
@@ -396,7 +402,7 @@ static void print_function_type_post(const function_type_t *type,
        }
        fputc(')', out);
 
-       intern_print_type_post(type->return_type, false);
+       intern_print_type_post(type->return_type);
 }
 
 /**
@@ -406,7 +412,10 @@ 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);
+       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);
        variable_t *const variable = type->base_variable;
        if (variable != NULL) {
                fputs(" __based(", out);
@@ -421,24 +430,30 @@ static void print_pointer_type_pre(const pointer_type_t *type)
 }
 
 /**
- * Prints the prefix part of a reference type.
+ * Prints the postfix part of a pointer type.
  *
- * @param type   The reference type.
+ * @param type   The pointer type.
  */
-static void print_reference_type_pre(const reference_type_t *type)
+static void print_pointer_type_post(const pointer_type_t *type)
 {
-       intern_print_type_pre(type->refers_to, false);
-       fputc('&', out);
+       type_t const *const points_to = type->points_to;
+       if (points_to->kind == TYPE_ARRAY || points_to->kind == TYPE_FUNCTION)
+               fputc(')', out);
+       intern_print_type_post(points_to);
 }
 
 /**
- * Prints the postfix part of a pointer type.
+ * Prints the prefix part of a reference type.
  *
- * @param type   The pointer type.
+ * @param type   The reference type.
  */
-static void print_pointer_type_post(const pointer_type_t *type)
+static void print_reference_type_pre(const reference_type_t *type)
 {
-       intern_print_type_post(type->points_to, false);
+       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);
 }
 
 /**
@@ -448,7 +463,10 @@ static void print_pointer_type_post(const pointer_type_t *type)
  */
 static void print_reference_type_post(const reference_type_t *type)
 {
-       intern_print_type_post(type->refers_to, false);
+       type_t const *const refers_to = type->refers_to;
+       if (refers_to->kind == TYPE_ARRAY || refers_to->kind == TYPE_FUNCTION)
+               fputc(')', out);
+       intern_print_type_post(refers_to);
 }
 
 /**
@@ -458,7 +476,7 @@ static void print_reference_type_post(const reference_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);
 }
 
 /**
@@ -480,7 +498,7 @@ static void print_array_type_post(const array_type_t *type)
                print_expression(type->size_expression);
        }
        fputc(']', out);
-       intern_print_type_post(type->element_type, false);
+       intern_print_type_post(type->element_type);
 }
 
 /**
@@ -492,7 +510,7 @@ static void print_bitfield_type_post(const bitfield_type_t *type)
 {
        fputs(" : ", out);
        print_expression(type->size_expression);
-       intern_print_type_post(type->base_type, false);
+       intern_print_type_post(type->base_type);
 }
 
 /**
@@ -635,9 +653,8 @@ static void print_typeof_type_pre(const typeof_type_t *const type)
  * 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:
@@ -666,7 +683,7 @@ static void intern_print_type_pre(const type_t *const type, const bool top)
                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);
@@ -675,7 +692,7 @@ static void intern_print_type_pre(const type_t *const type, const bool top)
                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);
@@ -694,13 +711,12 @@ static void intern_print_type_pre(const type_t *const type, const bool top)
  * 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);
@@ -727,10 +743,6 @@ static void intern_print_type_post(const type_t *const type, const bool top)
        case TYPE_TYPEDEF:
                break;
        }
-
-       if (type->base.modifiers & DM_TRANSPARENT_UNION) {
-               fputs("__attribute__((__transparent_union__))", out);
-       }
 }
 
 /**
@@ -751,15 +763,15 @@ void print_type_ext(const type_t *const type, const symbol_t *symbol,
                return;
        }
 
-       intern_print_type_pre(type, true);
+       intern_print_type_pre(type);
        if (symbol != NULL) {
                fputc(' ', out);
                fputs(symbol->string, out);
        }
        if (type->kind == TYPE_FUNCTION) {
-               print_function_type_post(&type->function, parameters, true);
+               print_function_type_post(&type->function, parameters);
        } else {
-               intern_print_type_post(type, true);
+               intern_print_type_post(type);
        }
 }
 
@@ -768,7 +780,7 @@ void print_type_ext(const type_t *const type, const symbol_t *symbol,
  *
  * @param type  The type.
  */
-static size_t get_type_size(const type_t *type)
+static size_t get_type_struct_size(const type_t *type)
 {
        switch(type->kind) {
        case TYPE_ATOMIC:          return sizeof(atomic_type_t);
@@ -801,7 +813,7 @@ 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);
 
        type_t *copy = obstack_alloc(type_obst, size);
        memcpy(copy, type, size);
@@ -1073,6 +1085,14 @@ 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.
  */
@@ -1087,7 +1107,14 @@ static bool function_types_compatible(const function_type_t *func1,
        if (func1->linkage != func2->linkage)
                return false;
 
-       if (func1->calling_convention != func2->calling_convention)
+       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;
 
        /* can parameters be compared? */
@@ -1182,7 +1209,11 @@ bool types_compatible(const type_t *type1, const type_t *type2)
        }
 
        case TYPE_COMPOUND_STRUCT:
-       case TYPE_COMPOUND_UNION:
+       case TYPE_COMPOUND_UNION: {
+
+
+               break;
+       }
        case TYPE_ENUM:
        case TYPE_BUILTIN:
                /* TODO: not implemented */
@@ -1213,19 +1244,13 @@ bool types_compatible(const type_t *type1, const type_t *type2)
 type_t *skip_typeref(type_t *type)
 {
        type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE;
-       type_modifiers_t  modifiers  = TYPE_MODIFIER_NONE;
-       il_alignment_t    alignment  = 0;
 
        while (true) {
-               if (alignment < type->base.alignment)
-                       alignment = type->base.alignment;
-
                switch (type->kind) {
                case TYPE_ERROR:
                        return type;
                case TYPE_TYPEDEF: {
                        qualifiers |= type->base.qualifiers;
-                       modifiers  |= type->base.modifiers;
 
                        const typedef_type_t *typedef_type = &type->typedeft;
                        if (typedef_type->resolved_type != NULL) {
@@ -1237,7 +1262,6 @@ type_t *skip_typeref(type_t *type)
                }
                case TYPE_TYPEOF:
                        qualifiers |= type->base.qualifiers;
-                       modifiers  |= type->base.modifiers;
                        type        = type->typeoft.typeof_type;
                        continue;
                default:
@@ -1246,9 +1270,7 @@ type_t *skip_typeref(type_t *type)
                break;
        }
 
-       if (qualifiers != TYPE_QUALIFIER_NONE ||
-                       modifiers  != TYPE_MODIFIER_NONE  ||
-                       alignment  >  type->base.alignment) {
+       if (qualifiers != TYPE_QUALIFIER_NONE) {
                type_t *const copy = duplicate_type(type);
 
                /* for const with typedefed array type the element type has to be
@@ -1257,13 +1279,9 @@ type_t *skip_typeref(type_t *type)
                        type_t *element_type           = copy->array.element_type;
                        element_type                   = duplicate_type(element_type);
                        element_type->base.qualifiers |= qualifiers;
-                       element_type->base.modifiers  |= modifiers;
-                       element_type->base.alignment   = alignment;
                        copy->array.element_type       = element_type;
                } else {
                        copy->base.qualifiers |= qualifiers;
-                       copy->base.modifiers  |= modifiers;
-                       copy->base.alignment   = alignment;
                }
 
                type = identify_new_type(copy);
@@ -1272,6 +1290,143 @@ type_t *skip_typeref(type_t *type)
        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_BUILTIN:
+               return get_type_size(type->builtin.real_type);
+       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_BUILTIN:
+               return get_type_alignment(type->builtin.real_type);
+       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_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);
+               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;
@@ -1424,8 +1579,6 @@ type_t *make_atomic_type(atomic_type_kind_t akind, type_qualifiers_t qualifiers)
        memset(type, 0, sizeof(atomic_type_t));
 
        type->kind            = TYPE_ATOMIC;
-       type->base.size       = get_atomic_type_size(akind);
-       type->base.alignment  = get_atomic_type_alignment(akind);
        type->base.qualifiers = qualifiers;
        type->atomic.akind    = akind;
 
@@ -1445,7 +1598,6 @@ type_t *make_complex_type(atomic_type_kind_t akind, type_qualifiers_t qualifiers
 
        type->kind            = TYPE_COMPLEX;
        type->base.qualifiers = qualifiers;
-       type->base.alignment  = get_atomic_type_alignment(akind);
        type->complex.akind   = akind;
 
        return identify_new_type(type);
@@ -1464,7 +1616,6 @@ type_t *make_imaginary_type(atomic_type_kind_t akind, type_qualifiers_t qualifie
 
        type->kind            = TYPE_IMAGINARY;
        type->base.qualifiers = qualifiers;
-       type->base.alignment  = get_atomic_type_alignment(akind);
        type->imaginary.akind = akind;
 
        return identify_new_type(type);
@@ -1483,7 +1634,6 @@ type_t *make_pointer_type(type_t *points_to, type_qualifiers_t qualifiers)
 
        type->kind                  = TYPE_POINTER;
        type->base.qualifiers       = qualifiers;
-       type->base.alignment        = 0;
        type->pointer.points_to     = points_to;
        type->pointer.base_variable = NULL;
 
@@ -1502,7 +1652,6 @@ type_t *make_reference_type(type_t *refers_to)
 
        type->kind                = TYPE_REFERENCE;
        type->base.qualifiers     = 0;
-       type->base.alignment      = 0;
        type->reference.refers_to = refers_to;
 
        return identify_new_type(type);
@@ -1523,7 +1672,6 @@ type_t *make_based_pointer_type(type_t *points_to,
 
        type->kind                  = TYPE_POINTER;
        type->base.qualifiers       = qualifiers;
-       type->base.alignment        = 0;
        type->pointer.points_to     = points_to;
        type->pointer.base_variable = variable;
 
@@ -1539,7 +1687,6 @@ type_t *make_array_type(type_t *element_type, size_t size,
 
        type->kind                = TYPE_ARRAY;
        type->base.qualifiers     = qualifiers;
-       type->base.alignment      = 0;
        type->array.element_type  = element_type;
        type->array.size          = size;
        type->array.size_constant = true;
@@ -1547,6 +1694,177 @@ 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)
+                       break;
+
+               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;
+       }
+
+       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);
+
+       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;
+               }
+       }
+
+       if (need_pad) {
+               if (warning.padded) {
+                       warningf(&compound->base.source_position, "'%T' needs padding",
+                                type);
+               }
+       } else if (compound->packed && warning.packed) {
+               warningf(&compound->base.source_position,
+                        "superfluous packed attribute on '%T'", type);
+       }
+
+       compound->size      = offset;
+       compound->alignment = alignment;
+       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);
+
+       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;
+}
+
 /**
  * Debug helper. Prints the given type to stdout.
  */