- skip_Id nodes when returning the entity initializer: this should fix ldst_opt_id.c
[libfirm] / ir / tr / entity.c
index 20b930d..380ee1e 100644 (file)
 /*
- * Project:     libFIRM
- * File name:   ir/tr/entity.c
- * Purpose:     Representation of all program known entities.
- * Author:      Martin Trapp, Christian Schaefer
- * Modified by: Goetz Lindenmaier
- * Created:
- * CVS-ID:      $Id$
- * Copyright:   (c) 1998-2003 Universität Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
+/**
+ * @file
+ * @brief   Representation of all program known entities.
+ * @author  Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Michael Beck
+ * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-# include <stddef.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stddef.h>
 
 #include "firm_common_t.h"
 
-# include "xmalloc.h"
-# include "entity_t.h"
-# include "mangle.h"
-# include "typegmod.h"
-# include "array.h"
+#include "xmalloc.h"
+#include "entity_t.h"
+#include "array.h"
+#include "irtools.h"
+#include "irhooks.h"
+#include "irprintf.h"
+
+#include "irprog_t.h"
+#include "ircons.h"
+#include "tv_t.h"
+#include "irdump.h"
+#include "irgraph_t.h"
+#include "callgraph.h"
+#include "error.h"
 
-/* All this is needed to build the constant node for methods: */
-# include "irprog_t.h"
-# include "ircons.h"
-# include "tv_t.h"
-
-#if DEBUG_libfirm
-# include "irdump.h"  /* for output if errors occur. */
-#endif
-
-# include "callgraph.h"  /* for dumping debug output */
-
-/*******************************************************************/
+/*-----------------------------------------------------------------*/
 /** general                                                       **/
-/*******************************************************************/
-
-entity *unknown_entity = NULL; entity *get_unknown_entity(void) { return unknown_entity; }
-#define UNKNOWN_ENTITY_NAME "unknown_entity"
-
-static INLINE entity *
-new_rd_entity (dbg_info *db, type *owner, ident *name, type *type);
-
-void
-init_entity (void)
-{
-  symconst_symbol sym;
+/*-----------------------------------------------------------------*/
 
-  assert(firm_unknown_type && "Call init_type before init_entity!");
-  assert(!unknown_entity && "Call 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_ld_ident(unknown_entity, get_entity_ident(unknown_entity));
+ir_entity *unknown_entity = NULL;
 
-  sym.entity_p = unknown_entity;
-  current_ir_graph = get_const_code_irg();
-  unknown_entity->value = new_SymConst(sym, symconst_addr_ent);
-}
+ir_entity *get_unknown_entity(void) { return unknown_entity; }
 
+/** The name of the unknown entity. */
+#define UNKNOWN_ENTITY_NAME "unknown_entity"
 
 /*-----------------------------------------------------------------*/
 /* ENTITY                                                          */
 /*-----------------------------------------------------------------*/
 
-static INLINE void insert_entity_in_owner (entity *ent) {
-  type *owner = ent->owner;
-  switch (get_type_tpop_code(owner)) {
-  case tpo_class: {
-    add_class_member (owner, ent);
-  } break;
-  case tpo_struct: {
-    add_struct_member (owner, ent);
-  } break;
-  case tpo_union: {
-    add_union_member (owner, ent);
-  } break;
-  case tpo_array: {
-    set_array_element_entity(owner, ent);
-  } break;
-  default: assert(0);
-  }
-}
+/**
+ * Add an entity to it's already set owner type.
+ */
+static inline void insert_entity_in_owner(ir_entity *ent) {
+       ir_type *owner = ent->owner;
+       switch (get_type_tpop_code(owner)) {
+       case tpo_class:
+               add_class_member(owner, ent);
+               break;
+       case tpo_struct:
+               add_struct_member(owner, ent);
+               break;
+       case tpo_union:
+               add_union_member(owner, ent);
+               break;
+       case tpo_array:
+               set_array_element_entity(owner, ent);
+               break;
+       default:
+               panic("Unsupported type kind");
+       }
+}  /* insert_entity_in_owner */
 
 /**
- * creates a new entity
+ * Creates a new entity. This entity is NOT inserted in the owner type.
+ *
+ * @param db     debug info for this entity
+ * @param owner  the owner type of the new entity
+ * @param name   the name of the new entity
+ * @param type   the type of the new entity
+ *
+ * @return the new created entity
  */
-static INLINE entity *
-new_rd_entity (dbg_info *db, type *owner, ident *name, type *type)
+static inline ir_entity *
+new_rd_entity(dbg_info *db, ir_type *owner, ident *name, ir_type *type)
 {
-  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->kind = k_entity;
-  res->owner = owner;
-  res->name = name;
-  res->type = type;
-
-  if (get_type_tpop(type) == type_method)
-    res->allocation = allocation_static;
-  else
-    res->allocation = allocation_automatic;
-
-  res->visibility = visibility_local;
-  res->offset = -1;
-  if (is_Method_type(type)) {
-    symconst_symbol sym;
-    sym.entity_p = res;
-    res->variability = variability_constant;
-    rem = current_ir_graph;
-    current_ir_graph = get_const_code_irg();
-    res->value = new_SymConst(sym, symconst_addr_ent);
-    current_ir_graph = rem;
-  } else {
-    res->variability = variability_uninitialized;
-    res->value  = NULL;
-    res->values = NULL;
-    res->val_paths = NULL;
-  }
-  res->peculiarity   = peculiarity_existent;
-  res->volatility    = volatility_non_volatile;
-  res->stickyness    = stickyness_unsticky;
-  res->ld_name       = NULL;
-  if (is_Class_type(owner)) {
-    res->overwrites    = NEW_ARR_F(entity *, 0);
-    res->overwrittenby = NEW_ARR_F(entity *, 0);
-  } else {
-    res->overwrites    = NULL;
-    res->overwrittenby = NULL;
-  }
-  res->irg = NULL;
-
-  //res->accesses = NULL;
+       ir_entity *res;
+       ir_graph *rem;
+
+       assert(!id_contains_char(name, ' ') && "entity name should not contain spaces");
+
+       res = XMALLOCZ(ir_entity);
+
+       res->kind    = k_entity;
+       res->name    = name;
+       res->ld_name = NULL;
+       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->usage                = ir_usage_unknown;
+       res->final                = 0;
+       res->compiler_gen         = 0;
+       res->backend_marked       = 0;
+       res->offset               = -1;
+       res->offset_bit_remainder = 0;
+       res->link                 = NULL;
+       res->repr_class           = NULL;
+
+       if (is_Method_type(type)) {
+               symconst_symbol sym;
+               ir_mode *mode = is_Method_type(type) ? mode_P_code : mode_P_data;
+               sym.entity_p            = res;
+               rem                     = current_ir_graph;
+               current_ir_graph        = get_const_code_irg();
+               res->value              = new_SymConst(mode, sym, symconst_addr_ent);
+               current_ir_graph        = rem;
+               res->allocation         = allocation_static;
+               res->variability        = variability_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;
+       }
 
 #ifdef DEBUG_libfirm
-  res->nr = get_irp_new_node_nr();
+       res->nr = get_irp_new_node_nr();
 #endif /* DEBUG_libfirm */
 
-  res->visit = 0;
-  set_entity_dbg_info(res, db);
+       res->visit = 0;
+       set_entity_dbg_info(res, db);
 
-  return res;
-}
+       return res;
+}  /* new_rd_entity */
 
-entity *
-new_d_entity (type *owner, ident *name, type *type, dbg_info *db) {
-  entity *res;
+ir_entity *
+new_d_entity(ir_type *owner, ident *name, ir_type *type, dbg_info *db) {
+       ir_entity *res;
 
-  assert_legal_owner_of_ent(owner);
-  res = new_rd_entity(db, owner, name, type);
-  /* Remember entity in it's owner. */
-  insert_entity_in_owner (res);
-
-  return res;
-}
-
-entity *
-new_entity (type *owner, ident *name, type *type) {
-  return new_d_entity(owner, name, type, NULL);
-}
+       assert(is_compound_type(owner));
+       res = new_rd_entity(db, owner, name, type);
+       /* Remember entity in it's owner. */
+       insert_entity_in_owner(res);
 
+       hook_new_entity(res);
+       return res;
+}  /* new_d_entity */
 
+ir_entity *
+new_entity(ir_type *owner, ident *name, ir_type *type) {
+       return new_d_entity(owner, name, type, NULL);
+}  /* new_entity */
 
+/**
+ * Free entity attributes.
+ *
+ * @param ent  the entity
+ */
+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 (is_compound_entity(ent)) {
+               if (ent->has_initializer) {
+                       /* TODO: free initializers */
+               } else {
+                       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]) {
+                                               /* free_compound_graph_path(ent->attr.cmpd_attr.val_paths[i]) ;  * @@@ warum nich? */
+                                               /* Geht nich: wird mehrfach verwendet!!! ==> mehrfach frei gegeben. */
+                                               /* DEL_ARR_F(ent->attr.cmpd_attr.val_paths); */
+                                       }
+                                       ent->attr.cmpd_attr.val_paths = NULL;
+                       }
+                       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) {
+                       DEL_ARR_F(ent->attr.mtd_attr.param_access);
+                       ent->attr.mtd_attr.param_access = NULL;
+               }
+               if (ent->attr.mtd_attr.param_weight) {
+                       DEL_ARR_F(ent->attr.mtd_attr.param_weight);
+                       ent->attr.mtd_attr.param_weight = NULL;
+               }
+       }
+}  /* free_entity_attrs */
 
-static void free_entity_attrs(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->values) DEL_ARR_F(ent->values); *//* @@@ warum nich? */
-  if (ent->val_paths) {
-    if (is_compound_entity(ent))
-      for (i = 0; i < get_compound_ent_n_values(ent); i++)
-    if (ent->val_paths[i]) ;
-    /* free_compound_graph_path(ent->val_paths[i]) ;  * @@@ warum nich? */
-    /* Geht nich: wird mehrfach verwendet!!! ==> mehrfach frei gegeben. */
-    /* DEL_ARR_F(ent->val_paths); */
-  }
-  ent->val_paths = NULL;
-  ent->values = NULL;
-}
-
-entity *
-copy_entity_own (entity *old, type *new_owner) {
-  entity *newe;
-  assert(old && old->kind == k_entity);
-  assert_legal_owner_of_ent(new_owner);
-
-  if (old->owner == new_owner) return old;
-  newe = xmalloc(sizeof(*newe));
-  memcpy (newe, old, sizeof(*newe));
-  newe->owner = new_owner;
-  if (is_Class_type(new_owner)) {
-    newe->overwrites    = NEW_ARR_F(entity *, 0);
-    newe->overwrittenby = NEW_ARR_F(entity *, 0);
-  }
-#ifdef DEBUG_libfirm
-  newe->nr = get_irp_new_node_nr();
-#endif
-
-  insert_entity_in_owner (newe);
-
-  return newe;
-}
+/**
+ * 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 (is_compound_entity(old)) {
+               if (old->has_initializer) {
+                       /* FIXME: the initializers are NOT copied */
+               } else {
+                       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;
+       }
 
-entity *
-copy_entity_name (entity *old, ident *new_name) {
-  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->name = new_name;
-  newe->ld_name = NULL;
-  if (is_Class_type(newe->owner)) {
-    newe->overwrites    = DUP_ARR_F(entity *, old->overwrites);
-    newe->overwrittenby = DUP_ARR_F(entity *, old->overwrittenby);
-  }
 #ifdef DEBUG_libfirm
-  newe->nr = get_irp_new_node_nr();
+       newe->nr = get_irp_new_node_nr();
 #endif
-
-  insert_entity_in_owner (newe);
-
-  return newe;
+       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 *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;
+
+       /* 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);
+       }
+
+       insert_entity_in_owner(newe);
+       return newe;
+}  /* copy_entity_own */
+
+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 = 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);
+       }
+       insert_entity_in_owner(newe);
+
+       return newe;
+}  /* copy_entity_name */
 
 void
-free_entity (entity *ent) {
-  assert(ent && ent->kind == k_entity);
-  free_entity_attrs(ent);
-  ent->kind = k_BAD;
-  free(ent);
-}
+free_entity(ir_entity *ent) {
+       assert(ent && ent->kind == k_entity);
+       free_entity_attrs(ent);
+       ent->kind = k_BAD;
+       free(ent);
+}  /* free_entity */
 
 /* Outputs a unique number for this node */
 long
-get_entity_nr(entity *ent) {
-  assert(ent && ent->kind == k_entity);
+get_entity_nr(const ir_entity *ent) {
+       assert(ent && ent->kind == k_entity);
 #ifdef DEBUG_libfirm
-  return ent->nr;
+       return ent->nr;
 #else
-  return 0;
+       return (long)PTR_TO_INT(ent);
 #endif
-}
+}  /* get_entity_nr */
 
 const char *
-(get_entity_name)(const entity *ent) {
-  return __get_entity_name(ent);
-}
+(get_entity_name)(const ir_entity *ent) {
+       return _get_entity_name(ent);
+}  /* get_entity_name */
 
 ident *
-(get_entity_ident)(const entity *ent) {
-  return get_entity_ident(ent);
-}
+(get_entity_ident)(const ir_entity *ent) {
+       return _get_entity_ident(ent);
+}  /* get_entity_ident */
 
-/*
-void   set_entitye_ld_name  (entity *, char *ld_name);
-void   set_entity_ld_ident (entity *, ident *ld_ident);
-*/
+void
+(set_entity_ident)(ir_entity *ent, ident *id) {
+       _set_entity_ident(ent, id);
+}  /* set_entity_ident */
 
-type *
-(get_entity_owner)(entity *ent) {
-  return __get_entity_owner(ent);
-}
+ir_type *
+(get_entity_owner)(ir_entity *ent) {
+       return _get_entity_owner(ent);
+}  /* get_entity_owner */
 
 void
-set_entity_owner (entity *ent, type *owner) {
-  assert(ent && ent->kind == k_entity);
-  assert_legal_owner_of_ent(owner);
-  ent->owner = owner;
-}
-
-void   /* should this go into type.c? */
-assert_legal_owner_of_ent(type *owner) {
-  assert(get_type_tpop_code(owner) == tpo_class ||
-          get_type_tpop_code(owner) == tpo_union ||
-          get_type_tpop_code(owner) == tpo_struct ||
-      get_type_tpop_code(owner) == tpo_array);   /* Yes, array has an entity
-                            -- to select fields! */
-}
+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)(entity *ent) {
-  return __get_entity_ld_ident(ent);
-}
+(get_entity_ld_ident)(ir_entity *ent) {
+       return _get_entity_ld_ident(ent);
+}  /* get_entity_ld_ident */
 
 void
-(set_entity_ld_ident)(entity *ent, ident *ld_ident) {
-   __set_entity_ld_ident(ent, ld_ident);
-}
+(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)(entity *ent) {
-  return __get_entity_ld_name(ent);
-}
+(get_entity_ld_name)(ir_entity *ent) {
+       return _get_entity_ld_name(ent);
+}  /* get_entity_ld_name */
 
-type *
-(get_entity_type)(entity *ent) {
-  return __get_entity_type(ent);
-}
+ir_type *
+(get_entity_type)(ir_entity *ent) {
+       return _get_entity_type(ent);
+}  /* get_entity_type */
 
 void
-(set_entity_type)(entity *ent, type *type) {
-  __set_entity_type(ent, type);
-}
+(set_entity_type)(ir_entity *ent, ir_type *type) {
+       _set_entity_type(ent, type);
+}  /* set_entity_type */
 
-ent_allocation
-(get_entity_allocation)(const entity *ent) {
-  return __get_entity_allocation(ent);
-}
+ir_allocation
+(get_entity_allocation)(const ir_entity *ent) {
+       return _get_entity_allocation(ent);
+}  /* get_entity_allocation */
 
 void
-(set_entity_allocation)(entity *ent, ent_allocation al) {
-  __set_entity_allocation(ent, al);
-}
+(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(ent_allocation all)
+const char *get_allocation_name(ir_allocation all)
 {
 #define X(a)    case a: return #a
-  switch (all) {
-    X(allocation_automatic);
-    X(allocation_parameter);
-    X(allocation_dynamic);
-    X(allocation_static);
+       switch (all) {
+       X(allocation_automatic);
+       X(allocation_parameter);
+       X(allocation_dynamic);
+       X(allocation_static);
     default: return "BAD VALUE";
-  }
+       }
 #undef X
-}
+}  /* get_allocation_name */
 
-
-ent_visibility
-(get_entity_visibility)(const entity *ent) {
-  return __get_entity_visibility(ent);
-}
+ir_visibility
+(get_entity_visibility)(const ir_entity *ent) {
+       return _get_entity_visibility(ent);
+}  /* get_entity_visibility */
 
 void
-set_entity_visibility (entity *ent, ent_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(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 the name of the visibility */
-const char *get_visibility_name(ent_visibility vis)
+const char *get_visibility_name(ir_visibility vis)
 {
 #define X(a)    case a: return #a
-  switch (vis) {
-    X(visibility_local);
-    X(visibility_external_visible);
-    X(visibility_external_allocated);
+       switch (vis) {
+       X(visibility_local);
+       X(visibility_external_visible);
+       X(visibility_external_allocated);
     default: return "BAD VALUE";
-  }
+       }
 #undef X
-}
+}  /* get_visibility_name */
 
-ent_variability
-(get_entity_variability)(const entity *ent) {
-  return __get_entity_variability(ent);
-}
+ir_variability
+(get_entity_variability)(const ir_entity *ent) {
+       return _get_entity_variability(ent);
+}  /* get_entity_variability */
 
 void
-set_entity_variability (entity *ent, ent_variability var)
+set_entity_variability(ir_entity *ent, ir_variability var)
 {
-  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 datastructures for constant values */
-    ent->values    = NEW_ARR_F(ir_node *, 0);
-    ent->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 datastructures for constant values */
-    DEL_ARR_F(ent->values);    ent->values    = NULL;
-    DEL_ARR_F(ent->val_paths); ent->val_paths = NULL;
-  }
-  ent->variability = var;
-}
-
-/* return the name of the variablity */
-const char *get_variability_name(ent_variability var)
+       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 */
+
+/* return the name of the variability */
+const char *get_variability_name(ir_variability var)
 {
 #define X(a)    case a: return #a
-  switch (var) {
-    X(variability_uninitialized);
-    X(variability_initialized);
-    X(variability_part_constant);
-    X(variability_constant);
+       switch (var) {
+       X(variability_uninitialized);
+       X(variability_initialized);
+       X(variability_part_constant);
+       X(variability_constant);
     default: return "BAD VALUE";
-  }
+       }
 #undef X
-}
+}  /* get_variability_name */
 
-ent_volatility
-(get_entity_volatility)(const entity *ent) {
-  return __get_entity_volatility(ent);
-}
+ir_volatility
+(get_entity_volatility)(const ir_entity *ent) {
+       return _get_entity_volatility(ent);
+}  /* get_entity_volatility */
 
 void
-(set_entity_volatility)(entity *ent, ent_volatility vol) {
-  __set_entity_volatility(ent, vol);
-}
+(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(ent_volatility var)
+/* Return the name of the volatility. */
+const char *get_volatility_name(ir_volatility var)
 {
 #define X(a)    case a: return #a
-  switch (var) {
-    X(volatility_non_volatile);
-    X(volatility_is_volatile);
+       switch (var) {
+       X(volatility_non_volatile);
+       X(volatility_is_volatile);
     default: return "BAD VALUE";
-  }
+       }
 #undef X
-}
+}  /* get_volatility_name */
 
-peculiarity
-(get_entity_peculiarity)(const entity *ent) {
-  return __get_entity_peculiarity(ent);
-}
+ir_align
+(get_entity_align)(const ir_entity *ent) {
+       return _get_entity_align(ent);
+}  /* get_entity_align */
 
 void
-(set_entity_peculiarity)(entity *ent, peculiarity pec) {
-  __set_entity_peculiarity(ent, pec);
-}
+(set_entity_align)(ir_entity *ent, ir_align a) {
+       _set_entity_align(ent, a);
+}  /* set_entity_align */
 
-/* return the name of the peculiarity */
-const char *get_peculiarity_name(peculiarity var)
+/* Return the name of the alignment. */
+const char *get_align_name(ir_align a)
 {
 #define X(a)    case a: return #a
-  switch (var) {
-    X(peculiarity_description);
-    X(peculiarity_inherited);
-    X(peculiarity_existent);
-    default: return "BAD VALUE";
-  }
+       switch (a) {
+       X(align_non_aligned);
+       X(align_is_aligned);
+       default: return "BAD VALUE";
+       }
 #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_peculiarity)(ir_entity *ent, ir_peculiarity pec) {
+       _set_entity_peculiarity(ent, pec);
+}  /* set_entity_peculiarity */
+
+/* Checks if an entity cannot be overridden anymore. */
+int (is_entity_final)(const ir_entity *ent) {
+       return _is_entity_final(ent);
+}  /* is_entity_final */
+
+/* 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 */
+
+/* Checks if an entity is compiler generated */
+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) {
+       _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 */
+
+/* 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 */
+
+ir_entity_usage (get_entity_usage)(const ir_entity *ent) {
+       return _get_entity_usage(ent);
 }
 
-/* Get the entity's stickyness */
-ent_stickyness
-(get_entity_stickyness)(const entity *ent) {
-  return __get_entity_stickyness(ent);
+void (set_entity_usage)(ir_entity *ent, ir_entity_usage flags) {
+       _set_entity_usage(ent, flags);
 }
 
+/* Get the entity's stickyness */
+ir_stickyness
+(get_entity_stickyness)(const ir_entity *ent) {
+       return _get_entity_stickyness(ent);
+}  /* get_entity_stickyness */
+
 /* Set the entity's stickyness */
 void
-(set_entity_stickyness)(entity *ent, ent_stickyness stickyness) {
-  __set_entity_stickyness(ent, stickyness);
-}
+(set_entity_stickyness)(ir_entity *ent, ir_stickyness stickyness) {
+       _set_entity_stickyness(ent, stickyness);
+}  /* set_entity_stickyness */
 
 /* Set has no effect for existent entities of type method. */
 ir_node *
-get_atomic_ent_value(entity *ent)
+get_atomic_ent_value(ir_entity *ent)
 {
-  assert(ent && is_atomic_entity(ent));
-  assert(ent->variability != variability_uninitialized);
-  return skip_Id (ent->value);
-}
+       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(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;
-  ent->value = val;
-}
+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 */
 
 /* Returns true if the the node is representable as code on
  *  const_code_irg. */
 int is_irn_const_expression(ir_node *n) {
-  ir_mode *m;
-
-  /* we are in danger iff an exception will arise. TODO: be more precisely,
-   * for instance Div. will NOT rise if divisor != 0
-   */
-  if (is_binop(n) && !is_fragile_op(n))
-    return is_irn_const_expression(get_binop_left(n)) && is_irn_const_expression(get_binop_right(n));
-
-  m = get_irn_mode(n);
-  switch(get_irn_opcode(n)) {
-  case iro_Const:
-  case iro_SymConst:
-  case iro_Unknown:
-    return true; break;
-  case iro_Conv:
-  case iro_Cast:
-    return is_irn_const_expression(get_irn_n(n, 0));
-  default:
-    return false;
-    break;
-  }
-  return false;
+       ir_mode *m;
+
+       /* we are in danger iff an exception will arise. TODO: be more precisely,
+        * for instance Div. will NOT rise if divisor != 0
+        */
+       if (is_binop(n) && !is_fragile_op(n))
+               return is_irn_const_expression(get_binop_left(n)) && is_irn_const_expression(get_binop_right(n));
+
+       m = get_irn_mode(n);
+       switch (get_irn_opcode(n)) {
+       case iro_Const:
+       case iro_SymConst:
+       case iro_Unknown:
+               return 1;
+       case iro_Conv:
+       case iro_Cast:
+               return is_irn_const_expression(get_irn_n(n, 0));
+       default:
+               break;
+       }
+       return 0;
+}  /* is_irn_const_expression */
+
+/*
+ * 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 *nn;
+       ir_mode *m;
+
+       /* @@@ GL I think  we should implement this using the routines from irgopt for
+              dead node elimination/inlineing. */
+
+       m = get_irn_mode(n);
+       switch (get_irn_opcode(n)) {
+       case iro_Const:
+               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),
+                       get_SymConst_value_type(n));
+               break;
+       case iro_Add:
+               nn = new_d_Add(dbg, copy_const_value(dbg, get_Add_left(n)),
+                       copy_const_value(dbg, get_Add_right(n)), m); break;
+       case iro_Sub:
+               nn = new_d_Sub(dbg, copy_const_value(dbg, get_Sub_left(n)),
+                       copy_const_value(dbg, get_Sub_right(n)), m); break;
+       case iro_Mul:
+               nn = new_d_Mul(dbg, copy_const_value(dbg, get_Mul_left(n)),
+                       copy_const_value(dbg, get_Mul_right(n)), m); break;
+       case iro_And:
+               nn = new_d_And(dbg, copy_const_value(dbg, get_And_left(n)),
+                       copy_const_value(dbg, get_And_right(n)), m); break;
+       case iro_Or:
+               nn = new_d_Or(dbg, copy_const_value(dbg, get_Or_left(n)),
+                       copy_const_value(dbg, get_Or_right(n)), m); break;
+       case iro_Eor:
+               nn = new_d_Eor(dbg, copy_const_value(dbg, get_Eor_left(n)),
+                       copy_const_value(dbg, get_Eor_right(n)), m); break;
+       case iro_Cast:
+               nn = new_d_Cast(dbg, copy_const_value(dbg, get_Cast_op(n)), get_Cast_type(n)); break;
+       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;
+       default:
+               assert(0 && "opcode invalid or not implemented");
+               nn = NULL;
+               break;
+       }
+       return nn;
+}  /* copy_const_value */
+
+static ir_initializer_t null_initializer = { IR_INITIALIZER_NULL };
+
+ir_initializer_t *get_initializer_null(void)
+{
+       return &null_initializer;
 }
 
+ir_initializer_t *create_initializer_const(ir_node *value)
+{
+       struct obstack *obst = get_irg_obstack(get_const_code_irg());
 
-ir_node *copy_const_value(ir_node *n) {
-  ir_node *nn;
-  ir_mode *m;
-
-  /* @@@ GL I think  we should implement this using the routines from irgopt for
-     dead node elimination/inlineing. */
-
-  m = get_irn_mode(n);
-  switch(get_irn_opcode(n)) {
-  case iro_Const:
-    nn = new_Const(m, get_Const_tarval(n));     set_Const_type(nn, get_Const_type(n));
-    //nn = new_rd_Const_type(get_irn_dbg_info(n), current_ir_graph, get_cur_block(),
-    //            m,  get_Const_tarval(n), get_Const_type(n));
-    break;
-  case iro_SymConst:
-    nn = new_d_SymConst_type(NULL, get_SymConst_symbol(n), get_SymConst_kind(n),
-                            get_SymConst_value_type(n));
-    break;
-  case iro_Add:
-    nn = new_Add(copy_const_value(get_Add_left(n)),
-                copy_const_value(get_Add_right(n)), m); break;
-  case iro_Sub:
-    nn = new_Sub(copy_const_value(get_Sub_left(n)),
-                copy_const_value(get_Sub_right(n)), m); break;
-  case iro_Mul:
-    nn = new_Mul(copy_const_value(get_Mul_left(n)),
-                copy_const_value(get_Mul_right(n)), m); break;
-  case iro_And:
-    nn = new_And(copy_const_value(get_And_left(n)),
-                copy_const_value(get_And_right(n)), m); break;
-  case iro_Or:
-    nn = new_Or(copy_const_value(get_Or_left(n)),
-               copy_const_value(get_Or_right(n)), m); break;
-  case iro_Eor:
-    nn = new_Eor(copy_const_value(get_Eor_left(n)),
-                copy_const_value(get_Eor_right(n)), m); break;
-  case iro_Cast:
-    nn = new_Cast(copy_const_value(get_Cast_op(n)), get_Cast_type(n)); break;
-  case iro_Conv:
-    nn = new_Conv(copy_const_value(get_Conv_op(n)), m); break;
-  case iro_Unknown:
-    nn = new_Unknown(m); break;
-  default:
-    DDMN(n);
-    assert(0 && "opcode invalid or not implemented");
-    nn = NULL;
-    break;
-  }
-  return nn;
-}
+       ir_initializer_t *initializer
+               = obstack_alloc(obst, sizeof(ir_initializer_const_t));
+       initializer->kind         = IR_INITIALIZER_CONST;
+       initializer->consti.value = value;
 
-compound_graph_path *
-new_compound_graph_path(type *tp, int length) {
-  compound_graph_path *res;
+       return initializer;
+}
 
-  assert(is_type(tp) && is_compound_type(tp));
-  assert(length > 0);
+ir_initializer_t *create_initializer_tarval(tarval *tv)
+{
+       struct obstack *obst = get_irg_obstack(get_const_code_irg());
 
-  res = xmalloc(sizeof(*res) + (length-1) * sizeof(res->nodes[0]));
-  memset(res, 0, sizeof(*res) + (length-1) * sizeof(res->nodes[0]));
-  res->kind         = k_ir_compound_graph_path;
-  res->tp           = tp;
-  res->len          = length;
-  res->arr_indicees = xcalloc(length, sizeof(res ->arr_indicees[0]));
+       ir_initializer_t *initializer
+               = obstack_alloc(obst, sizeof(ir_initializer_tarval_t));
+       initializer->kind         = IR_INITIALIZER_TARVAL;
+       initializer->tarval.value = tv;
 
-  return res;
+       return initializer;
 }
 
-void
-free_compound_graph_path (compound_graph_path *gr) {
-  assert(gr && is_compound_graph_path(gr));
-  gr->kind = k_BAD;
-  free(gr ->arr_indicees);
-  free(gr);
-}
+ir_initializer_t *create_initializer_compound(unsigned n_entries)
+{
+       struct obstack *obst = get_irg_obstack(get_const_code_irg());
 
-int
-is_compound_graph_path(void *thing) {
-  return (get_kind(thing) == k_ir_compound_graph_path);
-}
+       size_t i;
+       size_t size  = sizeof(ir_initializer_compound_t)
+                    + (n_entries-1) * sizeof(ir_initializer_t*);
 
-/* checks whether nodes 0..pos are correct (all lie on a path.) */
-/* @@@ not implemented */
-int is_proper_compound_graph_path(compound_graph_path *gr, int pos) {
-  int i;
-  entity *node;
-  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 true;
-    if (get_entity_owner(node) != owner) return false;
-    owner = get_entity_type(node);
-  }
-  if (pos == get_compound_graph_path_length(gr))
-    if (!is_atomic_type(owner)) return false;
-  return true;
-}
+       ir_initializer_t *initializer = obstack_alloc(obst, size);
+       initializer->kind                    = IR_INITIALIZER_COMPOUND;
+       initializer->compound.n_initializers = n_entries;
 
-int
-get_compound_graph_path_length(compound_graph_path *gr) {
-  assert(gr && is_compound_graph_path(gr));
-  return gr->len;
-}
+       for(i = 0; i < n_entries; ++i) {
+               initializer->compound.initializers[i] = get_initializer_null();
+       }
 
-entity *
-get_compound_graph_path_node(compound_graph_path *gr, int pos) {
-  assert(gr && is_compound_graph_path(gr));
-  assert(pos >= 0 && pos < gr->len);
-  return gr->nodes[pos];
+       return initializer;
 }
 
-void
-set_compound_graph_path_node(compound_graph_path *gr, int pos, entity *node) {
-  assert(gr && is_compound_graph_path(gr));
-  assert(pos >= 0 && pos < gr->len);
-  assert(is_entity(node));
-  gr->nodes[pos] = node;
-  assert(is_proper_compound_graph_path(gr, pos));
+ir_node *get_initializer_const_value(const ir_initializer_t *initializer)
+{
+       assert(initializer->kind == IR_INITIALIZER_CONST);
+       return skip_Id(initializer->consti.value);
 }
 
-int
-get_compound_graph_path_array_index(compound_graph_path *gr, int pos) {
-  assert(gr && is_compound_graph_path(gr));
-  assert(pos >= 0 && pos < gr->len);
-  return gr->arr_indicees[pos];
+tarval *get_initializer_tarval_value(const ir_initializer_t *initializer)
+{
+       assert(initializer->kind == IR_INITIALIZER_TARVAL);
+       return initializer->tarval.value;
 }
 
-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->arr_indicees[pos] = index;
+unsigned get_initializer_compound_n_entries(const ir_initializer_t *initializer)
+{
+       assert(initializer->kind == IR_INITIALIZER_COMPOUND);
+       return initializer->compound.n_initializers;
 }
 
-/* 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(entity *ent, ir_node *val, compound_graph_path *path) {
-  assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
-  ARR_APP1 (ir_node *, ent->values, val);
-  ARR_APP1 (compound_graph_path *, ent->val_paths, path);
-}
+void set_initializer_compound_value(ir_initializer_t *initializer,
+                                    unsigned index, ir_initializer_t *value)
+{
+       assert(initializer->kind == IR_INITIALIZER_COMPOUND);
+       assert(index < initializer->compound.n_initializers);
 
-void
-set_compound_ent_value_w_path(entity *ent, ir_node *val, compound_graph_path *path, int pos) {
-  assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
-  ent->values[pos] = val;
-  ent->val_paths[pos] = path;
+       initializer->compound.initializers[index] = value;
 }
 
-int
-get_compound_ent_n_values(entity *ent) {
-  assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
-  return (ARR_LEN (ent->values));
-}
+ir_initializer_t *get_initializer_compound_value(
+               const ir_initializer_t *initializer, unsigned index)
+{
+       assert(initializer->kind == IR_INITIALIZER_COMPOUND);
+       assert(index < initializer->compound.n_initializers);
 
-ir_node  *
-get_compound_ent_value(entity *ent, int pos) {
-  assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
-  return ent->values[pos];
+       return initializer->compound.initializers[index];
 }
 
-compound_graph_path *
-get_compound_ent_value_path(entity *ent, int pos) {
-  assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
-  return ent->val_paths[pos];
+ir_initializer_kind_t get_initializer_kind(const ir_initializer_t *initializer)
+{
+       return initializer->kind;
 }
 
-/**
- * Returns non-zero, if two compound_graph_pathes are equal
- */
-static int equal_paths(compound_graph_path *path1, int *visited_indicees, 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 false;
-
-  for (i = 0; i < len1; i++) {
-    type   *tp;
-    entity *node1 = get_compound_graph_path_node(path1, i);
-    entity *node2 = get_compound_graph_path_node(path2, i);
-
-    if (node1 != node2) return false;
-
-    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_indicees[i] < get_compound_graph_path_array_index(path2, i)) {
-             visited_indicees[i]++;
-             return false;
-      } else {
-             assert(low + visited_indicees[i] == get_compound_graph_path_array_index(path2, i));
-      }
-    }
-  }
-  return true;
+static void check_entity_initializer(ir_entity *entity)
+{
+       /* TODO */
+       (void) entity;
 }
 
-/* Returns the position of a value with the given path.
- *  The path must contain array indicees for all array element entities. */
-int get_compound_ent_pos_by_path(entity *ent, compound_graph_path *path) {
-  int i, n_paths = get_compound_ent_n_values(ent);
-  int *visited_indicees = (int *)xcalloc(get_compound_graph_path_length(path), sizeof(int));
-  for (i = 0; i < n_paths; i ++) {
-    if (equal_paths(get_compound_ent_value_path(ent, i), visited_indicees, path))
-      return i;
-  }
-  assert(0 && "path not found");
-  return -1;
+void set_entity_initializer(ir_entity *entity, ir_initializer_t *initializer)
+{
+       entity->attr.initializer = initializer;
+       entity->has_initializer  = 1;
+       check_entity_initializer(entity);
 }
 
-/* Returns a constant value given the access path.
- *  The path must contain array indicees for all array element entities. */
-ir_node *get_compound_ent_value_by_path(entity *ent, compound_graph_path *path) {
-  return get_compound_ent_value(ent, get_compound_ent_pos_by_path(ent, path));
+ir_initializer_t *get_entity_initializer(const ir_entity *entity)
+{
+       assert(entity->has_initializer);
+       return entity->attr.initializer;
 }
 
+/* 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
-remove_compound_ent_value(entity *ent, entity *value_ent) {
-  int i;
-  assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
-  for (i = 0; i < (ARR_LEN (ent->val_paths)); i++) {
-    compound_graph_path *path = ent->val_paths[i];
-    if (path->nodes[path->len-1] == value_ent) {
-      for(; i < (ARR_LEN (ent->val_paths))-1; i++) {
-        ent->val_paths[i] = ent->val_paths[i+1];
-        ent->values[i]   = ent->values[i+1];
-      }
-      ARR_SETLEN(entity*,  ent->val_paths, ARR_LEN(ent->val_paths) - 1);
-      ARR_SETLEN(ir_node*, ent->values,    ARR_LEN(ent->values)    - 1);
-      break;
-    }
-  }
-}
+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 */
 
-void
-add_compound_ent_value(entity *ent, ir_node *val, entity *member) {
-  compound_graph_path *path;
-  type *owner_tp = get_entity_owner(ent);
-  assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
-  path = new_compound_graph_path(owner_tp, 1);
-  path->nodes[0] = member;
-  if (is_Array_type(owner_tp)) {
-    int max;
-    int i;
-
-    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; i < get_compound_ent_n_values(ent); ++i) {
-      int index = get_compound_graph_path_array_index(get_compound_ent_value_path(ent, i), 0);
-      if (index > max) {
-        max = index;
-      }
-    }
-    path->arr_indicees[0] = max + 1;
-  }
-  add_compound_ent_value_w_path(ent, val, path);
-}
+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 */
 
-/* Copies the firm subgraph referenced by val to const_code_irg and adds
-   the node as constant initialization to ent.
-   The subgraph may not contain control flow operations.
 void
-copy_and_add_compound_ent_value(entity *ent, ir_node *val, entity *member) {
-  ir_graph *rem = current_ir_graph;
-
-  assert(get_entity_variability(ent) != variability_uninitialized);
-  current_ir_graph = get_const_code_irg();
-
-  val = copy_const_value(val);
-  add_compound_ent_value(ent, val, member);
-  current_ir_graph = rem;
-  }*/
+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 */
 
-/* Copies the value i of the entity to current_block in current_ir_graph.
-ir_node *
-copy_compound_ent_value(entity *ent, int pos) {
-  assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
-  return copy_const_value(ent->values[pos+1]);
-  }*/
-
-entity   *
-get_compound_ent_value_member(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);
+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
-set_compound_ent_value(entity *ent, ir_node *val, 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);
-}
+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_array_entity_values(entity *ent, tarval **values, int num_vals) {
-  int i;
-  ir_graph *rem = current_ir_graph;
-  type *arrtp = get_entity_type(ent);
-  ir_node *val;
-  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_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_value_offset_bits(entity *ent, int pos) {
-  compound_graph_path *path;
-  int i, path_len;
-  int offset = 0;
-
-  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);
-
-  for (i = 0; i < path_len; ++i) {
-    entity *node = get_compound_graph_path_node(path, i);
-    type *node_tp = get_entity_type(node);
-    type *owner_tp = get_entity_owner(node);
-    if (is_Array_type(owner_tp)) {
-      int size  = get_type_size_bits(node_tp);
-      int align = get_type_alignment_bits(node_tp);
-      if (size < align)
-        size = align;
-      else {
-        assert(size % align == 0);
-        /* ansonsten aufrunden */
-      }
-      offset += size * get_compound_graph_path_array_index(path, i);
-    } else {
-      offset += get_entity_offset_bits(node);
-    }
-  }
-  return offset;
-}
-
-int  get_compound_ent_value_offset_bytes(entity *ent, int pos) {
-  int offset = get_compound_ent_value_offset_bits(ent, pos);
-  assert(offset % 8 == 0);
-  return offset >> 3;
-}
+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 */
 
-static void init_index(type *arr) {
-  int init;
-  int dim = 0;
+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 */
 
-  assert(get_array_n_dimensions(arr) == 1);
+/**
+ * Returns non-zero, if two compound_graph_pathes are equal
+ *
+ * @param path1            the first path
+ * @param path2            the second path
+ */
+static int equal_paths(compound_graph_path *path1, 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;
+
+               tp = get_entity_owner(node1);
+               if (is_Array_type(tp)) {
+                       int index1 = get_compound_graph_path_array_index(path1, i);
+                       int index2 = get_compound_graph_path_array_index(path2, i);
+                       if (index1 != index2)
+                               return 0;
+               }
+       }
+       return 1;
+}  /* equal_paths */
 
-  if (has_array_lower_bound(arr, dim))
-    init = get_array_lower_bound_int(arr, 0) -1;
-  else
-    init = get_array_upper_bound_int(arr, 0) +1;
+/**
+ * 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 * |path|)
+ *        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);
 
-  set_entity_link(get_array_element_entity(arr), (void *)init);
-}
+       for (i = 0; i < n_paths; i ++) {
+               compound_graph_path *gr = get_compound_ent_value_path(ent, i);
+               if (equal_paths(gr, path))
+                       return i;
+       }
+       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) {
+       int pos = get_compound_ent_pos_by_path(ent, path);
+       if (pos >= 0)
+               return get_compound_ent_value(ent, pos);
+       return NULL;
+}  /* get_compound_ent_value_by_path */
 
-static int get_next_index(entity *elem_ent) {
-  type *arr = get_entity_owner(elem_ent);
-  int next;
-  int dim = 0;
-
-  assert(get_array_n_dimensions(arr) == 1);
-
-  if (has_array_lower_bound(arr, dim)) {
-    next = (int)get_entity_link(elem_ent) +1;
-    if (has_array_upper_bound(arr, dim)) {
-      int upper = get_array_upper_bound_int(arr, dim);
-      if (next == upper) next = get_array_lower_bound_int(arr, dim);
-    }
-  } else {
-    next = (int)get_entity_link(elem_ent) -1;
-    if (has_array_lower_bound(arr, dim)) {
-      int upper = get_array_upper_bound_int(arr, dim);
-      if (next == upper) next = get_array_upper_bound_int(arr, dim);
-    }
-  }
-
-  set_entity_link(elem_ent, (void *)next);
-  return next;
-}
 
-/* Compute the array indices in compound graph paths of initialized entities.
- *
- *  All arrays must have fixed lower and upper bounds.  One array can
- *  have an open bound.  If there are several open bounds, we do
- *  nothing.  There must be initializer elements for all array
- *  elements.  Uses the link field in the array element entities.  The
- *  array bounds must be representable as ints.
- *
- *  (If the bounds are not representable as ints we have to represent
- *  the indices as firm nodes.  But still we must be able to
- *  evaluate the index against the upper bound.)
- */
-void compute_compound_ent_array_indicees(entity *ent) {
-  type *tp = get_entity_type(ent);
-  int i, n_vals;
-  entity *unknown_bound_entity = NULL;
-
-  if (!is_compound_type(tp) ||
-      (ent->variability == variability_uninitialized)) return ;
-
-  n_vals = get_compound_ent_n_values(ent);
-  if (n_vals == 0) return;
-
-  /* We can not compute the indexes if there is more than one array
-     with an unknown bound.  For this remember the first entity that
-     represents such an array. It could be ent. */
-  if (is_Array_type(tp)) {
-    int dim = 0;
-
-    assert(get_array_n_dimensions(tp) == 1 && "other not implemented");
-    if (!has_array_lower_bound(tp, dim) || !has_array_upper_bound(tp, dim))
-     unknown_bound_entity = ent;
-  }
-
-  /* Initialize the entity links to lower bound -1 and test all path elements
-     for known bounds. */
-  for (i = 0; i < n_vals; ++i) {
-    compound_graph_path *path = get_compound_ent_value_path(ent, i);
-    int j, path_len =  get_compound_graph_path_length(path);
-    for (j = 0; j < path_len; ++j) {
-      entity *node = get_compound_graph_path_node(path, j);
-      type *elem_tp = get_entity_type(node);
-
-      if (is_Array_type(elem_tp)) {
-        int dim = 0;
-        assert(get_array_n_dimensions(elem_tp) == 1 && "other not implemented");
-        if (!has_array_lower_bound(elem_tp, dim) || !has_array_upper_bound(elem_tp, dim)) {
-          if (!unknown_bound_entity) unknown_bound_entity = node;
-          if (node != unknown_bound_entity) return;
-        }
-
-        init_index(elem_tp);
-      }
-    }
-  }
-
-  /* Finally compute the indexes ... */
-  for (i = 0; i < n_vals; ++i) {
-    compound_graph_path *path = get_compound_ent_value_path(ent, i);
-    int j, path_len =  get_compound_graph_path_length(path);
-    for (j = 0; j < path_len; ++j) {
-      entity *node = get_compound_graph_path_node(path, j);
-      type *owner_tp = get_entity_owner(node);
-      if (is_Array_type(owner_tp))
-        set_compound_graph_path_array_index (path, j, get_next_index(node));
-    }
-  }
-}
+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 */
 
-/** resize: double the allocated buffer */
-static int *resize (int *buf, int *size) {
-  int new_size =  *size * 2;
-  int *new_buf = xcalloc(new_size, sizeof(new_buf[0]));
-  memcpy(new_buf, buf, *size);
-  free(buf);
-  *size = new_size;
-  return new_buf;
-}
+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 */
 
-/* We sort the elements by placing them at their bit offset in an
-   array where each entry represents one bit called permutation.  In
-   fact, we do not place the values themselves, as we would have to
-   copy two things, the value and the path.  We only remember the
-   position in the old order. Each value should have a distinct
-   position in the permutation.
-
-   A second iteration now permutes the actual elements into two
-   new arrays. */
-void sort_compound_ent_values(entity *ent) {
-  type *tp;
-  int i, n_vals;
-  int tp_size;
-  int size;
-  int *permutation;
-
-  int next;
-  ir_node **my_values;
-  compound_graph_path **my_paths;
-
-  assert(get_type_state(get_entity_type(ent)) == layout_fixed);
-
-  tp      = get_entity_type(ent);
-  n_vals  = get_compound_ent_n_values(ent);
-  tp_size = get_type_size_bits(tp);
-
-  if (!is_compound_type(tp)                           ||
-      (ent->variability == variability_uninitialized) ||
-      (get_type_state(tp) != layout_fixed)            ||
-      (n_vals == 0)                                     ) return;
-
-  /* estimated upper bound for size. Better: use flexible array ... */
-  size = ((tp_size > (n_vals * 32)) ? tp_size : (n_vals * 32)) * 4;
-  permutation = xcalloc(size, sizeof(permutation[0]));
-
-  for (i = 0; i < n_vals; ++i) {
-    int pos = get_compound_ent_value_offset_bits(ent, i);
-    while (pos >= size) {
-      permutation = resize(permutation, &size);
-    }
-    assert(pos < size);
-    assert(permutation[pos] == 0 && "two values with the same offset");
-    permutation[pos] = i + 1;         /* We initialized with 0, so we can not distinguish entry 0.
-                     So inc all entries by one. */
-    //fprintf(stderr, "i: %d, pos: %d \n", i, pos);
-  }
-
-  next = 0;
-  my_values = NEW_ARR_F(ir_node *, n_vals);
-  my_paths  = NEW_ARR_F(compound_graph_path *, n_vals);
-  for (i = 0; i < size; ++i) {
-    int pos = permutation[i];
-    if (pos) {
-      //fprintf(stderr, "pos: %d i: %d  next %d \n", i, pos, next);
-      assert(next < n_vals);
-      pos--;   /* We increased the pos by one */
-      my_values[next] = get_compound_ent_value     (ent, pos);
-      my_paths [next] = get_compound_ent_value_path(ent, pos);
-      next++;
-    }
-  }
-  free(permutation);
-
-  DEL_ARR_F(ent->values);
-  ent->values = my_values;
-  DEL_ARR_F(ent->val_paths);
-  ent->val_paths = my_paths;
-}
+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 */
 
-int
-(get_entity_offset_bytes)(const entity *ent) {
-  return __get_entity_offset_bytes(ent);
-}
+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 */
 
 int
-(get_entity_offset_bits)(const entity *ent) {
-  return __get_entity_offset_bits(ent);
-}
+(get_entity_offset)(const ir_entity *ent) {
+       return _get_entity_offset(ent);
+}  /* get_entity_offset */
 
 void
-(set_entity_offset_bytes)(entity *ent, int offset) {
-  __set_entity_offset_bytes(ent, offset);
-}
+(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) {
+       return _get_entity_offset_bits_remainder(ent);
+}  /* get_entity_offset_bits_remainder */
 
 void
-(set_entity_offset_bits)(entity *ent, int offset) {
-  __set_entity_offset_bits(ent, offset);
-}
+(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(entity *ent, entity *overwritten) {
-  assert(ent && is_Class_type(get_entity_owner(ent)));
-  ARR_APP1(entity *, ent->overwrites, overwritten);
-  ARR_APP1(entity *, overwritten->overwrittenby, ent);
-}
+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 */
+       ARR_APP1(ir_entity *, ent->overwrites, overwritten);
+       ARR_APP1(ir_entity *, overwritten->overwrittenby, ent);
+}  /* add_entity_overwrites */
 
 int
-get_entity_n_overwrites(entity *ent) {
-  assert(ent && is_Class_type(get_entity_owner(ent)));
-  return (ARR_LEN(ent->overwrites));
-}
+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_overwrites_index(entity *ent, entity *overwritten) {
-  int i;
-  assert(ent && is_Class_type(get_entity_owner(ent)));
-  for (i = 0; i < get_entity_n_overwrites(ent); i++)
-    if (get_entity_overwrites(ent, i) == overwritten)
-      return i;
-  return -1;
-}
-
-entity *
-get_entity_overwrites   (entity *ent, int pos) {
-  assert(ent && is_Class_type(get_entity_owner(ent)));
-  assert(pos < get_entity_n_overwrites(ent));
-  return ent->overwrites[pos];
-}
+get_entity_overwrites_index(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)));
+       assert(pos < get_entity_n_overwrites(ent));
+       return ent->overwrites[pos];
+}  /* get_entity_overwrites */
 
 void
-set_entity_overwrites   (entity *ent, int pos, entity *overwritten) {
-  assert(ent && is_Class_type(get_entity_owner(ent)));
-  assert(pos < get_entity_n_overwrites(ent));
-  ent->overwrites[pos] = overwritten;
-}
+set_entity_overwrites(ir_entity *ent, int pos, ir_entity *overwritten) {
+       assert(is_Class_type(get_entity_owner(ent)));
+       assert(pos < get_entity_n_overwrites(ent));
+       ent->overwrites[pos] = overwritten;
+}  /* set_entity_overwrites */
 
 void
-remove_entity_overwrites(entity *ent, entity *overwritten) {
-  int i;
-  assert(ent && is_Class_type(get_entity_owner(ent)));
-  for (i = 0; i < (ARR_LEN (ent->overwrites)); i++)
-    if (ent->overwrites[i] == overwritten) {
-      for(; i < (ARR_LEN (ent->overwrites))-1; i++)
-    ent->overwrites[i] = ent->overwrites[i+1];
-      ARR_SETLEN(entity*, ent->overwrites, ARR_LEN(ent->overwrites) - 1);
-      break;
-    }
-}
+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);
+       for (i = 0; i < n; ++i) {
+               if (ent->overwrites[i] == overwritten) {
+                       for (; i < n - 1; i++)
+                               ent->overwrites[i] = ent->overwrites[i+1];
+                       ARR_SETLEN(ir_entity*, ent->overwrites, n - 1);
+                       break;
+               }
+       }
+}  /* remove_entity_overwrites */
 
 void
-add_entity_overwrittenby   (entity *ent, entity *overwrites) {
-  assert(ent && is_Class_type(get_entity_owner(ent)));
-  add_entity_overwrites(overwrites, ent);
-}
+add_entity_overwrittenby(ir_entity *ent, ir_entity *overwrites) {
+       add_entity_overwrites(overwrites, ent);
+}  /* add_entity_overwrittenby */
 
 int
-get_entity_n_overwrittenby (entity *ent) {
-  assert(ent && is_Class_type(get_entity_owner(ent)));
-  return (ARR_LEN (ent->overwrittenby));
-}
+get_entity_n_overwrittenby(ir_entity *ent) {
+       assert(is_Class_type(get_entity_owner(ent)));
+       return ARR_LEN(ent->overwrittenby);
+}  /* get_entity_n_overwrittenby */
 
 int
-get_entity_overwrittenby_index(entity *ent, entity *overwrites) {
-  int i;
-  assert(ent && is_Class_type(get_entity_owner(ent)));
-  for (i = 0; i < get_entity_n_overwrittenby(ent); i++)
-    if (get_entity_overwrittenby(ent, i) == overwrites)
-      return i;
-  return -1;
-}
-
-entity *
-get_entity_overwrittenby   (entity *ent, int pos) {
-  assert(ent && is_Class_type(get_entity_owner(ent)));
-  assert(pos < get_entity_n_overwrittenby(ent));
-  return ent->overwrittenby[pos];
-}
+get_entity_overwrittenby_index(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)));
+       assert(pos < get_entity_n_overwrittenby(ent));
+       return ent->overwrittenby[pos];
+}  /* get_entity_overwrittenby */
 
 void
-set_entity_overwrittenby   (entity *ent, int pos, entity *overwrites) {
-  assert(ent && is_Class_type(get_entity_owner(ent)));
-  assert(pos < get_entity_n_overwrittenby(ent));
-  ent->overwrittenby[pos] = overwrites;
-}
-
-void    remove_entity_overwrittenby(entity *ent, entity *overwrites) {
-  int i;
-  assert(ent  && is_Class_type(get_entity_owner(ent)));
-  for (i = 0; i < (ARR_LEN (ent->overwrittenby)); i++)
-    if (ent->overwrittenby[i] == overwrites) {
-      for(; i < (ARR_LEN (ent->overwrittenby))-1; i++)
-    ent->overwrittenby[i] = ent->overwrittenby[i+1];
-      ARR_SETLEN(entity*, ent->overwrittenby, ARR_LEN(ent->overwrittenby) - 1);
-      break;
-    }
-}
+set_entity_overwrittenby(ir_entity *ent, int pos, ir_entity *overwrites) {
+       assert(is_Class_type(get_entity_owner(ent)));
+       assert(pos < get_entity_n_overwrittenby(ent));
+       ent->overwrittenby[pos] = overwrites;
+}  /* set_entity_overwrittenby */
+
+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);
+       for (i = 0; i < n; ++i) {
+               if (ent->overwrittenby[i] == overwrites) {
+                       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 entity *ent) {
-  return __get_entity_link(ent);
-}
+(get_entity_link)(const ir_entity *ent) {
+       return _get_entity_link(ent);
+}  /* get_entity_link */
 
 void
-(set_entity_link)(entity *ent, void *l) {
-  __set_entity_link(ent, l);
-}
+(set_entity_link)(ir_entity *ent, void *l) {
+       _set_entity_link(ent, l);
+}  /* set_entity_link */
 
 ir_graph *
-(get_entity_irg)(const entity *ent) {
-  return __get_entity_irg(ent);
-}
+(get_entity_irg)(const ir_entity *ent) {
+       return _get_entity_irg(ent);
+}  /* get_entity_irg */
 
 void
-set_entity_irg(entity *ent, ir_graph *irg) {
-  assert(ent && is_Method_type(get_entity_type(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));
-  ent->irg = irg;
-}
+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));
+       ent->attr.mtd_attr.irg = irg;
+}  /* set_entity_irg */
+
+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) {
+       assert(is_method_entity(ent));
+       ent->attr.mtd_attr.vtable_number = vtable_number;
+}  /* set_entity_vtable_number */
 
 int
 (is_entity)(const void *thing) {
-  return __is_entity(thing);
-}
-
-int is_atomic_entity(entity *ent) {
-  type* t = get_entity_type(ent);
-  assert(ent && ent->kind == k_entity);
-  return (is_Primitive_type(t) || is_Pointer_type(t) ||
-      is_Enumeration_type(t) || is_Method_type(t));
-}
-
-int is_compound_entity(entity *ent) {
-  type* t = get_entity_type(ent);
-  assert(ent && ent->kind == k_entity);
-  return (is_Class_type(t) || is_Struct_type(t) ||
-      is_Array_type(t) || is_Union_type(t));
-}
+       return _is_entity(thing);
+}  /* is_entity */
+
+int is_atomic_entity(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) {
+       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) {
+       ir_type *t = get_entity_type(ent);
+       return is_Method_type(t);
+}  /* is_method_entity */
 
 /**
  * @todo not implemented!!! */
-bool equal_entity(entity *ent1, entity *ent2) {
-  fprintf(stderr, " calling unimplemented equal entity!!! \n");
-  return true;
-}
+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(entity *ent) {
-  assert(ent && ent->kind == k_entity);
-  return ent->visit;
-}
-void        set_entity_visited(entity *ent, unsigned long num) {
-  assert(ent && ent->kind == k_entity);
-  ent->visit = num;
-}
-/* Sets visited field in entity to entity_visited. */
-void        mark_entity_visited(entity *ent) {
-  assert(ent && ent->kind == k_entity);
-  ent->visit = type_visited;
-}
+ir_visited_t (get_entity_visited)(ir_entity *ent) {
+       return _get_entity_visited(ent);
+}  /* get_entity_visited */
 
+void (set_entity_visited)(ir_entity *ent, ir_visited_t num) {
+       _set_entity_visited(ent, num);
+}  /* set_entity_visited */
 
-bool entity_visited(entity *ent) {
-  assert(ent && ent->kind == k_entity);
-  return get_entity_visited(ent) >= type_visited;
-}
+/* Sets visited field in ir_entity to entity_visited. */
+void (mark_entity_visited)(ir_entity *ent) {
+       _mark_entity_visited(ent);
+}  /* mark_entity_visited */
 
-bool entity_not_visited(entity *ent) {
-  assert(ent && ent->kind == k_entity);
-  return get_entity_visited(ent) < type_visited;
-}
+int (entity_visited)(ir_entity *ent) {
+       return _entity_visited(ent);
+}  /* entity_visited */
+
+int (entity_not_visited)(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) {
+       ir_graph *irg;
+
+       assert(is_method_entity(ent));
+
+       /* first check, if the graph has additional properties */
+       irg = get_entity_irg(ent);
+
+       if (irg)
+               return get_irg_additional_properties(irg);
+
+       if (ent->attr.mtd_attr.irg_add_properties & mtp_property_inherited)
+               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;
+
+       assert(is_method_entity(ent));
+
+       /* first check, if the graph exists */
+       irg = get_entity_irg(ent);
+       if (irg)
+               set_irg_additional_properties(irg, property_mask);
+       else {
+    /* do not allow to set the mtp_property_inherited flag or
+               * 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;
+
+       assert(is_method_entity(ent));
+
+       /* first check, if the graph exists */
+       irg = get_entity_irg(ent);
+       if (irg)
+               set_irg_additional_property(irg, flag);
+       else {
+               unsigned mask = ent->attr.mtd_attr.irg_add_properties;
+
+               if (mask & mtp_property_inherited)
+                       mask = get_method_additional_properties(get_entity_type(ent));
+
+                       /* do not allow to set the mtp_property_inherited flag or
+               * 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) {
+       return _get_entity_repr_class(ent);
+}  /* get_entity_repr_class */
+
+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) {
+       _set_entity_dbg_info(ent, db);
+}  /* set_entity_dbg_info */
+
+/* Initialize entity module. */
+void firm_init_entity(void)
+{
+       symconst_symbol sym;
+
+       assert(firm_unknown_type && "Call init_type() before firm_init_entity()!");
+       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_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 */