X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Fentity.c;h=c791c24cde0f310801e7ce479a535f7f065930a2;hb=217c4f3a0ffc115825dbebb2270ab1d20c246e97;hp=b13f78f55e18ef91c4efa5ba1971b751c5846cad;hpb=84746215f1d8b47f9a36b9c4e4046bc7da721bf0;p=libfirm

diff --git a/ir/tr/entity.c b/ir/tr/entity.c
index b13f78f55..c791c24cd 100644
--- a/ir/tr/entity.c
+++ b/ir/tr/entity.c
@@ -1,48 +1,77 @@
-/* Copyright (C) 1998 - 2000 by Universitaet Karlsruhe
-* All rights reserved.
-*
-* Authors: Martin Trapp, Christian Schaefer
-*
-*/
-
-/* $Id$ */
-
+/*
+ * 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.
+ */
 #ifdef HAVE_CONFIG_H
-# include <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 "firm_common_t.h"
+
+# include "xmalloc.h"
 # include "entity_t.h"
 # include "mangle.h"
-# include "typegmod_t.h"
+# include "typegmod.h"
 # include "array.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));
+
+  sym.entity_p = unknown_entity;
+  current_ir_graph = get_const_code_irg();
+  unknown_entity->value = new_SymConst(sym, symconst_addr_ent);
 }
 
-/*******************************************************************/
-/** ENTITY                                                        **/
-/*******************************************************************/
 
-/* redeclared to declare INLINE. */
-INLINE entity *get_entity_overwrites   (entity *ent, int pos);
-INLINE entity *get_entity_overwrittenby   (entity *ent, int pos);
-INLINE type   *get_entity_owner (entity *ent);
+/*-----------------------------------------------------------------*/
+/* ENTITY                                                          */
+/*-----------------------------------------------------------------*/
 
-INLINE void insert_entity_in_owner (entity *ent) {
+static INLINE void insert_entity_in_owner (entity *ent) {
   type *owner = ent->owner;
   switch (get_type_tpop_code(owner)) {
   case tpo_class: {
@@ -61,136 +90,171 @@ INLINE void insert_entity_in_owner (entity *ent) {
   }
 }
 
-entity *
-new_entity (type *owner, ident *name, type *type)
+/**
+ * creates a new entity
+ */
+static INLINE entity *
+new_rd_entity (dbg_info *db, type *owner, ident *name, type *type)
 {
   entity *res;
   ir_graph *rem;
 
   assert(!id_contains_char(name, ' ') && "entity name should not contain spaces");
 
-  res = (entity *) malloc (sizeof (entity));
+  res = xmalloc(sizeof(*res));
+  memset(res, 0, sizeof(*res));
   res->kind = k_entity;
-  assert_legal_owner_of_ent(owner);
   res->owner = owner;
   res->name = name;
   res->type = type;
+
   if (get_type_tpop(type) == type_method)
-    res->allocation = static_allocated;
+    res->allocation = allocation_static;
   else
-    res->allocation = automatic_allocated;
-  res->visibility = local;
+    res->allocation = allocation_automatic;
+
+  res->visibility = visibility_local;
   res->offset = -1;
-  if (is_method_type(type)) {
-    res->variability = constant;
+  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_Const(mode_P, new_tarval_from_entity(res, mode_P));
+    res->value = new_SymConst(sym, symconst_addr_ent);
     current_ir_graph = rem;
   } else {
-    res->variability = uninitialized;
-    res->value = NULL;
+    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->peculiarity = existent;
-  res->volatility = non_volatile;
-  res->ld_name = NULL;
-  res->overwrites = NEW_ARR_F(entity *, 1);
-  res->overwrittenby = NEW_ARR_F(entity *, 1);
-
   res->irg = NULL;
 
+  //res->accesses = NULL;
+
 #ifdef DEBUG_libfirm
   res->nr = get_irp_new_node_nr();
-#endif
+#endif /* DEBUG_libfirm */
 
   res->visit = 0;
+  set_entity_dbg_info(res, db);
 
-  /* Remember entity in it's owner. */
-  insert_entity_in_owner (res);
   return res;
 }
+
 entity *
 new_d_entity (type *owner, ident *name, type *type, dbg_info *db) {
-  entity *res = new_entity(owner, name, type);
-  set_entity_dbg_info(res, db);
+  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;
 }
-INLINE void free_entity_attrs(entity *ent) {
-  assert(ent);
+
+entity *
+new_entity (type *owner, ident *name, type *type) {
+  return new_d_entity(owner, name, type, NULL);
+}
+
+
+
+
+static void free_entity_attrs(entity *ent) {
+  int i;
   if (get_type_tpop(get_entity_owner(ent)) == type_class) {
-    DEL_ARR_F(ent->overwrites);
-    DEL_ARR_F(ent->overwrittenby);
+    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 *new;
-
+  entity *newe;
+  assert(old && old->kind == k_entity);
   assert_legal_owner_of_ent(new_owner);
+
   if (old->owner == new_owner) return old;
-  new = (entity *) malloc (sizeof (entity));
-  memcpy (new, old, sizeof (entity));
-  new->owner = new_owner;
-  /*
-  if ((get_type_tpop(get_entity_owner(old)) == type_class) &&
-      (get_type_tpop(new_owner) == type_class)) {
-    new->overwrites = DUP_ARR_F(entity *, old->overwrites);
-    new->overwrittenby = DUP_ARR_F(entity *, old->overwrittenby);
-  } else if ((get_type_tpop(get_entity_owner(old)) != type_class) &&
-	     (get_type_tpop(new_owner) == type_class)) {
-    new->overwrites = NEW_ARR_F(entity *, 1);
-    new->overwrittenby = NEW_ARR_F(entity *, 1);
-  }
-  */
-  if (is_class_type(new_owner)) {
-    new->overwrites = NEW_ARR_F(entity *, 1);
-    new->overwrittenby = NEW_ARR_F(entity *, 1);
+  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
-  new->nr = get_irp_new_node_nr();
+  newe->nr = get_irp_new_node_nr();
 #endif
 
-  insert_entity_in_owner (new);
+  insert_entity_in_owner (newe);
 
-  return new;
+  return newe;
 }
 
 entity *
 copy_entity_name (entity *old, ident *new_name) {
-  entity *new;
+  entity *newe;
+  assert(old && old->kind == k_entity);
 
   if (old->name == new_name) return old;
-  new = (entity *) malloc (sizeof (entity));
-  memcpy (new, old, sizeof (entity));
-  new->name = new_name;
-  new->ld_name = NULL;
-  if (is_class_type(new->owner)) {
-    new->overwrites = DUP_ARR_F(entity *, old->overwrites);
-    new->overwrittenby = DUP_ARR_F(entity *, old->overwrittenby);
+  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
-  new->nr = get_irp_new_node_nr();
+  newe->nr = get_irp_new_node_nr();
 #endif
 
-  insert_entity_in_owner (new);
+  insert_entity_in_owner (newe);
 
-  return new;
+  return newe;
 }
 
 
 void
 free_entity (entity *ent) {
-  free_tarval_entity(ent);
+  assert(ent && ent->kind == k_entity);
   free_entity_attrs(ent);
+  ent->kind = k_BAD;
   free(ent);
 }
 
 /* Outputs a unique number for this node */
-INLINE long
+long
 get_entity_nr(entity *ent) {
-  assert(ent);
+  assert(ent && ent->kind == k_entity);
 #ifdef DEBUG_libfirm
   return ent->nr;
 #else
@@ -198,16 +262,14 @@ get_entity_nr(entity *ent) {
 #endif
 }
 
-INLINE const char *
-get_entity_name (entity *ent) {
-  assert (ent);
-  return id_to_str(get_entity_ident(ent));
+const char *
+(get_entity_name)(const entity *ent) {
+  return _get_entity_name(ent);
 }
 
 ident *
-get_entity_ident    (entity *ent) {
-  assert(ent);
-  return ent->name;
+(get_entity_ident)(const entity *ent) {
+  return get_entity_ident(ent);
 }
 
 /*
@@ -215,106 +277,135 @@ void   set_entitye_ld_name  (entity *, char *ld_name);
 void   set_entity_ld_ident (entity *, ident *ld_ident);
 */
 
-INLINE type *
-get_entity_owner (entity *ent) {
-  return ent->owner = skip_tid(ent->owner);
+type *
+(get_entity_owner)(entity *ent) {
+  return _get_entity_owner(ent);
 }
 
-INLINE void
+void
 set_entity_owner (entity *ent, type *owner) {
+  assert(ent && ent->kind == k_entity);
   assert_legal_owner_of_ent(owner);
   ent->owner = owner;
 }
 
-INLINE void   /* should this go into type.c? */
+void   /* should this go into type.c? */
 assert_legal_owner_of_ent(type *owner) {
-  assert (get_type_tpop_code(owner) == tpo_class ||
+  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! */
+      get_type_tpop_code(owner) == tpo_array);   /* Yes, array has an entity
+                            -- to select fields! */
 }
 
-INLINE ident *
-get_entity_ld_ident (entity *ent)
-{
-  if (ent->ld_name == NULL)
-    ent->ld_name = mangle_entity (ent);
-  return ent->ld_name;
+ident *
+(get_entity_ld_ident)(entity *ent) {
+  return _get_entity_ld_ident(ent);
 }
 
-INLINE void
-set_entity_ld_ident (entity *ent, ident *ld_ident) {
-  ent->ld_name = ld_ident;
+void
+(set_entity_ld_ident)(entity *ent, ident *ld_ident) {
+   _set_entity_ld_ident(ent, ld_ident);
 }
 
-INLINE const char *
-get_entity_ld_name (entity *ent) {
-  return id_to_str(get_entity_ld_ident(ent));
+const char *
+(get_entity_ld_name)(entity *ent) {
+  return _get_entity_ld_name(ent);
 }
 
-/*
-char  *get_entity_ld_name  (entity *);
-void   set_entity_ld_name  (entity *, char *ld_name);
-*/
-
-INLINE type *
-get_entity_type (entity *ent) {
-  return ent->type = skip_tid(ent->type);
+type *
+(get_entity_type)(entity *ent) {
+  return _get_entity_type(ent);
 }
 
-INLINE void
-set_entity_type (entity *ent, type *type) {
-  ent->type = type;
+void
+(set_entity_type)(entity *ent, type *type) {
+  _set_entity_type(ent, type);
 }
 
+ent_allocation
+(get_entity_allocation)(const entity *ent) {
+  return _get_entity_allocation(ent);
+}
 
-INLINE ent_allocation
-get_entity_allocation (entity *ent) {
-  return ent->allocation;
+void
+(set_entity_allocation)(entity *ent, ent_allocation al) {
+  _set_entity_allocation(ent, al);
 }
 
-INLINE void
-set_entity_allocation (entity *ent, ent_allocation al) {
-  ent->allocation = al;
+/* return the name of the visibility */
+const char *get_allocation_name(ent_allocation all)
+{
+#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
 }
 
 
-INLINE ent_visibility
-get_entity_visibility (entity *ent) {
-  return ent->visibility;
+visibility
+(get_entity_visibility)(const entity *ent) {
+  return _get_entity_visibility(ent);
 }
 
-INLINE void
-set_entity_visibility (entity *ent, ent_visibility vis) {
-  if (vis != local)
-    assert((ent->allocation == static_allocated) ||
-	   (ent->allocation == automatic_allocated));
-  // @@@ Test that the owner type is not local, but how??
-  //       && get_class_visibility(get_entity_owner(ent)) != local));
+void
+set_entity_visibility (entity *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;
 }
 
-INLINE ent_variability
-get_entity_variability (entity *ent) {
-  return ent->variability;
+/* return the name of the visibility */
+const char *get_visibility_name(visibility vis)
+{
+#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
 }
 
-INLINE void
-set_entity_variability (entity *ent, ent_variability var){
-  if (var == part_constant)
-    assert(is_class_type(ent->type) || is_struct_type(ent->type));
+ent_variability
+(get_entity_variability)(const entity *ent) {
+  return _get_entity_variability(ent);
+}
+
+void
+set_entity_variability (entity *ent, 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 == uninitialized) && (var != uninitialized)) {
+      (ent->variability == variability_uninitialized) && (var != variability_uninitialized)) {
     /* Allocate datastructures for constant values */
-    ent->values = NEW_ARR_F(ir_node *, 1);
-    ent->val_ents = NEW_ARR_F(entity *, 1);
+    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 == uninitialized) && (ent->variability != uninitialized)) {
+      (var == variability_uninitialized) && (ent->variability != variability_uninitialized)) {
     /* Free datastructures for constant values */
-    DEL_ARR_F(ent->values);
-    DEL_ARR_F(ent->val_ents);
+    DEL_ARR_F(ent->values);    ent->values    = NULL;
+    DEL_ARR_F(ent->val_paths); ent->val_paths = NULL;
   }
   ent->variability = var;
 }
@@ -322,119 +413,411 @@ set_entity_variability (entity *ent, ent_variability var){
 /* return the name of the variablity */
 const char *get_variability_name(ent_variability var)
 {
-#define X(a)	case a: return #a
+#define X(a)    case a: return #a
   switch (var) {
-    X(uninitialized);
-    X(initialized);
-    X(part_constant);
-    X(constant);
+    X(variability_uninitialized);
+    X(variability_initialized);
+    X(variability_part_constant);
+    X(variability_constant);
     default: return "BAD VALUE";
   }
 #undef X
 }
 
-INLINE ent_volatility
-get_entity_volatility (entity *ent) {
-  assert (ent);
-  return ent->volatility;
+ent_volatility
+(get_entity_volatility)(const entity *ent) {
+  return _get_entity_volatility(ent);
 }
 
-INLINE void
-set_entity_volatility (entity *ent, ent_volatility vol) {
-  assert (ent);
-  ent->volatility = vol;
+void
+(set_entity_volatility)(entity *ent, ent_volatility vol) {
+  _set_entity_volatility(ent, vol);
 }
 
 /* return the name of the volatility */
 const char *get_volatility_name(ent_volatility var)
 {
-#define X(a)	case a: return #a
+#define X(a)    case a: return #a
   switch (var) {
-    X(non_volatile);
-    X(is_volatile);
+    X(volatility_non_volatile);
+    X(volatility_is_volatile);
     default: return "BAD VALUE";
   }
 #undef X
 }
 
-INLINE peculiarity
-get_entity_peculiarity (entity *ent) {
-  assert (ent);
-  return ent->peculiarity;
+peculiarity
+(get_entity_peculiarity)(const entity *ent) {
+  return _get_entity_peculiarity(ent);
 }
 
-INLINE void
-set_entity_peculiarity (entity *ent, peculiarity pec) {
-  assert (ent);
-  /* @@@ why peculiarity only for methods? */
-  assert (is_method_type(ent->type));
-  ent->peculiarity = pec;
+void
+(set_entity_peculiarity)(entity *ent, peculiarity pec) {
+  _set_entity_peculiarity(ent, pec);
 }
 
 /* return the name of the peculiarity */
 const char *get_peculiarity_name(peculiarity var)
 {
-#define X(a)	case a: return #a
+#define X(a)    case a: return #a
   switch (var) {
-    X(description);
-    X(inherited);
-    X(existent);
+    X(peculiarity_description);
+    X(peculiarity_inherited);
+    X(peculiarity_existent);
     default: return "BAD VALUE";
   }
 #undef X
 }
 
-/* Set has no effect for entities of type method. */
-INLINE ir_node *
-get_atomic_ent_value(entity *ent) {
-  assert(ent); assert(is_atomic_entity(ent));
-  assert((ent->variability != uninitialized));
-  return ent->value;
+/* Get the entity's stickyness */
+ent_stickyness
+(get_entity_stickyness)(const entity *ent) {
+  return _get_entity_stickyness(ent);
+}
+
+/* Set the entity's stickyness */
+void
+(set_entity_stickyness)(entity *ent, ent_stickyness stickyness) {
+  _set_entity_stickyness(ent, stickyness);
 }
 
-INLINE void
+/* Set has no effect for existent entities of type method. */
+ir_node *
+get_atomic_ent_value(entity *ent)
+{
+  assert(ent && is_atomic_entity(ent));
+  assert(ent->variability != variability_uninitialized);
+  return skip_Id (ent->value);
+}
+
+void
 set_atomic_ent_value(entity *ent, ir_node *val) {
-  assert(ent && is_atomic_entity(ent) && (ent->variability != uninitialized));
-  if (is_method_type(ent->type)) return;
+  assert(is_atomic_entity(ent) && (ent->variability != variability_uninitialized));
+  if (is_Method_type(ent->type) && (ent->peculiarity == peculiarity_existent))
+    return;
   ent->value = val;
 }
 
+/* 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_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)); break;
+    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_SymConst(get_SymConst_type_or_id(n), get_SymConst_kind(n)); break;
+    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;
+    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:
-    assert(0 && "opdope invalid or not implemented"); break;
+    DDMN(n);
+    assert(0 && "opcode invalid or not implemented");
+    nn = NULL;
+    break;
   }
   return nn;
 }
 
-/* A value of a compound entity is a pair of value and the corresponding member of
+compound_graph_path *
+new_compound_graph_path(type *tp, int length) {
+  compound_graph_path *res;
+
+  assert(is_type(tp) && is_compound_type(tp));
+  assert(length > 0);
+
+  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]));
+
+  return res;
+}
+
+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);
+}
+
+int
+is_compound_graph_path(void *thing) {
+  return (get_kind(thing) == k_ir_compound_graph_path);
+}
+
+/* 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;
+}
+
+int
+get_compound_graph_path_length(compound_graph_path *gr) {
+  assert(gr && is_compound_graph_path(gr));
+  return gr->len;
+}
+
+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];
+}
+
+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));
+}
+
+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];
+}
+
+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;
+}
+
+/* A value of a compound entity is a pair of value and the corresponding path to a member of
    the compound. */
-INLINE void
-add_compound_ent_value(entity *ent, ir_node *val, entity *member) {
-  assert(ent && is_compound_entity(ent) && (ent->variability != uninitialized));
+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 (entity *, ent->val_ents, member);
+  ARR_APP1 (compound_graph_path *, ent->val_paths, path);
+}
+
+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;
+}
+
+int
+get_compound_ent_n_values(entity *ent) {
+  assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
+  return (ARR_LEN (ent->values));
+}
+
+ir_node  *
+get_compound_ent_value(entity *ent, int pos) {
+  assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
+  return ent->values[pos];
+}
+
+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];
+}
+
+/**
+ * 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;
+}
+
+/* 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;
+  }
+
+#if 0
+  {
+    int j;
+    printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
+      printf("Entity %s : ", get_entity_name(ent));
+      for (j = 0; j < get_compound_graph_path_length(path); ++j) {
+        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;
+}
+
+/* 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));
+}
+
+
+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;
+    }
+  }
+}
+
+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);
 }
 
 /* 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.
-INLINE void
+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) != uninitialized);
+  assert(get_entity_variability(ent) != variability_uninitialized);
   current_ir_graph = get_const_code_irg();
 
   val = copy_const_value(val);
@@ -442,53 +825,29 @@ copy_and_add_compound_ent_value(entity *ent, ir_node *val, entity *member) {
   current_ir_graph = rem;
   }*/
 
-INLINE int
-get_compound_ent_n_values(entity *ent) {
-  assert(ent && is_compound_entity(ent) && (ent->variability != uninitialized));
-  return (ARR_LEN (ent->values))-1;
-}
-
-INLINE ir_node  *
-get_compound_ent_value(entity *ent, int pos) {
-  assert(ent && is_compound_entity(ent) && (ent->variability != uninitialized));
-  return ent->values[pos+1];
-}
-
 /* 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(ent && is_compound_entity(ent) && (ent->variability != uninitialized));
+  assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
   return copy_const_value(ent->values[pos+1]);
   }*/
 
-INLINE entity   *
+entity   *
 get_compound_ent_value_member(entity *ent, int pos) {
-  assert(ent && is_compound_entity(ent) && (ent->variability != uninitialized));
-  return ent->val_ents[pos+1];
-}
+  compound_graph_path *path;
+  assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
+  path = get_compound_ent_value_path(ent, pos);
 
-INLINE void
-set_compound_ent_value(entity *ent, ir_node *val, entity *member, int pos) {
-  assert(ent && is_compound_entity(ent) && (ent->variability != uninitialized));
-  ent->values[pos+1] = val;
-  ent->val_ents[pos+1] = member;
+  return get_compound_graph_path_node(path, get_compound_graph_path_length(path)-1);
 }
 
 void
-remove_compound_ent_value(entity *ent, entity *value_ent) {
-  int i;
-  assert(ent && is_compound_entity(ent) && (ent->variability != uninitialized));
-  for (i = 1; i < (ARR_LEN (ent->val_ents)); i++) {
-    if (ent->val_ents[i] == value_ent) {
-      for(; i < (ARR_LEN (ent->val_ents))-1; i++) {
-	ent->val_ents[i] = ent->val_ents[i+1];
-	ent->values[i]   = ent->values[i+1];
-      }
-      ARR_SETLEN(entity*,  ent->val_ents, ARR_LEN(ent->val_ents) - 1);
-      ARR_SETLEN(ir_node*, ent->values,   ARR_LEN(ent->values) - 1);
-      break;
-    }
-  }
+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);
 }
 
 void
@@ -497,133 +856,363 @@ set_array_entity_values(entity *ent, tarval **values, int num_vals) {
   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(is_Array_type(arrtp));
   assert(get_array_n_dimensions(arrtp) == 1);
-  /* One bound is sufficient, the nunmber of constant fields makes the
+  /* 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) != uninitialized);
+  assert(get_entity_variability(ent) != variability_uninitialized);
   current_ir_graph = get_const_code_irg();
 
   for (i = 0; i < num_vals; i++) {
-    val = new_Const(get_tarval_mode (values[i]), values[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;
 }
 
-INLINE int
-get_entity_offset (entity *ent) {
-  return ent->offset;
+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;
+}
+
+
+static void init_index(type *arr) {
+  int init;
+  int dim = 0;
+
+  assert(get_array_n_dimensions(arr) == 1);
+
+  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;
+
+  set_entity_link(get_array_element_entity(arr), (void *)init);
+}
+
+
+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));
+    }
+  }
+}
+
+/** 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;
+}
+
+/* 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;
+}
+
+int
+(get_entity_offset_bytes)(const entity *ent) {
+  return _get_entity_offset_bytes(ent);
 }
 
-INLINE void
-set_entity_offset (entity *ent, int offset) {
-  ent->offset = offset;
+int
+(get_entity_offset_bits)(const entity *ent) {
+  return _get_entity_offset_bits(ent);
 }
 
-INLINE void
-add_entity_overwrites   (entity *ent, entity *overwritten) {
-  assert(ent);
-  assert(is_class_type(get_entity_owner(ent)));
-  ARR_APP1 (entity *, ent->overwrites, overwritten);
-  ARR_APP1 (entity *, overwritten->overwrittenby, ent);
+void
+(set_entity_offset_bytes)(entity *ent, int offset) {
+  _set_entity_offset_bytes(ent, offset);
 }
 
-INLINE int
-get_entity_n_overwrites (entity *ent) {
-  assert(ent);
-  assert(is_class_type(get_entity_owner(ent)));
-  return (ARR_LEN (ent->overwrites))-1;
+void
+(set_entity_offset_bits)(entity *ent, int offset) {
+  _set_entity_offset_bits(ent, offset);
+}
+
+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);
+}
+
+int
+get_entity_n_overwrites(entity *ent) {
+  assert(ent && is_Class_type(get_entity_owner(ent)));
+  return (ARR_LEN(ent->overwrites));
 }
 
 int
 get_entity_overwrites_index(entity *ent, entity *overwritten) {
   int i;
-  assert(ent && is_class_type(get_entity_owner(ent)));
+  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;
 }
 
-INLINE entity *
+entity *
 get_entity_overwrites   (entity *ent, int pos) {
-  assert(ent);
-  assert(is_class_type(get_entity_owner(ent)));
+  assert(ent && is_Class_type(get_entity_owner(ent)));
   assert(pos < get_entity_n_overwrites(ent));
-  return ent->overwrites[pos+1];
+  return ent->overwrites[pos];
 }
 
-INLINE void
+void
 set_entity_overwrites   (entity *ent, int pos, entity *overwritten) {
-  assert(ent);
-  assert(is_class_type(get_entity_owner(ent)));
+  assert(ent && is_Class_type(get_entity_owner(ent)));
   assert(pos < get_entity_n_overwrites(ent));
-  ent->overwrites[pos+1] = overwritten;
+  ent->overwrites[pos] = overwritten;
 }
 
 void
 remove_entity_overwrites(entity *ent, entity *overwritten) {
   int i;
-  assert(ent && is_class_type(get_entity_owner(ent)));
-  for (i = 1; i < (ARR_LEN (ent->overwrites)); 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];
+    ent->overwrites[i] = ent->overwrites[i+1];
       ARR_SETLEN(entity*, ent->overwrites, ARR_LEN(ent->overwrites) - 1);
       break;
     }
 }
 
-INLINE void
+void
 add_entity_overwrittenby   (entity *ent, entity *overwrites) {
-  assert(ent);
-  assert(is_class_type(get_entity_owner(ent)));
+  assert(ent && is_Class_type(get_entity_owner(ent)));
   add_entity_overwrites(overwrites, ent);
 }
 
-INLINE int
+int
 get_entity_n_overwrittenby (entity *ent) {
-  assert(ent);
-  assert(is_class_type(get_entity_owner(ent)));
-  return (ARR_LEN (ent->overwrittenby))-1;
+  assert(ent && is_Class_type(get_entity_owner(ent)));
+  return (ARR_LEN (ent->overwrittenby));
 }
 
 int
 get_entity_overwrittenby_index(entity *ent, entity *overwrites) {
   int i;
-  assert(ent && is_class_type(get_entity_owner(ent)));
+  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;
 }
 
-INLINE entity *
+entity *
 get_entity_overwrittenby   (entity *ent, int pos) {
-  assert(ent);
-  assert(is_class_type(get_entity_owner(ent)));
+  assert(ent && is_Class_type(get_entity_owner(ent)));
   assert(pos < get_entity_n_overwrittenby(ent));
-  return ent->overwrittenby[pos+1];
+  return ent->overwrittenby[pos];
 }
 
-INLINE void
+void
 set_entity_overwrittenby   (entity *ent, int pos, entity *overwrites) {
-  assert(ent);
-  assert(is_class_type(get_entity_owner(ent)));
+  assert(ent && is_Class_type(get_entity_owner(ent)));
   assert(pos < get_entity_n_overwrittenby(ent));
-  ent->overwrittenby[pos+1] = overwrites;
+  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 = 1; i < (ARR_LEN (ent->overwrittenby)); 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];
+    ent->overwrittenby[i] = ent->overwrittenby[i+1];
       ARR_SETLEN(entity*, ent->overwrittenby, ARR_LEN(ent->overwrittenby) - 1);
       break;
     }
@@ -631,81 +1220,84 @@ void    remove_entity_overwrittenby(entity *ent, entity *overwrites) {
 
 /* A link to store intermediate information */
 void *
-get_entity_link(entity *ent) {
-  assert(ent);
-  return ent->link;
+(get_entity_link)(const entity *ent) {
+  return _get_entity_link(ent);
 }
 
 void
-set_entity_link(entity *ent, void *l) {
-  assert(ent);
-  ent->link = l;
+(set_entity_link)(entity *ent, void *l) {
+  _set_entity_link(ent, l);
 }
 
-INLINE ir_graph *
-get_entity_irg(entity *ent) {
-  assert (ent);
-  assert (is_method_type(ent->type));
-  return ent->irg;
+ir_graph *
+(get_entity_irg)(const entity *ent) {
+  return _get_entity_irg(ent);
 }
 
-INLINE void
+void
 set_entity_irg(entity *ent, ir_graph *irg) {
-  assert (ent && ent->type);
+  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. */
-  /* assert (irg); */
-  assert (is_method_type(ent->type));
-  assert (ent->peculiarity == existent);
+   * 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;
 }
 
-int is_entity (void *thing) {
-  assert(thing);
-  if (get_kind(thing) == k_entity)
-    return 1;
-  else
-    return 0;
+int
+(is_entity)(const void *thing) {
+  return _is_entity(thing);
 }
 
 int is_atomic_entity(entity *ent) {
   type* t = get_entity_type(ent);
-  return (is_primitive_type(t) || is_pointer_type(t) ||
-	  is_enumeration_type(t) || is_method_type(t));
+  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);
-  return (is_class_type(t) || is_struct_type(t) ||
-	  is_array_type(t) || is_union_type(t));
+  assert(ent && ent->kind == k_entity);
+  return (is_Class_type(t) || is_Struct_type(t) ||
+      is_Array_type(t) || is_Union_type(t));
 }
 
-/* @@@ not implemnted!!! */
+/**
+ * @todo not implemented!!! */
 bool equal_entity(entity *ent1, entity *ent2) {
-  printf(" calling unimplemented equal entity!!! \n");
+  fprintf(stderr, " calling unimplemented equal entity!!! \n");
   return true;
 }
 
 
 unsigned long get_entity_visited(entity *ent) {
-  assert (ent);
+  assert(ent && ent->kind == k_entity);
   return ent->visit;
 }
 void        set_entity_visited(entity *ent, unsigned long num) {
-  assert (ent);
+  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);
+  assert(ent && ent->kind == k_entity);
   ent->visit = type_visited;
 }
 
 
-INLINE bool entity_visited(entity *ent) {
+bool entity_visited(entity *ent) {
+  assert(ent && ent->kind == k_entity);
   return get_entity_visited(ent) >= type_visited;
 }
-INLINE bool entity_not_visited(entity *ent) {
+
+bool entity_not_visited(entity *ent) {
+  assert(ent && ent->kind == k_entity);
   return get_entity_visited(ent) < type_visited;
 }