- do not expand the frame size for inner functions, they are NOT living on the outer...
[cparser] / type.c
diff --git a/type.c b/type.c
index 9ac6d17..0c73682 100644 (file)
--- a/type.c
+++ b/type.c
 #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"
 
 static struct obstack   _type_obst;
@@ -34,8 +37,8 @@ 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 {
@@ -44,6 +47,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] = {
@@ -51,6 +57,12 @@ static atomic_type_properties_t atomic_type_properties[ATOMIC_TYPE_LAST+1] = {
                .alignment  = 0,
                .flags      = ATOMIC_TYPE_FLAG_NONE
        },
+       [ATOMIC_TYPE_WCHAR_T] = {
+               .size       = (unsigned)-1,
+               .alignment  = (unsigned)-1,
+               /* signed flag will be set when known */
+               .flags      = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC,
+       },
        [ATOMIC_TYPE_CHAR] = {
                .size       = 1,
                .alignment  = 1,
@@ -144,7 +156,7 @@ void init_types(void)
 
        atomic_type_properties_t *props = atomic_type_properties;
 
-       if(char_is_signed) {
+       if (char_is_signed) {
                props[ATOMIC_TYPE_CHAR].flags |= ATOMIC_TYPE_FLAG_SIGNED;
        }
 
@@ -167,12 +179,17 @@ 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_LONGLONG].alignment  = 4;
-       props[ATOMIC_TYPE_ULONGLONG].alignment = 4;
+       props[ATOMIC_TYPE_FLOAT].alignment       = 4;
+       props[ATOMIC_TYPE_DOUBLE].alignment      = 4;
+       props[ATOMIC_TYPE_LONG_DOUBLE].alignment = 4;
+       props[ATOMIC_TYPE_LONGLONG].alignment    = 4;
+       props[ATOMIC_TYPE_ULONGLONG].alignment   = 4;
 
-       props[ATOMIC_TYPE_BOOL] = props[ATOMIC_TYPE_UINT];
+       /* TODO: make this configurable for platforms which do not use byte sized
+        * bools. */
+       props[ATOMIC_TYPE_BOOL] = props[ATOMIC_TYPE_UCHAR];
+
+       props[ATOMIC_TYPE_WCHAR_T] = props[wchar_atomic_kind];
 }
 
 void exit_types(void)
@@ -192,9 +209,44 @@ void inc_type_visited(void)
 
 void print_type_qualifiers(type_qualifiers_t qualifiers)
 {
-       if(qualifiers & TYPE_QUALIFIER_CONST)    fputs("const ",    out);
-       if(qualifiers & TYPE_QUALIFIER_VOLATILE) fputs("volatile ", out);
-       if(qualifiers & TYPE_QUALIFIER_RESTRICT) fputs("restrict ", out);
+       int first = 1;
+       if (qualifiers & TYPE_QUALIFIER_CONST) {
+               fputs(" const" + first,    out);
+               first = 0;
+       }
+       if (qualifiers & TYPE_QUALIFIER_VOLATILE) {
+               fputs(" volatile" + first, out);
+               first = 0;
+       }
+       if (qualifiers & TYPE_QUALIFIER_RESTRICT) {
+               fputs(" restrict" + first, out);
+               first = 0;
+       }
+}
+
+const char *get_atomic_kind_name(atomic_type_kind_t kind)
+{
+       switch(kind) {
+       case ATOMIC_TYPE_INVALID: break;
+       case ATOMIC_TYPE_VOID:        return "void";
+       case ATOMIC_TYPE_WCHAR_T:     return "wchar_t";
+       case ATOMIC_TYPE_BOOL:        return c_mode & _CXX ? "bool" : "_Bool";
+       case ATOMIC_TYPE_CHAR:        return "char";
+       case ATOMIC_TYPE_SCHAR:       return "signed char";
+       case ATOMIC_TYPE_UCHAR:       return "unsigned char";
+       case ATOMIC_TYPE_INT:         return "int";
+       case ATOMIC_TYPE_UINT:        return "unsigned int";
+       case ATOMIC_TYPE_SHORT:       return "short";
+       case ATOMIC_TYPE_USHORT:      return "unsigned short";
+       case ATOMIC_TYPE_LONG:        return "long";
+       case ATOMIC_TYPE_ULONG:       return "unsigned long";
+       case ATOMIC_TYPE_LONGLONG:    return "long long";
+       case ATOMIC_TYPE_ULONGLONG:   return "unsigned long long";
+       case ATOMIC_TYPE_LONG_DOUBLE: return "long double";
+       case ATOMIC_TYPE_FLOAT:       return "float";
+       case ATOMIC_TYPE_DOUBLE:      return "double";
+       }
+       return "INVALIDATOMIC";
 }
 
 /**
@@ -202,29 +254,9 @@ void print_type_qualifiers(type_qualifiers_t qualifiers)
  *
  * @param kind  The type kind.
  */
-static
-void print_atomic_kinds(atomic_type_kind_t kind)
+static void print_atomic_kinds(atomic_type_kind_t kind)
 {
-       const char *s = "INVALIDATOMIC";
-       switch(kind) {
-       case ATOMIC_TYPE_INVALID:                               break;
-       case ATOMIC_TYPE_VOID:        s = "void";               break;
-       case ATOMIC_TYPE_BOOL:        s = "_Bool";              break;
-       case ATOMIC_TYPE_CHAR:        s = "char";               break;
-       case ATOMIC_TYPE_SCHAR:       s = "signed char";        break;
-       case ATOMIC_TYPE_UCHAR:       s = "unsigned char";      break;
-       case ATOMIC_TYPE_INT:         s = "int";                break;
-       case ATOMIC_TYPE_UINT:        s = "unsigned int";       break;
-       case ATOMIC_TYPE_SHORT:       s = "short";              break;
-       case ATOMIC_TYPE_USHORT:      s = "unsigned short";     break;
-       case ATOMIC_TYPE_LONG:        s = "long";               break;
-       case ATOMIC_TYPE_ULONG:       s = "unsigned long";      break;
-       case ATOMIC_TYPE_LONGLONG:    s = "long long";          break;
-       case ATOMIC_TYPE_ULONGLONG:   s = "unsigned long long"; break;
-       case ATOMIC_TYPE_LONG_DOUBLE: s = "long double";        break;
-       case ATOMIC_TYPE_FLOAT:       s = "float";              break;
-       case ATOMIC_TYPE_DOUBLE:      s = "double";             break;
-       }
+       const char *s = get_atomic_kind_name(kind);
        fputs(s, out);
 }
 
@@ -233,10 +265,11 @@ void print_atomic_kinds(atomic_type_kind_t kind)
  *
  * @param type  The type.
  */
-static
-void print_atomic_type(const atomic_type_t *type)
+static void print_atomic_type(const atomic_type_t *type)
 {
        print_type_qualifiers(type->base.qualifiers);
+       if (type->base.qualifiers != 0)
+               fputc(' ', out);
        print_atomic_kinds(type->akind);
 }
 
@@ -248,8 +281,9 @@ void print_atomic_type(const atomic_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 ", out);
+       fputs(" _Complex " + empty, out);
        print_atomic_kinds(type->akind);
 }
 
@@ -261,8 +295,9 @@ void print_complex_type(const complex_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 ", out);
+       fputs(" _Imaginary " + empty, out);
        print_atomic_kinds(type->akind);
 }
 
@@ -270,40 +305,53 @@ 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:
+                       break;
+
+               case LINKAGE_C:
+                       if (c_mode & _CXX)
+                               fputs("extern \"C\" ",   out);
+                       break;
+
+               case LINKAGE_CXX:
+                       if (!(c_mode & _CXX))
+                               fputs("extern \"C++\" ", out);
+                       break;
+       }
+
        print_type_qualifiers(type->base.qualifiers);
+       if (type->base.qualifiers != 0)
+               fputc(' ', out);
 
-       intern_print_type_pre(type->return_type, false);
+       intern_print_type_pre(type->return_type);
 
-       /* don't emit braces if we're the toplevel type... */
-       if(!top)
-               fputc('(', out);
+       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;
+       }
 }
 
 /**
  * Print the second part (the postfix) of a type.
  *
  * @param type   The type to print.
- * @param top    true, if this is the top type, false if it's an embedded type.
  */
 static void print_function_type_post(const function_type_t *type,
-                                     const scope_t *scope, bool top)
+                                     const scope_t *parameters)
 {
-       intern_print_type_post(type->return_type, false);
-       /* don't emit braces if we're the toplevel type... */
-       if(!top)
-               fputc(')', out);
-
        fputc('(', out);
-
        bool first = true;
-       if(scope == NULL) {
+       if (parameters == NULL) {
                function_parameter_t *parameter = type->parameters;
                for( ; parameter != NULL; parameter = parameter->next) {
-                       if(first) {
+                       if (first) {
                                first = false;
                        } else {
                                fputs(", ", out);
@@ -311,29 +359,38 @@ static void print_function_type_post(const function_type_t *type,
                        print_type(parameter->type);
                }
        } else {
-               declaration_t *parameter = scope->declarations;
-               for( ; parameter != NULL; parameter = parameter->next) {
-                       if(first) {
+               entity_t *parameter = parameters->entities;
+               for (; parameter != NULL; parameter = parameter->base.next) {
+                       if (parameter->kind != ENTITY_PARAMETER)
+                               continue;
+
+                       if (first) {
                                first = false;
                        } else {
                                fputs(", ", out);
                        }
-                       print_type_ext(parameter->type, parameter->symbol,
-                                      &parameter->scope);
+                       const type_t *const type = parameter->declaration.type;
+                       if (type == NULL) {
+                               fputs(parameter->base.symbol->string, out);
+                       } else {
+                               print_type_ext(type, parameter->base.symbol, NULL);
+                       }
                }
        }
-       if(type->variadic) {
-               if(first) {
+       if (type->variadic) {
+               if (first) {
                        first = false;
                } else {
                        fputs(", ", out);
                }
                fputs("...", out);
        }
-       if(first && !type->unspecified_parameters) {
+       if (first && !type->unspecified_parameters) {
                fputs("void", out);
        }
        fputc(')', out);
+
+       intern_print_type_post(type->return_type);
 }
 
 /**
@@ -343,9 +400,21 @@ static void print_function_type_post(const function_type_t *type,
  */
 static void print_pointer_type_pre(const pointer_type_t *type)
 {
-       intern_print_type_pre(type->points_to, false);
-       fputs("*", out);
-       print_type_qualifiers(type->base.qualifiers);
+       type_t const *const points_to = type->points_to;
+       intern_print_type_pre(points_to);
+       if (points_to->kind == TYPE_ARRAY || points_to->kind == TYPE_FUNCTION)
+               fputs(" (", out);
+       variable_t *const variable = type->base_variable;
+       if (variable != NULL) {
+               fputs(" __based(", out);
+               fputs(variable->base.base.symbol->string, out);
+               fputs(") ", out);
+       }
+       fputc('*', out);
+       type_qualifiers_t const qual = type->base.qualifiers;
+       if (qual != 0)
+               fputc(' ', out);
+       print_type_qualifiers(qual);
 }
 
 /**
@@ -355,7 +424,37 @@ static void print_pointer_type_pre(const pointer_type_t *type)
  */
 static void print_pointer_type_post(const pointer_type_t *type)
 {
-       intern_print_type_post(type->points_to, false);
+       type_t const *const points_to = type->points_to;
+       if (points_to->kind == TYPE_ARRAY || points_to->kind == TYPE_FUNCTION)
+               fputc(')', out);
+       intern_print_type_post(points_to);
+}
+
+/**
+ * Prints the prefix part of a reference type.
+ *
+ * @param type   The reference type.
+ */
+static void print_reference_type_pre(const reference_type_t *type)
+{
+       type_t const *const refers_to = type->refers_to;
+       intern_print_type_pre(refers_to);
+       if (refers_to->kind == TYPE_ARRAY || refers_to->kind == TYPE_FUNCTION)
+               fputs(" (", out);
+       fputc('&', out);
+}
+
+/**
+ * Prints the postfix part of a reference type.
+ *
+ * @param type   The reference type.
+ */
+static void print_reference_type_post(const reference_type_t *type)
+{
+       type_t const *const refers_to = type->refers_to;
+       if (refers_to->kind == TYPE_ARRAY || refers_to->kind == TYPE_FUNCTION)
+               fputc(')', out);
+       intern_print_type_post(refers_to);
 }
 
 /**
@@ -365,7 +464,7 @@ static void print_pointer_type_post(const pointer_type_t *type)
  */
 static void print_array_type_pre(const array_type_t *type)
 {
-       intern_print_type_pre(type->element_type, false);
+       intern_print_type_pre(type->element_type);
 }
 
 /**
@@ -376,16 +475,18 @@ static void print_array_type_pre(const array_type_t *type)
 static void print_array_type_post(const array_type_t *type)
 {
        fputc('[', out);
-       if(type->is_static) {
+       if (type->is_static) {
                fputs("static ", out);
        }
        print_type_qualifiers(type->base.qualifiers);
-       if(type->size_expression != NULL
+       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);
-       intern_print_type_post(type->element_type, false);
+       intern_print_type_post(type->element_type);
 }
 
 /**
@@ -396,8 +497,8 @@ static void print_array_type_post(const array_type_t *type)
 static void print_bitfield_type_post(const bitfield_type_t *type)
 {
        fputs(" : ", out);
-       print_expression(type->size);
-       intern_print_type_post(type->base_type, false);
+       print_expression(type->size_expression);
+       intern_print_type_post(type->base_type);
 }
 
 /**
@@ -405,34 +506,34 @@ static void print_bitfield_type_post(const bitfield_type_t *type)
  *
  * @param declaration  The enum's type declaration.
  */
-void print_enum_definition(const declaration_t *declaration)
+void print_enum_definition(const enum_t *enume)
 {
        fputs("{\n", out);
 
        change_indent(1);
 
-       declaration_t *entry = declaration->next;
-       for( ; entry != NULL && entry->storage_class == STORAGE_CLASS_ENUM_ENTRY;
-              entry = entry->next) {
+       entity_t *entry = enume->base.next;
+       for( ; entry != NULL && entry->kind == ENTITY_ENUM_VALUE;
+              entry = entry->base.next) {
 
                print_indent();
-               fprintf(out, "%s", entry->symbol->string);
-               if(entry->init.initializer != NULL) {
-                       fprintf(out, " = ");
+               fputs(entry->base.symbol->string, out);
+               if (entry->enum_value.value != NULL) {
+                       fputs(" = ", out);
 
                        /* skip the implicit cast */
-                       expression_t *expression = entry->init.enum_value;
-                       if(expression->kind == EXPR_UNARY_CAST_IMPLICIT) {
+                       expression_t *expression = entry->enum_value.value;
+                       if (expression->kind == EXPR_UNARY_CAST_IMPLICIT) {
                                expression = expression->unary.value;
                        }
                        print_expression(expression);
                }
-               fprintf(out, ",\n");
+               fputs(",\n", out);
        }
 
        change_indent(-1);
        print_indent();
-       fputs("}", out);
+       fputc('}', out);
 }
 
 /**
@@ -442,38 +543,43 @@ void print_enum_definition(const declaration_t *declaration)
  */
 static void print_type_enum(const enum_type_t *type)
 {
+       int empty = type->base.qualifiers == 0;
        print_type_qualifiers(type->base.qualifiers);
-       fputs("enum ", out);
+       fputs(" enum " + empty, out);
 
-       declaration_t *declaration = type->declaration;
-       symbol_t      *symbol      = declaration->symbol;
-       if(symbol != NULL) {
+       enum_t   *enume  = type->enume;
+       symbol_t *symbol = enume->base.symbol;
+       if (symbol != NULL) {
                fputs(symbol->string, out);
        } else {
-               print_enum_definition(declaration);
+               print_enum_definition(enume);
        }
 }
 
 /**
  * Print the compound part of a compound type.
- *
- * @param declaration  The declaration of the compound type.
  */
-void print_compound_definition(const declaration_t *declaration)
+void print_compound_definition(const compound_t *compound)
 {
        fputs("{\n", out);
        change_indent(1);
 
-       declaration_t *iter = declaration->scope.declarations;
-       for( ; iter != NULL; iter = iter->next) {
+       entity_t *entity = compound->members.entities;
+       for( ; entity != NULL; entity = entity->base.next) {
+               if (entity->kind != ENTITY_COMPOUND_MEMBER)
+                       continue;
+
                print_indent();
-               print_declaration(iter);
+               print_entity(entity);
                fputc('\n', out);
        }
 
        change_indent(-1);
        print_indent();
-       fputs("}", out);
+       fputc('}', out);
+       if (compound->modifiers & DM_TRANSPARENT_UNION) {
+               fputs("__attribute__((__transparent_union__))", out);
+       }
 }
 
 /**
@@ -483,21 +589,22 @@ void print_compound_definition(const declaration_t *declaration)
  */
 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 ", out);
+       if (type->base.kind == TYPE_COMPOUND_STRUCT) {
+               fputs(" struct " + empty, out);
        } else {
                assert(type->base.kind == TYPE_COMPOUND_UNION);
-               fputs("union ", out);
+               fputs(" union " + empty, out);
        }
 
-       declaration_t *declaration = type->declaration;
-       symbol_t      *symbol      = declaration->symbol;
-       if(symbol != NULL) {
+       compound_t *compound = type->compound;
+       symbol_t   *symbol   = compound->base.symbol;
+       if (symbol != NULL) {
                fputs(symbol->string, out);
        } else {
-               print_compound_definition(declaration);
+               print_compound_definition(compound);
        }
 }
 
@@ -509,7 +616,9 @@ static void print_compound_type(const compound_type_t *type)
 static void print_typedef_type_pre(const typedef_type_t *const type)
 {
        print_type_qualifiers(type->base.qualifiers);
-       fputs(type->declaration->symbol->string, out);
+       if (type->base.qualifiers != 0)
+               fputc(' ', out);
+       fputs(type->typedefe->base.symbol->string, out);
 }
 
 /**
@@ -520,8 +629,7 @@ static void print_typedef_type_pre(const typedef_type_t *const type)
 static void print_typeof_type_pre(const typeof_type_t *const type)
 {
        fputs("typeof(", out);
-       if(type->expression != NULL) {
-               assert(type->typeof_type == NULL);
+       if (type->expression != NULL) {
                print_expression(type->expression);
        } else {
                print_type(type->typeof_type);
@@ -533,13 +641,13 @@ 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:
                fputs("<error>", out);
+               return;
        case TYPE_INVALID:
                fputs("<invalid>", out);
                return;
@@ -563,13 +671,16 @@ 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);
                return;
+       case TYPE_REFERENCE:
+               print_reference_type_pre(&type->reference);
+               return;
        case TYPE_BITFIELD:
-               intern_print_type_pre(type->bitfield.base_type, top);
+               intern_print_type_pre(type->bitfield.base_type);
                return;
        case TYPE_ARRAY:
                print_array_type_pre(&type->array);
@@ -588,17 +699,19 @@ 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);
                return;
+       case TYPE_REFERENCE:
+               print_reference_type_post(&type->reference);
+               return;
        case TYPE_ARRAY:
                print_array_type_post(&type->array);
                return;
@@ -631,22 +744,22 @@ void print_type(const type_t *const type)
 }
 
 void print_type_ext(const type_t *const type, const symbol_t *symbol,
-                    const scope_t *scope)
+                    const scope_t *parameters)
 {
-       if(type == NULL) {
+       if (type == NULL) {
                fputs("nil type", out);
                return;
        }
 
-       intern_print_type_pre(type, true);
-       if(symbol != NULL) {
+       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, scope, true);
+       if (type->kind == TYPE_FUNCTION) {
+               print_function_type_post(&type->function, parameters);
        } else {
-               intern_print_type_post(type, true);
+               intern_print_type_post(type);
        }
 }
 
@@ -655,7 +768,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);
@@ -666,6 +779,7 @@ static size_t get_type_size(const type_t *type)
        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);
@@ -687,10 +801,11 @@ static size_t get_type_size(const type_t *type)
  */
 type_t *duplicate_type(const type_t *type)
 {
-       size_t size = get_type_size(type);
+       size_t size = get_type_struct_size(type);
 
        type_t *copy = obstack_alloc(type_obst, size);
        memcpy(copy, type, size);
+       copy->base.firm_type = NULL;
 
        return copy;
 }
@@ -703,18 +818,43 @@ type_t *duplicate_type(const type_t *type)
  */
 type_t *get_unqualified_type(type_t *type)
 {
-       if(type->base.qualifiers == TYPE_QUALIFIER_NONE)
+       assert(!is_typeref(type));
+
+       if (type->base.qualifiers == TYPE_QUALIFIER_NONE)
                return type;
 
        type_t *unqualified_type          = duplicate_type(type);
        unqualified_type->base.qualifiers = TYPE_QUALIFIER_NONE;
 
-       type_t *result = typehash_insert(unqualified_type);
-       if(result != unqualified_type) {
-               obstack_free(type_obst, unqualified_type);
+       return identify_new_type(unqualified_type);
+}
+
+type_t *get_qualified_type(type_t *orig_type, type_qualifiers_t const qual)
+{
+       type_t *type = skip_typeref(orig_type);
+
+       type_t *copy;
+       if (is_type_array(type)) {
+               /* For array types the element type has to be adjusted */
+               type_t *element_type      = type->array.element_type;
+               type_t *qual_element_type = get_qualified_type(element_type, qual);
+
+               if (qual_element_type == element_type)
+                       return orig_type;
+
+               copy                     = duplicate_type(type);
+               copy->array.element_type = qual_element_type;
+       } else if (is_type_valid(type)) {
+               if ((type->base.qualifiers & qual) == qual)
+                       return orig_type;
+
+               copy                   = duplicate_type(type);
+               copy->base.qualifiers |= qual;
+       } else {
+               return type;
        }
 
-       return result;
+       return identify_new_type(copy);
 }
 
 /**
@@ -745,15 +885,29 @@ bool is_type_integer(const type_t *type)
 {
        assert(!is_typeref(type));
 
-       if(type->kind == TYPE_ENUM)
+       if (type->kind == TYPE_ENUM)
+               return true;
+       if (type->kind == TYPE_BITFIELD)
                return true;
 
-       if(type->kind != TYPE_ATOMIC)
+       if (type->kind != TYPE_ATOMIC)
                return false;
 
        return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_INTEGER);
 }
 
+/**
+ * Returns true if the given type is an enum type.
+ *
+ * @param type  The type to check.
+ * @return True if type is an enum type.
+ */
+bool is_type_enum(const type_t *type)
+{
+       assert(!is_typeref(type));
+       return type->kind == TYPE_ENUM;
+}
+
 /**
  * Returns true if the given type is an floating point type.
  *
@@ -764,12 +918,28 @@ bool is_type_float(const type_t *type)
 {
        assert(!is_typeref(type));
 
-       if(type->kind != TYPE_ATOMIC)
+       if (type->kind != TYPE_ATOMIC)
                return false;
 
        return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_FLOAT);
 }
 
+/**
+ * Returns true if the given type is an complex type.
+ *
+ * @param type  The type to check.
+ * @return True if type is a complex type.
+ */
+bool is_type_complex(const type_t *type)
+{
+       assert(!is_typeref(type));
+
+       if (type->kind != TYPE_ATOMIC)
+               return false;
+
+       return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_COMPLEX);
+}
+
 /**
  * Returns true if the given type is a signed type.
  *
@@ -781,10 +951,12 @@ bool is_type_signed(const type_t *type)
        assert(!is_typeref(type));
 
        /* enum types are int for now */
-       if(type->kind == TYPE_ENUM)
+       if (type->kind == TYPE_ENUM)
                return true;
+       if (type->kind == TYPE_BITFIELD)
+               return is_type_signed(type->bitfield.base_type);
 
-       if(type->kind != TYPE_ATOMIC)
+       if (type->kind != TYPE_ATOMIC)
                return false;
 
        return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_SIGNED);
@@ -815,6 +987,18 @@ bool is_type_arithmetic(const type_t *type)
        }
 }
 
+/**
+ * Returns true if the given type is an integer or float type.
+ *
+ * @param type  The type to check.
+ * @return True if type is an integer or float type.
+ */
+bool is_type_real(const type_t *type)
+{
+       /* 6.2.5 (17) */
+       return is_type_integer(type) || is_type_float(type);
+}
+
 /**
  * Returns true if the given type represents a scalar type.
  *
@@ -848,20 +1032,14 @@ bool is_type_incomplete(const type_t *type)
        case TYPE_COMPOUND_STRUCT:
        case TYPE_COMPOUND_UNION: {
                const compound_type_t *compound_type = &type->compound;
-               declaration_t         *declaration   = compound_type->declaration;
-               return !declaration->init.complete;
-       }
-       case TYPE_ENUM: {
-               const enum_type_t *enum_type   = &type->enumt;
-               declaration_t     *declaration = enum_type->declaration;
-               return !declaration->init.complete;
+               return !compound_type->compound->complete;
        }
-       case TYPE_BITFIELD:
-       case TYPE_FUNCTION:
-               return true;
+       case TYPE_ENUM:
+               return false;
 
        case TYPE_ARRAY:
-               return type->array.size_expression == NULL;
+               return type->array.size_expression == NULL
+                       && !type->array.size_constant;
 
        case TYPE_ATOMIC:
                return type->atomic.akind == ATOMIC_TYPE_VOID;
@@ -872,7 +1050,10 @@ bool is_type_incomplete(const type_t *type)
        case TYPE_IMAGINARY:
                return type->imaginary.akind == ATOMIC_TYPE_VOID;
 
+       case TYPE_BITFIELD:
+       case TYPE_FUNCTION:
        case TYPE_POINTER:
+       case TYPE_REFERENCE:
        case TYPE_BUILTIN:
        case TYPE_ERROR:
                return false;
@@ -887,6 +1068,19 @@ bool is_type_incomplete(const type_t *type)
        panic("invalid type found");
 }
 
+bool is_type_object(const type_t *type)
+{
+       return !is_type_function(type) && !is_type_incomplete(type);
+}
+
+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.
  */
@@ -898,11 +1092,20 @@ static bool function_types_compatible(const function_type_t *func1,
        if (!types_compatible(ret1, ret2))
                return false;
 
+       if (func1->linkage != func2->linkage)
+               return false;
+
+       /* this would make alot of sense, but gcc doesn't seem to do this */
+#if 0
+       if (func1->calling_convention != func2->calling_convention)
+               return false;
+#endif
+
        /* can parameters be compared? */
-       if(func1->unspecified_parameters || func2->unspecified_parameters)
+       if (func1->unspecified_parameters || func2->unspecified_parameters)
                return true;
 
-       if(func1->variadic != func2->variadic)
+       if (func1->variadic != func2->variadic)
                return false;
 
        /* TODO: handling of unspecified parameters not correct yet */
@@ -910,7 +1113,7 @@ static bool function_types_compatible(const function_type_t *func1,
        /* all argument types must be compatible */
        function_parameter_t *parameter1 = func1->parameters;
        function_parameter_t *parameter2 = func2->parameters;
-       for( ; parameter1 != NULL && parameter2 != NULL;
+       for ( ; parameter1 != NULL && parameter2 != NULL;
                        parameter1 = parameter1->next, parameter2 = parameter2->next) {
                type_t *parameter1_type = skip_typeref(parameter1->type);
                type_t *parameter2_type = skip_typeref(parameter2->type);
@@ -918,11 +1121,11 @@ static bool function_types_compatible(const function_type_t *func1,
                parameter1_type = get_unqualified_type(parameter1_type);
                parameter2_type = get_unqualified_type(parameter2_type);
 
-               if(!types_compatible(parameter1_type, parameter2_type))
+               if (!types_compatible(parameter1_type, parameter2_type))
                        return false;
        }
        /* same number of arguments? */
-       if(parameter1 != NULL || parameter2 != NULL)
+       if (parameter1 != NULL || parameter2 != NULL)
                return false;
 
        return true;
@@ -936,10 +1139,10 @@ static bool array_types_compatible(const array_type_t *array1,
 {
        type_t *element_type1 = skip_typeref(array1->element_type);
        type_t *element_type2 = skip_typeref(array2->element_type);
-       if(!types_compatible(element_type1, element_type2))
+       if (!types_compatible(element_type1, element_type2))
                return false;
 
-       if(!array1->size_constant || !array2->size_constant)
+       if (!array1->size_constant || !array2->size_constant)
                return true;
 
        return array1->size == array2->size;
@@ -954,15 +1157,18 @@ bool types_compatible(const type_t *type1, const type_t *type2)
        assert(!is_typeref(type2));
 
        /* shortcut: the same type is always compatible */
-       if(type1 == type2)
+       if (type1 == type2)
+               return true;
+
+       if (!is_type_valid(type1) || !is_type_valid(type2))
                return true;
 
-       if(type1->base.qualifiers != type2->base.qualifiers)
+       if (type1->base.qualifiers != type2->base.qualifiers)
                return false;
-       if(type1->kind != type2->kind)
+       if (type1->kind != type2->kind)
                return false;
 
-       switch(type1->kind) {
+       switch (type1->kind) {
        case TYPE_FUNCTION:
                return function_types_compatible(&type1->function, &type2->function);
        case TYPE_ATOMIC:
@@ -980,8 +1186,18 @@ bool types_compatible(const type_t *type1, const type_t *type2)
                return types_compatible(to1, to2);
        }
 
+       case TYPE_REFERENCE: {
+               const type_t *const to1 = skip_typeref(type1->reference.refers_to);
+               const type_t *const to2 = skip_typeref(type2->reference.refers_to);
+               return types_compatible(to1, to2);
+       }
+
        case TYPE_COMPOUND_STRUCT:
-       case TYPE_COMPOUND_UNION:
+       case TYPE_COMPOUND_UNION: {
+
+
+               break;
+       }
        case TYPE_ENUM:
        case TYPE_BUILTIN:
                /* TODO: not implemented */
@@ -1006,52 +1222,32 @@ bool types_compatible(const type_t *type1, const type_t *type2)
        return false;
 }
 
-/**
- * Check if two pointer types are compatible.
- */
-bool pointers_compatible(const type_t *type1, const type_t *type2)
-{
-       assert(!is_typeref(type1));
-       assert(!is_typeref(type2));
-
-       assert(type1->kind == TYPE_POINTER);
-       assert(type2->kind == TYPE_POINTER);
-       (void) type1;
-       (void) type2;
-       /* TODO */
-       return true;
-}
-
 /**
  * Skip all typerefs and return the underlying type.
  */
 type_t *skip_typeref(type_t *type)
 {
-       unsigned qualifiers = TYPE_QUALIFIER_NONE;
+       type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE;
 
-       while(true) {
-               switch(type->kind) {
+       while (true) {
+               switch (type->kind) {
                case TYPE_ERROR:
                        return type;
                case TYPE_TYPEDEF: {
                        qualifiers |= type->base.qualifiers;
+
                        const typedef_type_t *typedef_type = &type->typedeft;
-                       if(typedef_type->resolved_type != NULL) {
+                       if (typedef_type->resolved_type != NULL) {
                                type = typedef_type->resolved_type;
                                break;
                        }
-                       type = typedef_type->declaration->type;
+                       type = typedef_type->typedefe->type;
                        continue;
                }
-               case TYPE_TYPEOF: {
-                       const typeof_type_t *typeof_type = &type->typeoft;
-                       if(typeof_type->typeof_type != NULL) {
-                               type = typeof_type->typeof_type;
-                       } else {
-                               type = typeof_type->expression->base.type;
-                       }
+               case TYPE_TYPEOF:
+                       qualifiers |= type->base.qualifiers;
+                       type        = type->typeoft.typeof_type;
                        continue;
-               }
                default:
                        break;
                }
@@ -1059,18 +1255,189 @@ type_t *skip_typeref(type_t *type)
        }
 
        if (qualifiers != TYPE_QUALIFIER_NONE) {
-               type_t *const copy     = duplicate_type(type);
-               copy->base.qualifiers |= qualifiers;
-
-               type = typehash_insert(copy);
-               if (type != copy) {
-                       obstack_free(type_obst, copy);
+               type_t *const copy = duplicate_type(type);
+
+               /* for const with typedefed array type the element type has to be
+                * adjusted */
+               if (is_type_array(copy)) {
+                       type_t *element_type           = copy->array.element_type;
+                       element_type                   = duplicate_type(element_type);
+                       element_type->base.qualifiers |= qualifiers;
+                       copy->array.element_type       = element_type;
+               } else {
+                       copy->base.qualifiers |= qualifiers;
                }
+
+               type = identify_new_type(copy);
        }
 
        return type;
 }
 
+unsigned get_type_size(const 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:
+       case TYPE_COMPOUND_STRUCT:
+               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(const 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:
+       case TYPE_COMPOUND_STRUCT:
+               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;
+
+       while (true) {
+               switch (type->base.kind) {
+               case TYPE_ERROR:
+                       return TYPE_QUALIFIER_NONE;
+               case TYPE_TYPEDEF:
+                       qualifiers |= type->base.qualifiers;
+                       const typedef_type_t *typedef_type = &type->typedeft;
+                       if (typedef_type->resolved_type != NULL)
+                               type = typedef_type->resolved_type;
+                       else
+                               type = typedef_type->typedefe->type;
+                       continue;
+               case TYPE_TYPEOF:
+                       type = type->typeoft.typeof_type;
+                       continue;
+               case TYPE_ARRAY:
+                       if (skip_array_type) {
+                               type = type->array.element_type;
+                               continue;
+                       }
+                       break;
+               default:
+                       break;
+               }
+               break;
+       }
+       return type->base.qualifiers | qualifiers;
+}
+
 unsigned get_atomic_type_size(atomic_type_kind_t kind)
 {
        assert(kind <= ATOMIC_TYPE_LAST);
@@ -1091,9 +1458,9 @@ unsigned get_atomic_type_flags(atomic_type_kind_t kind)
 
 atomic_type_kind_t get_intptr_kind(void)
 {
-       if(machine_size <= 32)
+       if (machine_size <= 32)
                return ATOMIC_TYPE_INT;
-       else if(machine_size <= 64)
+       else if (machine_size <= 64)
                return ATOMIC_TYPE_LONG;
        else
                return ATOMIC_TYPE_LONGLONG;
@@ -1101,9 +1468,9 @@ atomic_type_kind_t get_intptr_kind(void)
 
 atomic_type_kind_t get_uintptr_kind(void)
 {
-       if(machine_size <= 32)
+       if (machine_size <= 32)
                return ATOMIC_TYPE_UINT;
-       else if(machine_size <= 64)
+       else if (machine_size <= 64)
                return ATOMIC_TYPE_ULONG;
        else
                return ATOMIC_TYPE_ULONGLONG;
@@ -1112,12 +1479,13 @@ atomic_type_kind_t get_uintptr_kind(void)
 /**
  * Find the atomic type kind representing a given size (signed).
  */
-atomic_type_kind_t find_signed_int_atomic_type_kind_for_size(unsigned size) {
+atomic_type_kind_t find_signed_int_atomic_type_kind_for_size(unsigned size)
+{
        static atomic_type_kind_t kinds[32];
 
        assert(size < 32);
        atomic_type_kind_t kind = kinds[size];
-       if(kind == ATOMIC_TYPE_INVALID) {
+       if (kind == ATOMIC_TYPE_INVALID) {
                static const atomic_type_kind_t possible_kinds[] = {
                        ATOMIC_TYPE_SCHAR,
                        ATOMIC_TYPE_SHORT,
@@ -1125,8 +1493,8 @@ atomic_type_kind_t find_signed_int_atomic_type_kind_for_size(unsigned size) {
                        ATOMIC_TYPE_LONG,
                        ATOMIC_TYPE_LONGLONG
                };
-               for(unsigned i = 0; i < sizeof(possible_kinds)/sizeof(possible_kinds[0]); ++i) {
-                       if(get_atomic_type_size(possible_kinds[i]) == size) {
+               for (size_t i = 0; i < lengthof(possible_kinds); ++i) {
+                       if (get_atomic_type_size(possible_kinds[i]) == size) {
                                kind = possible_kinds[i];
                                break;
                        }
@@ -1139,12 +1507,13 @@ atomic_type_kind_t find_signed_int_atomic_type_kind_for_size(unsigned size) {
 /**
  * Find the atomic type kind representing a given size (signed).
  */
-atomic_type_kind_t find_unsigned_int_atomic_type_kind_for_size(unsigned size) {
+atomic_type_kind_t find_unsigned_int_atomic_type_kind_for_size(unsigned size)
+{
        static atomic_type_kind_t kinds[32];
 
        assert(size < 32);
        atomic_type_kind_t kind = kinds[size];
-       if(kind == ATOMIC_TYPE_INVALID) {
+       if (kind == ATOMIC_TYPE_INVALID) {
                static const atomic_type_kind_t possible_kinds[] = {
                        ATOMIC_TYPE_UCHAR,
                        ATOMIC_TYPE_USHORT,
@@ -1152,8 +1521,8 @@ atomic_type_kind_t find_unsigned_int_atomic_type_kind_for_size(unsigned size) {
                        ATOMIC_TYPE_ULONG,
                        ATOMIC_TYPE_ULONGLONG
                };
-               for(unsigned i = 0; i < sizeof(possible_kinds)/sizeof(possible_kinds[0]); ++i) {
-                       if(get_atomic_type_size(possible_kinds[i]) == size) {
+               for (size_t i = 0; i < lengthof(possible_kinds); ++i) {
+                       if (get_atomic_type_size(possible_kinds[i]) == size) {
                                kind = possible_kinds[i];
                                break;
                        }
@@ -1167,10 +1536,10 @@ atomic_type_kind_t find_unsigned_int_atomic_type_kind_for_size(unsigned size) {
  * Hash the given type and return the "singleton" version
  * of it.
  */
-static type_t *identify_new_type(type_t *type)
+type_t *identify_new_type(type_t *type)
 {
        type_t *result = typehash_insert(type);
-       if(result != type) {
+       if (result != type) {
                obstack_free(type_obst, type);
        }
        return result;
@@ -1189,7 +1558,6 @@ type_t *make_atomic_type(atomic_type_kind_t akind, type_qualifiers_t qualifiers)
 
        type->kind            = TYPE_ATOMIC;
        type->base.qualifiers = qualifiers;
-       type->base.alignment  = get_atomic_type_alignment(akind);
        type->atomic.akind    = akind;
 
        return identify_new_type(type);
@@ -1208,7 +1576,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);
@@ -1227,7 +1594,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);
@@ -1244,14 +1610,53 @@ type_t *make_pointer_type(type_t *points_to, type_qualifiers_t qualifiers)
        type_t *type = obstack_alloc(type_obst, sizeof(pointer_type_t));
        memset(type, 0, sizeof(pointer_type_t));
 
-       type->kind              = TYPE_POINTER;
-       type->base.qualifiers   = qualifiers;
-       type->base.alignment    = 0;
-       type->pointer.points_to = points_to;
+       type->kind                  = TYPE_POINTER;
+       type->base.qualifiers       = qualifiers;
+       type->pointer.points_to     = points_to;
+       type->pointer.base_variable = NULL;
+
+       return identify_new_type(type);
+}
+
+/**
+ * Creates a new reference type.
+ *
+ * @param refers_to   The referred-to type for the new type.
+ */
+type_t *make_reference_type(type_t *refers_to)
+{
+       type_t *type = obstack_alloc(type_obst, sizeof(reference_type_t));
+       memset(type, 0, sizeof(reference_type_t));
+
+       type->kind                = TYPE_REFERENCE;
+       type->base.qualifiers     = 0;
+       type->reference.refers_to = refers_to;
+
+       return identify_new_type(type);
+}
+
+/**
+ * Creates a new based pointer type.
+ *
+ * @param points_to   The points-to type for the new type.
+ * @param qualifiers  Type qualifiers for the new type.
+ * @param variable    The based variable
+ */
+type_t *make_based_pointer_type(type_t *points_to,
+                                                               type_qualifiers_t qualifiers, variable_t *variable)
+{
+       type_t *type = obstack_alloc(type_obst, sizeof(pointer_type_t));
+       memset(type, 0, sizeof(pointer_type_t));
+
+       type->kind                  = TYPE_POINTER;
+       type->base.qualifiers       = qualifiers;
+       type->pointer.points_to     = points_to;
+       type->pointer.base_variable = variable;
 
        return identify_new_type(type);
 }
 
+
 type_t *make_array_type(type_t *element_type, size_t size,
                         type_qualifiers_t qualifiers)
 {
@@ -1260,7 +1665,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;