X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Fentity.c;h=031f9d48a697a33b4990454405c1da1a1c6b6a88;hb=79e991959fc8aee13e1b1d92220bde34a22afd92;hp=2bee18370844208aa6fb313162a2df0cef063590;hpb=bbba4631276380ff7e88dbc70a3b8fb89cb96899;p=libfirm

diff --git a/ir/tr/entity.c b/ir/tr/entity.c
index 2bee18370..031f9d48a 100644
--- a/ir/tr/entity.c
+++ b/ir/tr/entity.c
@@ -36,16 +36,11 @@ init_entity (void)
 {
 }
 
-/*******************************************************************/
-/** ENTITY                                                        **/
-/*******************************************************************/
+/*-----------------------------------------------------------------*/
+/* 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);
-
-INLINE void insert_entity_in_owner (entity *ent) {
+static void insert_entity_in_owner (entity *ent) {
   type *owner = ent->owner;
   switch (get_type_tpop_code(owner)) {
   case tpo_class: {
@@ -87,10 +82,12 @@ new_entity (type *owner, ident *name, type *type)
   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_Const(mode_P_mach, new_tarval_from_entity(res, mode_P_mach));
+    res->value = new_SymConst(sym, symconst_addr_ent);
     current_ir_graph = rem;
   } else {
     res->variability = variability_uninitialized;
@@ -100,10 +97,15 @@ new_entity (type *owner, ident *name, type *type)
   }
   res->peculiarity   = peculiarity_existent;
   res->volatility    = volatility_non_volatile;
+  res->stickyness    = stickyness_unsticky;
   res->ld_name       = NULL;
-  res->overwrites    = NEW_ARR_F(entity *, 0);
-  res->overwrittenby = NEW_ARR_F(entity *, 0);
-
+  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;
 
 #ifdef DEBUG_libfirm
@@ -123,26 +125,29 @@ new_d_entity (type *owner, ident *name, type *type, dbg_info *db) {
   return res;
 }
 
-INLINE void    free_compound_graph_path (compound_graph_path *gr);
-INLINE int     is_compound_graph_path(void *thing);
-INLINE int     get_compound_graph_path_length(compound_graph_path *gr);
-INLINE entity *get_compound_graph_path_node(compound_graph_path *gr, int pos);
-INLINE int     get_compound_ent_n_values(entity *ent);
+void    free_compound_graph_path (compound_graph_path *gr);
+int     is_compound_graph_path(void *thing);
+int     get_compound_graph_path_length(compound_graph_path *gr);
+entity *get_compound_graph_path_node(compound_graph_path *gr, int pos);
+int     get_compound_ent_n_values(entity *ent);
 
-INLINE void free_entity_attrs(entity *ent) {
+static void free_entity_attrs(entity *ent) {
   int i;
-  assert(ent);
   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->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? */
-    //DEL_ARR_F(ent->val_paths);
+    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;
@@ -151,25 +156,15 @@ INLINE void free_entity_attrs(entity *ent) {
 entity *
 copy_entity_own (entity *old, type *new_owner) {
   entity *new;
-
+  assert(old && old->kind == k_entity);
   assert_legal_owner_of_ent(new_owner);
+
   if (old->owner == new_owner) return old;
   new = (entity *) xmalloc (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 *, 0);
-    new->overwrittenby = NEW_ARR_F(entity *, 0);
-  }
-  */
   if (is_class_type(new_owner)) {
-    new->overwrites = NEW_ARR_F(entity *, 0);
+    new->overwrites    = NEW_ARR_F(entity *, 0);
     new->overwrittenby = NEW_ARR_F(entity *, 0);
   }
 #ifdef DEBUG_libfirm
@@ -184,6 +179,7 @@ copy_entity_own (entity *old, type *new_owner) {
 entity *
 copy_entity_name (entity *old, ident *new_name) {
   entity *new;
+  assert(old && old->kind == k_entity);
 
   if (old->name == new_name) return old;
   new = (entity *) xmalloc (sizeof (entity));
@@ -191,7 +187,7 @@ copy_entity_name (entity *old, ident *new_name) {
   new->name = new_name;
   new->ld_name = NULL;
   if (is_class_type(new->owner)) {
-    new->overwrites = DUP_ARR_F(entity *, old->overwrites);
+    new->overwrites    = DUP_ARR_F(entity *, old->overwrites);
     new->overwrittenby = DUP_ARR_F(entity *, old->overwrittenby);
   }
 #ifdef DEBUG_libfirm
@@ -206,6 +202,7 @@ copy_entity_name (entity *old, ident *new_name) {
 
 void
 free_entity (entity *ent) {
+  assert(ent && ent->kind == k_entity);
   free_tarval_entity(ent);
   free_entity_attrs(ent);
   ent->kind = k_BAD;
@@ -213,9 +210,9 @@ free_entity (entity *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
@@ -223,16 +220,14 @@ get_entity_nr(entity *ent) {
 #endif
 }
 
-INLINE const char *
-get_entity_name (entity *ent) {
-  assert (ent);
-  return get_id_str(get_entity_ident(ent));
+const char *
+(get_entity_name)(entity *ent) {
+  return __get_entity_name(ent);
 }
 
 ident *
-get_entity_ident    (entity *ent) {
-  assert(ent);
-  return ent->name;
+(get_entity_ident)(entity *ent) {
+  return get_entity_ident(ent);
 }
 
 /*
@@ -240,74 +235,66 @@ 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 get_id_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);
 }
 
-
-INLINE ent_allocation
-get_entity_allocation (entity *ent) {
-  return ent->allocation;
+ent_allocation
+(get_entity_allocation)(entity *ent) {
+  return __get_entity_allocation(ent);
 }
 
-INLINE void
-set_entity_allocation (entity *ent, ent_allocation al) {
-  ent->allocation = al;
+void
+(set_entity_allocation)(entity *ent, ent_allocation al) {
+  __set_entity_allocation(ent, al);
 }
 
 /* return the name of the visibility */
 const char *get_allocation_name(ent_allocation all)
 {
-#define X(a)	case a: return #a
+#define X(a)    case a: return #a
   switch (all) {
     X(allocation_automatic);
     X(allocation_parameter);
@@ -319,16 +306,17 @@ const char *get_allocation_name(ent_allocation all)
 }
 
 
-INLINE ent_visibility
-get_entity_visibility (entity *ent) {
-  return ent->visibility;
+ent_visibility
+(get_entity_visibility)(entity *ent) {
+  return __get_entity_visibility(ent);
 }
 
-INLINE void
+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));
+       (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;
@@ -337,7 +325,7 @@ set_entity_visibility (entity *ent, ent_visibility vis) {
 /* return the name of the visibility */
 const char *get_visibility_name(ent_visibility vis)
 {
-#define X(a)	case a: return #a
+#define X(a)    case a: return #a
   switch (vis) {
     X(visibility_local);
     X(visibility_external_visible);
@@ -347,14 +335,15 @@ const char *get_visibility_name(ent_visibility vis)
 #undef X
 }
 
-INLINE ent_variability
-get_entity_variability (entity *ent) {
-  return ent->variability;
+ent_variability
+(get_entity_variability)(entity *ent) {
+  return __get_entity_variability(ent);
 }
 
-INLINE void
+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));
 
@@ -377,7 +366,7 @@ 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(variability_uninitialized);
     X(variability_initialized);
@@ -388,22 +377,20 @@ const char *get_variability_name(ent_variability var)
 #undef X
 }
 
-INLINE ent_volatility
-get_entity_volatility (entity *ent) {
-  assert (ent);
-  return ent->volatility;
+ent_volatility
+(get_entity_volatility)(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(volatility_non_volatile);
     X(volatility_is_volatile);
@@ -412,24 +399,20 @@ const char *get_volatility_name(ent_volatility var)
 #undef X
 }
 
-INLINE peculiarity
-get_entity_peculiarity (entity *ent) {
-  assert (ent);
-  return ent->peculiarity;
+peculiarity
+(get_entity_peculiarity)(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(peculiarity_description);
     X(peculiarity_inherited);
@@ -439,19 +422,30 @@ const char *get_peculiarity_name(peculiarity var)
 #undef X
 }
 
+/* Get the entity's stickyness */
+ent_stickyness
+(get_entity_stickyness)(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);
+}
+
 /* Set has no effect for existent entities of type method. */
-INLINE ir_node *
+ir_node *
 get_atomic_ent_value(entity *ent)
 {
-  assert(ent);
-  assert(is_atomic_entity(ent));
+  assert(ent && is_atomic_entity(ent));
   assert(ent->variability != variability_uninitialized);
-  return ent->value;
+  return skip_Id (ent->value);
 }
 
-INLINE void
+void
 set_atomic_ent_value(entity *ent, ir_node *val) {
-  assert(ent && is_atomic_entity(ent) && (ent->variability != variability_uninitialized));
+  assert(is_atomic_entity(ent) && (ent->variability != variability_uninitialized));
   if (is_method_type(ent->type) && (ent->peculiarity == peculiarity_existent))
     return;
   ent->value = val;
@@ -469,8 +463,13 @@ int is_irn_const_expression(ir_node *n) {
   case iro_Unknown:
     return true; break;
   case iro_Add:
-    if (is_irn_const_expression(get_Add_left(n)))
-      return is_irn_const_expression(get_Add_right(n));
+  case iro_Sub:
+  case iro_Mul:
+  case iro_And:
+  case iro_Or:
+  case iro_Eor:
+    if (is_irn_const_expression(get_binop_left(n)))
+      return is_irn_const_expression(get_binop_right(n));
   case iro_Conv:
   case iro_Cast:
     return is_irn_const_expression(get_irn_n(n, 0));
@@ -491,10 +490,27 @@ ir_node *copy_const_value(ir_node *n) {
   case iro_Const:
     nn = new_Const(m, get_Const_tarval(n)); break;
   case iro_SymConst:
-    nn = new_SymConst(get_SymConst_type_or_id(n), get_SymConst_kind(n)); break;
+
+    nn = new_SymConst(get_SymConst_type_or_id(n), get_SymConst_kind(n));
+    break;
   case iro_Add:
     nn = new_Add(copy_const_value(get_Add_left(n)),
-		 copy_const_value(get_Add_right(n)), m); break;
+         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:
@@ -524,21 +540,21 @@ new_compound_graph_path(type *tp, int length) {
   return res;
 }
 
-INLINE void
+void
 free_compound_graph_path (compound_graph_path *gr) {
   assert(gr && is_compound_graph_path(gr));
   gr->kind = k_BAD;
   free(gr);
 }
 
-INLINE int
+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 */
-INLINE int is_proper_compound_graph_path(compound_graph_path *gr, int pos) {
+int is_proper_compound_graph_path(compound_graph_path *gr, int pos) {
   int i;
   entity *node;
   type *owner = gr->tp;
@@ -552,20 +568,20 @@ INLINE int is_proper_compound_graph_path(compound_graph_path *gr, int pos) {
   return true;
 }
 
-INLINE int
+int
 get_compound_graph_path_length(compound_graph_path *gr) {
   assert(gr && is_compound_graph_path(gr));
   return gr->len;
 }
 
-INLINE entity *
+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];
 }
 
-INLINE void
+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);
@@ -576,48 +592,48 @@ set_compound_graph_path_node(compound_graph_path *gr, int pos, entity *node) {
 
 /* A value of a compound entity is a pair of value and the corresponding path to a member of
    the compound. */
-INLINE void
+void
 add_compound_ent_value_w_path(entity *ent, ir_node *val, compound_graph_path *path) {
-  assert(ent && is_compound_entity(ent) && (ent->variability != variability_uninitialized));
+  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);
 }
 
-INLINE void
+void
 set_compound_ent_value_w_path(entity *ent, ir_node *val, compound_graph_path *path, int pos) {
-  assert(ent && is_compound_entity(ent) && (ent->variability != variability_uninitialized));
+  assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
   ent->values[pos] = val;
   ent->val_paths[pos] = path;
 }
 
-INLINE int
+int
 get_compound_ent_n_values(entity *ent) {
-  assert(ent && is_compound_entity(ent) && (ent->variability != variability_uninitialized));
+  assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
   return (ARR_LEN (ent->values));
 }
 
-INLINE ir_node  *
+ir_node  *
 get_compound_ent_value(entity *ent, int pos) {
-  assert(ent && is_compound_entity(ent) && (ent->variability != variability_uninitialized));
+  assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
   return ent->values[pos];
 }
 
-INLINE compound_graph_path *
+compound_graph_path *
 get_compound_ent_value_path(entity *ent, int pos) {
-  assert(ent && is_compound_entity(ent) && (ent->variability != variability_uninitialized));
+  assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
   return ent->val_paths[pos];
 }
 
 void
 remove_compound_ent_value(entity *ent, entity *value_ent) {
   int i;
-  assert(ent && is_compound_entity(ent) && (ent->variability != variability_uninitialized));
+  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];
+    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);
@@ -626,10 +642,10 @@ remove_compound_ent_value(entity *ent, entity *value_ent) {
   }
 }
 
-INLINE void
+void
 add_compound_ent_value(entity *ent, ir_node *val, entity *member) {
   compound_graph_path *path;
-  assert(ent && is_compound_entity(ent) && (ent->variability != variability_uninitialized));
+  assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
   path = new_compound_graph_path(get_entity_owner(ent), 1);
   path->nodes[0] = member;
   add_compound_ent_value_w_path(ent, val, path);
@@ -638,7 +654,7 @@ add_compound_ent_value(entity *ent, ir_node *val, entity *member) {
 /* 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;
 
@@ -653,23 +669,23 @@ copy_and_add_compound_ent_value(entity *ent, ir_node *val, entity *member) {
 /* 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 != 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) {
   compound_graph_path *path;
-  assert(ent && is_compound_entity(ent) && (ent->variability != variability_uninitialized));
+  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);
 }
 
-INLINE void
+void
 set_compound_ent_value(entity *ent, ir_node *val, entity *member, int pos) {
   compound_graph_path *path;
-  assert(ent && is_compound_entity(ent) && (ent->variability != variability_uninitialized));
+  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);
@@ -697,29 +713,37 @@ set_array_entity_values(entity *ent, tarval **values, int num_vals) {
   current_ir_graph = rem;
 }
 
-INLINE int
-get_entity_offset (entity *ent) {
-  return ent->offset;
+int
+(get_entity_offset_bytes)(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)(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));
+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
@@ -732,18 +756,16 @@ get_entity_overwrites_index(entity *ent, entity *overwritten) {
   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];
 }
 
-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] = overwritten;
 }
@@ -755,23 +777,21 @@ remove_entity_overwrites(entity *ent, entity *overwritten) {
   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)));
+  assert(ent && is_class_type(get_entity_owner(ent)));
   return (ARR_LEN (ent->overwrittenby));
 }
 
@@ -785,29 +805,27 @@ get_entity_overwrittenby_index(entity *ent, entity *overwrites) {
   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];
 }
 
-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] = overwrites;
 }
 
 void    remove_entity_overwrittenby(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 < (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;
     }
@@ -815,57 +833,54 @@ 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)(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)(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 == peculiarity_existent);
+  /* assert(irg); */
+  assert((irg  && ent->peculiarity == peculiarity_existent) ||
+         (!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)(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));
+      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));
+      is_array_type(t) || is_union_type(t));
 }
 
-/* @@@ not implemnted!!! */
+/**
+ * @todo not implemnted!!! */
 bool equal_entity(entity *ent1, entity *ent2) {
   printf(" calling unimplemented equal entity!!! \n");
   return true;
@@ -873,30 +888,32 @@ bool equal_entity(entity *ent1, entity *ent2) {
 
 
 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;
 }
 
 /* Need two routines because I want to assert the result. */
-static INLINE entity *resolve_ent_polymorphy2 (type *dynamic_class, entity* static_ent) {
+static entity *resolve_ent_polymorphy2 (type *dynamic_class, entity* static_ent) {
   int i, n_overwrittenby;
   entity *res = NULL;
 
@@ -911,11 +928,126 @@ static INLINE entity *resolve_ent_polymorphy2 (type *dynamic_class, entity* stat
   return res;
 }
 
-/* Returns the dynamically referenced entity if the static entity and the
- *  dynamic type are given.
- *  Search downwards in overwritten tree. */
+/** Resolve polymorphy in the inheritance relation.
+ *
+ * Returns the dynamically referenced entity if the static entity and the
+ * dynamic type are given.
+ * Search downwards in overwritten tree. */
 entity *resolve_ent_polymorphy(type *dynamic_class, entity* static_ent) {
-  entity *res = resolve_ent_polymorphy2(dynamic_class, static_ent);
+  entity *res;
+  assert(static_ent && static_ent->kind == k_entity);
+
+  res = resolve_ent_polymorphy2(dynamic_class, static_ent);
+  if (!res) {
+    printf(" Could not find entity "); DDME(static_ent);
+    printf("  in "); DDMT(dynamic_class);
+    printf("\n");
+    dump_entity(static_ent);
+    dump_type(get_entity_owner(static_ent));
+    dump_type(dynamic_class);
+  }
   assert(res);
   return res;
 }
+
+
+
+/*******************************************************************/
+/** Debug aides                                                   **/
+/*******************************************************************/
+
+
+#if 1 || DEBUG_libfirm
+int dump_node_opcode(FILE *F, ir_node *n); /* from irdump.c */
+
+#define X(a)    case a: printf(#a); break
+void dump_entity (entity *ent) {
+  int i, j;
+  type *owner = get_entity_owner(ent);
+  type *type  = get_entity_type(ent);
+  assert(ent && ent->kind == k_entity);
+  printf("entity %s (%ld)\n", get_entity_name(ent), get_entity_nr(ent));
+  printf("  type:  %s (%ld)\n", get_type_name(type),  get_type_nr(type));
+  printf("  owner: %s (%ld)\n", get_type_name(owner), get_type_nr(owner));
+
+  if (get_entity_n_overwrites(ent) > 0) {
+    printf ("  overwrites:\n");
+    for (i = 0; i < get_entity_n_overwrites(ent); ++i) {
+      entity *ov = get_entity_overwrites(ent, i);
+      printf("    %d: %s of class %s\n", i, get_entity_name(ov), get_type_name(get_entity_owner(ov)));
+    }
+  } else {
+    printf("  Does not overwrite other entities. \n");
+  }
+  if (get_entity_n_overwrittenby(ent) > 0) {
+    printf ("  overwritten by:\n");
+    for (i = 0; i < get_entity_n_overwrittenby(ent); ++i) {
+      entity *ov = get_entity_overwrittenby(ent, i);
+      printf("    %d: %s of class %s\n", i, get_entity_name(ov), get_type_name(get_entity_owner(ov)));
+    }
+  } else {
+    printf("  Is not overwriten by other entities. \n");
+  }
+
+  printf ("  allocation:  ");
+  switch (get_entity_allocation(ent)) {
+    X(allocation_dynamic);
+    X(allocation_automatic);
+    X(allocation_static);
+    X(allocation_parameter);
+  }
+
+  printf ("\n  visibility:  ");
+  switch (get_entity_visibility(ent)) {
+    X(visibility_local);
+    X(visibility_external_visible);
+    X(visibility_external_allocated);
+  }
+
+  printf ("\n  variability: ");
+  switch (get_entity_variability(ent)) {
+    X(variability_uninitialized);
+    X(variability_initialized);
+    X(variability_part_constant);
+    X(variability_constant);
+  }
+
+  if (get_entity_variability(ent) != variability_uninitialized) {
+    if (is_atomic_entity(ent)) {
+      printf("\n  atomic value: ");
+      dump_node_opcode(stdout, get_atomic_ent_value(ent));
+    } else {
+      printf("\n  compound values:");
+      for (i = 0; i < get_compound_ent_n_values(ent); ++i) {
+    compound_graph_path *path = get_compound_ent_value_path(ent, i);
+    entity *ent0 = get_compound_graph_path_node(path, 0);
+    printf("\n    %3d %s", get_entity_offset_bits(ent0), get_entity_name(ent0));
+    for (j = 1; j < get_compound_graph_path_length(path); ++j)
+      printf(".%s", get_entity_name(get_compound_graph_path_node(path, j)));
+    printf("\t = ");
+    dump_node_opcode(stdout, get_compound_ent_value(ent, i));
+      }
+    }
+  }
+
+  printf ("\n  volatility:  ");
+  switch (get_entity_volatility(ent)) {
+    X(volatility_non_volatile);
+    X(volatility_is_volatile);
+  }
+
+  printf("\n  peculiarity: %s", get_peculiarity_string(get_entity_peculiarity(ent)));
+  printf("\n  ld_name: %s", ent->ld_name ? get_entity_ld_name(ent) : "no yet set");
+  printf("\n  offset:  %d", get_entity_offset_bits(ent));
+  if (is_method_type(get_entity_type(ent))) {
+    if (get_entity_irg(ent))   /* can be null */
+      { printf ("\n  irg = %ld", get_irg_graph_nr(get_entity_irg(ent))); }
+    else
+      { printf ("\n  irg = NULL"); }
+  }
+  printf("\n\n");
+}
+#undef X
+#else  /* DEBUG_libfirm */
+void dump_entity (entity *ent) {}
+#endif /* DEBUG_libfirm */