X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Ftype.c;h=d2c79bf01c82e5695239cd23dbbf1e75f86820d0;hb=f64411a2a8a4e28e70a281ac67736a1bdf996b72;hp=524ed981fdfcbc94aa2348282a06f406b4a0548d;hpb=2a35ab7a070c551fe1107140ab7e71cacef38f7a;p=libfirm

diff --git a/ir/tr/type.c b/ir/tr/type.c
index 524ed981f..d2c79bf01 100644
--- a/ir/tr/type.c
+++ b/ir/tr/type.c
@@ -3,7 +3,7 @@
  * File name:   ir/tr/type.c
  * Purpose:     Representation of types.
  * Author:      Goetz Lindenmaier
- * Modified by:
+ * Modified by: Michael Beck
  * Created:
  * CVS-ID:      $Id$
  * Copyright:   (c) 2001-2003 Universität Karlsruhe
@@ -12,9 +12,12 @@
 
 /**
  *
- *   file type.c - implementation of the datastructure to hold
- *   type information.
- *  (C) 2001 by Universitaet Karlsruhe
+ *  @file type.c
+ *
+ *  Implementation of the datastructure to hold
+ *  type information.
+ *
+ *  (C) 2001-2005 by Universitaet Karlsruhe
  *  Goetz Lindenmaier
  *
  *  This module supplies a datastructure to represent all types
@@ -48,8 +51,10 @@
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
-
+#ifdef HAVE_STDLIB_H
 # include <stdlib.h>
+#endif
+
 # include <stddef.h>
 
 # include "type_t.h"
@@ -61,19 +66,20 @@
 # include "typegmod.h"
 # include "mangle.h"
 # include "tv_t.h"
+# include "irhooks.h"
 
 # include "array.h"
 
-/*******************************************************************/
+/*-----------------------------------------------------------------*/
 /** TYPE                                                          **/
-/*******************************************************************/
+/*-----------------------------------------------------------------*/
 
-type *none_type;    type *get_none_type(void)    { return none_type;    }
-type *unknown_type; type *get_unknown_type(void) { return unknown_type; }
+type *firm_none_type;    type *get_none_type(void)    { return firm_none_type;    }
+type *firm_unknown_type; type *get_unknown_type(void) { return firm_unknown_type; }
 
 
 #ifdef DEBUG_libfirm
-/** Returns a new, unique number to number nodes or the like. */
+/* Returns a new, unique number to number nodes or the like. */
 int get_irp_new_node_nr(void);
 #endif
 
@@ -81,58 +87,79 @@ int get_irp_new_node_nr(void);
 static ident *value_params_suffix = NULL;
 static ident *value_ress_suffix = NULL;
 
-void init_type(void) {
+/** The default calling convention for method types. */
+static unsigned default_cc_mask;
+
+/* return the default calling convention for method types */
+unsigned get_default_cc_mask(void) {
+  return default_cc_mask;
+}
+
+/* Initialize the type module. */
+void firm_init_type(dbg_info *builtin_db, unsigned def_cc_mask)
+{
+  default_cc_mask     = def_cc_mask;
   value_params_suffix = new_id_from_str(VALUE_PARAMS_SUFFIX);
   value_ress_suffix   = new_id_from_str(VALUE_RESS_SUFFIX);
 
   /* construct none and unknown type. */
-  none_type    = new_type(tpop_none,    mode_BAD, new_id_from_str("type_none"));
-  set_type_size_bits(none_type, 0);
-  set_type_state (none_type, layout_fixed);
-  remove_irp_type(none_type);
-  unknown_type = new_type(tpop_unknown, mode_ANY, new_id_from_str("type_unknown"));
-  set_type_size_bits(unknown_type, 0);
-  set_type_state (unknown_type, layout_fixed);
-  remove_irp_type(unknown_type);
-}
+  firm_none_type    = new_type(tpop_none,    mode_BAD, new_id_from_str("type_none"), builtin_db);
+  set_type_size_bits(firm_none_type, 0);
+  set_type_state (firm_none_type, layout_fixed);
+  remove_irp_type(firm_none_type);
 
-unsigned long type_visited;
+  firm_unknown_type = new_type(tpop_unknown, mode_ANY, new_id_from_str("type_unknown"), builtin_db);
+  set_type_size_bits(firm_unknown_type, 0);
+  set_type_state (firm_unknown_type, layout_fixed);
+  remove_irp_type(firm_unknown_type);
+}
 
-void (set_master_type_visited)(unsigned long val) { __set_master_type_visited(val); }
-unsigned long (get_master_type_visited)(void)     { return __get_master_type_visited(); }
-void (inc_master_type_visited)(void)              { __inc_master_type_visited(); }
+/** the global type visited flag */
+unsigned long firm_type_visited;
 
+void (set_master_type_visited)(unsigned long val) { _set_master_type_visited(val); }
+unsigned long (get_master_type_visited)(void)     { return _get_master_type_visited(); }
+void (inc_master_type_visited)(void)              { _inc_master_type_visited(); }
 
+/*
+ * Creates a new type representation.
+ */
 type *
-new_type(tp_op *type_op, ir_mode *mode, ident* name) {
+new_type(tp_op *type_op, ir_mode *mode, ident *name, dbg_info *db) {
   type *res;
-  int node_size ;
+  int node_size;
 
   assert(type_op != type_id);
   assert(!id_contains_char(name, ' ') && "type name should not contain spaces");
 
   node_size = offsetof(type, attr) +  type_op->attr_size;
-  res = xmalloc (node_size);
+  res = xmalloc(node_size);
   memset(res, 0, node_size);
-  add_irp_type(res);   /* Remember the new type global. */
 
-  res->kind    = k_type;
-  res->type_op = type_op;
-  res->mode    = mode;
-  res->name    = name;
-  res->state   = layout_undefined;
-  res->size    = -1;
-  res->align   = -1;
-  res->visit   = 0;
-  res -> link  = NULL;
+  res->kind       = k_type;
+  res->type_op    = type_op;
+  res->mode       = mode;
+  res->name       = name;
+  res->visibility = visibility_external_allocated;
+  res->frame_type = 0;
+  res->state      = layout_undefined;
+  res->size       = -1;
+  res->align      = -1;
+  res->visit      = 0;
+  res->link       = NULL;
+  res->dbi        = db;
 #ifdef DEBUG_libfirm
-  res->nr      = get_irp_new_node_nr();
+  res->nr         = get_irp_new_node_nr();
 #endif /* defined DEBUG_libfirm */
 
+  add_irp_type(res);   /* Remember the new type global. */
+
   return res;
 }
 
 void        free_type(type *tp) {
+  const tp_op *op = get_type_tpop(tp);
+
   if ((get_type_tpop(tp) == tpop_none) || (get_type_tpop(tp) == tpop_unknown))
     return;
   /* Remove from list of all types */
@@ -140,58 +167,42 @@ void        free_type(type *tp) {
   /* Free the attributes of the type. */
   free_type_attrs(tp);
   /* Free entities automatically allocated with the type */
-  if (is_array_type(tp))
-    free_entity(get_array_element_entity(tp));
+  if (op->ops.free_auto_entities)
+    op->ops.free_auto_entities(tp);
   /* And now the type itself... */
   tp->kind = k_BAD;
   free(tp);
 }
 
 void free_type_entities(type *tp) {
-  switch(get_type_tpop_code(tp)) {
-  case tpo_class:       { free_class_entities(tp);       } break;
-  case tpo_struct:      { free_struct_entities(tp);      } break;
-  case tpo_method:      { free_method_entities(tp);      } break;
-  case tpo_union:       { free_union_entities(tp);       } break;
-  case tpo_array:       { free_array_entities(tp);       } break;
-  case tpo_enumeration: { free_enumeration_entities(tp); } break;
-  case tpo_pointer:     { free_pointer_entities(tp);     } break;
-  case tpo_primitive:   { free_primitive_entities(tp);   } break;
-  default: break;
-  }
+  const tp_op *tpop = get_type_tpop(tp);
+
+  if (tpop->ops.free_entities)
+    tpop->ops.free_entities(tp);
 }
 
 void free_type_attrs(type *tp) {
-  switch(get_type_tpop_code(tp)) {
-  case tpo_class:       { free_class_attrs(tp);       } break;
-  case tpo_struct:      { free_struct_attrs(tp);      } break;
-  case tpo_method:      { free_method_attrs(tp);      } break;
-  case tpo_union:       { free_union_attrs(tp);       } break;
-  case tpo_array:       { free_array_attrs(tp);       } break;
-  case tpo_enumeration: { free_enumeration_attrs(tp); } break;
-  case tpo_pointer:     { free_pointer_attrs(tp);     } break;
-  case tpo_primitive:   { free_primitive_attrs(tp);   } break;
-  default: break;
-  }
+  const tp_op *tpop = get_type_tpop(tp);
+
+  if (tpop->ops.free_attrs)
+    tpop->ops.free_attrs(tp);
 }
 
 /* set/get the link field */
-void *(get_type_link)(const type *tp)
-{
-  return __get_type_link(tp);
+void *(get_type_link)(const type *tp) {
+  return _get_type_link(tp);
 }
 
-void (set_type_link)(type *tp, void *l)
-{
-  __set_type_link(tp, l);
+void (set_type_link)(type *tp, void *l) {
+  _set_type_link(tp, l);
 }
 
 const tp_op *(get_type_tpop)(const type *tp) {
-  return __get_type_tpop(tp);
+  return _get_type_tpop(tp);
 }
 
 ident *(get_type_tpop_nameid)(const type *tp) {
-  return __get_type_tpop_nameid(tp);
+  return _get_type_tpop_nameid(tp);
 }
 
 const char* get_type_tpop_name(const type *tp) {
@@ -200,60 +211,38 @@ const char* get_type_tpop_name(const type *tp) {
 }
 
 tp_opcode (get_type_tpop_code)(const type *tp) {
-  return __get_type_tpop_code(tp);
+  return _get_type_tpop_code(tp);
 }
 
 ir_mode *(get_type_mode)(const type *tp) {
-  return __get_type_mode(tp);
+  return _get_type_mode(tp);
 }
 
-void        set_type_mode(type *tp, ir_mode* m) {
-  assert(tp && tp->kind == k_type);
+void        set_type_mode(type *tp, ir_mode *mode) {
+  const tp_op *tpop = get_type_tpop(tp);
 
-  assert(((tp->type_op != type_primitive)   || mode_is_data(m))     &&
-     /* Modes of primitives must be data */
-     ((tp->type_op != type_enumeration) || mode_is_int(m))      &&
-         /* Modes of enumerations must be integers */
-     ((tp->type_op != type_pointer)     || mode_is_reference(m))   );
-     /* Modes of pointers must be references. */
-
-  switch (get_type_tpop_code(tp)) {
-  case tpo_primitive:
-    /* For primitive size depends on the mode. */
-    tp->size = get_mode_size_bits(m);
-    tp->mode = m;
-    break;
-  case tpo_enumeration:
-  case tpo_pointer:
-    /* For pointer and enumeration size depends on the mode, but only byte size allowed. */
-    assert((get_mode_size_bits(m) & 7) == 0 && "unorthodox modes not implemented");
-    tp->size = get_mode_size_bits(m);
-    tp->mode = m;
-    break;
-  case tpo_struct:
-  case tpo_class:
-    /* for classes and structs we allow to set a mode if the layout is fixed AND the size matches */
-    assert(get_type_state(tp) == layout_fixed &&
-       tp->size == get_mode_size_bits(m) &&
-       "mode don't match struct/class layout");
-    tp->mode = m;
-    break;
-  default:
+  if (tpop->ops.set_type_mode)
+    tpop->ops.set_type_mode(tp, mode);
+  else
     assert(0 && "setting a mode is NOT allowed for this type");
-  }
 }
 
 ident *(get_type_ident)(const type *tp) {
-  return __get_type_ident(tp);
+  return _get_type_ident(tp);
 }
 
 void (set_type_ident)(type *tp, ident* id) {
-  __set_type_ident(tp, id);
+  _set_type_ident(tp, id);
 }
 
 /* Outputs a unique number for this node */
-long (get_type_nr)(const type *tp) {
-  return __get_type_nr(tp);
+long get_type_nr(const type *tp) {
+  assert(tp);
+#ifdef DEBUG_libfirm
+  return tp->nr;
+#else
+  return (long)tp;
+#endif
 }
 
 const char* get_type_name(const type *tp) {
@@ -262,28 +251,72 @@ const char* get_type_name(const type *tp) {
 }
 
 int (get_type_size_bytes)(const type *tp) {
-  return __get_type_size_bytes(tp);
+  return _get_type_size_bytes(tp);
 }
 
 int (get_type_size_bits)(const type *tp) {
-  return __get_type_size_bits(tp);
+  return _get_type_size_bits(tp);
 }
 
-void
-set_type_size_bits(type *tp, int size) {
-  assert(tp && tp->kind == k_type);
-  /* For pointer enumeration and primitive size depends on the mode.
-     Methods don't have a size. */
-  if ((tp->type_op != type_pointer) && (tp->type_op != type_primitive) &&
-      (tp->type_op != type_enumeration) && (tp->type_op != type_method)) {
-    if (tp->type_op == type_primitive)
-      tp->size = size;
-    else {
-      /* argh: we must allow to set negative values as "invalid size" */
-      tp->size = (size >= 0) ? (size + 7) & ~7 : size;
-      assert(tp->size == size && "setting a bit size is NOT allowed for this type");
+
+visibility get_type_visibility (const type *tp) {
+#if 0
+  visibility res =  visibility_local;
+  if (is_compound_type(tp)) {
+
+    if (is_Array_type(tp)) {
+      entity *mem = get_array_element_entity(tp);
+      if (get_entity_visibility(mem) != visibility_local)
+        res = visibility_external_visible;
+    } else {
+      int i, n_mems = get_compound_n_members(tp);
+      for (i = 0; i < n_mems; ++i) {
+        entity *mem = get_compound_member(tp, i);
+        if (get_entity_visibility(mem) != visibility_local)
+          res = visibility_external_visible;
+      }
     }
   }
+  return res;
+#endif
+  assert(is_type(tp));
+  return tp->visibility;
+}
+
+void       set_type_visibility (type *tp, visibility v) {
+  assert(is_type(tp));
+#if 0
+  /* check for correctness */
+  if (v != visibility_external_allocated) {
+    visibility res =  visibility_local;
+    if (is_compound_type(tp)) {
+      if (is_Array_type(tp)) {
+        entity *mem = get_array_element_entity(tp);
+        if (get_entity_visibility(mem) >  res)
+	        res = get_entity_visibility(mem);
+      } else {
+        int i, n_mems = get_compound_n_members(tp);
+        for (i = 0; i < n_mems; ++i) {
+	        entity *mem = get_compound_member(tp, i);
+	        if (get_entity_visibility(mem) > res)
+	          res = get_entity_visibility(mem);
+        }
+      }
+    }
+    assert(res < v);
+  }
+#endif
+  tp->visibility = v;
+}
+
+void
+set_type_size_bits(type *tp, int size) {
+  const tp_op *tpop = get_type_tpop(tp);
+
+  if (tpop->ops.set_type_size)
+    tpop->ops.set_type_size(tp, size);
+  else
+    assert(0 && "Cannot set size for this type");
 }
 
 void
@@ -306,7 +339,7 @@ int get_type_alignment_bits(type *tp) {
   /* alignment NOT set calculate it "on demand" */
   if (tp->mode)
     align = get_mode_size_bits(tp->mode);
-  else if (is_array_type(tp))
+  else if (is_Array_type(tp))
     align = get_type_alignment_bits(get_array_element_type(tp));
   else if (is_compound_type(tp)) {
     int i, n = get_compound_n_members(tp);
@@ -320,7 +353,7 @@ int get_type_alignment_bits(type *tp) {
         align = a;
     }
   }
-  else if (is_method_type(tp))
+  else if (is_Method_type(tp))
     align = 0;
 
   /* write back */
@@ -340,11 +373,23 @@ set_type_alignment_bits(type *tp, int align) {
 
 void
 set_type_alignment_bytes(type *tp, int align) {
-  set_type_size_bits(tp, 8*align);
+  set_type_alignment_bits(tp, 8*align);
 }
 
+/* Returns a human readable string for the enum entry. */
+const char *get_type_state_name(type_state s) {
+#define X(a)    case a: return #a;
+  switch (s) {
+    X(layout_undefined);
+    X(layout_fixed);
+  }
+  return "<unknown>";
+#undef X
+}
+
+
 type_state (get_type_state)(const type *tp) {
-  return __get_type_state(tp);
+  return _get_type_state(tp);
 }
 
 void
@@ -369,7 +414,7 @@ set_type_state(type *tp, type_state state) {
           { DDMT(tp); DDME(get_class_member(tp, i)); }
         assert(get_entity_offset_bits(get_class_member(tp, i)) > -1);
             /* TR ??
-        assert(is_method_type(get_entity_type(get_class_member(tp, i))) ||
+        assert(is_Method_type(get_entity_type(get_class_member(tp, i))) ||
            (get_entity_allocation(get_class_member(tp, i)) == allocation_automatic));
                    */
       }
@@ -404,53 +449,53 @@ set_type_state(type *tp, type_state state) {
 }
 
 unsigned long (get_type_visited)(const type *tp) {
-  return __get_type_visited(tp);
+  return _get_type_visited(tp);
 }
 
 void (set_type_visited)(type *tp, unsigned long num) {
-  __set_type_visited(tp, num);
+  _set_type_visited(tp, num);
 }
 
 /* Sets visited field in type to type_visited. */
 void (mark_type_visited)(type *tp) {
-  __mark_type_visited(tp);
+  _mark_type_visited(tp);
 }
 
-/* @@@ name clash with master flag
 int (type_visited)(const type *tp) {
-  return __type_visited(tp);
-}*/
+  return _type_visited(tp);
+}
 
 int (type_not_visited)(const type *tp) {
-  return __type_not_visited(tp);
+  return _type_not_visited(tp);
 }
 
 int (is_type)(const void *thing) {
-  return __is_type(thing);
+  return _is_type(thing);
 }
 
-bool equal_type(type *typ1, type *typ2) {
+/* Checks whether two types are structural equal.*/
+int equal_type(type *typ1, type *typ2) {
   entity **m;
   type **t;
   int i, j;
 
-  if (typ1 == typ2) return true;
+  if (typ1 == typ2) return 1;
 
   if ((get_type_tpop_code(typ1) != get_type_tpop_code(typ2)) ||
       (get_type_ident(typ1) != get_type_ident(typ2)) ||
       (get_type_mode(typ1) != get_type_mode(typ2)) ||
       (get_type_state(typ1) != get_type_state(typ2)))
-    return false;
+    return 0;
   if ((get_type_state(typ1) == layout_fixed) &&
       (get_type_size_bits(typ1) != get_type_size_bits(typ2)))
-    return false;
+    return 0;
 
-  switch(get_type_tpop_code(typ1)) {
+  switch (get_type_tpop_code(typ1)) {
   case tpo_class:       {
-    if (get_class_n_members(typ1) != get_class_n_members(typ2)) return false;
-    if (get_class_n_subtypes(typ1) != get_class_n_subtypes(typ2)) return false;
-    if (get_class_n_supertypes(typ1) != get_class_n_supertypes(typ2)) return false;
-    if (get_class_peculiarity(typ1) != get_class_peculiarity(typ2)) return false;
+    if (get_class_n_members(typ1) != get_class_n_members(typ2)) return 0;
+    if (get_class_n_subtypes(typ1) != get_class_n_subtypes(typ2)) return 0;
+    if (get_class_n_supertypes(typ1) != get_class_n_supertypes(typ2)) return 0;
+    if (get_class_peculiarity(typ1) != get_class_peculiarity(typ2)) return 0;
     /** Compare the members **/
     m = alloca(sizeof(entity *) * get_class_n_members(typ1));
     memset(m, 0, sizeof(entity *) * get_class_n_members(typ1));
@@ -466,7 +511,7 @@ bool equal_type(type *typ1, type *typ2) {
     for (i = 0; i < get_class_n_members(typ1); i++) {
       if (!m[i]  ||  /* Found no counterpart */
           !equal_entity(get_class_member(typ1, i), m[i]))
-        return false;
+        return 0;
     }
     /** Compare the supertypes **/
     t = alloca(sizeof(entity *) * get_class_n_supertypes(typ1));
@@ -483,11 +528,11 @@ bool equal_type(type *typ1, type *typ2) {
     for (i = 0; i < get_class_n_supertypes(typ1); i++) {
       if (!t[i]  ||  /* Found no counterpart */
           get_class_supertype(typ1, i) != t[i])
-        return false;
+        return 0;
     }
   } break;
   case tpo_struct:      {
-    if (get_struct_n_members(typ1) != get_struct_n_members(typ2)) return false;
+    if (get_struct_n_members(typ1) != get_struct_n_members(typ2)) return 0;
     m = alloca(sizeof(entity *) * get_struct_n_members(typ1));
     memset(m, 0, sizeof(entity *) * get_struct_n_members(typ1));
     /* First sort the members of lt */
@@ -502,14 +547,16 @@ bool equal_type(type *typ1, type *typ2) {
     for (i = 0; i < get_struct_n_members(typ1); i++) {
       if (!m[i]  ||  /* Found no counterpart */
           !equal_entity(get_struct_member(typ1, i), m[i]))
-        return false;
+        return 0;
     }
   } break;
   case tpo_method:      {
     int n_param1, n_param2;
 
-    if (get_method_variadicity(typ1) != get_method_variadicity(typ2)) return false;
-    if (get_method_n_ress(typ1)      != get_method_n_ress(typ2)) return false;
+    if (get_method_variadicity(typ1) != get_method_variadicity(typ2)) return 0;
+    if (get_method_n_ress(typ1)      != get_method_n_ress(typ2)) return 0;
+    if (get_method_calling_convention(typ1) !=
+        get_method_calling_convention(typ2)) return 0;
 
     if (get_method_variadicity(typ1) == variadicity_non_variadic) {
       n_param1 = get_method_n_params(typ1);
@@ -520,19 +567,19 @@ bool equal_type(type *typ1, type *typ2) {
       n_param2 = get_method_first_variadic_param_index(typ2);
     }
 
-    if (n_param1 != n_param2) return false;
+    if (n_param1 != n_param2) return 0;
 
     for (i = 0; i < n_param1; i++) {
       if (!equal_type(get_method_param_type(typ1, i), get_method_param_type(typ2, i)))
-    return false;
+        return 0;
     }
     for (i = 0; i < get_method_n_ress(typ1); i++) {
       if (!equal_type(get_method_res_type(typ1, i), get_method_res_type(typ2, i)))
-        return false;
+        return 0;
     }
   } break;
   case tpo_union:       {
-    if (get_union_n_members(typ1) != get_union_n_members(typ2)) return false;
+    if (get_union_n_members(typ1) != get_union_n_members(typ2)) return 0;
     m = alloca(sizeof(entity *) * get_union_n_members(typ1));
     memset(m, 0, sizeof(entity *) * get_union_n_members(typ1));
     /* First sort the members of lt */
@@ -547,18 +594,18 @@ bool equal_type(type *typ1, type *typ2) {
     for (i = 0; i < get_union_n_members(typ1); i++) {
       if (!m[i]  ||  /* Found no counterpart */
           !equal_entity(get_union_member(typ1, i), m[i]))
-        return false;
+        return 0;
     }
   } break;
   case tpo_array:       {
     if (get_array_n_dimensions(typ1) != get_array_n_dimensions(typ2))
-      return false;
+      return 0;
     if (!equal_type(get_array_element_type(typ1), get_array_element_type(typ2)))
-      return false;
+      return 0;
     for(i = 0; i < get_array_n_dimensions(typ1); i++) {
       if (get_array_lower_bound(typ1, i) != get_array_lower_bound(typ2, i) ||
           get_array_upper_bound(typ1, i) != get_array_upper_bound(typ2, i))
-        return false;
+        return 0;
       if (get_array_order(typ1, i) != get_array_order(typ2, i))
         assert(0 && "type compare with different dimension orders not implemented");
     }
@@ -568,64 +615,80 @@ bool equal_type(type *typ1, type *typ2) {
   } break;
   case tpo_pointer:     {
     if (get_pointer_points_to_type(typ1) != get_pointer_points_to_type(typ2))
-      return false;
+      return 0;
   } break;
   case tpo_primitive:   {
   } break;
   default: break;
   }
-  return true;
+  return 1;
 }
 
-bool smaller_type (type *st, type *lt) {
+/* Checks whether two types are structural comparable. */
+int smaller_type (type *st, type *lt) {
   entity **m;
   int i, j;
 
-  if (st == lt) return true;
+  if (st == lt) return 1;
 
   if (get_type_tpop_code(st) != get_type_tpop_code(lt))
-    return false;
+    return 0;
 
   switch(get_type_tpop_code(st)) {
   case tpo_class:       {
-    return is_subclass_of(st, lt);
+    return is_SubClass_of(st, lt);
   } break;
   case tpo_struct:      {
-    if (get_struct_n_members(st) != get_struct_n_members(lt)) return false;
+    if (get_struct_n_members(st) != get_struct_n_members(lt)) return 0;
     m = alloca(sizeof(entity *) * get_struct_n_members(st));
     memset(m, 0, sizeof(entity *) * get_struct_n_members(st));
     /* First sort the members of lt */
     for (i = 0; i < get_struct_n_members(st); i++) {
       entity *se = get_struct_member(st, i);
       for (j = 0; j < get_struct_n_members(lt); j++) {
-    entity *le = get_struct_member(lt, j);
-    if (get_entity_name(le) == get_entity_name(se))
-      m[i] = le;
+        entity *le = get_struct_member(lt, j);
+        if (get_entity_name(le) == get_entity_name(se))
+          m[i] = le;
       }
     }
     for (i = 0; i < get_struct_n_members(st); i++) {
       if (!m[i]  ||  /* Found no counterpart */
           !smaller_type(get_entity_type(get_struct_member(st, i)),
                 get_entity_type(m[i])))
-        return false;
+        return 0;
     }
   } break;
   case tpo_method:      {
-    /** FIXME: is this still true? */
-    if (get_method_variadicity(st) != get_method_variadicity(lt)) return false;
-    if (get_method_n_params(st) != get_method_n_params(lt)) return false;
-    if (get_method_n_ress(st) != get_method_n_ress(lt)) return false;
+    int n_param1, n_param2;
+
+    /** FIXME: is this still 1? */
+    if (get_method_variadicity(st) != get_method_variadicity(lt)) return 0;
+    if (get_method_n_ress(st) != get_method_n_ress(lt)) return 0;
+    if (get_method_calling_convention(st) !=
+      get_method_calling_convention(lt)) return 0;
+
+    if (get_method_variadicity(st) == variadicity_non_variadic) {
+      n_param1 = get_method_n_params(st);
+      n_param2 = get_method_n_params(lt);
+    }
+    else {
+      n_param1 = get_method_first_variadic_param_index(st);
+      n_param2 = get_method_first_variadic_param_index(lt);
+    }
+
+    if (n_param1 != n_param2) return 0;
+
     for (i = 0; i < get_method_n_params(st); i++) {
       if (!smaller_type(get_method_param_type(st, i), get_method_param_type(lt, i)))
-        return false;
+        return 0;
     }
     for (i = 0; i < get_method_n_ress(st); i++) {
       if (!smaller_type(get_method_res_type(st, i), get_method_res_type(lt, i)))
-        return false;
+        return 0;
     }
   } break;
   case tpo_union:       {
-    if (get_union_n_members(st) != get_union_n_members(lt)) return false;
+    if (get_union_n_members(st) != get_union_n_members(lt)) return 0;
     m = alloca(sizeof(entity *) * get_union_n_members(st));
     memset(m, 0, sizeof(entity *) * get_union_n_members(st));
     /* First sort the members of lt */
@@ -641,34 +704,34 @@ bool smaller_type (type *st, type *lt) {
       if (!m[i]  ||  /* Found no counterpart */
           !smaller_type(get_entity_type(get_union_member(st, i)),
                 get_entity_type(m[i])))
-        return false;
+        return 0;
     }
   } break;
   case tpo_array:       {
     type *set, *let;  /* small/large elt. type */
     if (get_array_n_dimensions(st) != get_array_n_dimensions(lt))
-      return false;
+      return 0;
     set = get_array_element_type(st);
     let = get_array_element_type(lt);
     if (set != let) {
-      /* If the elt types are different, set must be convertible
+      /* If the element types are different, set must be convertible
          to let, and they must have the same size so that address
          computations work out.  To have a size the layout must
          be fixed. */
       if ((get_type_state(set) != layout_fixed) ||
           (get_type_state(let) != layout_fixed))
-        return false;
+        return 0;
       if (!smaller_type(set, let) ||
           get_type_size_bits(set) != get_type_size_bits(let))
-        return false;
+        return 0;
     }
     for(i = 0; i < get_array_n_dimensions(st); i++) {
       if (get_array_lower_bound(lt, i))
         if(get_array_lower_bound(st, i) != get_array_lower_bound(lt, i))
-          return false;
+          return 0;
       if (get_array_upper_bound(lt, i))
         if(get_array_upper_bound(st, i) != get_array_upper_bound(lt, i))
-          return false;
+          return 0;
     }
   } break;
   case tpo_enumeration: {
@@ -677,15 +740,15 @@ bool smaller_type (type *st, type *lt) {
   case tpo_pointer:     {
     if (!smaller_type(get_pointer_points_to_type(st),
               get_pointer_points_to_type(lt)))
-      return false;
+      return 0;
   } break;
   case tpo_primitive:   {
     if (!smaller_mode(get_type_mode(st), get_type_mode(lt)))
-      return false;
+      return 0;
   } break;
   default: break;
   }
-  return true;
+  return 1;
 }
 
 /*-----------------------------------------------------------------*/
@@ -693,29 +756,28 @@ bool smaller_type (type *st, type *lt) {
 /*-----------------------------------------------------------------*/
 
 /* create a new class type */
-type   *new_type_class (ident *name) {
+type   *new_d_type_class (ident *name, dbg_info *db) {
   type *res;
 
-  res = new_type(type_class, NULL, name);
+  res = new_type(type_class, NULL, name, db);
 
   res->attr.ca.members     = NEW_ARR_F (entity *, 0);
   res->attr.ca.subtypes    = NEW_ARR_F (type *, 0);
   res->attr.ca.supertypes  = NEW_ARR_F (type *, 0);
   res->attr.ca.peculiarity = peculiarity_existent;
   res->attr.ca.dfn         = 0;
-
+  hook_new_type(res);
   return res;
 }
-type   *new_d_type_class (ident *name, dbg_info* db) {
-  type *res = new_type_class (name);
-  set_type_dbg_info(res, db);
-  return res;
+
+type   *new_type_class (ident *name) {
+  return new_d_type_class (name, NULL);
 }
 
 void free_class_entities(type *clss) {
   int i;
   assert(clss && (clss->type_op == type_class));
-  for (i = get_class_n_members(clss)-1; i >= 0; --i)
+  for (i = get_class_n_members(clss) - 1; i >= 0; --i)
     free_entity(get_class_member(clss, i));
 }
 
@@ -729,11 +791,12 @@ void free_class_attrs(type *clss) {
 /* manipulate private fields of class type  */
 void    add_class_member   (type *clss, entity *member) {
   assert(clss && (clss->type_op == type_class));
+  assert(clss != get_entity_type(member) && "recursive type");
   ARR_APP1 (entity *, clss->attr.ca.members, member);
 }
 
 int     (get_class_n_members) (const type *clss) {
-  return __get_class_n_members(clss);
+  return _get_class_n_members(clss);
 }
 
 int     get_class_member_index(type *clss, entity *mem) {
@@ -746,7 +809,7 @@ int     get_class_member_index(type *clss, entity *mem) {
 }
 
 entity *(get_class_member)   (const type *clss, int pos) {
-  return __get_class_member(clss, pos);
+  return _get_class_member(clss, pos);
 }
 
 entity *get_class_member_by_name(type *clss, ident *name) {
@@ -780,8 +843,8 @@ void    remove_class_member(type *clss, entity *member) {
   assert(clss && (clss->type_op == type_class));
   for (i = 0; i < (ARR_LEN (clss->attr.ca.members)); i++) {
     if (clss->attr.ca.members[i] == member) {
-      for(; i < (ARR_LEN (clss->attr.ca.members)) - 1; i++)
-    clss->attr.ca.members[i] = clss->attr.ca.members[i + 1];
+      for (; i < (ARR_LEN (clss->attr.ca.members)) - 1; i++)
+        clss->attr.ca.members[i] = clss->attr.ca.members[i + 1];
       ARR_SETLEN(entity*, clss->attr.ca.members, ARR_LEN(clss->attr.ca.members) - 1);
       break;
     }
@@ -807,6 +870,14 @@ type   *get_class_subtype   (type *clss, int pos) {
   assert(pos >= 0 && pos < get_class_n_subtypes(clss));
   return clss->attr.ca.subtypes[pos] = skip_tid(clss->attr.ca.subtypes[pos]);
 }
+int     get_class_subtype_index(type *clss, const type *subclass) {
+  int i, n_subtypes = get_class_n_subtypes(clss);
+  assert(is_Class_type(subclass));
+  for (i = 0; i < n_subtypes; ++i) {
+    if (get_class_subtype(clss, i) == subclass) return i;
+  }
+  return -1;
+}
 void    set_class_subtype   (type *clss, type *subtype, int pos) {
   assert(clss && (clss->type_op == type_class));
   assert(pos >= 0 && pos < get_class_n_subtypes(clss));
@@ -817,8 +888,8 @@ void    remove_class_subtype(type *clss, type *subtype) {
   assert(clss && (clss->type_op == type_class));
   for (i = 0; i < (ARR_LEN (clss->attr.ca.subtypes)); i++)
     if (clss->attr.ca.subtypes[i] == subtype) {
-      for(; i < (ARR_LEN (clss->attr.ca.subtypes))-1; i++)
-    clss->attr.ca.subtypes[i] = clss->attr.ca.subtypes[i+1];
+      for (; i < (ARR_LEN (clss->attr.ca.subtypes))-1; i++)
+        clss->attr.ca.subtypes[i] = clss->attr.ca.subtypes[i+1];
       ARR_SETLEN(entity*, clss->attr.ca.subtypes, ARR_LEN(clss->attr.ca.subtypes) - 1);
       break;
     }
@@ -829,7 +900,7 @@ void    add_class_supertype   (type *clss, type *supertype) {
   assert(clss && (clss->type_op == type_class));
   assert(supertype && (supertype -> type_op == type_class));
   ARR_APP1 (type *, clss->attr.ca.supertypes, supertype);
-  for (i = 0; i < get_class_n_subtypes(supertype); i++)
+  for (i = get_class_n_subtypes(supertype) - 1; i >= 0; --i)
     if (get_class_subtype(supertype, i) == clss)
       /* Class already registered */
       return;
@@ -840,10 +911,9 @@ int     get_class_n_supertypes (const type *clss) {
   return (ARR_LEN (clss->attr.ca.supertypes));
 }
 int get_class_supertype_index(type *clss, type *super_clss) {
-  int i;
-  assert(clss && (clss->type_op == type_class));
+  int i, n_supertypes = get_class_n_supertypes(clss);
   assert(super_clss && (super_clss->type_op == type_class));
-  for (i = 0; i < get_class_n_supertypes(clss); i++)
+  for (i = 0; i < n_supertypes; i++)
     if (get_class_supertype(clss, i) == super_clss)
       return i;
   return -1;
@@ -871,14 +941,14 @@ void    remove_class_supertype(type *clss, type *supertype) {
 }
 
 const char *get_peculiarity_string(peculiarity p) {
+#define X(a)    case a: return #a
   switch (p) {
-  case peculiarity_description:
-    return "peculiarity_description";
-  case peculiarity_inherited:
-    return "peculiarity_inherited";
-  default:
-    return "peculiarity_existent";
+    X(peculiarity_description);
+    X(peculiarity_inherited);
+    X(peculiarity_existent);
   }
+#undef X
+  return "invalid peculiarity";
 }
 
 peculiarity get_class_peculiarity (const type *clss) {
@@ -903,22 +973,21 @@ int get_class_dfn (const type *clss)
 }
 
 /* typecheck */
-int (is_class_type)(const type *clss) {
-  return __is_class_type(clss);
+int (is_Class_type)(const type *clss) {
+  return _is_class_type(clss);
 }
 
-bool is_subclass_of(type *low, type *high) {
-  int i;
-  assert(is_class_type(low) && is_class_type(high));
-  if (low == high) return true;
-  /* depth first search from high downwards. */
-  for (i = 0; i < get_class_n_subtypes(high); i++) {
-    if (low == get_class_subtype(high, i))
-      return true;
-    if (is_subclass_of(low, get_class_subtype(high, i)))
-      return true;
-  }
-  return false;
+void set_class_mode(type *tp, ir_mode *mode) {
+  /* for classes and structs we allow to set a mode if the layout is fixed AND the size matches */
+  assert(get_type_state(tp) == layout_fixed &&
+    tp->size == get_mode_size_bits(mode) && "mode don't match class layout");
+  tp->mode = mode;
+}
+
+void set_class_size_bits(type *tp, int size) {
+  /* argh: we must allow to set negative values as "invalid size" */
+  tp->size = (size >= 0) ? (size + 7) & ~7 : size;
+  assert(tp->size == size && "setting a bit size is NOT allowed for this type");
 }
 
 /*----------------------------------------------------------------**/
@@ -926,17 +995,18 @@ bool is_subclass_of(type *low, type *high) {
 /*----------------------------------------------------------------**/
 
 /* create a new type struct */
-type   *new_type_struct (ident *name) {
-  type *res;
-  res = new_type(type_struct, NULL, name);
-  res->attr.sa.members = NEW_ARR_F (entity *, 0);
+type   *new_d_type_struct(ident *name, dbg_info *db) {
+  type *res = new_type(type_struct, NULL, name, db);
+
+  res->attr.sa.members = NEW_ARR_F(entity *, 0);
+  hook_new_type(res);
   return res;
 }
-type   *new_d_type_struct (ident *name, dbg_info* db) {
-  type *res = new_type_struct (name);
-  set_type_dbg_info(res, db);
-  return res;
+
+type   *new_type_struct (ident *name) {
+  return new_d_type_struct (name, NULL);
 }
+
 void free_struct_entities (type *strct) {
   int i;
   assert(strct && (strct->type_op == type_struct));
@@ -958,6 +1028,7 @@ void    add_struct_member   (type *strct, entity *member) {
   assert(strct && (strct->type_op == type_struct));
   assert(get_type_tpop(get_entity_type(member)) != type_method);
     /*    @@@ lowerfirm geht nicht durch */
+  assert(strct != get_entity_type(member) && "recursive type");
   ARR_APP1 (entity *, strct->attr.sa.members, member);
 }
 
@@ -995,8 +1066,21 @@ void    remove_struct_member(type *strct, entity *member) {
 }
 
 /* typecheck */
-int (is_struct_type)(const type *strct) {
-  return __is_struct_type(strct);
+int (is_Struct_type)(const type *strct) {
+  return _is_struct_type(strct);
+}
+
+void set_struct_mode(type *tp, ir_mode *mode) {
+  /* for classes and structs we allow to set a mode if the layout is fixed AND the size matches */
+  assert(get_type_state(tp) == layout_fixed &&
+    tp->size == get_mode_size_bits(mode) && "mode don't match struct layout");
+  tp->mode = mode;
+}
+
+void set_struct_size_bits(type *tp, int size) {
+  /* argh: we must allow to set negative values as "invalid size" */
+  tp->size = (size >= 0) ? (size + 7) & ~7 : size;
+  assert(tp->size == size && "setting a bit size is NOT allowed for this type");
 }
 
 /*******************************************************************/
@@ -1013,28 +1097,29 @@ int (is_struct_type)(const type *strct) {
  * @param tps     array of field types with length len
  */
 static INLINE type *
-build_value_type(ident *name, int len, type **tps) {
+build_value_type(ident *name, int len, tp_ent_pair *tps) {
   int i;
   type *res = new_type_struct(name);
   /* Remove type from type list.  Must be treated differently than other types. */
-  remove_irp_type_from_list(res);
+  remove_irp_type(res);
   for (i = 0; i < len; i++) {
-    type *elt_type = res;   /* use res as default if corresponding type is not yet set. */
-    if (tps[i]) elt_type = tps[i];
-    new_entity(res, mangle_u(name, get_type_ident(elt_type)), elt_type);
+    /* use res as default if corresponding type is not yet set. */
+    type *elt_type = tps[i].tp ? tps[i].tp : res;
+
+    tps[i].ent = new_entity(res, mangle_u(name, get_type_ident(elt_type)), elt_type);
   }
   return res;
 }
 
 /* Create a new method type.
    N_param is the number of parameters, n_res the number of results.  */
-type *new_type_method (ident *name, int n_param, int n_res) {
+type *new_d_type_method(ident *name, int n_param, int n_res, dbg_info *db) {
   type *res;
 
-  assert((get_mode_size_bytes(mode_P_mach) != -1) && "unorthodox modes not implemented");
-  res = new_type(type_method, mode_P_mach, name);
+  assert((get_mode_size_bytes(mode_P_code) != -1) && "unorthodox modes not implemented");
+  res = new_type(type_method, mode_P_code, name, db);
   res->state                        = layout_fixed;
-  res->size                         = get_mode_size_bits(mode_P_mach);
+  res->size                         = get_mode_size_bits(mode_P_code);
   res->attr.ma.n_params             = n_param;
   res->attr.ma.param_type           = xcalloc(n_param, sizeof(res->attr.ma.param_type[0]));
   res->attr.ma.value_params         = NULL;
@@ -1043,14 +1128,13 @@ type *new_type_method (ident *name, int n_param, int n_res) {
   res->attr.ma.value_ress           = NULL;
   res->attr.ma.variadicity          = variadicity_non_variadic;
   res->attr.ma.first_variadic_param = -1;
-
+  res->attr.ma.irg_calling_conv     = default_cc_mask;
+  hook_new_type(res);
   return res;
 }
 
-type *new_d_type_method (ident *name, int n_param, int n_res, dbg_info* db) {
-  type *res = new_type_method (name, n_param, n_res);
-  set_type_dbg_info(res, db);
-  return res;
+type *new_type_method(ident *name, int n_param, int n_res) {
+  return new_d_type_method(name, n_param, n_res, NULL);
 }
 
 void free_method_entities(type *method) {
@@ -1073,24 +1157,23 @@ void free_method_attrs(type *method) {
 }
 
 /* manipulate private fields of method. */
-int   get_method_n_params  (const type *method) {
-  assert(method && (method->type_op == type_method));
-  return method->attr.ma.n_params;
+int (get_method_n_params)(const type *method) {
+  return _get_method_n_params(method);
 }
 
 type *get_method_param_type(type *method, int pos) {
   type *res;
   assert(method && (method->type_op == type_method));
   assert(pos >= 0 && pos < get_method_n_params(method));
-  res = method->attr.ma.param_type[pos];
+  res = method->attr.ma.param_type[pos].tp;
   assert(res != NULL && "empty method param type");
-  return method->attr.ma.param_type[pos] = skip_tid(res);
+  return method->attr.ma.param_type[pos].tp = skip_tid(res);
 }
 
 void  set_method_param_type(type *method, int pos, type* tp) {
   assert(method && (method->type_op == type_method));
   assert(pos >= 0 && pos < get_method_n_params(method));
-  method->attr.ma.param_type[pos] = tp;
+  method->attr.ma.param_type[pos].tp = tp;
   /* If information constructed set pass-by-value representation. */
   if (method->attr.ma.value_params) {
     assert(get_method_n_params(method) == get_struct_n_members(method->attr.ma.value_params));
@@ -1103,14 +1186,20 @@ void  set_method_param_type(type *method, int pos, type* tp) {
 entity *get_method_value_param_ent(type *method, int pos) {
   assert(method && (method->type_op == type_method));
   assert(pos >= 0 && pos < get_method_n_params(method));
-  if (!method->attr.ma.value_params)
+
+  if (!method->attr.ma.value_params) {
+    /* parameter value type not created yet, build */
     method->attr.ma.value_params
       = build_value_type(mangle_u(get_type_ident(method), value_params_suffix),
              get_method_n_params(method), method->attr.ma.param_type);
-  assert((get_entity_type(get_struct_member(method->attr.ma.value_params, pos))
-      != method->attr.ma.value_params)
+  }
+  /*
+   * build_value_type() sets the method->attr.ma.value_params type as default if
+   * no type is set!
+   */
+  assert((get_entity_type(method->attr.ma.param_type[pos].ent) != method->attr.ma.value_params)
      && "param type not yet set");
-  return get_struct_member(method->attr.ma.value_params, pos);
+  return method->attr.ma.param_type[pos].ent;
 }
 
 /*
@@ -1122,25 +1211,24 @@ type *get_method_value_param_type(const type *method)
   return method->attr.ma.value_params;
 }
 
-int   get_method_n_ress   (const type *method) {
-  assert(method && (method->type_op == type_method));
-  return method->attr.ma.n_res;
+int (get_method_n_ress)(const type *method) {
+  return _get_method_n_ress(method);
 }
 
 type *get_method_res_type(type *method, int pos) {
   type *res;
   assert(method && (method->type_op == type_method));
   assert(pos >= 0 && pos < get_method_n_ress(method));
-  res = method->attr.ma.res_type[pos];
+  res = method->attr.ma.res_type[pos].tp;
   assert(res != NULL && "empty method return type");
-  return method->attr.ma.res_type[pos] = skip_tid(res);
+  return method->attr.ma.res_type[pos].tp = skip_tid(res);
 }
 
 void  set_method_res_type(type *method, int pos, type* tp) {
   assert(method && (method->type_op == type_method));
   assert(pos >= 0 && pos < get_method_n_ress(method));
   /* set the result type */
-  method->attr.ma.res_type[pos] = tp;
+  method->attr.ma.res_type[pos].tp = tp;
   /* If information constructed set pass-by-value representation. */
   if (method->attr.ma.value_ress) {
     assert(get_method_n_ress(method) == get_struct_n_members(method->attr.ma.value_ress));
@@ -1153,13 +1241,21 @@ void  set_method_res_type(type *method, int pos, type* tp) {
 entity *get_method_value_res_ent(type *method, int pos) {
   assert(method && (method->type_op == type_method));
   assert(pos >= 0 && pos < get_method_n_ress(method));
-  if (!method->attr.ma.value_ress)
+
+  if (!method->attr.ma.value_ress) {
+    /* result value type not created yet, build */
     method->attr.ma.value_ress
       = build_value_type(mangle_u(get_type_ident(method), value_ress_suffix),
              get_method_n_ress(method), method->attr.ma.res_type);
-  assert((get_entity_type(get_struct_member(method->attr.ma.value_ress, pos)) != method->attr.ma.value_ress)
+  }
+  /*
+   * build_value_type() sets the method->attr.ma.value_ress type as default if
+   * no type is set!
+   */
+  assert((get_entity_type(method->attr.ma.res_type[pos].ent) != method->attr.ma.value_ress)
      && "result type not yet set");
-  return get_struct_member(method->attr.ma.value_ress, pos);
+
+  return method->attr.ma.res_type[pos].ent;
 }
 
 /*
@@ -1227,9 +1323,47 @@ void set_method_first_variadic_param_index(type *method, int index)
   method->attr.ma.first_variadic_param = index;
 }
 
+unsigned (get_method_additional_properties)(const type *method) {
+  return _get_method_additional_properties(method);
+}
+
+void (set_method_additional_properties)(type *method, unsigned mask) {
+  _set_method_additional_properties(method, mask);
+}
+
+void (set_method_additional_property)(type *method, mtp_additional_property flag) {
+  _set_method_additional_property(method, flag);
+}
+
+/* Returns the calling convention of an entities graph. */
+unsigned (get_method_calling_convention)(const type *method) {
+  return _get_method_calling_convention(method);
+}
+
+/* Sets the calling convention of an entities graph. */
+void (set_method_calling_convention)(type *method, unsigned cc_mask) {
+  _set_method_calling_convention(method, cc_mask);
+}
+
+/* Returns the number of registers parameters, 0 means default. */
+unsigned get_method_n_regparams(type *method) {
+  unsigned cc = get_method_calling_convention(method);
+  assert(IS_FASTCALL(cc));
+
+  return cc & ~cc_bits;
+}
+
+/* Sets the number of registers parameters, 0 means default. */
+void set_method_n_regparams(type *method, unsigned n_regs) {
+  unsigned cc = get_method_calling_convention(method);
+  assert(IS_FASTCALL(cc));
+
+  set_method_calling_convention(method, (cc & cc_bits) | (n_regs & ~cc_bits));
+}
+
 /* typecheck */
-int (is_method_type)(const type *method) {
-  return __is_method_type(method);
+int (is_Method_type)(const type *method) {
+  return _is_method_type(method);
 }
 
 /*-----------------------------------------------------------------*/
@@ -1237,67 +1371,38 @@ int (is_method_type)(const type *method) {
 /*-----------------------------------------------------------------*/
 
 /* create a new type uni */
-type  *new_type_union (ident *name) {
-  type *res;
-  res = new_type(type_union, NULL, name);
-  /*res->attr.ua.unioned_type = xcalloc(n_types, sizeof(res->attr.ua.unioned_type[0]));
-    res->attr.ua.delim_names  = xcalloc(n_types, sizeof(res->attr.ua.delim_names[0])); */
-  res->attr.ua.members = NEW_ARR_F (entity *, 0);
+type  *new_d_type_union(ident *name, dbg_info *db) {
+  type *res = new_type(type_union, NULL, name, db);
+
+  res->attr.ua.members = NEW_ARR_F(entity *, 0);
+  hook_new_type(res);
   return res;
 }
-type  *new_d_type_union (ident *name, dbg_info* db) {
-  type *res = new_type_union (name);
-  set_type_dbg_info(res, db);
-  return res;
+
+type  *new_type_union(ident *name) {
+  return new_d_type_union(name, NULL);
 }
-void free_union_entities (type *uni) {
+
+void free_union_entities(type *uni) {
   int i;
   assert(uni && (uni->type_op == type_union));
-  for (i = get_union_n_members(uni)-1; i >= 0; --i)
+  for (i = get_union_n_members(uni) - 1; i >= 0; --i)
     free_entity(get_union_member(uni, i));
 }
+
 void free_union_attrs (type *uni) {
   assert(uni && (uni->type_op == type_union));
   DEL_ARR_F(uni->attr.ua.members);
 }
+
 /* manipulate private fields of union */
-#if 0
-int    get_union_n_types      (type *uni) {
-  assert(uni && (uni->type_op == type_union));
-  return uni->attr.ua.n_types;
-}
-type  *get_union_unioned_type (type *uni, int pos) {
-  assert(uni && (uni->type_op == type_union));
-  assert(pos >= 0 && pos < get_union_n_types(uni));
-  return uni->attr.ua.unioned_type[pos] = skip_tid(uni->attr.ua.unioned_type[pos]);
-}
-void   set_union_unioned_type (type *uni, int pos, type *tp) {
-  assert(uni && (uni->type_op == type_union));
-  assert(pos >= 0 && pos < get_union_n_types(uni));
-  uni->attr.ua.unioned_type[pos] = tp;
-}
-ident *get_union_delim_nameid (type *uni, int pos) {
-  assert(uni && (uni->type_op == type_union));
-  assert(pos >= 0 && pos < get_union_n_types(uni));
-  return uni->attr.ua.delim_names[pos];
-}
-const char *get_union_delim_name (type *uni, int pos) {
-  assert(uni && (uni->type_op == type_union));
-  assert(pos >= 0 && pos < get_union_n_types(uni));
-  return get_id_str(uni->attr.ua.delim_names[pos]);
-}
-void   set_union_delim_nameid (type *uni, int pos, ident *id) {
-  assert(uni && (uni->type_op == type_union));
-  assert(pos >= 0 && pos < get_union_n_types(uni));
-  uni->attr.ua.delim_names[pos] = id;
-}
-#endif
 int    get_union_n_members      (const type *uni) {
   assert(uni && (uni->type_op == type_union));
   return (ARR_LEN (uni->attr.ua.members));
 }
 void    add_union_member   (type *uni, entity *member) {
   assert(uni && (uni->type_op == type_union));
+  assert(uni != get_entity_type(member) && "recursive type");
   ARR_APP1 (entity *, uni->attr.ua.members, member);
 }
 entity  *get_union_member (const type *uni, int pos) {
@@ -1316,15 +1421,21 @@ void   remove_union_member(type *uni, entity *member) {
   for (i = 0; i < (ARR_LEN (uni->attr.ua.members)); i++)
     if (uni->attr.ua.members[i] == member) {
       for(; i < (ARR_LEN (uni->attr.ua.members))-1; i++)
-    uni->attr.ua.members[i] = uni->attr.ua.members[i+1];
+        uni->attr.ua.members[i] = uni->attr.ua.members[i+1];
       ARR_SETLEN(entity*, uni->attr.ua.members, ARR_LEN(uni->attr.ua.members) - 1);
       break;
     }
 }
 
 /* typecheck */
-int (is_union_type)(const type *uni) {
-  return __is_union_type(uni);
+int (is_Union_type)(const type *uni) {
+  return _is_union_type(uni);
+}
+
+void set_union_size_bits(type *tp, int size) {
+  /* argh: we must allow to set negative values as "invalid size" */
+  tp->size = (size >= 0) ? (size + 7) & ~7 : size;
+  assert(tp->size == size && "setting a bit size is NOT allowed for this type");
 }
 
 /*-----------------------------------------------------------------*/
@@ -1333,38 +1444,42 @@ int (is_union_type)(const type *uni) {
 
 
 /* create a new type array -- set dimension sizes independently */
-type *new_type_array         (ident *name, int n_dimensions,
-                  type *element_type) {
+type *new_d_type_array(ident *name, int n_dimensions, type *element_type, dbg_info *db) {
   type *res;
   int i;
+  ir_node *unk;
   ir_graph *rem = current_ir_graph;
-  assert(!is_method_type(element_type));
 
-  res = new_type(type_array, NULL, name);
+  assert(!is_Method_type(element_type));
+
+  res = new_type(type_array, NULL, name, db);
   res->attr.aa.n_dimensions = n_dimensions;
   res->attr.aa.lower_bound  = xcalloc(n_dimensions, sizeof(*res->attr.aa.lower_bound));
   res->attr.aa.upper_bound  = xcalloc(n_dimensions, sizeof(*res->attr.aa.upper_bound));
   res->attr.aa.order        = xcalloc(n_dimensions, sizeof(*res->attr.aa.order));
 
   current_ir_graph = get_const_code_irg();
+  unk = new_Unknown( mode_Iu);
   for (i = 0; i < n_dimensions; i++) {
-    res->attr.aa.lower_bound[i]  = new_Unknown(mode_Iu);
-    res->attr.aa.upper_bound[i]  = new_Unknown(mode_Iu);
-    res->attr.aa.order[i] = i;
+    res->attr.aa.lower_bound[i] =
+    res->attr.aa.upper_bound[i] = unk;
+    res->attr.aa.order[i]       = i;
   }
   current_ir_graph = rem;
 
   res->attr.aa.element_type = element_type;
   new_entity(res, mangle_u(name, new_id_from_chars("elem_ent", 8)), element_type);
-
+  hook_new_type(res);
   return res;
 }
 
-type *new_d_type_array (ident *name, int n_dimensions,
-            type *element_type, dbg_info* db) {
-  type *res = new_type_array (name, n_dimensions, element_type);
-  set_type_dbg_info(res, db);
-  return res;
+type *new_type_array(ident *name, int n_dimensions, type *element_type) {
+  return new_d_type_array(name, n_dimensions, element_type, NULL);
+}
+
+void free_array_automatic_entities(type *array) {
+  assert(array && (array->type_op == type_array));
+  free_entity(get_array_element_entity(array));
 }
 
 void free_array_entities (type *array) {
@@ -1464,14 +1579,27 @@ void set_array_order (type *array, int dimension, int order) {
   assert(array && (array->type_op == type_array));
   array->attr.aa.order[dimension] = order;
 }
+
 int  get_array_order (const type *array, int dimension) {
   assert(array && (array->type_op == type_array));
   return array->attr.aa.order[dimension];
 }
 
+int find_array_dimension(const type *array, int order) {
+  int dim;
+
+  assert(array && (array->type_op == type_array));
+
+  for (dim = 0; dim < array->attr.aa.n_dimensions; ++dim) {
+    if (array->attr.aa.order[dim] == order)
+      return dim;
+  }
+  return -1;
+}
+
 void  set_array_element_type (type *array, type *tp) {
   assert(array && (array->type_op == type_array));
-  assert(!is_method_type(tp));
+  assert(!is_Method_type(tp));
   array->attr.aa.element_type = tp;
 }
 type *get_array_element_type (type *array) {
@@ -1491,27 +1619,31 @@ entity *get_array_element_entity (const type *array) {
 }
 
 /* typecheck */
-int (is_array_type)(const type *array) {
-  return __is_array_type(array);
+int (is_Array_type)(const type *array) {
+  return _is_array_type(array);
 }
 
+void set_array_size_bits(type *tp, int size) {
+  /* FIXME: Here we should make some checks with the element type size */
+  tp->size = size;
+}
 /*-----------------------------------------------------------------*/
 /* TYPE_ENUMERATION                                                */
 /*-----------------------------------------------------------------*/
 
 /* create a new type enumeration -- set the enumerators independently */
-type   *new_type_enumeration    (ident *name, int n_enums) {
-  type *res;
-  res = new_type(type_enumeration, NULL, name);
+type   *new_d_type_enumeration(ident *name, int n_enums, dbg_info *db) {
+  type *res = new_type(type_enumeration, NULL, name, db);
+
   res->attr.ea.n_enums     = n_enums;
   res->attr.ea.enumer      = xcalloc(n_enums, sizeof(res->attr.ea.enumer[0]));
   res->attr.ea.enum_nameid = xcalloc(n_enums, sizeof(res->attr.ea.enum_nameid[0]));
+  hook_new_type(res);
   return res;
 }
-type   *new_d_type_enumeration    (ident *name, int n_enums, dbg_info* db) {
-  type *res = new_type_enumeration (name, n_enums);
-  set_type_dbg_info(res, db);
-  return res;
+
+type   *new_type_enumeration(ident *name, int n_enums) {
+  return new_d_type_enumeration(name, n_enums, NULL);
 }
 
 void free_enumeration_entities(type *enumeration) {
@@ -1555,8 +1687,17 @@ const char *get_enumeration_name(const type *enumeration, int pos) {
 }
 
 /* typecheck */
-int (is_enumeration_type)(const type *enumeration) {
-  return __is_enumeration_type(enumeration);
+int (is_Enumeration_type)(const type *enumeration) {
+  return _is_enumeration_type(enumeration);
+}
+
+void set_enumeration_mode(type *tp, ir_mode *mode) {
+  assert(mode_is_int(mode) && "Modes of enumerations must be integers");
+  /* For pointer and enumeration size depends on the mode, but only byte size allowed. */
+  assert((get_mode_size_bits(mode) & 7) == 0 && "unorthodox modes not implemented");
+
+  tp->size = get_mode_size_bits(mode);
+  tp->mode = mode;
 }
 
 /*-----------------------------------------------------------------*/
@@ -1564,94 +1705,111 @@ int (is_enumeration_type)(const type *enumeration) {
 /*-----------------------------------------------------------------*/
 
 /* Create a new type pointer */
-type *new_type_pointer_mode (ident *name, type *points_to, ir_mode *ptr_mode) {
+type *new_d_type_pointer(ident *name, type *points_to, ir_mode *ptr_mode, dbg_info *db) {
   type *res;
+
   assert(mode_is_reference(ptr_mode));
-  res = new_type(type_pointer, ptr_mode, name);
+  res = new_type(type_pointer, ptr_mode, name, db);
   res->attr.pa.points_to = points_to;
   assert((get_mode_size_bytes(res->mode) != -1) && "unorthodox modes not implemented");
   res->size = get_mode_size_bits(res->mode);
   res->state = layout_fixed;
+  hook_new_type(res);
   return res;
 }
-type *new_d_type_pointer (ident *name, type *points_to, ir_mode *ptr_mode, dbg_info* db) {
-  type *res = new_type_pointer_mode (name, points_to, ptr_mode);
-  set_type_dbg_info(res, db);
-  return res;
+
+type *new_type_pointer(ident *name, type *points_to, ir_mode *ptr_mode) {
+  return new_d_type_pointer(name, points_to, ptr_mode, NULL);
 }
+
 void free_pointer_entities (type *pointer) {
   assert(pointer && (pointer->type_op == type_pointer));
 }
+
 void free_pointer_attrs (type *pointer) {
   assert(pointer && (pointer->type_op == type_pointer));
 }
+
 /* manipulate fields of type_pointer */
 void  set_pointer_points_to_type (type *pointer, type *tp) {
   assert(pointer && (pointer->type_op == type_pointer));
   pointer->attr.pa.points_to = tp;
 }
+
 type *get_pointer_points_to_type (type *pointer) {
   assert(pointer && (pointer->type_op == type_pointer));
   return pointer->attr.pa.points_to = skip_tid(pointer->attr.pa.points_to);
 }
 
 /* typecheck */
-int (is_pointer_type)(const type *pointer) {
-  return __is_pointer_type(pointer);
+int (is_Pointer_type)(const type *pointer) {
+  return _is_pointer_type(pointer);
+}
+
+void set_pointer_mode(type *tp, ir_mode *mode) {
+  assert(mode_is_reference(mode) && "Modes of pointers must be references");
+  /* For pointer and enumeration size depends on the mode, but only byte size allowed. */
+  assert((get_mode_size_bits(mode) & 7) == 0 && "unorthodox modes not implemented");
+
+  tp->size = get_mode_size_bits(mode);
+  tp->mode = mode;
 }
 
 /* Returns the first pointer type that has as points_to tp.
  *  Not efficient: O(#types).
- *  If not found returns unknown_type. */
+ *  If not found returns firm_unknown_type. */
 type *find_pointer_type_to_type (type *tp) {
   int i;
   for (i = 0; i < get_irp_n_types(); ++i) {
     type *found = get_irp_type(i);
-    if (is_pointer_type(found) && get_pointer_points_to_type(found) == tp)
+    if (is_Pointer_type(found) && get_pointer_points_to_type(found) == tp)
       return (found);
   }
-  return unknown_type;
+  return firm_unknown_type;
 }
 
 
-
 /*-----------------------------------------------------------------*/
 /* TYPE_PRIMITIVE                                                  */
 /*-----------------------------------------------------------------*/
 
 /* create a new type primitive */
-type *new_type_primitive (ident *name, ir_mode *mode) {
+type *new_d_type_primitive(ident *name, ir_mode *mode, dbg_info *db) {
   type *res;
   /* @@@ assert( mode_is_data(mode) && (!mode_is_reference(mode))); */
-  res = new_type(type_primitive, mode, name);
+  res = new_type(type_primitive, mode, name, db);
   res->size  = get_mode_size_bits(mode);
   res->state = layout_fixed;
+  hook_new_type(res);
   return res;
 }
-type *new_d_type_primitive (ident *name, ir_mode *mode, dbg_info* db) {
-  type *res = new_type_primitive (name, mode);
-  set_type_dbg_info(res, db);
-  return res;
-}
-void free_primitive_entities (type *primitive) {
-  assert(primitive && (primitive->type_op == type_primitive));
-}
-void free_primitive_attrs (type *primitive) {
-  assert(primitive && (primitive->type_op == type_primitive));
+
+type *new_type_primitive(ident *name, ir_mode *mode) {
+  return new_d_type_primitive(name, mode, NULL);
 }
 
 /* typecheck */
-int (is_primitive_type)(const type *primitive) {
-  return __is_primitive_type(primitive);
+int (is_Primitive_type)(const type *primitive) {
+  return _is_primitive_type(primitive);
 }
 
+void set_primitive_mode(type *tp, ir_mode *mode) {
+  /* Modes of primitives must be data */
+  assert(mode_is_data(mode));
+
+  /* For primitive size depends on the mode. */
+  tp->size = get_mode_size_bits(mode);
+  tp->mode = mode;
+}
+
+
 /*-----------------------------------------------------------------*/
 /* common functionality                                            */
 /*-----------------------------------------------------------------*/
 
 
 int (is_atomic_type)(const type *tp) {
-  return __is_atomic_type(tp);
+  return _is_atomic_type(tp);
 }
 
 /*
@@ -1659,16 +1817,13 @@ int (is_atomic_type)(const type *tp) {
  */
 int get_compound_n_members(const type *tp)
 {
+  const tp_op *op = get_type_tpop(tp);
   int res = 0;
 
-  if (is_struct_type(tp))
-    res = get_struct_n_members(tp);
-  else if (is_class_type(tp))
-    res = get_class_n_members(tp);
-  else if (is_union_type(tp))
-    res = get_union_n_members(tp);
+  if (op->ops.get_n_members)
+    res = op->ops.get_n_members(tp);
   else
-    assert(0 && "need struct, union or class for member count");
+    assert(0 && "no member count for this type");
 
   return res;
 }
@@ -1678,25 +1833,41 @@ int get_compound_n_members(const type *tp)
  */
 entity *get_compound_member(const type *tp, int pos)
 {
-  entity *res;
-
-  if (is_struct_type(tp))
-    res = get_struct_member(tp, pos);
-  else if (is_class_type(tp))
-    res = get_class_member(tp, pos);
-  else if (is_union_type(tp))
-    res = get_union_member(tp, pos);
+  const tp_op *op = get_type_tpop(tp);
+  entity *res = NULL;
+
+  if (op->ops.get_member)
+    res = op->ops.get_member(tp, pos);
   else
-  {
-    assert(0 && "need struct, union or class to get a member");
-    res = NULL;
-  }
+    assert(0 && "no members in this type");
 
   return res;
 }
 
-
 int is_compound_type(const type *tp) {
   assert(tp && tp->kind == k_type);
   return tp->type_op->flags & TP_OP_FLAG_COMPOUND;
 }
+
+/* Checks, whether a type is a frame type */
+int is_frame_type(const type *tp) {
+  return tp->frame_type;
+}
+
+/* Makes a new frame type. */
+type *new_type_frame(ident *name)
+{
+  type *res = new_type_class(name);
+
+  res->frame_type = 1;
+
+  /* Remove type from type list.  Must be treated differently than other types. */
+  remove_irp_type(res);
+
+  return res;
+}
+
+/* set the type size for the unknown and none type */
+void set_default_size_bits(type *tp, int size) {
+  tp->size = size;
+}