X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Fentity.c;h=0a009a6d18b9171c47597b697cca5976da1f4cdf;hb=cdd8faf466750a0328e9e48cf52d5711232a98ec;hp=9af1de6a08983519575499f7c96eb2100d9bb8fc;hpb=b41ce1d070a9f7d216f024fc969ad49908098c0c;p=libfirm

diff --git a/ir/tr/entity.c b/ir/tr/entity.c
index 9af1de6a0..0a009a6d1 100644
--- a/ir/tr/entity.c
+++ b/ir/tr/entity.c
@@ -23,16 +23,12 @@
  * @author  Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Michael Beck
  * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <string.h>
 #include <stdlib.h>
 #include <stddef.h>
 
-#include "firm_common_t.h"
-
 #include "xmalloc.h"
 #include "entity_t.h"
 #include "array.h"
@@ -45,36 +41,9 @@
 #include "tv_t.h"
 #include "irdump.h"
 #include "irgraph_t.h"
-
 #include "callgraph.h"
-
-/**
- * An interval initializer.
- */
-typedef struct interval_initializer interval_initializer;
-
-/**
- * A value initializer.
- */
-typedef struct value_initializer value_initializer;
-
-struct interval_initializer {
-	int                  first_index; /**< The first index of the initialized interval. */
-	int                  last_index;  /**< The last index of the initialized interval. */
-	interval_initializer *next;       /**< Points to the next interval initializer. */
-};
-
-struct value_initializer {
-	ir_entity *ent;           /**< The initialized entity. */
-	value_initializer *next;  /**< Points to the next value initializer. */
-};
-
-typedef union initializer {
-	ir_node              *value;     /**< The value of the initializer. */
-	ir_node              **values;   /**< The values of an interval. */
-	value_initializer    *val_init;  /**< Points the the head of the next value initializers. */
-	interval_initializer *int_init;  /**< Points to the head of the next value initializers. */
-} initializer;
+#include "error.h"
+#include "compound_path.h"
 
 /*-----------------------------------------------------------------*/
 /** general                                                       **/
@@ -94,7 +63,8 @@ ir_entity *get_unknown_entity(void) { return unknown_entity; }
 /**
  * Add an entity to it's already set owner type.
  */
-static INLINE void insert_entity_in_owner(ir_entity *ent) {
+static inline void insert_entity_in_owner(ir_entity *ent)
+{
 	ir_type *owner = ent->owner;
 	switch (get_type_tpop_code(owner)) {
 	case tpo_class:
@@ -109,7 +79,8 @@ static INLINE void insert_entity_in_owner(ir_entity *ent) {
 	case tpo_array:
 		set_array_element_entity(owner, ent);
 		break;
-	default: assert(0);
+	default:
+		panic("Unsupported type kind");
 	}
 }  /* insert_entity_in_owner */
 
@@ -123,16 +94,15 @@ static INLINE void insert_entity_in_owner(ir_entity *ent) {
  *
  * @return the new created entity
  */
-static INLINE ir_entity *
-new_rd_entity(dbg_info *db, ir_type *owner, ident *name, ir_type *type)
+static inline ir_entity *new_rd_entity(dbg_info *db, ir_type *owner,
+                                       ident *name, ir_type *type)
 {
 	ir_entity *res;
 	ir_graph *rem;
 
 	assert(!id_contains_char(name, ' ') && "entity name should not contain spaces");
 
-	res = xmalloc(sizeof(*res));
-	memset(res, 0, sizeof(*res));
+	res = XMALLOCZ(ir_entity);
 
 	res->kind    = k_entity;
 	res->name    = name;
@@ -140,18 +110,14 @@ new_rd_entity(dbg_info *db, ir_type *owner, ident *name, ir_type *type)
 	res->type    = type;
 	res->owner   = owner;
 
-	res->allocation           = allocation_automatic;
-	res->visibility           = visibility_local;
 	res->volatility           = volatility_non_volatile;
-	res->align                = align_is_aligned;
-	res->stickyness           = stickyness_unsticky;
-	res->peculiarity          = peculiarity_existent;
-	res->address_taken        = ir_address_taken_unknown;
-	res->final                = 0;
+	res->aligned              = align_is_aligned;
+	res->usage                = ir_usage_unknown;
 	res->compiler_gen         = 0;
-	res->backend_marked       = 0;
+	res->visibility           = ir_visibility_default;
 	res->offset               = -1;
 	res->offset_bit_remainder = 0;
+	res->alignment            = 0;
 	res->link                 = NULL;
 	res->repr_class           = NULL;
 
@@ -161,31 +127,19 @@ new_rd_entity(dbg_info *db, ir_type *owner, ident *name, ir_type *type)
 		sym.entity_p            = res;
 		rem                     = current_ir_graph;
 		current_ir_graph        = get_const_code_irg();
-		res->value              = new_SymConst(mode, sym, symconst_addr_ent);
+		set_atomic_ent_value(res, new_SymConst(mode, sym, symconst_addr_ent));
 		current_ir_graph        = rem;
-		res->allocation         = allocation_static;
-		res->variability        = variability_constant;
+		res->linkage            = IR_LINKAGE_CONSTANT;
 		res->attr.mtd_attr.irg_add_properties = mtp_property_inherited;
 		res->attr.mtd_attr.vtable_number      = VTABLE_NUM_NOT_SET;
 		res->attr.mtd_attr.param_access       = NULL;
 		res->attr.mtd_attr.param_weight       = NULL;
 		res->attr.mtd_attr.irg                = NULL;
 	} else if (is_compound_type(type)) {
-		res->variability = variability_uninitialized;
-		res->value       = NULL;
 		res->attr.cmpd_attr.values    = NULL;
 		res->attr.cmpd_attr.val_paths = NULL;
-	} else {
-		res->variability = variability_uninitialized;
-		res->value       = NULL;
-	}
-
-	if (is_Class_type(owner)) {
-		res->overwrites    = NEW_ARR_F(ir_entity *, 0);
-		res->overwrittenby = NEW_ARR_F(ir_entity *, 0);
-	} else {
-		res->overwrites    = NULL;
-		res->overwrittenby = NULL;
+	} else if (is_code_type(type)) {
+		res->attr.code_attr.label = (ir_label_t) -1;
 	}
 
 #ifdef DEBUG_libfirm
@@ -198,8 +152,8 @@ new_rd_entity(dbg_info *db, ir_type *owner, ident *name, ir_type *type)
 	return res;
 }  /* new_rd_entity */
 
-ir_entity *
-new_d_entity(ir_type *owner, ident *name, ir_type *type, dbg_info *db) {
+ir_entity *new_d_entity(ir_type *owner, ident *name, ir_type *type, dbg_info *db)
+{
 	ir_entity *res;
 
 	assert(is_compound_type(owner));
@@ -211,8 +165,8 @@ new_d_entity(ir_type *owner, ident *name, ir_type *type, dbg_info *db) {
 	return res;
 }  /* new_d_entity */
 
-ir_entity *
-new_entity(ir_type *owner, ident *name, ir_type *type) {
+ir_entity *new_entity(ir_type *owner, ident *name, ir_type *type)
+{
 	return new_d_entity(owner, name, type, NULL);
 }  /* new_entity */
 
@@ -221,16 +175,21 @@ new_entity(ir_type *owner, ident *name, ir_type *type) {
  *
  * @param ent  the entity
  */
-static void free_entity_attrs(ir_entity *ent) {
+static void free_entity_attrs(ir_entity *ent)
+{
 	int i;
-	if (get_type_tpop(get_entity_owner(ent)) == type_class) {
-		DEL_ARR_F(ent->overwrites);    ent->overwrites = NULL;
-		DEL_ARR_F(ent->overwrittenby); ent->overwrittenby = NULL;
-	} else {
-		assert(ent->overwrites == NULL);
-		assert(ent->overwrittenby == NULL);
+	if (ent->overwrites != NULL) {
+		DEL_ARR_F(ent->overwrites);
+		ent->overwrites = NULL;
 	}
-	if (is_compound_entity(ent)) {
+	if (ent->overwrittenby != NULL) {
+		DEL_ARR_F(ent->overwrittenby);
+		ent->overwrittenby = NULL;
+	}
+
+	if (ent->initializer != NULL) {
+		/* TODO: free initializers */
+	} else if (entity_has_compound_ent_values(ent)) {
 		if (ent->attr.cmpd_attr.val_paths) {
 			for (i = get_compound_ent_n_values(ent) - 1; i >= 0; --i)
 				if (ent->attr.cmpd_attr.val_paths[i]) {
@@ -240,7 +199,11 @@ static void free_entity_attrs(ir_entity *ent) {
 				}
 				ent->attr.cmpd_attr.val_paths = NULL;
 		}
-		/* if (ent->attr.cmpd_attr.values) DEL_ARR_F(ent->attr.cmpd_attr.values); *//* @@@ warum nich? */
+	}
+	if (is_compound_entity(ent)) {
+		if (ent->attr.cmpd_attr.values) {
+			/*DEL_ARR_F(ent->attr.cmpd_attr.values)*/;
+		}
 		ent->attr.cmpd_attr.values = NULL;
 	} else if (is_method_entity(ent)) {
 		if (ent->attr.mtd_attr.param_access) {
@@ -254,60 +217,76 @@ static void free_entity_attrs(ir_entity *ent) {
 	}
 }  /* free_entity_attrs */
 
+/**
+ * Creates a deep copy of an entity.
+ */
+static ir_entity *deep_entity_copy(ir_entity *old)
+{
+	ir_entity *newe = XMALLOC(ir_entity);
+
+	*newe = *old;
+	if (old->initializer != NULL) {
+		/* FIXME: the initializers are NOT copied */
+	} else if (entity_has_compound_ent_values(old)) {
+		newe->attr.cmpd_attr.values    = NULL;
+		newe->attr.cmpd_attr.val_paths = NULL;
+		if (old->attr.cmpd_attr.values)
+			newe->attr.cmpd_attr.values = DUP_ARR_F(ir_node *, old->attr.cmpd_attr.values);
+
+		/* FIXME: the compound graph paths are NOT copied */
+		if (old->attr.cmpd_attr.val_paths)
+			newe->attr.cmpd_attr.val_paths = DUP_ARR_F(compound_graph_path *, old->attr.cmpd_attr.val_paths);
+	} else if (is_method_entity(old)) {
+		/* do NOT copy them, reanalyze. This might be the best solution */
+		newe->attr.mtd_attr.param_access = NULL;
+		newe->attr.mtd_attr.param_weight = NULL;
+	}
+	newe->overwrites    = NULL;
+	newe->overwrittenby = NULL;
+
+#ifdef DEBUG_libfirm
+	newe->nr = get_irp_new_node_nr();
+#endif
+	return newe;
+}
 /*
  * Copies the entity if the new_owner is different from the
  * owner of the old entity,  else returns the old entity.
  */
-ir_entity *
-copy_entity_own(ir_entity *old, ir_type *new_owner) {
+ir_entity *copy_entity_own(ir_entity *old, ir_type *new_owner)
+{
 	ir_entity *newe;
 	assert(is_entity(old));
 	assert(is_compound_type(new_owner));
 	assert(get_type_state(new_owner) != layout_fixed);
 
-	if (old->owner == new_owner) return old;
-	newe = xmalloc(sizeof(*newe));
-	memcpy(newe, old, sizeof(*newe));
+	if (old->owner == new_owner)
+		return old;
+
+	/* create a deep copy so we are safe of aliasing and double-freeing. */
+	newe        = deep_entity_copy(old);
 	newe->owner = new_owner;
-	if (is_Class_type(new_owner)) {
-		newe->overwrites    = NEW_ARR_F(ir_entity *, 0);
-		newe->overwrittenby = NEW_ARR_F(ir_entity *, 0);
-	}
-#ifdef DEBUG_libfirm
-	newe->nr = get_irp_new_node_nr();
-#endif
 
 	insert_entity_in_owner(newe);
-
 	return newe;
 }  /* copy_entity_own */
 
-ir_entity *
-copy_entity_name(ir_entity *old, ident *new_name) {
+ir_entity *copy_entity_name(ir_entity *old, ident *new_name)
+{
 	ir_entity *newe;
 	assert(old && old->kind == k_entity);
 
 	if (old->name == new_name) return old;
-	newe = xmalloc(sizeof(*newe));
-	memcpy(newe, old, sizeof(*newe));
+	newe       = deep_entity_copy(old);
 	newe->name = new_name;
 	newe->ld_name = NULL;
-	if (is_Class_type(newe->owner)) {
-		newe->overwrites    = DUP_ARR_F(ir_entity *, old->overwrites);
-		newe->overwrittenby = DUP_ARR_F(ir_entity *, old->overwrittenby);
-	}
-#ifdef DEBUG_libfirm
-	newe->nr = get_irp_new_node_nr();
-#endif
-
 	insert_entity_in_owner(newe);
 
 	return newe;
 }  /* copy_entity_name */
 
-
-void
-free_entity(ir_entity *ent) {
+void free_entity(ir_entity *ent)
+{
 	assert(ent && ent->kind == k_entity);
 	free_entity_attrs(ent);
 	ent->kind = k_BAD;
@@ -315,8 +294,8 @@ free_entity(ir_entity *ent) {
 }  /* free_entity */
 
 /* Outputs a unique number for this node */
-long
-get_entity_nr(const ir_entity *ent) {
+long get_entity_nr(const ir_entity *ent)
+{
 	assert(ent && ent->kind == k_entity);
 #ifdef DEBUG_libfirm
 	return ent->nr;
@@ -325,167 +304,67 @@ get_entity_nr(const ir_entity *ent) {
 #endif
 }  /* get_entity_nr */
 
-const char *
-(get_entity_name)(const ir_entity *ent) {
+const char *(get_entity_name)(const ir_entity *ent)
+{
 	return _get_entity_name(ent);
-}  /* get_entity_name */
+}
 
-ident *
-(get_entity_ident)(const ir_entity *ent) {
+ident *(get_entity_ident)(const ir_entity *ent)
+{
 	return _get_entity_ident(ent);
-}  /* get_entity_ident */
+}
 
-void
-(set_entity_ident)(ir_entity *ent, ident *id) {
+void (set_entity_ident)(ir_entity *ent, ident *id)
+{
 	_set_entity_ident(ent, id);
-}  /* set_entity_ident */
+}
 
-ir_type *
-(get_entity_owner)(ir_entity *ent) {
+ir_type *(get_entity_owner)(const ir_entity *ent)
+{
 	return _get_entity_owner(ent);
-}  /* get_entity_owner */
+}
 
-void
-set_entity_owner(ir_entity *ent, ir_type *owner) {
+void set_entity_owner(ir_entity *ent, ir_type *owner)
+{
 	assert(is_entity(ent));
 	assert(is_compound_type(owner));
 	ent->owner = owner;
-}  /* set_entity_owner */
+}
 
-ident *
-(get_entity_ld_ident)(ir_entity *ent) {
+ident *(get_entity_ld_ident)(const ir_entity *ent)
+{
 	return _get_entity_ld_ident(ent);
-}  /* get_entity_ld_ident */
+}
 
-void
-(set_entity_ld_ident)(ir_entity *ent, ident *ld_ident) {
+void (set_entity_ld_ident)(ir_entity *ent, ident *ld_ident)
+{
 	_set_entity_ld_ident(ent, ld_ident);
-}  /* set_entity_ld_ident */
-
-const char *
-(get_entity_ld_name)(ir_entity *ent) {
-	return _get_entity_ld_name(ent);
-}  /* get_entity_ld_name */
-
-ir_type *
-(get_entity_type)(ir_entity *ent) {
-	return _get_entity_type(ent);
-}  /* get_entity_type */
-
-void
-(set_entity_type)(ir_entity *ent, ir_type *type) {
-	_set_entity_type(ent, type);
-}  /* set_entity_type */
-
-ir_allocation
-(get_entity_allocation)(const ir_entity *ent) {
-	return _get_entity_allocation(ent);
-}  /* get_entity_allocation */
-
-void
-(set_entity_allocation)(ir_entity *ent, ir_allocation al) {
-	_set_entity_allocation(ent, al);
-}  /* set_entity_allocation */
+}
 
-/* return the name of the visibility */
-const char *get_allocation_name(ir_allocation all)
+const char *(get_entity_ld_name)(const ir_entity *ent)
 {
-#define X(a)    case a: return #a
-	switch (all) {
-	X(allocation_automatic);
-	X(allocation_parameter);
-	X(allocation_dynamic);
-	X(allocation_static);
-    default: return "BAD VALUE";
-	}
-#undef X
-}  /* get_allocation_name */
-
-ir_visibility
-(get_entity_visibility)(const ir_entity *ent) {
-	return _get_entity_visibility(ent);
-}  /* get_entity_visibility */
-
-void
-set_entity_visibility(ir_entity *ent, ir_visibility vis) {
-	assert(ent && ent->kind == k_entity);
-	if (vis != visibility_local)
-		assert((ent->allocation == allocation_static) ||
-		(ent->allocation == allocation_automatic));
-		/* @@@ Test that the owner type is not local, but how??
-	&& get_class_visibility(get_entity_owner(ent)) != local));*/
-	ent->visibility = vis;
-}  /* set_entity_visibility */
+	return _get_entity_ld_name(ent);
+}
 
-/* return the name of the visibility */
-const char *get_visibility_name(ir_visibility vis)
+ir_type *(get_entity_type)(const ir_entity *ent)
 {
-#define X(a)    case a: return #a
-	switch (vis) {
-	X(visibility_local);
-	X(visibility_external_visible);
-	X(visibility_external_allocated);
-    default: return "BAD VALUE";
-	}
-#undef X
-}  /* get_visibility_name */
-
-ir_variability
-(get_entity_variability)(const ir_entity *ent) {
-	return _get_entity_variability(ent);
-}  /* get_entity_variability */
+	return _get_entity_type(ent);
+}
 
-void
-set_entity_variability(ir_entity *ent, ir_variability var)
+void (set_entity_type)(ir_entity *ent, ir_type *type)
 {
-	assert(ent && ent->kind == k_entity);
-	if (var == variability_part_constant)
-		assert(is_Class_type(ent->type) || is_Struct_type(ent->type));
-
-	if ((is_compound_type(ent->type)) &&
-		(ent->variability == variability_uninitialized) && (var != variability_uninitialized)) {
-		/* Allocate data structures for constant values */
-		ent->attr.cmpd_attr.values    = NEW_ARR_F(ir_node *, 0);
-		ent->attr.cmpd_attr.val_paths = NEW_ARR_F(compound_graph_path *, 0);
-	}
-	if ((is_atomic_type(ent->type)) &&
-		(ent->variability == variability_uninitialized) && (var != variability_uninitialized)) {
-		/* Set default constant value. */
-		ent->value = new_rd_Unknown(get_const_code_irg(), get_type_mode(ent->type));
-	}
-
-	if ((is_compound_type(ent->type)) &&
-		(var == variability_uninitialized) && (ent->variability != variability_uninitialized)) {
-		/* Free data structures for constant values */
-		DEL_ARR_F(ent->attr.cmpd_attr.values);    ent->attr.cmpd_attr.values    = NULL;
-		DEL_ARR_F(ent->attr.cmpd_attr.val_paths); ent->attr.cmpd_attr.val_paths = NULL;
-	}
-	ent->variability = var;
-}  /* set_entity_variability */
+	_set_entity_type(ent, type);
+}
 
-/* return the name of the variability */
-const char *get_variability_name(ir_variability var)
+ir_volatility (get_entity_volatility)(const ir_entity *ent)
 {
-#define X(a)    case a: return #a
-	switch (var) {
-	X(variability_uninitialized);
-	X(variability_initialized);
-	X(variability_part_constant);
-	X(variability_constant);
-    default: return "BAD VALUE";
-	}
-#undef X
-}  /* get_variability_name */
-
-ir_volatility
-(get_entity_volatility)(const ir_entity *ent) {
 	return _get_entity_volatility(ent);
-}  /* get_entity_volatility */
+}
 
-void
-(set_entity_volatility)(ir_entity *ent, ir_volatility vol) {
+void (set_entity_volatility)(ir_entity *ent, ir_volatility vol)
+{
 	_set_entity_volatility(ent, vol);
-}  /* set_entity_volatility */
+}
 
 /* Return the name of the volatility. */
 const char *get_volatility_name(ir_volatility var)
@@ -499,15 +378,25 @@ const char *get_volatility_name(ir_volatility var)
 #undef X
 }  /* get_volatility_name */
 
-ir_align
-(get_entity_align)(const ir_entity *ent) {
-	return _get_entity_align(ent);
-}  /* get_entity_align */
+ir_align (get_entity_aligned)(const ir_entity *ent)
+{
+	return _get_entity_aligned(ent);
+}
 
-void
-(set_entity_align)(ir_entity *ent, ir_align a) {
-	_set_entity_align(ent, a);
-}  /* set_entity_align */
+void (set_entity_aligned)(ir_entity *ent, ir_align a)
+{
+	_set_entity_aligned(ent, a);
+}
+
+unsigned (get_entity_alignment)(const ir_entity *ent)
+{
+	return _get_entity_alignment(ent);
+}
+
+void (set_entity_alignment)(ir_entity *ent, unsigned alignment)
+{
+	_set_entity_alignment(ent, alignment);
+}
 
 /* Return the name of the alignment. */
 const char *get_align_name(ir_align a)
@@ -521,101 +410,122 @@ const char *get_align_name(ir_align a)
 #undef X
 }  /* get_align_name */
 
-ir_peculiarity
-(get_entity_peculiarity)(const ir_entity *ent) {
-	return _get_entity_peculiarity(ent);
-}  /* get_entity_peculiarity */
+void set_entity_label(ir_entity *ent, ir_label_t label)
+{
+	ent->attr.code_attr.label = label;
+}
+
+ir_label_t get_entity_label(const ir_entity *ent)
+{
+	return ent->attr.code_attr.label;
+}
+
+static void verify_visibility(const ir_entity *entity)
+{
+	if (get_entity_visibility(entity) == ir_visibility_external
+			&& !is_method_entity(entity)) {
+		assert(!entity_has_definition(entity));
+	}
+}
+
+void set_entity_visibility(ir_entity *entity, ir_visibility visibility)
+{
+	entity->visibility = visibility;
+	verify_visibility(entity);
+}
+
+ir_visibility get_entity_visibility(const ir_entity *entity)
+{
+	return entity->visibility;
+}
+
+void set_entity_linkage(ir_entity *entity, ir_linkage linkage)
+{
+	entity->linkage = linkage;
+}
 
-void
-(set_entity_peculiarity)(ir_entity *ent, ir_peculiarity pec) {
-	_set_entity_peculiarity(ent, pec);
-}  /* set_entity_peculiarity */
+ir_linkage (get_entity_linkage)(const ir_entity *entity)
+{
+	return get_entity_linkage(entity);
+}
 
-/* Checks if an entity cannot be overridden anymore. */
-int (is_entity_final)(const ir_entity *ent) {
-	return _is_entity_final(ent);
-}  /* is_entity_final */
+void add_entity_linkage(ir_entity *entity, ir_linkage linkage)
+{
+	entity->linkage |= linkage;
+}
 
-/* Sets/resets the final flag of an entity. */
-void (set_entity_final)(ir_entity *ent, int final) {
-	_set_entity_final(ent, final);
-}  /* set_entity_final */
+void remove_entity_linkage(ir_entity *entity, ir_linkage linkage)
+{
+	entity->linkage &= ~linkage;
+}
 
 /* Checks if an entity is compiler generated */
-int (is_entity_compiler_generated)(const ir_entity *ent) {
+int (is_entity_compiler_generated)(const ir_entity *ent)
+{
 	return _is_entity_compiler_generated(ent);
 }  /* is_entity_compiler_generated */
 
 /* Sets/resets the compiler generated flag */
-void (set_entity_compiler_generated)(ir_entity *ent, int flag) {
+void (set_entity_compiler_generated)(ir_entity *ent, int flag)
+{
 	_set_entity_compiler_generated(ent, flag);
 }  /* set_entity_compiler_generated */
 
-/* Checks if an entity is marked by the backend */
-int (is_entity_backend_marked)(const ir_entity *ent) {
-	return _is_entity_backend_marked(ent);
-}  /* is_entity_backend_marked */
+ir_entity_usage (get_entity_usage)(const ir_entity *ent)
+{
+	return _get_entity_usage(ent);
+}
+
+void (set_entity_usage)(ir_entity *ent, ir_entity_usage flags)
+{
+	_set_entity_usage(ent, flags);
+}
 
-/* Sets/resets the compiler generated flag */
-void (set_entity_backend_marked)(ir_entity *ent, int flag) {
-	_set_entity_backend_marked(ent, flag);
-}  /* set_entity_backend_marked */
-
-/* Checks if the address of an entity was taken. */
-ir_address_taken_state (get_entity_address_taken)(const ir_entity *ent) {
-	return _get_entity_address_taken(ent);
-}  /* is_entity_address_taken */
-
-/* Sets/resets the address taken flag. */
-void (set_entity_address_taken)(ir_entity *ent, ir_address_taken_state flag) {
-	_set_entity_address_taken(ent, flag);
-}  /* set_entity_address_taken */
-
-/* Return the name of the address_taken state. */
-const char *get_address_taken_state_name(ir_address_taken_state state) {
-#define X(a)    case a: return #a
-	switch (state) {
-	X(ir_address_not_taken);
-	X(ir_address_taken_unknown);
-	X(ir_address_taken);
-    default: return "BAD VALUE";
+/* Set has no effect for existent entities of type method. */
+ir_node *get_atomic_ent_value(ir_entity *entity)
+{
+	ir_initializer_t *initializer = get_entity_initializer(entity);
+
+	assert(entity && is_atomic_entity(entity));
+	if (initializer == NULL) {
+		ir_type *type = get_entity_type(entity);
+		return new_r_Unknown(get_const_code_irg(), get_type_mode(type));
 	}
-#undef X
-}  /* get_address_taken_state_name */
 
-/* Get the entity's stickyness */
-ir_stickyness
-(get_entity_stickyness)(const ir_entity *ent) {
-	return _get_entity_stickyness(ent);
-}  /* get_entity_stickyness */
+	switch (get_initializer_kind(initializer)) {
+	case IR_INITIALIZER_NULL: {
+		ir_type *type = get_entity_type(entity);
+		ir_mode *mode = get_type_mode(type);
+		return new_r_Const(get_const_code_irg(), get_mode_null(mode));
+	}
+	case IR_INITIALIZER_TARVAL: {
+		tarval *tv = get_initializer_tarval_value(initializer);
+		return new_r_Const(get_const_code_irg(), tv);
+	}
+	case IR_INITIALIZER_CONST:
+		return get_initializer_const_value(initializer);
+	case IR_INITIALIZER_COMPOUND:
+		panic("compound initializer in atomic entity not allowed (%+F)", entity);
+	}
+
+	panic("invalid initializer kind in get_atomic_ent_value(%+F)", entity);
+}
 
-/* Set the entity's stickyness */
-void
-(set_entity_stickyness)(ir_entity *ent, ir_stickyness stickyness) {
-	_set_entity_stickyness(ent, stickyness);
-}  /* set_entity_stickyness */
+void set_atomic_ent_value(ir_entity *entity, ir_node *val)
+{
+	ir_initializer_t *initializer;
 
-/* Set has no effect for existent entities of type method. */
-ir_node *
-get_atomic_ent_value(ir_entity *ent)
-{
-	assert(ent && is_atomic_entity(ent));
-	assert(ent->variability != variability_uninitialized);
-	return skip_Id(ent->value);
-}  /* get_atomic_ent_value */
-
-void
-set_atomic_ent_value(ir_entity *ent, ir_node *val) {
-	assert(is_atomic_entity(ent) && (ent->variability != variability_uninitialized));
-	if (is_Method_type(ent->type) && (ent->peculiarity == peculiarity_existent))
-		return;
-	assert(get_irn_mode(val) == get_type_mode(ent->type));
-	ent->value = val;
-}  /* set_atomic_ent_value */
+	assert(is_atomic_entity(entity));
+
+	assert(is_Dummy(val) || get_irn_mode(val) == get_type_mode(entity->type));
+	initializer = create_initializer_const(val);
+	entity->initializer = initializer;
+}
 
 /* Returns true if the the node is representable as code on
  *  const_code_irg. */
-int is_irn_const_expression(ir_node *n) {
+int is_irn_const_expression(ir_node *n)
+{
 	ir_mode *m;
 
 	/* we are in danger iff an exception will arise. TODO: be more precisely,
@@ -643,7 +553,8 @@ int is_irn_const_expression(ir_node *n) {
  * Copies a firm subgraph that complies to the restrictions for
  * constant expressions to current_block in current_ir_graph.
  */
-ir_node *copy_const_value(dbg_info *dbg, ir_node *n) {
+ir_node *copy_const_value(dbg_info *dbg, ir_node *n)
+{
 	ir_node *nn;
 	ir_mode *m;
 
@@ -653,7 +564,7 @@ ir_node *copy_const_value(dbg_info *dbg, ir_node *n) {
 	m = get_irn_mode(n);
 	switch (get_irn_opcode(n)) {
 	case iro_Const:
-		nn = new_d_Const_type(dbg, m, get_Const_tarval(n), get_Const_type(n));
+		nn = new_d_Const_type(dbg, get_Const_tarval(n), get_Const_type(n));
 		break;
 	case iro_SymConst:
 		nn = new_d_SymConst_type(dbg, get_irn_mode(n), get_SymConst_symbol(n), get_SymConst_kind(n),
@@ -682,15 +593,27 @@ ir_node *copy_const_value(dbg_info *dbg, ir_node *n) {
 	case iro_Conv:
 		nn = new_d_Conv(dbg, copy_const_value(dbg, get_Conv_op(n)), m); break;
 	case iro_Unknown:
-		nn = new_d_Unknown(m); break;
+		nn = new_Unknown(m); break;
 	default:
-		assert(0 && "opcode invalid or not implemented");
-		nn = NULL;
-		break;
+		panic("opcode invalid or not implemented");
 	}
 	return nn;
 }  /* copy_const_value */
 
+/** Return the name of the initializer kind. */
+const char *get_initializer_kind_name(ir_initializer_kind_t ini)
+{
+#define X(a)    case a: return #a
+	switch (ini) {
+	X(IR_INITIALIZER_CONST);
+	X(IR_INITIALIZER_TARVAL);
+	X(IR_INITIALIZER_NULL);
+	X(IR_INITIALIZER_COMPOUND);
+    default: return "BAD VALUE";
+	}
+#undef X
+}
+
 static ir_initializer_t null_initializer = { IR_INITIALIZER_NULL };
 
 ir_initializer_t *get_initializer_null(void)
@@ -734,7 +657,7 @@ ir_initializer_t *create_initializer_compound(unsigned n_entries)
 	initializer->kind                    = IR_INITIALIZER_COMPOUND;
 	initializer->compound.n_initializers = n_entries;
 
-	for(i = 0; i < n_entries; ++i) {
+	for (i = 0; i < n_entries; ++i) {
 		initializer->compound.initializers[i] = get_initializer_null();
 	}
 
@@ -744,7 +667,7 @@ ir_initializer_t *create_initializer_compound(unsigned n_entries)
 ir_node *get_initializer_const_value(const ir_initializer_t *initializer)
 {
 	assert(initializer->kind == IR_INITIALIZER_CONST);
-	return initializer->consti.value;
+	return skip_Id(initializer->consti.value);
 }
 
 tarval *get_initializer_tarval_value(const ir_initializer_t *initializer)
@@ -784,457 +707,108 @@ ir_initializer_kind_t get_initializer_kind(const ir_initializer_t *initializer)
 
 static void check_entity_initializer(ir_entity *entity)
 {
-	/* TODO */
-	(void) entity;
+#ifndef NDEBUG
+	ir_initializer_t *initializer = entity->initializer;
+	ir_type          *entity_tp   = get_entity_type(entity);
+	switch (initializer->kind) {
+	case IR_INITIALIZER_COMPOUND:
+		assert(is_compound_type(entity_tp));
+		break;
+	case IR_INITIALIZER_CONST:
+		/* methods are initialized by a SymConst */
+		assert(is_atomic_type(entity_tp) || is_Method_type(entity_tp));
+		break;
+	case IR_INITIALIZER_TARVAL:
+		assert(is_atomic_type(entity_tp));
+		break;
+	case IR_INITIALIZER_NULL:
+		break;
+	}
+#endif
 }
 
 void set_entity_initializer(ir_entity *entity, ir_initializer_t *initializer)
 {
-	entity->attr.initializer = initializer;
-	entity->has_initializer  = 1;
+	entity->initializer = initializer;
 	check_entity_initializer(entity);
 }
 
-ir_initializer_t *get_entity_initializer(const ir_entity *entity)
+int has_entity_initializer(const ir_entity *entity)
 {
-	assert(entity->has_initializer);
-	return entity->attr.initializer;
+	return entity->initializer != NULL;
 }
 
-/* Creates a new compound graph path. */
-compound_graph_path *
-new_compound_graph_path(ir_type *tp, int length) {
-	compound_graph_path *res;
-
-	assert(is_compound_type(tp));
-	assert(length > 0);
-
-	res = xmalloc(sizeof(*res) + (length-1) * sizeof(res->list[0]));
-	memset(res, 0, sizeof(*res) + (length-1) * sizeof(res->list[0]));
-	res->kind         = k_ir_compound_graph_path;
-	res->tp           = tp;
-	res->len          = length;
-
-	return res;
-}  /* new_compound_graph_path */
-
-/* Frees an graph path object */
-void free_compound_graph_path (compound_graph_path *gr) {
-	assert(gr && is_compound_graph_path(gr));
-	gr->kind = k_BAD;
-	free(gr);
-}  /* free_compound_graph_path */
-
-/* Returns non-zero if an object is a compound graph path */
-int is_compound_graph_path(const void *thing) {
-	return (get_kind(thing) == k_ir_compound_graph_path);
-}  /* is_compound_graph_path */
-
-/* Checks whether the path up to pos is correct. If the path contains a NULL,
- *  assumes the path is not complete and returns 'true'. */
-int is_proper_compound_graph_path(compound_graph_path *gr, int pos) {
-	int i;
-	ir_entity *node;
-	ir_type *owner = gr->tp;
-
-	for (i = 0; i <= pos; i++) {
-		node = get_compound_graph_path_node(gr, i);
-		if (node == NULL)
-			/* Path not yet complete. */
-			return 1;
-		if (get_entity_owner(node) != owner)
-			return 0;
-		owner = get_entity_type(node);
-	}
-	if (pos == get_compound_graph_path_length(gr))
-		if (!is_atomic_type(owner))
-			return 0;
-		return 1;
-}  /* is_proper_compound_graph_path */
-
-/* Returns the length of a graph path */
-int get_compound_graph_path_length(const compound_graph_path *gr) {
-	assert(gr && is_compound_graph_path(gr));
-	return gr->len;
-}  /* get_compound_graph_path_length */
-
-ir_entity *
-get_compound_graph_path_node(const compound_graph_path *gr, int pos) {
-	assert(gr && is_compound_graph_path(gr));
-	assert(pos >= 0 && pos < gr->len);
-	return gr->list[pos].node;
-}  /* get_compound_graph_path_node */
-
-void
-set_compound_graph_path_node(compound_graph_path *gr, int pos, ir_entity *node) {
-	assert(gr && is_compound_graph_path(gr));
-	assert(pos >= 0 && pos < gr->len);
-	assert(is_entity(node));
-	gr->list[pos].node = node;
-	assert(is_proper_compound_graph_path(gr, pos));
-}  /* set_compound_graph_path_node */
-
-int
-get_compound_graph_path_array_index(const compound_graph_path *gr, int pos) {
-	assert(gr && is_compound_graph_path(gr));
-	assert(pos >= 0 && pos < gr->len);
-	return gr->list[pos].index;
-}  /* get_compound_graph_path_array_index */
-
-void
-set_compound_graph_path_array_index(compound_graph_path *gr, int pos, int index) {
-	assert(gr && is_compound_graph_path(gr));
-	assert(pos >= 0 && pos < gr->len);
-	gr->list[pos].index = index;
-}  /* set_compound_graph_path_array_index */
-
-ir_type *
-get_compound_graph_path_type(const compound_graph_path *gr) {
-	assert(gr && is_compound_graph_path(gr));
-	return gr->tp;
-}
-
-/* A value of a compound entity is a pair of value and the corresponding path to a member of
-   the compound. */
-void
-add_compound_ent_value_w_path(ir_entity *ent, ir_node *val, compound_graph_path *path) {
-	assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
-	assert(is_compound_graph_path(path));
-	ARR_APP1(ir_node *, ent->attr.cmpd_attr.values, val);
-	ARR_APP1(compound_graph_path *, ent->attr.cmpd_attr.val_paths, path);
-}  /* add_compound_ent_value_w_path */
-
-void
-set_compound_ent_value_w_path(ir_entity *ent, ir_node *val, compound_graph_path *path, int pos) {
-	assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
-	assert(is_compound_graph_path(path));
-	assert(0 <= pos && pos < ARR_LEN(ent->attr.cmpd_attr.values));
-	ent->attr.cmpd_attr.values[pos]    = val;
-	ent->attr.cmpd_attr.val_paths[pos] = path;
-}  /* set_compound_ent_value_w_path */
-
-int
-get_compound_ent_n_values(ir_entity *ent) {
-	assert(!ent->has_initializer);
-	assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
-	return ARR_LEN(ent->attr.cmpd_attr.values);
-}  /* get_compound_ent_n_values */
-
-ir_node *
-get_compound_ent_value(ir_entity *ent, int pos) {
-	assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
-	assert(!ent->has_initializer);
-	assert(0 <= pos && pos < ARR_LEN(ent->attr.cmpd_attr.values));
-	return ent->attr.cmpd_attr.values[pos];
-}  /* get_compound_ent_value */
-
-compound_graph_path *
-get_compound_ent_value_path(ir_entity *ent, int pos) {
-	assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
-	assert(!ent->has_initializer);
-	assert(0 <= pos && pos < ARR_LEN(ent->attr.cmpd_attr.val_paths));
-	return ent->attr.cmpd_attr.val_paths[pos];
-}  /* get_compound_ent_value_path */
-
-/**
- * Returns non-zero, if two compound_graph_pathes are equal
- *
- * @param path1            the first path
- * @param visited_indices
- * @param path2            the second path
- */
-static int equal_paths(compound_graph_path *path1, int *visited_indices, compound_graph_path *path2) {
-	int i;
-	int len1 = get_compound_graph_path_length(path1);
-	int len2 = get_compound_graph_path_length(path2);
-
-	if (len2 != len1) return 0;
-
-	for (i = 0; i < len1; i++) {
-		ir_type *tp;
-		ir_entity *node1 = get_compound_graph_path_node(path1, i);
-		ir_entity *node2 = get_compound_graph_path_node(path2, i);
-
-		if (node1 != node2) return 0;
-
-		/* FIXME: Strange code. What is it good for? */
-		tp = get_entity_owner(node1);
-		if (is_Array_type(tp)) {
-			long low;
-
-			/* Compute the index of this node. */
-			assert(get_array_n_dimensions(tp) == 1 && "multidim not implemented");
-
-			low = get_array_lower_bound_int(tp, 0);
-			if (low + visited_indices[i] < get_compound_graph_path_array_index(path2, i)) {
-				visited_indices[i]++;
-				return 0;
-			} else
-				assert(low + visited_indices[i] == get_compound_graph_path_array_index(path2, i));
-		}
-	}
-	return 1;
-}  /* equal_paths */
-
-/**
- * Returns the position of a value with the given path.
- * The path must contain array indices for all array element entities.
- *
- * @todo  This implementation is very slow (O(number of initializers^2) and should
- *        be replaced when the new tree oriented
- *        value representation is finally implemented.
- */
-static int get_compound_ent_pos_by_path(ir_entity *ent, compound_graph_path *path) {
-	int i, n_paths = get_compound_ent_n_values(ent);
-	int *visited_indices;
-	int path_len = get_compound_graph_path_length(path);
-
-	NEW_ARR_A(int *, visited_indices, path_len);
-	memset(visited_indices, 0, sizeof(*visited_indices) * path_len);
-	for (i = 0; i < n_paths; i ++) {
-		if (equal_paths(get_compound_ent_value_path(ent, i), visited_indices, path))
-			return i;
-	}
-
-#if 0
-	{
-		int j;
-		printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
-		printf("Entity %s : ", get_entity_name(ent));
-		for (j = 0; j < get_compound_graph_path_length(path); ++j) {
-			ir_entity *node = get_compound_graph_path_node(path, j);
-			printf("%s", get_entity_name(node));
-			if (is_Array_type(get_entity_owner(node)))
-				printf("[%d]", get_compound_graph_path_array_index(path, j));
-		}
-		printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
-	}
-#endif
-
-	assert(0 && "path not found");
-	return -1;
-}  /* get_compound_ent_pos_by_path */
-
-/* Returns a constant value given the access path.
- *  The path must contain array indices for all array element entities. */
-ir_node *get_compound_ent_value_by_path(ir_entity *ent, compound_graph_path *path) {
-	return get_compound_ent_value(ent, get_compound_ent_pos_by_path(ent, path));
-}  /* get_compound_ent_value_by_path */
-
-
-void
-remove_compound_ent_value(ir_entity *ent, ir_entity *value_ent) {
-	int i, n;
-	assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
-
-	n = ARR_LEN(ent->attr.cmpd_attr.val_paths);
-	for (i = 0; i < n; ++i) {
-		compound_graph_path *path = ent->attr.cmpd_attr.val_paths[i];
-		if (path->list[path->len-1].node == value_ent) {
-			for (; i < n - 1; ++i) {
-				ent->attr.cmpd_attr.val_paths[i] = ent->attr.cmpd_attr.val_paths[i+1];
-				ent->attr.cmpd_attr.values[i]    = ent->attr.cmpd_attr.values[i+1];
-			}
-			ARR_SETLEN(ir_entity*, ent->attr.cmpd_attr.val_paths, n - 1);
-			ARR_SETLEN(ir_node*,   ent->attr.cmpd_attr.values,    n - 1);
-			break;
-		}
-	}
-}  /* remove_compound_ent_value */
-
-void
-add_compound_ent_value(ir_entity *ent, ir_node *val, ir_entity *member) {
-	compound_graph_path *path;
-	ir_type *owner_tp = get_entity_owner(member);
-	assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
-	path = new_compound_graph_path(get_entity_type(ent), 1);
-	path->list[0].node = member;
-	if (is_Array_type(owner_tp)) {
-		int max;
-		int i, n;
-
-		assert(get_array_n_dimensions(owner_tp) == 1 && has_array_lower_bound(owner_tp, 0));
-		max = get_array_lower_bound_int(owner_tp, 0) -1;
-		for (i = 0, n = get_compound_ent_n_values(ent); i < n; ++i) {
-			int index = get_compound_graph_path_array_index(get_compound_ent_value_path(ent, i), 0);
-			if (index > max) {
-				max = index;
-			}
-		}
-		path->list[0].index = max + 1;
-	}
-	add_compound_ent_value_w_path(ent, val, path);
-}  /* add_compound_ent_value */
-
-
-ir_entity *
-get_compound_ent_value_member(ir_entity *ent, int pos) {
-	compound_graph_path *path;
-	assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
-	path = get_compound_ent_value_path(ent, pos);
-
-	return get_compound_graph_path_node(path, get_compound_graph_path_length(path)-1);
-}  /* get_compound_ent_value_member */
-
-void
-set_compound_ent_value(ir_entity *ent, ir_node *val, ir_entity *member, int pos) {
-	compound_graph_path *path;
-	assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
-	path = get_compound_ent_value_path(ent, pos);
-	set_compound_graph_path_node(path, 0, member);
-	set_compound_ent_value_w_path(ent, val, path, pos);
-}  /* set_compound_ent_value */
-
-void
-set_array_entity_values(ir_entity *ent, tarval **values, int num_vals) {
-	int i;
-	ir_graph *rem = current_ir_graph;
-	ir_type *arrtp = get_entity_type(ent);
-	ir_node *val;
-	ir_type *elttp = get_array_element_type(arrtp);
-
-	assert(is_Array_type(arrtp));
-	assert(get_array_n_dimensions(arrtp) == 1);
-	/* One bound is sufficient, the number of constant fields makes the
-	   size. */
-	assert(get_array_lower_bound (arrtp, 0) || get_array_upper_bound (arrtp, 0));
-	assert(get_entity_variability(ent) != variability_uninitialized);
-	current_ir_graph = get_const_code_irg();
-
-	for (i = 0; i < num_vals; i++) {
-		val = new_Const_type(values[i], elttp);
-		add_compound_ent_value(ent, val, get_array_element_entity(arrtp));
-		set_compound_graph_path_array_index(get_compound_ent_value_path(ent, i), 0, i);
-	}
-	current_ir_graph = rem;
-}  /* set_array_entity_values */
-
-/* Return the overall offset of value at position pos in bytes. */
-unsigned get_compound_ent_value_offset_bytes(ir_entity *ent, int pos) {
-	compound_graph_path *path;
-	int path_len, i;
-	unsigned offset = 0;
-	ir_type *curr_tp;
-
-	assert(get_type_state(get_entity_type(ent)) == layout_fixed);
-
-	path     = get_compound_ent_value_path(ent, pos);
-	path_len = get_compound_graph_path_length(path);
-	curr_tp  = path->tp;
-
-	for (i = 0; i < path_len; ++i) {
-		if (is_Array_type(curr_tp)) {
-			ir_type *elem_type = get_array_element_type(curr_tp);
-			unsigned size      = get_type_size_bytes(elem_type);
-			unsigned align     = get_type_alignment_bytes(elem_type);
-			int      idx;
-
-			assert(size > 0);
-			if(size % align > 0) {
-				size += align - (size % align);
-			}
-			idx = get_compound_graph_path_array_index(path, i);
-			assert(idx >= 0);
-			offset += size * idx;
-			curr_tp = elem_type;
-		} else {
-			ir_entity *node = get_compound_graph_path_node(path, i);
-			offset += get_entity_offset(node);
-			curr_tp = get_entity_type(node);
-		}
-	}
-
-	return offset;
-}  /* get_compound_ent_value_offset_bytes */
-
-/* Return the offset in bits from the last byte address. */
-unsigned get_compound_ent_value_offset_bit_remainder(ir_entity *ent, int pos) {
-	compound_graph_path *path;
-	int path_len;
-	ir_entity *last_node;
-
-	assert(get_type_state(get_entity_type(ent)) == layout_fixed);
-
-	path      = get_compound_ent_value_path(ent, pos);
-	path_len  = get_compound_graph_path_length(path);
-	last_node = get_compound_graph_path_node(path, path_len - 1);
-
-	if(last_node == NULL)
-		return 0;
-
-  	return get_entity_offset_bits_remainder(last_node);
-}  /* get_compound_ent_value_offset_bit_remainder */
+ir_initializer_t *get_entity_initializer(const ir_entity *entity)
+{
+	return entity->initializer;
+}
 
-int
-(get_entity_offset)(const ir_entity *ent) {
+int (get_entity_offset)(const ir_entity *ent)
+{
 	return _get_entity_offset(ent);
-}  /* get_entity_offset */
+}
 
-void
-(set_entity_offset)(ir_entity *ent, int offset) {
+void (set_entity_offset)(ir_entity *ent, int offset)
+{
 	_set_entity_offset(ent, offset);
-}  /* set_entity_offset */
+}
 
-unsigned char
-(get_entity_offset_bits_remainder)(const ir_entity *ent) {
+unsigned char (get_entity_offset_bits_remainder)(const ir_entity *ent)
+{
 	return _get_entity_offset_bits_remainder(ent);
-}  /* get_entity_offset_bits_remainder */
+}
 
-void
-(set_entity_offset_bits_remainder)(ir_entity *ent, unsigned char offset) {
+void (set_entity_offset_bits_remainder)(ir_entity *ent, unsigned char offset)
+{
 	_set_entity_offset_bits_remainder(ent, offset);
-}  /* set_entity_offset_bits_remainder */
+}
 
-void
-add_entity_overwrites(ir_entity *ent, ir_entity *overwritten) {
-#ifndef NDEBUG
-	ir_type *owner     = get_entity_owner(ent);
-	ir_type *ovw_ovner = get_entity_owner(overwritten);
-	assert(is_Class_type(owner));
-	assert(is_Class_type(ovw_ovner));
-	assert(! is_class_final(ovw_ovner));
-#endif /* NDEBUG */
+void add_entity_overwrites(ir_entity *ent, ir_entity *overwritten)
+{
+	if (ent->overwrites == NULL) {
+		ent->overwrites = NEW_ARR_F(ir_entity*, 0);
+	}
 	ARR_APP1(ir_entity *, ent->overwrites, overwritten);
+	if (overwritten->overwrittenby == NULL) {
+		overwritten->overwrittenby = NEW_ARR_F(ir_entity*, 0);
+	}
 	ARR_APP1(ir_entity *, overwritten->overwrittenby, ent);
-}  /* add_entity_overwrites */
+}
 
-int
-get_entity_n_overwrites(ir_entity *ent) {
-	assert(is_Class_type(get_entity_owner(ent)));
-	return (ARR_LEN(ent->overwrites));
-}  /* get_entity_n_overwrites */
+int get_entity_n_overwrites(const ir_entity *ent)
+{
+	if (ent->overwrites == NULL)
+		return 0;
+	return ARR_LEN(ent->overwrites);
+}
 
-int
-get_entity_overwrites_index(ir_entity *ent, ir_entity *overwritten) {
+int get_entity_overwrites_index(const ir_entity *ent, ir_entity *overwritten)
+{
 	int i, n;
-	assert(is_Class_type(get_entity_owner(ent)));
 	n = get_entity_n_overwrites(ent);
 	for (i = 0; i < n; ++i) {
 		if (get_entity_overwrites(ent, i) == overwritten)
 			return i;
 	}
 	return -1;
-}  /* get_entity_overwrites_index */
+}
 
-ir_entity *
-get_entity_overwrites(ir_entity *ent, int pos) {
-	assert(is_Class_type(get_entity_owner(ent)));
+ir_entity *get_entity_overwrites(const ir_entity *ent, int pos)
+{
 	assert(pos < get_entity_n_overwrites(ent));
 	return ent->overwrites[pos];
-}  /* get_entity_overwrites */
+}
 
-void
-set_entity_overwrites(ir_entity *ent, int pos, ir_entity *overwritten) {
-	assert(is_Class_type(get_entity_owner(ent)));
+void set_entity_overwrites(ir_entity *ent, int pos, ir_entity *overwritten)
+{
 	assert(pos < get_entity_n_overwrites(ent));
 	ent->overwrites[pos] = overwritten;
-}  /* set_entity_overwrites */
+}
 
-void
-remove_entity_overwrites(ir_entity *ent, ir_entity *overwritten) {
+void remove_entity_overwrites(ir_entity *ent, ir_entity *overwritten)
+{
 	int i, n;
-	assert(is_Class_type(get_entity_owner(ent)));
-	n = ARR_LEN(ent->overwrites);
+	n = get_entity_n_overwrites(ent);
 	for (i = 0; i < n; ++i) {
 		if (ent->overwrites[i] == overwritten) {
 			for (; i < n - 1; i++)
@@ -1243,159 +817,142 @@ remove_entity_overwrites(ir_entity *ent, ir_entity *overwritten) {
 			break;
 		}
 	}
-}  /* remove_entity_overwrites */
+}
 
-void
-add_entity_overwrittenby(ir_entity *ent, ir_entity *overwrites) {
-	add_entity_overwrites(overwrites, ent);
-}  /* add_entity_overwrittenby */
 
-int
-get_entity_n_overwrittenby(ir_entity *ent) {
-	assert(is_Class_type(get_entity_owner(ent)));
+int get_entity_n_overwrittenby(const ir_entity *ent)
+{
+	if (ent->overwrittenby == NULL)
+		return 0;
 	return ARR_LEN(ent->overwrittenby);
-}  /* get_entity_n_overwrittenby */
+}
 
-int
-get_entity_overwrittenby_index(ir_entity *ent, ir_entity *overwrites) {
+int get_entity_overwrittenby_index(const ir_entity *ent, ir_entity *overwrites)
+{
 	int i, n;
-	assert(is_Class_type(get_entity_owner(ent)));
 	n = get_entity_n_overwrittenby(ent);
 	for (i = 0; i < n; ++i) {
 		if (get_entity_overwrittenby(ent, i) == overwrites)
 			return i;
 	}
 	return -1;
-}  /* get_entity_overwrittenby_index */
+}
 
-ir_entity *
-get_entity_overwrittenby(ir_entity *ent, int pos) {
-	assert(is_Class_type(get_entity_owner(ent)));
+ir_entity *get_entity_overwrittenby(const ir_entity *ent, int pos)
+{
 	assert(pos < get_entity_n_overwrittenby(ent));
 	return ent->overwrittenby[pos];
-}  /* get_entity_overwrittenby */
+}
 
-void
-set_entity_overwrittenby(ir_entity *ent, int pos, ir_entity *overwrites) {
-	assert(is_Class_type(get_entity_owner(ent)));
+void set_entity_overwrittenby(ir_entity *ent, int pos, ir_entity *overwrites)
+{
 	assert(pos < get_entity_n_overwrittenby(ent));
 	ent->overwrittenby[pos] = overwrites;
-}  /* set_entity_overwrittenby */
+}
 
-void remove_entity_overwrittenby(ir_entity *ent, ir_entity *overwrites) {
+void remove_entity_overwrittenby(ir_entity *ent, ir_entity *overwrites)
+{
 	int i, n;
-	assert(is_Class_type(get_entity_owner(ent)));
 
-	n = ARR_LEN(ent->overwrittenby);
+	n = get_entity_n_overwrittenby(ent);
 	for (i = 0; i < n; ++i) {
 		if (ent->overwrittenby[i] == overwrites) {
-			for(; i < n - 1; ++i)
+			for (; i < n - 1; ++i)
 				ent->overwrittenby[i] = ent->overwrittenby[i+1];
 			ARR_SETLEN(ir_entity*, ent->overwrittenby, n - 1);
 			break;
 		}
 	}
-}  /* remove_entity_overwrittenby */
+}
 
-/* A link to store intermediate information */
-void *
-(get_entity_link)(const ir_entity *ent) {
+void *(get_entity_link)(const ir_entity *ent)
+{
 	return _get_entity_link(ent);
-}  /* get_entity_link */
+}
 
-void
-(set_entity_link)(ir_entity *ent, void *l) {
+void (set_entity_link)(ir_entity *ent, void *l)
+{
 	_set_entity_link(ent, l);
-}  /* set_entity_link */
+}
 
-ir_graph *
-(get_entity_irg)(const ir_entity *ent) {
+ir_graph *(get_entity_irg)(const ir_entity *ent)
+{
 	return _get_entity_irg(ent);
-}  /* get_entity_irg */
+}
 
-void
-set_entity_irg(ir_entity *ent, ir_graph *irg) {
+void set_entity_irg(ir_entity *ent, ir_graph *irg)
+{
 	assert(is_method_entity(ent));
-	/* Wie kann man die Referenz auf einen IRG löschen, z.B. wenn die
-	 * Methode selbst nicht mehr aufgerufen werden kann, die Entität
-	 * aber erhalten bleiben soll?  Wandle die Entitaet in description oder
-	 * inherited um! */
-	/* assert(irg); */
-	assert((irg  && ent->peculiarity == peculiarity_existent) ||
-		(!irg && (ent->peculiarity == peculiarity_existent)
-		&& (ent -> visibility == visibility_external_allocated)) ||
-		(!irg && ent->peculiarity == peculiarity_description) ||
-		(!irg && ent->peculiarity == peculiarity_inherited));
+	assert(get_entity_peculiarity(ent) == peculiarity_existent);
 	ent->attr.mtd_attr.irg = irg;
-}  /* set_entity_irg */
+}
 
-unsigned get_entity_vtable_number(const ir_entity *ent) {
+unsigned get_entity_vtable_number(const ir_entity *ent)
+{
 	assert(is_method_entity((ir_entity *)ent));
 	return ent->attr.mtd_attr.vtable_number;
-}  /* get_entity_vtable_number */
+}
 
-void set_entity_vtable_number(ir_entity *ent, unsigned vtable_number) {
+void set_entity_vtable_number(ir_entity *ent, unsigned vtable_number)
+{
 	assert(is_method_entity(ent));
 	ent->attr.mtd_attr.vtable_number = vtable_number;
-}  /* set_entity_vtable_number */
+}
 
-int
-(is_entity)(const void *thing) {
+int (is_entity)(const void *thing)
+{
 	return _is_entity(thing);
-}  /* is_entity */
+}
 
-int is_atomic_entity(ir_entity *ent) {
+int is_atomic_entity(const ir_entity *ent)
+{
 	ir_type *t      = get_entity_type(ent);
 	const tp_op *op = get_type_tpop(t);
 	return (op == type_primitive || op == type_pointer ||
 		op == type_enumeration || op == type_method);
-}  /* is_atomic_entity */
+}
 
-int is_compound_entity(ir_entity *ent) {
+int is_compound_entity(const ir_entity *ent)
+{
 	ir_type     *t  = get_entity_type(ent);
 	const tp_op *op = get_type_tpop(t);
 	return (op == type_class || op == type_struct ||
 		op == type_array || op == type_union);
-}  /* is_compound_entity */
+}
 
-int is_method_entity(ir_entity *ent) {
+int is_method_entity(const ir_entity *ent)
+{
 	ir_type *t = get_entity_type(ent);
 	return is_Method_type(t);
-}  /* is_method_entity */
-
-/**
- * @todo not implemented!!! */
-int equal_entity(ir_entity *ent1, ir_entity *ent2) {
-	(void) ent1;
-	(void) ent2;
-	fprintf(stderr, " calling unimplemented equal entity!!! \n");
-	return 1;
-}  /* equal_entity */
-
+}
 
-unsigned long (get_entity_visited)(ir_entity *ent) {
+ir_visited_t (get_entity_visited)(const ir_entity *ent)
+{
 	return _get_entity_visited(ent);
-}  /* get_entity_visited */
+}
 
-void (set_entity_visited)(ir_entity *ent, unsigned long num) {
+void (set_entity_visited)(ir_entity *ent, ir_visited_t num)
+{
 	_set_entity_visited(ent, num);
-}  /* set_entity_visited */
+}
 
-/* Sets visited field in ir_entity to entity_visited. */
-void (mark_entity_visited)(ir_entity *ent) {
+void (mark_entity_visited)(ir_entity *ent)
+{
 	_mark_entity_visited(ent);
-}  /* mark_entity_visited */
+}
 
-int (entity_visited)(ir_entity *ent) {
+int (entity_visited)(const ir_entity *ent)
+{
 	return _entity_visited(ent);
-}  /* entity_visited */
+}
 
-int (entity_not_visited)(ir_entity *ent) {
+int (entity_not_visited)(const ir_entity *ent)
+{
 	return _entity_not_visited(ent);
-}  /* entity_not_visited */
+}
 
-/* Returns the mask of the additional entity properties. */
-unsigned get_entity_additional_properties(ir_entity *ent) {
+unsigned get_entity_additional_properties(const ir_entity *ent)
+{
 	ir_graph *irg;
 
 	assert(is_method_entity(ent));
@@ -1410,9 +967,8 @@ unsigned get_entity_additional_properties(ir_entity *ent) {
 		return get_method_additional_properties(get_entity_type(ent));
 
 	return ent->attr.mtd_attr.irg_add_properties;
-}  /* get_entity_additional_properties */
+}
 
-/* Sets the mask of the additional graph properties. */
 void set_entity_additional_properties(ir_entity *ent, unsigned property_mask)
 {
 	ir_graph *irg;
@@ -1428,9 +984,8 @@ void set_entity_additional_properties(ir_entity *ent, unsigned property_mask)
 		* the automatic inheritance of flags will not work */
 		ent->attr.mtd_attr.irg_add_properties = property_mask & ~mtp_property_inherited;
 	}
-}  /* set_entity_additional_properties */
+}
 
-/* Sets one additional graph property. */
 void set_entity_additional_property(ir_entity *ent, mtp_additional_property flag)
 {
 	ir_graph *irg;
@@ -1451,23 +1006,38 @@ void set_entity_additional_property(ir_entity *ent, mtp_additional_property flag
 		* the automatic inheritance of flags will not work */
 		ent->attr.mtd_attr.irg_add_properties = mask | (flag & ~mtp_property_inherited);
 	}
-}  /* set_entity_additional_property */
+}
 
 /* Returns the class type that this type info entity represents or NULL
    if ent is no type info entity. */
-ir_type *(get_entity_repr_class)(const ir_entity *ent) {
+ir_type *(get_entity_repr_class)(const ir_entity *ent)
+{
 	return _get_entity_repr_class(ent);
-}  /* get_entity_repr_class */
+}
 
-dbg_info *(get_entity_dbg_info)(const ir_entity *ent) {
+dbg_info *(get_entity_dbg_info)(const ir_entity *ent)
+{
 	return _get_entity_dbg_info(ent);
-}  /* get_entity_dbg_info */
+}
 
-void (set_entity_dbg_info)(ir_entity *ent, dbg_info *db) {
+void (set_entity_dbg_info)(ir_entity *ent, dbg_info *db)
+{
 	_set_entity_dbg_info(ent, db);
-}  /* set_entity_dbg_info */
+}
+
+int entity_is_externally_visible(const ir_entity *entity)
+{
+	return get_entity_visibility(entity) != ir_visibility_local
+		|| (get_entity_linkage(entity) & IR_LINKAGE_HIDDEN_USER);
+}
+
+int entity_has_definition(const ir_entity *entity)
+{
+	return entity->initializer != NULL
+		|| get_entity_irg(entity) != NULL
+		|| entity_has_compound_ent_values(entity);
+}
 
-/* Initialize entity module. */
 void firm_init_entity(void)
 {
 	symconst_symbol sym;
@@ -1476,11 +1046,40 @@ void firm_init_entity(void)
 	assert(!unknown_entity && "Call firm_init_entity() only once!");
 
 	unknown_entity = new_rd_entity(NULL, firm_unknown_type, new_id_from_str(UNKNOWN_ENTITY_NAME), firm_unknown_type);
-	set_entity_visibility(unknown_entity, visibility_external_allocated);
+	set_entity_visibility(unknown_entity, ir_visibility_external);
+
 	set_entity_ld_ident(unknown_entity, get_entity_ident(unknown_entity));
 
-	current_ir_graph      = get_const_code_irg();
-	sym.entity_p          = unknown_entity;
-	/* TODO: we need two unknown_entities here, one for code and one for data */
-	unknown_entity->value = new_SymConst(mode_P_data, sym, symconst_addr_ent);
-}  /* firm_init_entity */
+	current_ir_graph = get_const_code_irg();
+	sym.entity_p     = unknown_entity;
+}
+
+ir_allocation get_entity_allocation(const ir_entity *entity)
+{
+	return entity->allocation;
+}
+
+void set_entity_allocation(ir_entity *entity, ir_allocation allocation)
+{
+	entity->allocation = allocation;
+}
+
+ir_peculiarity get_entity_peculiarity(const ir_entity *entity)
+{
+	return entity->peculiarity;
+}
+
+void set_entity_peculiarity(ir_entity *entity, ir_peculiarity peculiarity)
+{
+	entity->peculiarity = peculiarity;
+}
+
+void set_entity_final(ir_entity *entity, int final)
+{
+	entity->final = final;
+}
+
+int is_entity_final(const ir_entity *entity)
+{
+	return entity->final;
+}