X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Ftype.c;h=e4f9b3aea48f6df8891f6dfb357867fd9d07b969;hb=88b428f23045d2410147fb97b22d8b4982ef6b04;hp=043f64b935f34231bd2145124688370d40651246;hpb=ef3f4288a57fc536e74087390be6d0f33771511d;p=libfirm

diff --git a/ir/tr/type.c b/ir/tr/type.c
index 043f64b93..e4f9b3aea 100644
--- a/ir/tr/type.c
+++ b/ir/tr/type.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -21,7 +21,6 @@
  * @file    type.c
  * @brief   Representation of types.
  * @author  Goetz Lindenmaier, Michael Beck
- * @version $Id$
  * @brief
  *
  *  Implementation of the datastructure to hold
@@ -47,6 +46,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stddef.h>
+#include <stdbool.h>
 
 #include "type_t.h"
 
@@ -56,63 +56,53 @@
 #include "tpop_t.h"
 #include "tv_t.h"
 #include "irhooks.h"
-#include "irtools.h"
+#include "util.h"
 #include "entity_t.h"
+#include "error.h"
+#include "dbginfo.h"
+#include "irprog_t.h"
 
 #include "array.h"
 
-ir_type *firm_none_type;
+static ir_type *new_type(tp_op const *type_op, ir_mode *mode, type_dbg_info *db);
+
 ir_type *get_none_type(void)
 {
-	return firm_none_type;
+	return irp->none_type;
 }
 
-ir_type *firm_code_type;
 ir_type *get_code_type(void)
 {
-	return firm_code_type;
+	return irp->code_type;
 }
 
-ir_type *firm_unknown_type;
-ir_type *get_unknown_type(void) {
-	return firm_unknown_type;
-}
-
-/* Suffixes added to types used for pass-by-value representations. */
-static ident *value_params_suffix = NULL;
-static ident *value_ress_suffix = NULL;
-
-/** The default calling convention for method types. */
-static unsigned default_cc_mask;
-
-unsigned get_default_cc_mask(void)
+ir_type *get_unknown_type(void)
 {
-	return default_cc_mask;
+	return irp->unknown_type;
 }
 
-void firm_init_type(dbg_info *builtin_db, unsigned def_cc_mask)
+void ir_init_type(ir_prog *irp)
 {
-	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. */
-	firm_none_type    = new_type(tpop_none,    mode_BAD, new_id_from_str("type_none"), builtin_db);
-	set_type_size_bytes(firm_none_type, 0);
-	set_type_state (firm_none_type, layout_fixed);
-	remove_irp_type(firm_none_type);
+	irp->none_type = new_type(tpop_none, mode_BAD, NULL);
+	set_type_size_bytes(irp->none_type, 0);
+	set_type_state (irp->none_type, layout_fixed);
 
-	firm_code_type    = new_type(tpop_code, mode_ANY, new_id_from_str("type_code"), builtin_db);
-	set_type_state(firm_code_type, layout_fixed);
-	remove_irp_type(firm_code_type);
+	irp->code_type = new_type(tpop_code, mode_ANY, NULL);
+	set_type_state(irp->code_type, layout_fixed);
 
-	firm_unknown_type = new_type(tpop_unknown, mode_ANY, new_id_from_str("type_unknown"), builtin_db);
-	set_type_size_bytes(firm_unknown_type, 0);
-	set_type_state (firm_unknown_type, layout_fixed);
-	remove_irp_type(firm_unknown_type);
+	irp->unknown_type = new_type(tpop_unknown, mode_ANY, NULL);
+	set_type_size_bytes(irp->unknown_type, 0);
+	set_type_state (irp->unknown_type, layout_fixed);
+}
+
+void ir_finish_type(ir_prog *irp)
+{
+	/** nothing todo. (The none, code, unknown types are in the global type list
+	 * and freed there */
+	(void)irp;
 }
 
-/** the global type visited flag */
 ir_visited_t firm_type_visited;
 
 void (set_master_type_visited)(ir_visited_t val)
@@ -130,30 +120,35 @@ void (inc_master_type_visited)(void)
 	_inc_master_type_visited();
 }
 
-ir_type *new_type(const tp_op *type_op, ir_mode *mode, ident *name,
-                  dbg_info *db)
+/**
+ *   Creates a new type representation:
+ *
+ *   @param type_op  the kind of this type.  May not be type_id.
+ *   @param mode     the mode to be used for this type, may be NULL
+ *   @param db       debug info
+ *
+ *   @return A new type of the given type.  The remaining private attributes are
+ *           not initialized.  The type is in state layout_undefined.
+ */
+static ir_type *new_type(tp_op const *type_op, ir_mode *mode, type_dbg_info *db)
 {
 	ir_type *res;
-	int node_size;
-
-	assert(!id_contains_char(name, ' ') && "type name should not contain spaces");
+	size_t node_size;
 
 	node_size = offsetof(ir_type, attr) +  type_op->attr_size;
-	res = xmalloc(node_size);
+	res = (ir_type*)xmalloc(node_size);
 	memset(res, 0, node_size);
 
 	res->kind       = k_type;
 	res->type_op    = type_op;
 	res->mode       = mode;
-	res->name       = name;
-	res->visibility = visibility_external_allocated;
+	res->visibility = ir_visibility_external;
 	res->flags      = tf_none;
 	res->size       = 0;
 	res->align      = 0;
 	res->visit      = 0;
 	res->link       = NULL;
 	res->dbi        = db;
-	res->assoc_type = NULL;
 #ifdef DEBUG_libfirm
 	res->nr         = get_irp_new_node_nr();
 #endif /* defined DEBUG_libfirm */
@@ -163,13 +158,26 @@ ir_type *new_type(const tp_op *type_op, ir_mode *mode, ident *name,
 	return res;
 }
 
+void free_type_entities(ir_type *tp)
+{
+	const tp_op *op = get_type_tpop(tp);
+	if (op->ops.free_entities != NULL)
+		op->ops.free_entities(tp);
+}
+
+static void free_type_attrs(ir_type *tp)
+{
+	const tp_op *tpop = get_type_tpop(tp);
+
+	if (tpop->ops.free_attrs)
+		tpop->ops.free_attrs(tp);
+}
+
 void free_type(ir_type *tp)
 {
 	const tp_op *op = get_type_tpop(tp);
 
-	if ((get_type_tpop(tp) == tpop_none) || (get_type_tpop(tp) == tpop_unknown)
-			|| (get_type_tpop(tp) == tpop_code))
-		return;
+	free_type_entities(tp);
 	/* Remove from list of all types */
 	remove_irp_type(tp);
 	/* Free the attributes of the type. */
@@ -178,26 +186,12 @@ void free_type(ir_type *tp)
 	if (op->ops.free_auto_entities)
 		op->ops.free_auto_entities(tp);
 	/* And now the type itself... */
+#ifdef DEBUG_libfirm
 	tp->kind = k_BAD;
+#endif
 	free(tp);
 }
 
-void free_type_entities(ir_type *tp)
-{
-	const tp_op *tpop = get_type_tpop(tp);
-
-	if (tpop->ops.free_entities)
-		tpop->ops.free_entities(tp);
-}
-
-void free_type_attrs(ir_type *tp)
-{
-	const tp_op *tpop = get_type_tpop(tp);
-
-	if (tpop->ops.free_attrs)
-		tpop->ops.free_attrs(tp);
-}
-
 void *(get_type_link)(const ir_type *tp)
 {
 	return _get_type_link(tp);
@@ -244,17 +238,6 @@ void set_type_mode(ir_type *tp, ir_mode *mode)
 		assert(0 && "setting a mode is NOT allowed for this type");
 }
 
-ident *(get_type_ident)(const ir_type *tp)
-{
-	return _get_type_ident(tp);
-}
-
-void (set_type_ident)(ir_type *tp, ident* id)
-{
-	_set_type_ident(tp, id);
-}
-
-/* Outputs a unique number for this node */
 long get_type_nr(const ir_type *tp)
 {
 	assert(tp);
@@ -265,12 +248,6 @@ long get_type_nr(const ir_type *tp)
 #endif
 }
 
-const char *get_type_name(const ir_type *tp)
-{
-	assert(tp && tp->kind == k_type);
-	return (get_id_str(tp->name));
-}
-
 unsigned (get_type_size_bytes)(const ir_type *tp)
 {
 	return _get_type_size_bytes(tp);
@@ -311,7 +288,7 @@ unsigned get_type_alignment_bytes(ir_type *tp)
 	else if (is_Array_type(tp))
 		align = get_type_alignment_bytes(get_array_element_type(tp));
 	else if (is_compound_type(tp)) {
-		int i, n = get_compound_n_members(tp);
+		size_t i, n = get_compound_n_members(tp);
 
 		align = 0;
 		for (i = 0; i < n; ++i) {
@@ -342,7 +319,7 @@ void set_type_alignment_bytes(ir_type *tp, unsigned align)
 
 const char *get_type_state_name(ir_type_state s)
 {
-#define X(a)    case a: return #a;
+#define X(a)    case a: return #a
 	switch (s) {
 		X(layout_undefined);
 		X(layout_fixed);
@@ -366,46 +343,42 @@ void set_type_state(ir_type *tp, ir_type_state state)
 
 	/* Just a correctness check: */
 	if (state == layout_fixed) {
-		int i;
+		size_t i;
 		switch (get_type_tpop_code(tp)) {
 		case tpo_class:
 			if (tp != get_glob_type()) {
-				int n_mem = get_class_n_members(tp);
+				size_t n_mem = get_class_n_members(tp);
 				for (i = 0; i < n_mem; i++) {
-					assert(get_entity_offset(get_class_member(tp, i)) > -1);
-					/* TR ??
-					assert(is_Method_type(get_entity_type(get_class_member(tp, i))) ||
-					(get_entity_allocation(get_class_member(tp, i)) == allocation_automatic));
-					*/
+					ir_entity *entity = get_class_member(tp, i);
+					if (is_Method_type(get_entity_type(entity)))
+						continue;
+					assert(get_entity_offset(entity) > -1);
 				}
 			}
 			break;
 		case tpo_struct:
 			for (i = 0; i < get_struct_n_members(tp); i++) {
 				assert(get_entity_offset(get_struct_member(tp, i)) > -1);
-				assert((get_entity_allocation(get_struct_member(tp, i)) == allocation_automatic));
 			}
 			break;
 		case tpo_union:
-			/* ?? */
 			break;
 		case tpo_array:
-			/* ??
-			   Check order?
-			   Assure that only innermost dimension is dynamic? */
 			break;
-		case tpo_enumeration:
+		case tpo_enumeration: {
 #ifndef NDEBUG
-			assert(get_type_mode != NULL);
-			for (i = get_enumeration_n_enums(tp) - 1; i >= 0; --i) {
+			size_t n_enums = get_enumeration_n_enums(tp);
+			assert(get_type_mode(tp) != NULL);
+			for (i = 0; i < n_enums; ++i) {
 				ir_enum_const *ec = get_enumeration_const(tp, i);
-				tarval        *tv = get_enumeration_value(ec);
+				ir_tarval     *tv = get_enumeration_value(ec);
 				assert(tv != NULL && tv != tarval_bad);
 			}
 #endif
 			break;
+		}
 		default: break;
-		} /* switch (tp) */
+		}
 	}
 	if (state == layout_fixed)
 		tp->flags |= tf_layout_fixed;
@@ -438,12 +411,12 @@ int (type_not_visited)(const ir_type *tp)
 	return _type_not_visited(tp);
 }
 
-dbg_info *(get_type_dbg_info)(const ir_type *tp)
+type_dbg_info *(get_type_dbg_info)(const ir_type *tp)
 {
 	return _get_type_dbg_info(tp);
 }
 
-void (set_type_dbg_info)(ir_type *tp, dbg_info *db)
+void (set_type_dbg_info)(ir_type *tp, type_dbg_info *db)
 {
 	_set_type_dbg_info(tp, db);
 }
@@ -453,17 +426,17 @@ int (is_type)(const void *thing)
 	return _is_type(thing);
 }
 
-/* Checks whether two types are structural equal.*/
 int equal_type(ir_type *typ1, ir_type *typ2)
 {
 	ir_entity **m;
 	ir_type **t;
-	int i, j;
+	size_t i;
+	size_t j;
 
 	if (typ1 == typ2) return 1;
 
 	if ((get_type_tpop_code(typ1) != get_type_tpop_code(typ2)) ||
-	    (get_type_ident(typ1) != get_type_ident(typ2)) ||
+	    typ1->name != typ2->name ||
 	    (get_type_mode(typ1) != get_type_mode(typ2)) ||
 	    (get_type_state(typ1) != get_type_state(typ2)))
 		return 0;
@@ -499,7 +472,7 @@ int equal_type(ir_type *typ1, ir_type *typ2)
 			ir_type *t1 = get_class_supertype(typ1, i);
 			for (j = 0; j < get_class_n_supertypes(typ2); j++) {
 				ir_type *t2 = get_class_supertype(typ2, j);
-				if (get_type_ident(t2) == get_type_ident(t1))
+				if (t2->name == t1->name)
 					t[i] = t2;
 			}
 		}
@@ -529,20 +502,16 @@ int equal_type(ir_type *typ1, ir_type *typ2)
 		break;
 
 	case tpo_method: {
-		int n_param1, n_param2;
+		size_t n_param1;
+		size_t n_param2;
 
 		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);
-			n_param2 = get_method_n_params(typ2);
-		} else {
-			n_param1 = get_method_first_variadic_param_index(typ1);
-			n_param2 = get_method_first_variadic_param_index(typ2);
-		}
+		n_param1 = get_method_n_params(typ1);
+		n_param2 = get_method_n_params(typ2);
 
 		if (n_param1 != n_param2) return 0;
 
@@ -579,7 +548,7 @@ int equal_type(ir_type *typ1, ir_type *typ2)
 			return 0;
 		if (!equal_type(get_array_element_type(typ1), get_array_element_type(typ2)))
 			return 0;
-		for(i = 0; i < get_array_n_dimensions(typ1); i++) {
+		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 0;
@@ -608,14 +577,16 @@ int equal_type(ir_type *typ1, ir_type *typ2)
 int smaller_type(ir_type *st, ir_type *lt)
 {
 	ir_entity **m;
-	int i, j, n_st_members;
+	size_t i;
+	size_t j;
+	size_t n_st_members;
 
 	if (st == lt) return 1;
 
 	if (get_type_tpop_code(st) != get_type_tpop_code(lt))
 		return 0;
 
-	switch(get_type_tpop_code(st)) {
+	switch (get_type_tpop_code(st)) {
 	case tpo_class:
 		return is_SubClass_of(st, lt);
 
@@ -628,7 +599,7 @@ int smaller_type(ir_type *st, ir_type *lt)
 		/* First sort the members of lt */
 		for (i = 0; i < n_st_members; ++i) {
 			ir_entity *se = get_struct_member(st, i);
-			int n = get_struct_n_members(lt);
+			size_t n = get_struct_n_members(lt);
 			for (j = 0; j < n; ++j) {
 				ir_entity *le = get_struct_member(lt, j);
 				if (get_entity_name(le) == get_entity_name(se))
@@ -643,7 +614,7 @@ int smaller_type(ir_type *st, ir_type *lt)
 		break;
 
 	case tpo_method: {
-		int n_param1, n_param2;
+		size_t n_param1, n_param2;
 
 		/** FIXME: is this still 1? */
 		if (get_method_variadicity(st) != get_method_variadicity(lt)) return 0;
@@ -651,13 +622,8 @@ int smaller_type(ir_type *st, ir_type *lt)
 		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);
-		}
+		n_param1 = get_method_n_params(st);
+		n_param2 = get_method_n_params(lt);
 
 		if (n_param1 != n_param2) return 0;
 
@@ -678,7 +644,7 @@ int smaller_type(ir_type *st, ir_type *lt)
 		/* First sort the members of lt */
 		for (i = 0; i < n_st_members; ++i) {
 			ir_entity *se = get_union_member(st, i);
-			int n = get_union_n_members(lt);
+			size_t n = get_union_n_members(lt);
 			for (j = 0; j < n; ++j) {
 				ir_entity *le = get_union_member(lt, j);
 				if (get_entity_name(le) == get_entity_name(se))
@@ -710,12 +676,12 @@ int smaller_type(ir_type *st, ir_type *lt)
 			    get_type_size_bytes(set) != get_type_size_bytes(let))
 				return 0;
 		}
-		for(i = 0; i < get_array_n_dimensions(st); i++) {
+		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))
+				if (get_array_lower_bound(st, i) != get_array_lower_bound(lt, i))
 					return 0;
 				if (get_array_upper_bound(lt, i))
-					if(get_array_upper_bound(st, i) != get_array_upper_bound(lt, i))
+					if (get_array_upper_bound(st, i) != get_array_upper_bound(lt, i))
 						return 0;
 		}
 	} break;
@@ -740,11 +706,12 @@ int smaller_type(ir_type *st, ir_type *lt)
 }
 
 
-ir_type *new_d_type_class(ident *name, dbg_info *db)
+ir_type *new_d_type_class(ident *name, type_dbg_info *db)
 {
 	ir_type *res;
 
-	res = new_type(type_class, NULL, name, db);
+	res = new_type(type_class, NULL, db);
+	res->name = name;
 
 	res->attr.ca.members     = NEW_ARR_F (ir_entity *, 0);
 	res->attr.ca.subtypes    = NEW_ARR_F (ir_type *, 0);
@@ -760,15 +727,16 @@ ir_type *new_d_type_class(ident *name, dbg_info *db)
 
 ir_type *new_type_class(ident *name)
 {
-	return new_d_type_class (name, NULL);
+	return new_d_type_class(name, NULL);
 }
 
 void free_class_entities(ir_type *clss)
 {
-	int i;
+	size_t i;
 	assert(clss && (clss->type_op == type_class));
-	for (i = get_class_n_members(clss) - 1; i >= 0; --i)
-		free_entity(get_class_member(clss, i));
+	/* we must iterate backward here */
+	for (i = get_class_n_members(clss); i > 0;)
+		free_entity(get_class_member(clss, --i));
 	/* do NOT free the type info here. It belongs to another class */
 }
 
@@ -780,72 +748,67 @@ void free_class_attrs(ir_type *clss)
 	DEL_ARR_F(clss->attr.ca.supertypes);
 }
 
-void add_class_member(ir_type *clss, ir_entity *member)
+ident *get_class_ident(const ir_type *clss)
+{
+	assert(clss->type_op == type_class);
+	return clss->name;
+}
+
+const char *get_class_name(const ir_type *clss)
+{
+	if (get_class_ident(clss) == NULL)
+		return NULL;
+	return get_id_str(get_class_ident(clss));
+}
+
+static void add_class_member(ir_type *clss, ir_entity *member)
 {
 	assert(clss && (clss->type_op == type_class));
 	assert(clss != get_entity_type(member) && "recursive type");
-	assert(get_type_state(clss) != layout_fixed);
 	ARR_APP1 (ir_entity *, clss->attr.ca.members, member);
 }
 
-int (get_class_n_members)(const ir_type *clss)
+size_t (get_class_n_members)(const ir_type *clss)
 {
 	return _get_class_n_members(clss);
 }
 
-int get_class_member_index(const ir_type *clss, ir_entity *mem)
+size_t get_class_member_index(const ir_type *clss, ir_entity *mem)
 {
-	int i, n;
+	size_t i, n;
 	assert(clss && (clss->type_op == type_class));
-	for (i = 0, n = get_class_n_members(clss); i < n; ++i)
+	for (i = 0, n = get_class_n_members(clss); i < n; ++i) {
 		if (get_class_member(clss, i) == mem)
 			return i;
-		return -1;
+	}
+	return INVALID_MEMBER_INDEX;
 }
 
-ir_entity *(get_class_member)(const ir_type *clss, int pos)
+ir_entity *(get_class_member)(const ir_type *clss, size_t pos)
 {
 	return _get_class_member(clss, pos);
 }
 
 ir_entity *get_class_member_by_name(ir_type *clss, ident *name)
 {
-	int i, n_mem;
+	size_t i, n_mem;
 	assert(clss && (clss->type_op == type_class));
 	n_mem = get_class_n_members(clss);
 	for (i = 0; i < n_mem; ++i) {
 		ir_entity *mem = get_class_member(clss, i);
-		if (get_entity_ident(mem) == name) return mem;
+		if (get_entity_ident(mem) == name)
+			return mem;
 	}
 	return NULL;
 }
 
-void set_class_member(ir_type *clss, ir_entity *member, int pos)
-{
-	assert(clss && (clss->type_op == type_class));
-	assert(pos >= 0 && pos < get_class_n_members(clss));
-	clss->attr.ca.members[pos] = member;
-}
-
-void set_class_members(ir_type *clss, ir_entity **members, int arity)
-{
-	int i;
-	assert(clss && (clss->type_op == type_class));
-	DEL_ARR_F(clss->attr.ca.members);
-	clss->attr.ca.members = NEW_ARR_F(ir_entity *, 0);
-	for (i = 0; i < arity; ++i) {
-		set_entity_owner(members[i], clss);
-		ARR_APP1(ir_entity *, clss->attr.ca.members, members[i]);
-	}
-}
-
-void remove_class_member(ir_type *clss, ir_entity *member)
+static void remove_class_member(ir_type *clss, ir_entity *member)
 {
-	int i;
+	size_t i;
 	assert(clss && (clss->type_op == type_class));
-	for (i = 0; i < (ARR_LEN (clss->attr.ca.members)); i++) {
+	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++)
+			for (; i < ARR_LEN(clss->attr.ca.members) - 1; ++i)
 				clss->attr.ca.members[i] = clss->attr.ca.members[i + 1];
 			ARR_SETLEN(ir_entity*, clss->attr.ca.members, ARR_LEN(clss->attr.ca.members) - 1);
 			break;
@@ -855,113 +818,120 @@ void remove_class_member(ir_type *clss, ir_entity *member)
 
 void add_class_subtype(ir_type *clss, ir_type *subtype)
 {
-	int i;
-	assert(clss && (clss->type_op == type_class));
+	size_t i;
+	assert(clss->type_op == type_class);
 	ARR_APP1 (ir_type *, clss->attr.ca.subtypes, subtype);
-	for (i = 0; i < get_class_n_supertypes(subtype); i++)
+	for (i = 0; i < get_class_n_supertypes(subtype); i++) {
 		if (get_class_supertype(subtype, i) == clss)
 			/* Class already registered */
 			return;
-		ARR_APP1(ir_type *, subtype->attr.ca.supertypes, clss);
+	}
+	ARR_APP1(ir_type *, subtype->attr.ca.supertypes, clss);
 }
 
-int get_class_n_subtypes(const ir_type *clss)
+size_t get_class_n_subtypes(const ir_type *clss)
 {
-	assert(clss && (clss->type_op == type_class));
-	return (ARR_LEN (clss->attr.ca.subtypes));
+	assert(clss->type_op == type_class);
+	return ARR_LEN (clss->attr.ca.subtypes);
 }
 
-ir_type *get_class_subtype(ir_type *clss, int pos)
+ir_type *get_class_subtype(ir_type *clss, size_t pos)
 {
-	assert(clss && (clss->type_op == type_class));
-	assert(pos >= 0 && pos < get_class_n_subtypes(clss));
+	assert(clss->type_op == type_class);
+	assert(pos < get_class_n_subtypes(clss));
 	return clss->attr.ca.subtypes[pos];
 }
 
-int get_class_subtype_index(ir_type *clss, const ir_type *subclass)
+size_t get_class_subtype_index(ir_type *clss, const ir_type *subclass)
 {
-	int i, n_subtypes = get_class_n_subtypes(clss);
+	size_t 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;
+		if (get_class_subtype(clss, i) == subclass)
+			return i;
 	}
-	return -1;
+	return (size_t)-1;
 }
 
-void set_class_subtype(ir_type *clss, ir_type *subtype, int pos)
+void set_class_subtype(ir_type *clss, ir_type *subtype, size_t pos)
 {
-	assert(clss && (clss->type_op == type_class));
-	assert(pos >= 0 && pos < get_class_n_subtypes(clss));
+	assert(clss->type_op == type_class);
+	assert(pos < get_class_n_subtypes(clss));
 	clss->attr.ca.subtypes[pos] = subtype;
 }
 
 void remove_class_subtype(ir_type *clss, ir_type *subtype)
 {
-	int i;
+	size_t i;
 	assert(clss && (clss->type_op == type_class));
-	for (i = 0; i < (ARR_LEN (clss->attr.ca.subtypes)); i++)
+	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++)
+			for (; i < ARR_LEN(clss->attr.ca.subtypes) - 1; ++i)
 				clss->attr.ca.subtypes[i] = clss->attr.ca.subtypes[i+1];
-			ARR_SETLEN(ir_entity*, clss->attr.ca.subtypes, ARR_LEN(clss->attr.ca.subtypes) - 1);
+			ARR_SETLEN(ir_type*, clss->attr.ca.subtypes, ARR_LEN(clss->attr.ca.subtypes) - 1);
 			break;
 		}
+	}
 }
 
 void add_class_supertype(ir_type *clss, ir_type *supertype)
 {
-	int i;
+	size_t i;
+	size_t n;
 	assert(clss && (clss->type_op == type_class));
 	assert(supertype && (supertype -> type_op == type_class));
 	ARR_APP1 (ir_type *, clss->attr.ca.supertypes, supertype);
-	for (i = get_class_n_subtypes(supertype) - 1; i >= 0; --i)
+	for (i = 0, n = get_class_n_subtypes(supertype); i < n; ++i) {
 		if (get_class_subtype(supertype, i) == clss)
 			/* Class already registered */
 			return;
+	}
 	ARR_APP1(ir_type *, supertype->attr.ca.subtypes, clss);
 }
 
-int get_class_n_supertypes(const ir_type *clss)
+size_t get_class_n_supertypes(const ir_type *clss)
 {
-	assert(clss && (clss->type_op == type_class));
+	assert(clss->type_op == type_class);
 	return ARR_LEN(clss->attr.ca.supertypes);
 }
 
-int get_class_supertype_index(ir_type *clss, ir_type *super_clss)
+size_t get_class_supertype_index(ir_type *clss, ir_type *super_clss)
 {
-	int i, n_supertypes = get_class_n_supertypes(clss);
+	size_t i, n_supertypes = get_class_n_supertypes(clss);
 	assert(super_clss && (super_clss->type_op == type_class));
-	for (i = 0; i < n_supertypes; i++)
+	for (i = 0; i < n_supertypes; i++) {
 		if (get_class_supertype(clss, i) == super_clss)
 			return i;
-		return -1;
+	}
+	return (size_t)-1;
 }
 
-ir_type *get_class_supertype(ir_type *clss, int pos)
+ir_type *get_class_supertype(ir_type *clss, size_t pos)
 {
-	assert(clss && (clss->type_op == type_class));
-	assert(pos >= 0 && pos < get_class_n_supertypes(clss));
+	assert(clss->type_op == type_class);
+	assert(pos < get_class_n_supertypes(clss));
 	return clss->attr.ca.supertypes[pos];
 }
 
-void set_class_supertype(ir_type *clss, ir_type *supertype, int pos)
+void set_class_supertype(ir_type *clss, ir_type *supertype, size_t pos)
 {
-	assert(clss && (clss->type_op == type_class));
-	assert(pos >= 0 && pos < get_class_n_supertypes(clss));
+	assert(clss->type_op == type_class);
+	assert(pos < get_class_n_supertypes(clss));
 	clss->attr.ca.supertypes[pos] = supertype;
 }
 
 void remove_class_supertype(ir_type *clss, ir_type *supertype)
 {
-	int i;
+	size_t i;
 	assert(clss && (clss->type_op == type_class));
-	for (i = 0; i < (ARR_LEN(clss->attr.ca.supertypes)); i++)
+	for (i = 0; i < ARR_LEN(clss->attr.ca.supertypes); ++i) {
 		if (clss->attr.ca.supertypes[i] == supertype) {
-			for(; i < (ARR_LEN(clss->attr.ca.supertypes))-1; i++)
+			for (; i < ARR_LEN(clss->attr.ca.supertypes) - 1; ++i)
 				clss->attr.ca.supertypes[i] = clss->attr.ca.supertypes[i+1];
-			ARR_SETLEN(ir_entity*, clss->attr.ca.supertypes, ARR_LEN(clss->attr.ca.supertypes) - 1);
+			ARR_SETLEN(ir_type*, clss->attr.ca.supertypes, ARR_LEN(clss->attr.ca.supertypes) - 1);
 			break;
 		}
+	}
 }
 
 ir_entity *get_class_type_info(const ir_type *clss)
@@ -976,18 +946,6 @@ void set_class_type_info(ir_type *clss, ir_entity *ent)
 		ent->repr_class = clss;
 }
 
-const char *get_peculiarity_name(ir_peculiarity p)
-{
-#define X(a)    case a: return #a
-	switch (p) {
-	X(peculiarity_description);
-	X(peculiarity_inherited);
-	X(peculiarity_existent);
-	}
-#undef X
-	return "invalid peculiarity";
-}
-
 ir_peculiarity get_class_peculiarity(const ir_type *clss)
 {
 	assert(clss && (clss->type_op == type_class));
@@ -1064,14 +1022,16 @@ void set_class_mode(ir_type *tp, ir_mode *mode)
 	tp->mode = mode;
 }
 
-void set_class_size(ir_type *tp, unsigned size) {
+void set_class_size(ir_type *tp, unsigned size)
+{
 	tp->size = size;
 }
 
 
-ir_type *new_d_type_struct(ident *name, dbg_info *db)
+ir_type *new_d_type_struct(ident *name, type_dbg_info *db)
 {
-	ir_type *res = new_type(type_struct, NULL, name, db);
+	ir_type *res = new_type(type_struct, NULL, db);
+	res->name = name;
 
 	res->attr.sa.members = NEW_ARR_F(ir_entity *, 0);
 	hook_new_type(res);
@@ -1085,10 +1045,11 @@ ir_type *new_type_struct(ident *name)
 
 void free_struct_entities(ir_type *strct)
 {
-	int i;
+	size_t i;
 	assert(strct && (strct->type_op == type_struct));
-	for (i = get_struct_n_members(strct)-1; i >= 0; --i)
-		free_entity(get_struct_member(strct, i));
+	/* we must iterate backward here */
+	for (i = get_struct_n_members(strct); i > 0;)
+		free_entity(get_struct_member(strct, --i));
 }
 
 void free_struct_attrs(ir_type *strct)
@@ -1097,57 +1058,63 @@ void free_struct_attrs(ir_type *strct)
 	DEL_ARR_F(strct->attr.sa.members);
 }
 
-int get_struct_n_members(const ir_type *strct)
+ident *get_struct_ident(const ir_type *strct)
 {
-	assert(strct && (strct->type_op == type_struct));
+	assert(strct->type_op == type_struct);
+	return strct->name;
+}
+
+const char *get_struct_name(const ir_type *strct)
+{
+	if (get_struct_ident(strct) == NULL)
+		return NULL;
+	return get_id_str(get_struct_ident(strct));
+}
+
+size_t get_struct_n_members(const ir_type *strct)
+{
+	assert(strct->type_op == type_struct);
 	return ARR_LEN(strct->attr.sa.members);
 }
 
-void add_struct_member(ir_type *strct, ir_entity *member)
+static void add_struct_member(ir_type *strct, ir_entity *member)
 {
 	assert(strct && (strct->type_op == type_struct));
 	assert(get_type_tpop(get_entity_type(member)) != type_method);
 	assert(strct != get_entity_type(member) && "recursive type");
-	assert(get_type_state(strct) != layout_fixed);
 	ARR_APP1 (ir_entity *, strct->attr.sa.members, member);
 }
 
-ir_entity *get_struct_member(const ir_type *strct, int pos)
+ir_entity *get_struct_member(const ir_type *strct, size_t pos)
 {
 	assert(strct && (strct->type_op == type_struct));
-	assert(pos >= 0 && pos < get_struct_n_members(strct));
+	assert(pos < get_struct_n_members(strct));
 	return strct->attr.sa.members[pos];
 }
 
-int get_struct_member_index(const ir_type *strct, ir_entity *mem)
+size_t get_struct_member_index(const ir_type *strct, ir_entity *mem)
 {
-	int i, n;
+	size_t i, n;
 	assert(strct && (strct->type_op == type_struct));
-	for (i = 0, n = get_struct_n_members(strct); i < n; ++i)
+	for (i = 0, n = get_struct_n_members(strct); i < n; ++i) {
 		if (get_struct_member(strct, i) == mem)
 			return i;
-		return -1;
-}
-
-void set_struct_member(ir_type *strct, int pos, ir_entity *member)
-{
-	assert(strct && (strct->type_op == type_struct));
-	assert(pos >= 0 && pos < get_struct_n_members(strct));
-	assert(get_entity_type(member)->type_op != type_method);/* @@@ lowerfirm !!*/
-	strct->attr.sa.members[pos] = member;
+	}
+	return (size_t)-1;
 }
 
-void remove_struct_member(ir_type *strct, ir_entity *member)
+static void remove_struct_member(ir_type *strct, ir_entity *member)
 {
-	int i;
+	size_t i;
 	assert(strct && (strct->type_op == type_struct));
-	for (i = 0; i < (ARR_LEN (strct->attr.sa.members)); i++)
+	for (i = 0; i < ARR_LEN(strct->attr.sa.members); ++i) {
 		if (strct->attr.sa.members[i] == member) {
-			for(; i < (ARR_LEN (strct->attr.sa.members))-1; i++)
+			for (; i < ARR_LEN(strct->attr.sa.members) - 1; ++i)
 				strct->attr.sa.members[i] = strct->attr.sa.members[i+1];
 			ARR_SETLEN(ir_entity*, strct->attr.sa.members, ARR_LEN(strct->attr.sa.members) - 1);
 			break;
 		}
+	}
 }
 
 int (is_Struct_type)(const ir_type *strct)
@@ -1168,99 +1135,56 @@ void set_struct_size(ir_type *tp, unsigned size)
 	tp->size = size;
 }
 
-
-/**
- * Lazy construction of value argument / result representation.
- * Constructs a struct type and its member.  The types of the members
- * are passed in the argument list.
- *
- * @param name    name of the type constructed
- * @param len     number of fields
- * @param tps     array of field types with length len
- */
-static ir_type *build_value_type(ident *name, int len, tp_ent_pair *tps)
-{
-	int i;
-	ir_type *res = new_type_struct(name);
-	res->flags |= tf_value_param_type;
-	/* Remove type from type list.  Must be treated differently than other types. */
-	remove_irp_type(res);
-	for (i = 0; i < len; i++) {
-		ident *id = tps[i].param_name;
-
-		/* use res as default if corresponding type is not yet set. */
-		ir_type *elt_type = tps[i].tp ? tps[i].tp : res;
-
-		/* use the parameter name if specified */
-		if (! id)
-			id = id_mangle_u(name, get_type_ident(elt_type));
-		tps[i].ent = new_entity(res, id, elt_type);
-		set_entity_allocation(tps[i].ent, allocation_parameter);
-	}
-	return res;
-}
-
-ir_type *new_d_type_method(ident *name, int n_param, int n_res, dbg_info *db)
+ir_type *new_d_type_method(size_t n_param, size_t n_res, type_dbg_info *db)
 {
 	ir_type *res;
 
 	assert((get_mode_size_bits(mode_P_code) % 8 == 0) && "unorthodox modes not implemented");
-	res = new_type(type_method, mode_P_code, name, db);
+	res = new_type(type_method, mode_P_code, db);
 	res->flags                       |= tf_layout_fixed;
 	res->size                         = get_mode_size_bytes(mode_P_code);
 	res->attr.ma.n_params             = n_param;
 	res->attr.ma.params               = XMALLOCNZ(tp_ent_pair, n_param);
-	res->attr.ma.value_params         = NULL;
 	res->attr.ma.n_res                = n_res;
 	res->attr.ma.res_type             = XMALLOCNZ(tp_ent_pair, 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.additional_properties = mtp_no_property;
-	res->attr.ma.irg_calling_conv     = default_cc_mask;
 	hook_new_type(res);
 	return res;
 }
 
-ir_type *new_type_method(ident *name, int n_param, int n_res)
+ir_type *new_type_method(size_t n_param, size_t n_res)
 {
-	return new_d_type_method(name, n_param, n_res, NULL);
+	return new_d_type_method(n_param, n_res, NULL);
 }
 
-ir_type *clone_type_method(ir_type *tp, ident *prefix)
+ir_type *clone_type_method(ir_type *tp)
 {
 	ir_type  *res;
-	ident    *name;
 	ir_mode  *mode;
-	int      n_params, n_res;
-	dbg_info *db;
+	size_t    n_params;
+	size_t    n_res;
+	type_dbg_info *db;
 
 	assert(is_Method_type(tp));
 
-	name = tp->name;
-	if (prefix != NULL)
-		name = id_mangle(prefix, name);
-
 	mode     = tp->mode;
 	n_params = tp->attr.ma.n_params;
 	n_res    = tp->attr.ma.n_res;
 	db       = tp->dbi;
 
-	res = new_type(type_method, mode, name, db);
+	res = new_type(type_method, mode, db);
 
 	res->flags                         = tp->flags;
-	res->assoc_type                    = tp->assoc_type;
+	res->higher_type                   = tp->higher_type;
 	res->size                          = tp->size;
 	res->attr.ma.n_params              = n_params;
 	res->attr.ma.params                = XMALLOCN(tp_ent_pair, n_params);
 	memcpy(res->attr.ma.params, tp->attr.ma.params, n_params * sizeof(res->attr.ma.params[0]));
-	res->attr.ma.value_params          = tp->attr.ma.value_params;
 	res->attr.ma.n_res                 = n_res;
 	res->attr.ma.res_type              = XMALLOCN(tp_ent_pair, n_res);
 	memcpy(res->attr.ma.res_type, tp->attr.ma.res_type, n_res * sizeof(res->attr.ma.res_type[0]));
-	res->attr.ma.value_ress            = tp->attr.ma.value_ress;
 	res->attr.ma.variadicity           = tp->attr.ma.variadicity;
-	res->attr.ma.first_variadic_param  = tp->attr.ma.first_variadic_param;
 	res->attr.ma.additional_properties = tp->attr.ma.additional_properties;
 	res->attr.ma.irg_calling_conv      = tp->attr.ma.irg_calling_conv;
 	hook_new_type(res);
@@ -1278,161 +1202,52 @@ void free_method_attrs(ir_type *method)
 	assert(method && (method->type_op == type_method));
 	free(method->attr.ma.params);
 	free(method->attr.ma.res_type);
-	/* cannot free it yet, type could be cloned ...
-	if (method->attr.ma.value_params) {
-		free_type_entities(method->attr.ma.value_params);
-		free_type(method->attr.ma.value_params);
-	}
-	*/
-	if (method->attr.ma.value_ress) {
-		free_type_entities(method->attr.ma.value_ress);
-		free_type(method->attr.ma.value_ress);
-	}
 }
 
-int (get_method_n_params)(const ir_type *method)
+size_t (get_method_n_params)(const ir_type *method)
 {
 	return _get_method_n_params(method);
 }
 
-ir_type *get_method_param_type(ir_type *method, int pos)
+ir_type *get_method_param_type(const ir_type *method, size_t pos)
 {
 	ir_type *res;
-	assert(method && (method->type_op == type_method));
-	assert(pos >= 0 && pos < get_method_n_params(method));
+	assert(method->type_op == type_method);
+	assert(pos < get_method_n_params(method));
 	res = method->attr.ma.params[pos].tp;
 	assert(res != NULL && "empty method param type");
 	return res;
 }
 
-void set_method_param_type(ir_type *method, int pos, ir_type *tp)
+void set_method_param_type(ir_type *method, size_t pos, ir_type *tp)
 {
-	assert(method && (method->type_op == type_method));
-	assert(pos >= 0 && pos < get_method_n_params(method));
+	assert(method->type_op == type_method);
+	assert(pos < get_method_n_params(method));
 	method->attr.ma.params[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));
-		set_entity_type(get_struct_member(method->attr.ma.value_params, pos), tp);
-	}
-}
-
-ident *get_method_param_ident(ir_type *method, int pos)
-{
-	assert(method && (method->type_op == type_method));
-	assert(pos >= 0 && pos < get_method_n_params(method));
-	return method->attr.ma.params[pos].param_name;
-}
-
-const char *get_method_param_name(ir_type *method, int pos)
-{
-	ident *id = get_method_param_ident(method, pos);
-	return id ? get_id_str(id) : NULL;
-}
-
-void set_method_param_ident(ir_type *method, int pos, ident *id)
-{
-	assert(method && (method->type_op == type_method));
-	assert(pos >= 0 && pos < get_method_n_params(method));
-	method->attr.ma.params[pos].param_name = id;
-}
-
-ir_entity *get_method_value_param_ent(ir_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) {
-		/* parameter value type not created yet, build */
-		method->attr.ma.value_params
-			= build_value_type(id_mangle_u(get_type_ident(method), value_params_suffix),
-			get_method_n_params(method), method->attr.ma.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.params[pos].ent) != method->attr.ma.value_params)
-	       && "param type not yet set");
-	return method->attr.ma.params[pos].ent;
-}
-
-void set_method_value_param_type(ir_type *method, ir_type *tp)
-{
-	int i, n;
-
-	assert(method && (method->type_op == type_method));
-	assert(is_value_param_type(tp));
-	assert(get_method_n_params(method) == get_struct_n_members(tp));
-
-	method->attr.ma.value_params = tp;
-
-	n = get_struct_n_members(tp);
-	for (i = 0; i < n; i++) {
-		ir_entity *ent = get_struct_member(tp, i);
-		method->attr.ma.params[i].ent = ent;
-	}
 }
 
-ir_type *get_method_value_param_type(const ir_type *method)
-{
-	assert(method && (method->type_op == type_method));
-	return method->attr.ma.value_params;
-}
-
-int (get_method_n_ress)(const ir_type *method)
+size_t (get_method_n_ress)(const ir_type *method)
 {
 	return _get_method_n_ress(method);
 }
 
-ir_type *get_method_res_type(ir_type *method, int pos)
+ir_type *get_method_res_type(const ir_type *method, size_t pos)
 {
 	ir_type *res;
-	assert(method && (method->type_op == type_method));
-	assert(pos >= 0 && pos < get_method_n_ress(method));
+	assert(method->type_op == type_method);
+	assert(pos < get_method_n_ress(method));
 	res = method->attr.ma.res_type[pos].tp;
 	assert(res != NULL && "empty method return type");
 	return res;
 }
 
-void  set_method_res_type(ir_type *method, int pos, ir_type *tp)
+void set_method_res_type(ir_type *method, size_t pos, ir_type *tp)
 {
-	assert(method && (method->type_op == type_method));
-	assert(pos >= 0 && pos < get_method_n_ress(method));
+	assert(method->type_op == type_method);
+	assert(pos < get_method_n_ress(method));
 	/* set the result ir_type */
 	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));
-		set_entity_type(get_struct_member(method->attr.ma.value_ress, pos), tp);
-	}
-}
-
-ir_entity *get_method_value_res_ent(ir_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) {
-		/* result value type not created yet, build */
-		method->attr.ma.value_ress
-			= build_value_type(id_mangle_u(get_type_ident(method), value_ress_suffix),
-			get_method_n_ress(method), method->attr.ma.res_type);
-	}
-	/*
-	 * 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 method->attr.ma.res_type[pos].ent;
-}
-
-ir_type *get_method_value_res_type(const ir_type *method)
-{
-	assert(method && (method->type_op == type_method));
-	return method->attr.ma.value_ress;
 }
 
 const char *get_variadicity_name(ir_variadicity vari)
@@ -1459,40 +1274,20 @@ void set_method_variadicity(ir_type *method, ir_variadicity vari)
 	method->attr.ma.variadicity = vari;
 }
 
-int get_method_first_variadic_param_index(const ir_type *method)
-{
-	assert(method && (method->type_op == type_method));
-
-	if (method->attr.ma.variadicity == variadicity_non_variadic)
-		return -1;
-
-	if (method->attr.ma.first_variadic_param == -1)
-		return get_method_n_params(method);
-	return method->attr.ma.first_variadic_param;
-}
-
-void set_method_first_variadic_param_index(ir_type *method, int index)
-{
-	assert(method && (method->type_op == type_method));
-	assert(index >= 0 && index <= get_method_n_params(method));
-
-	method->attr.ma.first_variadic_param = index;
-}
-
-unsigned (get_method_additional_properties)(const ir_type *method)
+mtp_additional_properties (get_method_additional_properties)(const ir_type *method)
 {
 	return _get_method_additional_properties(method);
 }
 
-void (set_method_additional_properties)(ir_type *method, unsigned mask)
+void (set_method_additional_properties)(ir_type *method, mtp_additional_properties mask)
 {
 	_set_method_additional_properties(method, mask);
 }
 
-void (set_method_additional_property)(ir_type *method,
-                                      mtp_additional_property flag)
+void (add_method_additional_properties)(ir_type *method,
+                                        mtp_additional_properties flag)
 {
-	_set_method_additional_property(method, flag);
+	_add_method_additional_properties(method, flag);
 }
 
 unsigned (get_method_calling_convention)(const ir_type *method)
@@ -1527,9 +1322,10 @@ int (is_Method_type)(const ir_type *method)
 }
 
 
-ir_type *new_d_type_union(ident *name, dbg_info *db)
+ir_type *new_d_type_union(ident *name, type_dbg_info *db)
 {
-	ir_type *res = new_type(type_union, NULL, name, db);
+	ir_type *res = new_type(type_union, NULL, db);
+	res->name = name;
 
 	res->attr.ua.members = NEW_ARR_F(ir_entity *, 0);
 	hook_new_type(res);
@@ -1543,64 +1339,70 @@ ir_type *new_type_union(ident *name)
 
 void free_union_entities(ir_type *uni)
 {
-	int i;
+	size_t i;
 	assert(uni && (uni->type_op == type_union));
-	for (i = get_union_n_members(uni) - 1; i >= 0; --i)
-		free_entity(get_union_member(uni, i));
+	/* we must iterate backward here */
+	for (i = get_union_n_members(uni); i > 0;)
+		free_entity(get_union_member(uni, --i));
 }
 
-void free_union_attrs (ir_type *uni)
+void free_union_attrs(ir_type *uni)
 {
 	assert(uni && (uni->type_op == type_union));
 	DEL_ARR_F(uni->attr.ua.members);
 }
 
-int get_union_n_members(const ir_type *uni)
+ident *get_union_ident(const ir_type *uni)
 {
-	assert(uni && (uni->type_op == type_union));
+	assert(uni->type_op == type_union);
+	return uni->name;
+}
+
+const char *get_union_name(const ir_type *uni)
+{
+	if (get_union_ident(uni) == NULL)
+		return NULL;
+	return get_id_str(get_union_ident(uni));
+}
+
+size_t get_union_n_members(const ir_type *uni)
+{
+	assert(uni->type_op == type_union);
 	return ARR_LEN(uni->attr.ua.members);
 }
 
-void add_union_member(ir_type *uni, ir_entity *member)
+static void add_union_member(ir_type *uni, ir_entity *member)
 {
-	assert(uni && (uni->type_op == type_union));
+	assert(uni->type_op == type_union);
 	assert(uni != get_entity_type(member) && "recursive type");
-	assert(get_type_state(uni) != layout_fixed);
 	ARR_APP1(ir_entity *, uni->attr.ua.members, member);
 }
 
-ir_entity *get_union_member(const ir_type *uni, int pos)
+ir_entity *get_union_member(const ir_type *uni, size_t pos)
 {
-	assert(uni && (uni->type_op == type_union));
-	assert(pos >= 0 && pos < get_union_n_members(uni));
+	assert(uni->type_op == type_union);
+	assert(pos < get_union_n_members(uni));
 	return uni->attr.ua.members[pos];
 }
 
-int get_union_member_index(const ir_type *uni, ir_entity *mem)
+size_t get_union_member_index(const ir_type *uni, ir_entity *mem)
 {
-	int i, n;
+	size_t i, n;
 	assert(uni && (uni->type_op == type_union));
 	for (i = 0, n = get_union_n_members(uni); i < n; ++i) {
 		if (get_union_member(uni, i) == mem)
 			return i;
 	}
-	return -1;
+	return (size_t)-1;
 }
 
-void set_union_member(ir_type *uni, int pos, ir_entity *member)
+static void remove_union_member(ir_type *uni, ir_entity *member)
 {
+	size_t i;
 	assert(uni && (uni->type_op == type_union));
-	assert(pos >= 0 && pos < get_union_n_members(uni));
-	uni->attr.ua.members[pos] = member;
-}
-
-void remove_union_member(ir_type *uni, ir_entity *member)
-{
-	int i;
-	assert(uni && (uni->type_op == type_union));
-	for (i = 0; i < (ARR_LEN(uni->attr.ua.members)); i++) {
+	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++)
+			for (; i < ARR_LEN(uni->attr.ua.members) - 1; i++)
 				uni->attr.ua.members[i] = uni->attr.ua.members[i+1];
 			ARR_SETLEN(ir_entity*, uni->attr.ua.members, ARR_LEN(uni->attr.ua.members) - 1);
 			break;
@@ -1620,206 +1422,201 @@ void set_union_size(ir_type *tp, unsigned size)
 
 
 
-ir_type *new_d_type_array(ident *name, int n_dimensions, ir_type *element_type,
-                          dbg_info *db)
+ir_type *new_d_type_array(size_t n_dimensions, ir_type *element_type,
+                          type_dbg_info *db)
 {
 	ir_type *res;
-	int i;
+	size_t i;
 	ir_node *unk;
-	ir_graph *rem = current_ir_graph;
+	ir_graph *irg = get_const_code_irg();
 
 	assert(!is_Method_type(element_type));
 
-	res = new_type(type_array, NULL, name, db);
+	res = new_type(type_array, NULL, db);
 	res->attr.aa.n_dimensions = n_dimensions;
 	res->attr.aa.lower_bound  = XMALLOCNZ(ir_node*, n_dimensions);
 	res->attr.aa.upper_bound  = XMALLOCNZ(ir_node*, n_dimensions);
-	res->attr.aa.order        = XMALLOCNZ(int,      n_dimensions);
+	res->attr.aa.order        = XMALLOCNZ(size_t,   n_dimensions);
 
-	current_ir_graph = get_const_code_irg();
-	unk = new_Unknown(mode_Iu);
+	unk = new_r_Unknown(irg, mode_Iu);
 	for (i = 0; i < n_dimensions; 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, id_mangle_u(name, new_id_from_chars("elem_ent", 8)), element_type);
+	res->attr.aa.element_ent
+		= new_entity(NULL, new_id_from_chars("elem_ent", 8), element_type);
+	res->attr.aa.element_ent->owner = res;
+
 	hook_new_type(res);
 	return res;
 }
 
-ir_type *new_type_array(ident *name, int n_dimensions, ir_type *element_type)
+ir_type *new_type_array(size_t n_dimensions, ir_type *element_type)
 {
-	return new_d_type_array(name, n_dimensions, element_type, NULL);
+	return new_d_type_array(n_dimensions, element_type, NULL);
 }
 
 void free_array_automatic_entities(ir_type *array)
 {
-	assert(array && (array->type_op == type_array));
+	assert(array->type_op == type_array);
 	free_entity(get_array_element_entity(array));
 }
 
-void free_array_entities (ir_type *array)
+void free_array_entities(ir_type *array)
 {
 	(void) array;
-	assert(array && (array->type_op == type_array));
+	assert(array->type_op == type_array);
 }
 
-void free_array_attrs (ir_type *array)
+void free_array_attrs(ir_type *array)
 {
-	assert(array && (array->type_op == type_array));
+	assert(array->type_op == type_array);
 	free(array->attr.aa.lower_bound);
 	free(array->attr.aa.upper_bound);
 	free(array->attr.aa.order);
 }
 
-/* manipulate private fields of array ir_type */
-int get_array_n_dimensions (const ir_type *array)
+size_t get_array_n_dimensions(const ir_type *array)
 {
-	assert(array && (array->type_op == type_array));
+	assert(array->type_op == type_array);
 	return array->attr.aa.n_dimensions;
 }
 
-void set_array_bounds(ir_type *array, int dimension, ir_node *lower_bound,
+void set_array_bounds(ir_type *array, size_t dimension, ir_node *lower_bound,
                       ir_node *upper_bound)
 {
-	assert(array && (array->type_op == type_array));
+	assert(array->type_op == type_array);
 	assert(lower_bound && "lower_bound node may not be NULL.");
 	assert(upper_bound && "upper_bound node may not be NULL.");
-	assert(dimension < array->attr.aa.n_dimensions && dimension >= 0);
+	assert(dimension < array->attr.aa.n_dimensions);
 	array->attr.aa.lower_bound[dimension] = lower_bound;
 	array->attr.aa.upper_bound[dimension] = upper_bound;
 }
 
-void set_array_bounds_int(ir_type *array, int dimension, int lower_bound,
+void set_array_bounds_int(ir_type *array, size_t dimension, int lower_bound,
                           int upper_bound)
 {
-	ir_graph *rem = current_ir_graph;
-	current_ir_graph = get_const_code_irg();
+	ir_graph *irg = get_const_code_irg();
 	set_array_bounds(array, dimension,
-	          new_Const_long(mode_Iu, lower_bound),
-	          new_Const_long(mode_Iu, upper_bound));
-	current_ir_graph = rem;
+	          new_r_Const_long(irg, mode_Iu, lower_bound),
+	          new_r_Const_long(irg, mode_Iu, upper_bound));
 }
 
-void set_array_lower_bound(ir_type *array, int dimension, ir_node *lower_bound)
+void set_array_lower_bound(ir_type *array, size_t dimension,
+                           ir_node *lower_bound)
 {
-	assert(array && (array->type_op == type_array));
+	assert(array->type_op == type_array);
 	assert(lower_bound && "lower_bound node may not be NULL.");
 	array->attr.aa.lower_bound[dimension] = lower_bound;
 }
 
-void set_array_lower_bound_int(ir_type *array, int dimension, int lower_bound)
+void set_array_lower_bound_int(ir_type *array, size_t dimension, int lower_bound)
 {
-	ir_graph *rem = current_ir_graph;
-	current_ir_graph = get_const_code_irg();
+	ir_graph *irg = get_const_code_irg();
 	set_array_lower_bound(array, dimension,
-	     new_Const_long(mode_Iu, lower_bound));
-	current_ir_graph = rem;
+	     new_r_Const_long(irg, mode_Iu, lower_bound));
 }
 
-void set_array_upper_bound(ir_type *array, int dimension, ir_node *upper_bound)
+void set_array_upper_bound(ir_type *array, size_t dimension, ir_node *upper_bound)
 {
-  assert(array && (array->type_op == type_array));
+  assert(array->type_op == type_array);
   assert(upper_bound && "upper_bound node may not be NULL.");
   array->attr.aa.upper_bound[dimension] = upper_bound;
 }
 
-void set_array_upper_bound_int(ir_type *array, int dimension, int upper_bound)
+void set_array_upper_bound_int(ir_type *array, size_t dimension, int upper_bound)
 {
-	ir_graph *rem = current_ir_graph;
-	current_ir_graph = get_const_code_irg();
+	ir_graph *irg = get_const_code_irg();
 	set_array_upper_bound(array, dimension,
-	            new_Const_long(mode_Iu, upper_bound));
-	current_ir_graph = rem;
+	                      new_r_Const_long(irg, mode_Iu, upper_bound));
 }
 
-int has_array_lower_bound(const ir_type *array, int dimension)
+int has_array_lower_bound(const ir_type *array, size_t dimension)
 {
-	assert(array && (array->type_op == type_array));
+	assert(array->type_op == type_array);
 	return !is_Unknown(array->attr.aa.lower_bound[dimension]);
 }
 
-ir_node *get_array_lower_bound(const ir_type *array, int dimension)
+ir_node *get_array_lower_bound(const ir_type *array, size_t dimension)
 {
-	assert(array && (array->type_op == type_array));
+	assert(array->type_op == type_array);
 	return array->attr.aa.lower_bound[dimension];
 }
 
-long get_array_lower_bound_int(const ir_type *array, int dimension)
+long get_array_lower_bound_int(const ir_type *array, size_t dimension)
 {
 	ir_node *node;
-	assert(array && (array->type_op == type_array));
+	assert(array->type_op == type_array);
 	node = array->attr.aa.lower_bound[dimension];
 	assert(is_Const(node));
 	return get_tarval_long(get_Const_tarval(node));
 }
 
-int has_array_upper_bound(const ir_type *array, int dimension)
+int has_array_upper_bound(const ir_type *array, size_t dimension)
 {
-	assert(array && (array->type_op == type_array));
+	assert(array->type_op == type_array);
 	return !is_Unknown(array->attr.aa.upper_bound[dimension]);
 }
 
-ir_node *get_array_upper_bound(const ir_type *array, int dimension)
+ir_node *get_array_upper_bound(const ir_type *array, size_t dimension)
 {
-	assert(array && (array->type_op == type_array));
+	assert(array->type_op == type_array);
 	return array->attr.aa.upper_bound[dimension];
 }
 
-long get_array_upper_bound_int(const ir_type *array, int dimension)
+long get_array_upper_bound_int(const ir_type *array, size_t dimension)
 {
 	ir_node *node;
-	assert(array && (array->type_op == type_array));
+	assert(array->type_op == type_array);
 	node = array->attr.aa.upper_bound[dimension];
 	assert(is_Const(node));
 	return get_tarval_long(get_Const_tarval(node));
 }
 
-void set_array_order(ir_type *array, int dimension, int order)
+void set_array_order(ir_type *array, size_t dimension, size_t order)
 {
-	assert(array && (array->type_op == type_array));
+	assert(array->type_op == type_array);
 	array->attr.aa.order[dimension] = order;
 }
 
-int get_array_order(const ir_type *array, int dimension)
+size_t get_array_order(const ir_type *array, size_t dimension)
 {
-	assert(array && (array->type_op == type_array));
+	assert(array->type_op == type_array);
 	return array->attr.aa.order[dimension];
 }
 
-int find_array_dimension(const ir_type *array, int order)
+size_t find_array_dimension(const ir_type *array, size_t order)
 {
-	int dim;
+	size_t dim;
 
-	assert(array && (array->type_op == type_array));
+	assert(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;
+	return (size_t)-1;
 }
 
 void set_array_element_type(ir_type *array, ir_type *tp)
 {
-	assert(array && (array->type_op == type_array));
+	assert(array->type_op == type_array);
 	assert(!is_Method_type(tp));
 	array->attr.aa.element_type = tp;
 }
 
-ir_type *get_array_element_type(ir_type *array)
+ir_type *get_array_element_type(const ir_type *array)
 {
-	assert(array && (array->type_op == type_array));
+	assert(array->type_op == type_array);
 	return array->attr.aa.element_type;
 }
 
 void set_array_element_entity(ir_type *array, ir_entity *ent)
 {
-	assert(array && (array->type_op == type_array));
+	assert(array->type_op == type_array);
 	assert((get_entity_type(ent)->type_op != type_method));
 	array->attr.aa.element_ent = ent;
 	array->attr.aa.element_type = get_entity_type(ent);
@@ -1827,10 +1624,23 @@ void set_array_element_entity(ir_type *array, ir_entity *ent)
 
 ir_entity *get_array_element_entity(const ir_type *array)
 {
-	assert(array && (array->type_op == type_array));
+	assert(array->type_op == type_array);
 	return array->attr.aa.element_ent;
 }
 
+int is_array_variable_size(const ir_type *array)
+{
+	assert(array->type_op == type_array);
+	return (array->flags & tf_variable_size) != 0;
+}
+
+void set_array_variable_size(ir_type *array, int flag)
+{
+	assert(array->type_op == type_array);
+	array->flags = (array->flags & ~tf_variable_size)
+	               | (flag != 0 ? tf_variable_size : 0);
+}
+
 int (is_Array_type)(const ir_type *array)
 {
 	return _is_array_type(array);
@@ -1843,18 +1653,18 @@ void set_array_size(ir_type *tp, unsigned size)
 }
 
 
-ir_type *new_d_type_enumeration(ident *name, int n_enums, dbg_info *db)
+ir_type *new_d_type_enumeration(ident *name, size_t n_enums, type_dbg_info *db)
 {
 	ir_type *res;
 
-	assert(n_enums >= 0);
-	res = new_type(type_enumeration, NULL, name, db);
+	res = new_type(type_enumeration, NULL, db);
+	res->name = name;
 	res->attr.ea.enumer = NEW_ARR_F(ir_enum_const, n_enums);
 	hook_new_type(res);
 	return res;
 }
 
-ir_type *new_type_enumeration(ident *name, int n_enums)
+ir_type *new_type_enumeration(ident *name, size_t n_enums)
 {
 	return new_d_type_enumeration(name, n_enums, NULL);
 }
@@ -1862,34 +1672,47 @@ ir_type *new_type_enumeration(ident *name, int n_enums)
 void free_enumeration_entities(ir_type *enumeration)
 {
 	(void) enumeration;
-	assert(enumeration && (enumeration->type_op == type_enumeration));
+	assert(enumeration->type_op == type_enumeration);
 }
 
 void free_enumeration_attrs(ir_type *enumeration)
 {
-	assert(enumeration && (enumeration->type_op == type_enumeration));
+	assert(enumeration->type_op == type_enumeration);
 	DEL_ARR_F(enumeration->attr.ea.enumer);
 }
 
-int get_enumeration_n_enums(const ir_type *enumeration)
+ident *get_enumeration_ident(const ir_type *enumeration)
 {
-	assert(enumeration && (enumeration->type_op == type_enumeration));
+	assert(enumeration->type_op == type_enumeration);
+	return enumeration->name;
+}
+
+const char *get_enumeration_name(const ir_type *enumeration)
+{
+	if (get_enumeration_ident(enumeration) == NULL)
+		return NULL;
+	return get_id_str(get_enumeration_ident(enumeration));
+}
+
+size_t get_enumeration_n_enums(const ir_type *enumeration)
+{
+	assert(enumeration->type_op == type_enumeration);
 	return ARR_LEN(enumeration->attr.ea.enumer);
 }
 
-void set_enumeration_const(ir_type *enumeration, int pos, ident *nameid,
-                           tarval *con)
+void set_enumeration_const(ir_type *enumeration, size_t pos, ident *nameid,
+                           ir_tarval *con)
 {
-	assert(0 <= pos && pos < ARR_LEN(enumeration->attr.ea.enumer));
+	assert(pos < ARR_LEN(enumeration->attr.ea.enumer));
 	enumeration->attr.ea.enumer[pos].nameid = nameid;
 	enumeration->attr.ea.enumer[pos].value  = con;
 	enumeration->attr.ea.enumer[pos].owner  = enumeration;
 }
 
-ir_enum_const *get_enumeration_const(const ir_type *enumeration, int pos)
+ir_enum_const *get_enumeration_const(const ir_type *enumeration, size_t pos)
 {
-	assert(enumeration && (enumeration->type_op == type_enumeration));
-	assert(pos >= 0 && pos < get_enumeration_n_enums(enumeration));
+	assert(enumeration->type_op == type_enumeration);
+	assert(pos < get_enumeration_n_enums(enumeration));
 	return &enumeration->attr.ea.enumer[pos];
 }
 
@@ -1898,12 +1721,12 @@ ir_type *get_enumeration_owner(const ir_enum_const *enum_cnst)
 	return enum_cnst->owner;
 }
 
-void set_enumeration_value(ir_enum_const *enum_cnst, tarval *con)
+void set_enumeration_value(ir_enum_const *enum_cnst, ir_tarval *con)
 {
 	enum_cnst->value = con;
 }
 
-tarval *get_enumeration_value(const ir_enum_const *enum_cnst)
+ir_tarval *get_enumeration_value(const ir_enum_const *enum_cnst)
 {
 	return enum_cnst->value;
 }
@@ -1913,12 +1736,12 @@ void set_enumeration_nameid(ir_enum_const *enum_cnst, ident *id)
 	enum_cnst->nameid = id;
 }
 
-ident *get_enumeration_nameid(const ir_enum_const *enum_cnst)
+ident *get_enumeration_const_nameid(const ir_enum_const *enum_cnst)
 {
 	return enum_cnst->nameid;
 }
 
-const char *get_enumeration_name(const ir_enum_const *enum_cnst)
+const char *get_enumeration_const_name(const ir_enum_const *enum_cnst)
 {
 	return get_id_str(enum_cnst->nameid);
 }
@@ -1940,13 +1763,18 @@ void set_enumeration_mode(ir_type *tp, ir_mode *mode)
 
 
 
-ir_type *new_d_type_pointer(ident *name, ir_type *points_to, ir_mode *ptr_mode,
-                            dbg_info *db)
+ir_type *new_d_type_pointer(ir_type *points_to, type_dbg_info *db)
 {
 	ir_type *res;
+	ir_mode *mode;
 
-	assert(mode_is_reference(ptr_mode));
-	res = new_type(type_pointer, ptr_mode, name, db);
+	if (is_Method_type(points_to) || is_code_type(points_to)) {
+		mode = mode_P_code;
+	} else {
+		mode = mode_P_data;
+	}
+
+	res = new_type(type_pointer, mode, db);
 	res->attr.pa.points_to = points_to;
 	assert((get_mode_size_bits(res->mode) % 8 == 0) && "unorthodox modes not implemented");
 	res->size = get_mode_size_bytes(res->mode);
@@ -1955,9 +1783,9 @@ ir_type *new_d_type_pointer(ident *name, ir_type *points_to, ir_mode *ptr_mode,
 	return res;
 }
 
-ir_type *new_type_pointer(ident *name, ir_type *points_to, ir_mode *ptr_mode)
+ir_type *new_type_pointer(ir_type *points_to)
 {
-	return new_d_type_pointer(name, points_to, ptr_mode, NULL);
+	return new_d_type_pointer(points_to, NULL);
 }
 
 void free_pointer_entities(ir_type *pointer)
@@ -1978,7 +1806,7 @@ void set_pointer_points_to_type(ir_type *pointer, ir_type *tp)
 	pointer->attr.pa.points_to = tp;
 }
 
-ir_type *get_pointer_points_to_type(ir_type *pointer)
+ir_type *get_pointer_points_to_type(const ir_type *pointer)
 {
 	assert(pointer && (pointer->type_op == type_pointer));
 	return pointer->attr.pa.points_to;
@@ -2001,20 +1829,19 @@ void set_pointer_mode(ir_type *tp, ir_mode *mode)
 
 ir_type *find_pointer_type_to_type(ir_type *tp)
 {
-	int i, n = get_irp_n_types();
+	size_t i, n = get_irp_n_types();
 	for (i = 0; i < n; ++i) {
 		ir_type *found = get_irp_type(i);
 		if (is_Pointer_type(found) && get_pointer_points_to_type(found) == tp)
 			return (found);
 	}
-	return firm_unknown_type;
+	return get_unknown_type();
 }
 
 
-
-ir_type *new_d_type_primitive(ident *name, ir_mode *mode, dbg_info *db)
+ir_type *new_d_type_primitive(ir_mode *mode, type_dbg_info *db)
 {
-	ir_type *res = new_type(type_primitive, mode, name, db);
+	ir_type *res = new_type(type_primitive, mode, db);
 	res->size  = get_mode_size_bytes(mode);
 	res->flags |= tf_layout_fixed;
 	res->attr.ba.base_type = NULL;
@@ -2022,9 +1849,9 @@ ir_type *new_d_type_primitive(ident *name, ir_mode *mode, dbg_info *db)
 	return res;
 }
 
-ir_type *new_type_primitive(ident *name, ir_mode *mode)
+ir_type *new_type_primitive(ir_mode *mode)
 {
-	return new_d_type_primitive(name, mode, NULL);
+	return new_d_type_primitive(mode, NULL);
 }
 
 int (is_Primitive_type)(const ir_type *primitive)
@@ -2042,7 +1869,7 @@ void set_primitive_mode(ir_type *tp, ir_mode *mode)
 	tp->mode = mode;
 }
 
-ir_type *get_primitive_base_type(ir_type *tp)
+ir_type *get_primitive_base_type(const ir_type *tp)
 {
 	assert(is_Primitive_type(tp));
 	return tp->attr.ba.base_type;
@@ -2061,93 +1888,107 @@ int (is_atomic_type)(const ir_type *tp)
 	return _is_atomic_type(tp);
 }
 
-int get_compound_n_members(const ir_type *tp)
+size_t get_compound_n_members(const ir_type *tp)
 {
-	const tp_op *op = get_type_tpop(tp);
-	int res = 0;
-
-	if (op->ops.get_n_members)
-		res = op->ops.get_n_members(tp);
-	else
-		assert(0 && "no member count for this type");
-
-	return res;
+	const tp_op *op  = get_type_tpop(tp);
+	return op->ops.get_n_members(tp);
 }
 
-ir_entity *get_compound_member(const ir_type *tp, int pos)
+ir_entity *get_compound_member(const ir_type *tp, size_t pos)
 {
 	const tp_op *op = get_type_tpop(tp);
-	ir_entity *res = NULL;
-
-	if (op->ops.get_member)
-		res = op->ops.get_member(tp, pos);
-	else
-		assert(0 && "no members in this type");
-
-	return res;
+	return op->ops.get_member(tp, pos);
 }
 
-int get_compound_member_index(const ir_type *tp, ir_entity *member)
+size_t get_compound_member_index(const ir_type *tp, ir_entity *member)
 {
 	const tp_op *op = get_type_tpop(tp);
-	int index = -1;
+	return op->ops.get_member_index(tp, member);
+}
 
-	if (op->ops.get_member_index)
-		index = op->ops.get_member_index(tp, member);
-	else
-		assert(0 && "no members in this type");
+void set_compound_variable_size(ir_type *tp, int variable_size_flag)
+{
+	assert(is_compound_type(tp));
+	tp->flags = (tp->flags & ~tf_variable_size)
+	            | (variable_size_flag != 0 ? tf_variable_size : 0);
+}
 
-	return index;
+int is_compound_variable_size(const ir_type *tp)
+{
+	assert(is_compound_type(tp));
+	return (tp->flags & tf_variable_size) != 0;
 }
 
 int is_compound_type(const ir_type *tp)
 {
-	assert(tp && tp->kind == k_type);
+	assert(tp->kind == k_type);
 	return tp->type_op->flags & TP_OP_FLAG_COMPOUND;
 }
 
-int is_code_type(const ir_type *tp)
+ident *get_compound_ident(const ir_type *tp)
 {
-	assert(tp && tp->kind == k_type);
-	return tp->type_op == tpop_code;
+	assert(is_compound_type(tp));
+	return tp->name;
 }
 
-int is_frame_type(const ir_type *tp)
+const char *get_compound_name(const ir_type *tp)
 {
-	return tp->flags & tf_frame_type;
+	if (get_compound_ident(tp) == NULL)
+		return NULL;
+	return get_id_str(get_compound_ident(tp));
 }
 
-int is_value_param_type(const ir_type *tp)
+void remove_compound_member(ir_type *compound, ir_entity *entity)
 {
-	return tp->flags & tf_value_param_type;
+	switch (get_type_tpop_code(compound)) {
+	case tpo_class:  remove_class_member(compound, entity);  break;
+	case tpo_struct: remove_struct_member(compound, entity); break;
+	case tpo_union:  remove_union_member(compound, entity);  break;
+	default:
+		panic("argument for remove_compound_member not a compound type");
+	}
 }
 
-int is_lowered_type(const ir_type *tp)
+void add_compound_member(ir_type *compound, ir_entity *entity)
 {
-	return tp->flags & tf_lowered_type;
+	switch (get_type_tpop_code(compound)) {
+	case tpo_class:  add_class_member(compound, entity);  break;
+	case tpo_struct: add_struct_member(compound, entity); break;
+	case tpo_union:  add_union_member(compound, entity);  break;
+	default:
+		panic("argument for add_compound_member not a compound type");
+	}
 }
 
-ir_type *new_type_value(ident *name)
+int is_code_type(const ir_type *tp)
 {
-	ir_type *res = new_type_struct(name);
+	assert(tp->kind == k_type);
+	return tp->type_op == tpop_code;
+}
 
-	res->flags |= tf_value_param_type;
+int is_unknown_type(const ir_type *tp)
+{
+	assert(tp->kind == k_type);
+	return tp->type_op == tpop_unknown;
+}
 
-	/* Remove type from type list.  Must be treated differently than other types. */
-	remove_irp_type(res);
+int is_none_type(const ir_type *tp)
+{
+	assert(tp->kind == k_type);
+	return tp->type_op == tpop_none;
+}
 
-	return res;
+int is_frame_type(const ir_type *tp)
+{
+	return tp->flags & tf_frame_type;
 }
 
-ir_type *new_type_frame(ident *name)
+ir_type *new_type_frame(void)
 {
-	ir_type *res = new_type_class(name);
+	ir_type *res = new_type_class(new_id_from_str("<frame_type>"));
 
 	res->flags |= tf_frame_type;
 
-	/* Remove type from type list.  Must be treated differently than other types. */
-	remove_irp_type(res);
-
 	/* It is not possible to derive from the frame type. Set the final flag. */
 	set_class_final(res, 1);
 
@@ -2157,13 +1998,13 @@ ir_type *new_type_frame(ident *name)
 ir_type *clone_frame_type(ir_type *type)
 {
 	ir_type *res;
-	int     i, n;
+	size_t  i, n;
 
 	assert(is_frame_type(type));
 	/* the entity link resource should be allocated if this function is called */
-	assert(irp_resources_reserved(irp) & IR_RESOURCE_ENTITY_LINK);
+	assert(irp_resources_reserved(irp) & IRP_RESOURCE_ENTITY_LINK);
 
-	res = new_type_frame(type->name);
+	res = new_type_frame();
 	for (i = 0, n = get_class_n_members(type); i < n; ++i) {
 		ir_entity *ent  = get_class_member(type, i);
 		ir_entity *nent = copy_entity_own(ent, res);
@@ -2173,22 +2014,54 @@ ir_type *clone_frame_type(ir_type *type)
 	return res;
 }
 
-void set_lowered_type(ir_type *tp, ir_type *lowered_type)
+void set_default_size(ir_type *tp, unsigned size)
 {
-	assert(is_type(tp) && is_type(lowered_type));
-	lowered_type->flags |= tf_lowered_type;
-	tp->assoc_type = lowered_type;
-	lowered_type->assoc_type = tp;
+	tp->size = size;
 }
 
-ir_type *get_associated_type(const ir_type *tp)
+void default_layout_compound_type(ir_type *type)
 {
-	return tp->assoc_type;
-}
+	size_t   i;
+	size_t   n         = get_compound_n_members(type);
+	int      size      = 0;
+	unsigned align_all = 1;
+	bool     var_size  = is_compound_variable_size(type);
 
-void set_default_size(ir_type *tp, unsigned size)
-{
-	tp->size = size;
+	for (i = 0; i < n; ++i) {
+		ir_entity *entity      = get_compound_member(type, i);
+		ir_type   *entity_type = get_entity_type(entity);
+		unsigned   align;
+		unsigned   misalign;
+		unsigned   entity_size;
+
+		if (is_Method_type(entity_type))
+			continue;
+
+		if (i+1 < n || !var_size) {
+			assert(get_type_state(entity_type) == layout_fixed);
+			entity_size = get_type_size_bytes(entity_type);
+		} else {
+			entity_size = 0;
+		}
+
+		align     = get_type_alignment_bytes(entity_type);
+		align_all = align > align_all ? align : align_all;
+		misalign  = (align ? size % align : 0);
+		size     += (misalign ? align - misalign : 0);
+
+		set_entity_offset(entity, size);
+		if (!is_Union_type(type)) {
+			size += entity_size;
+		}
+	}
+	if (align_all > 0 && size % align_all) {
+		size += align_all - (size % align_all);
+	}
+	if (align_all > get_type_alignment_bytes(type)) {
+		set_type_alignment_bytes(type, align_all);
+	}
+	set_type_size_bytes(type, size);
+	set_type_state(type, layout_fixed);
 }
 
 ir_entity *frame_alloc_area(ir_type *frame_type, int size, unsigned alignment,
@@ -2198,48 +2071,39 @@ ir_entity *frame_alloc_area(ir_type *frame_type, int size, unsigned alignment,
 	ir_type *tp;
 	ident *name;
 	char buf[32];
-	unsigned frame_align;
-	int i, offset, frame_size;
+	int offset;
+	unsigned frame_size  = get_type_size_bytes(frame_type);
+	unsigned frame_align = get_type_alignment_bytes(frame_type);
 	static unsigned area_cnt = 0;
-	static ir_type *a_byte = NULL;
 
 	assert(is_frame_type(frame_type));
 	assert(get_type_state(frame_type) == layout_fixed);
 	assert(get_type_alignment_bytes(frame_type) > 0);
 	set_type_state(frame_type, layout_undefined);
 
-	if (! a_byte)
-		a_byte = new_type_primitive(new_id_from_chars("byte", 4), mode_Bu);
+	if (irp->byte_type == NULL)
+		irp->byte_type = new_type_primitive(mode_Bu);
 
 	snprintf(buf, sizeof(buf), "area%u", area_cnt++);
 	name = new_id_from_str(buf);
 
-	/* align the size */
-	frame_align = get_type_alignment_bytes(frame_type);
-	size = (size + frame_align - 1) & ~(frame_align - 1);
-
-	tp = new_type_array(id_mangle_u(get_type_ident(frame_type), name), 1, a_byte);
+	tp = new_type_array(1, irp->byte_type);
 	set_array_bounds_int(tp, 0, 0, size);
 	set_type_alignment_bytes(tp, alignment);
+	set_type_size_bytes(tp, size);
 
-	frame_size = get_type_size_bytes(frame_type);
 	if (at_start) {
+		size_t i, n;
+		unsigned delta = (size + frame_align - 1) & ~(frame_align - 1);
 		/* fix all offsets so far */
-		for (i = get_class_n_members(frame_type) - 1; i >= 0; --i) {
+		for (i = 0, n = get_class_n_members(frame_type); i < n; ++i) {
 			ir_entity *ent = get_class_member(frame_type, i);
 
-			set_entity_offset(ent, get_entity_offset(ent) + size);
+			set_entity_offset(ent, get_entity_offset(ent) + delta);
 		}
 		/* calculate offset and new type size */
 		offset = 0;
-		frame_size += size;
-
-		/* increase size to match alignment... */
-		if (alignment > frame_align) {
-			frame_align = alignment;
-			set_type_alignment_bytes(frame_type, frame_align);
-			frame_size  = (frame_size + frame_align - 1) & ~(frame_align - 1);
-		}
+		frame_size += delta;
 	} else {
 		/* calculate offset and new type size */
 		offset = (frame_size + alignment - 1) & ~(alignment - 1);
@@ -2249,6 +2113,9 @@ ir_entity *frame_alloc_area(ir_type *frame_type, int size, unsigned alignment,
 	area = new_entity(frame_type, name, tp);
 	set_entity_offset(area, offset);
 	set_type_size_bytes(frame_type, frame_size);
+	if (alignment > frame_align) {
+		set_type_alignment_bytes(frame_type, alignment);
+	}
 
 	/* mark this entity as compiler generated */
 	set_entity_compiler_generated(area, 1);
@@ -2256,3 +2123,75 @@ ir_entity *frame_alloc_area(ir_type *frame_type, int size, unsigned alignment,
 	set_type_state(frame_type, layout_fixed);
 	return area;
 }
+
+void ir_print_type(char *buffer, size_t buffer_size, const ir_type *type)
+{
+	ident *id;
+	int p;
+	type_dbg_info *tdbgi = get_type_dbg_info(type);
+	if (tdbgi != NULL) {
+		ir_retrieve_type_dbg_info(buffer, buffer_size, tdbgi);
+		return;
+	}
+
+	/* we have to construct some name... */
+	switch (get_type_tpop_code(type)) {
+	case tpo_uninitialized:
+		break;
+	case tpo_code:
+		snprintf(buffer, buffer_size, "code");
+		return;
+
+	case tpo_class:
+		id = get_class_ident(type);
+		snprintf(buffer, buffer_size, "class '%s'", get_id_str(id));
+		return;
+
+	case tpo_struct:
+		id = get_struct_ident(type);
+		snprintf(buffer, buffer_size, "struct '%s'", get_id_str(id));
+		return;
+
+	case tpo_union:
+		id = get_union_ident(type);
+		snprintf(buffer, buffer_size, "union '%s'", get_id_str(id));
+		return;
+
+	case tpo_enumeration:
+		id = get_enumeration_ident(type);
+		snprintf(buffer, buffer_size, "enumeration '%s'", get_id_str(id));
+		return;
+
+	case tpo_unknown:
+		snprintf(buffer, buffer_size, "unknown type");
+		return;
+
+	case tpo_pointer:
+		p = snprintf(buffer, buffer_size, "pointer to ");
+		buffer      += p;
+		buffer_size -= p;
+		ir_print_type(buffer, buffer_size, get_pointer_points_to_type(type));
+		return;
+
+	case tpo_array:
+		p = snprintf(buffer, buffer_size, "array of ");
+		buffer      += p;
+		buffer_size -= p;
+		ir_print_type(buffer, buffer_size, get_array_element_type(type));
+		return;
+
+	case tpo_primitive:
+		id = get_mode_ident(get_type_mode(type));
+		snprintf(buffer, buffer_size, "%s", get_id_str(id));
+		return;
+
+	case tpo_none:
+		snprintf(buffer, buffer_size, "none");
+		return;
+	case tpo_method:
+		/* TODO: we should print argument and return types here... */
+		snprintf(buffer, buffer_size, "method type");
+		return;
+	}
+	snprintf(buffer, buffer_size, "invalid type");
+}