X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Fentity.c;h=aee090d62606da2b56a95581eaa47d99cf98fe28;hb=0850a3224410b24400a5552feff23cf85bf443c3;hp=71d85b65a57bcde59c5ef6b04a5e06628a3311d1;hpb=0804355762ef7b45199c73902aaec3016edb1243;p=libfirm

diff --git a/ir/tr/entity.c b/ir/tr/entity.c
index 71d85b65a..aee090d62 100644
--- a/ir/tr/entity.c
+++ b/ir/tr/entity.c
@@ -9,38 +9,69 @@
  * 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.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(unknown_type && "Call init_type before init_entity!");
+  assert(!unknown_entity && "Call init_entity only once!");
+  unknown_entity = new_rd_entity(NULL, unknown_type, new_id_from_str(UNKNOWN_ENTITY_NAME), 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                                                          */
 /*-----------------------------------------------------------------*/
 
-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: {
@@ -59,8 +90,8 @@ void insert_entity_in_owner (entity *ent) {
   }
 }
 
-entity *
-new_entity (type *owner, ident *name, type *type)
+static INLINE entity *
+new_rd_entity (dbg_info *db, type *owner, ident *name, type *type)
 {
   entity *res;
   ir_graph *rem;
@@ -68,8 +99,8 @@ new_entity (type *owner, ident *name, type *type)
   assert(!id_contains_char(name, ' ') && "entity name should not contain spaces");
 
   res = (entity *) xmalloc (sizeof (entity));
+  memset(res, 0, sizeof(res));
   res->kind = k_entity;
-  assert_legal_owner_of_ent(owner);
   res->owner = owner;
   res->name = name;
   res->type = type;
@@ -82,10 +113,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;
@@ -95,50 +128,67 @@ 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;
 
+  //res->accesses = NULL;
+
 #ifdef DEBUG_libfirm
   res->nr = get_irp_new_node_nr();
-#endif
+  res->c_name = (char *)get_id_str (name);
+#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;
 }
 
-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);
+entity *
+new_entity (type *owner, ident *name, type *type) {
+  return new_d_entity(owner, name, type, NULL);
+}
+
 
-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? */
-	  /* Geht nich: wird mehrfach verwendet!!! ==> mehrfach frei gegeben. */
-    //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;
@@ -147,25 +197,15 @@ 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
@@ -180,6 +220,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));
@@ -187,11 +228,12 @@ 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
   new->nr = get_irp_new_node_nr();
+  new->c_name = (char *)get_id_str (new->name);
 #endif
 
   insert_entity_in_owner (new);
@@ -202,7 +244,7 @@ copy_entity_name (entity *old, ident *new_name) {
 
 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);
@@ -211,7 +253,7 @@ free_entity (entity *ent) {
 /* Outputs a unique number for this node */
 long
 get_entity_nr(entity *ent) {
-  assert(ent);
+  assert(ent && ent->kind == k_entity);
 #ifdef DEBUG_libfirm
   return ent->nr;
 #else
@@ -220,15 +262,13 @@ get_entity_nr(entity *ent) {
 }
 
 const char *
-get_entity_name (entity *ent) {
-  assert (ent);
-  return get_id_str(get_entity_ident(ent));
+(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);
 }
 
 /*
@@ -237,73 +277,65 @@ void   set_entity_ld_ident (entity *, ident *ld_ident);
 */
 
 type *
-get_entity_owner (entity *ent) {
-  return ent->owner = skip_tid(ent->owner);
+(get_entity_owner)(entity *ent) {
+  return __get_entity_owner(ent);
 }
 
 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 ||
+  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! */
 }
 
 ident *
-get_entity_ld_ident (entity *ent)
-{
-  if (ent->ld_name == NULL)
-    ent->ld_name = mangle_entity (ent);
-  return ent->ld_name;
+(get_entity_ld_ident)(entity *ent) {
+  return __get_entity_ld_ident(ent);
 }
 
 void
-set_entity_ld_ident (entity *ent, ident *ld_ident) {
-  ent->ld_name = ld_ident;
+(set_entity_ld_ident)(entity *ent, ident *ld_ident) {
+   __set_entity_ld_ident(ent, ld_ident);
 }
 
 const char *
-get_entity_ld_name (entity *ent) {
-  return get_id_str(get_entity_ld_ident(ent));
+(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);
-*/
-
 type *
-get_entity_type (entity *ent) {
-  return ent->type = skip_tid(ent->type);
+(get_entity_type)(entity *ent) {
+  return __get_entity_type(ent);
 }
 
 void
-set_entity_type (entity *ent, type *type) {
-  ent->type = type;
+(set_entity_type)(entity *ent, type *type) {
+  __set_entity_type(ent, type);
 }
 
-
 ent_allocation
-get_entity_allocation (entity *ent) {
-  return ent->allocation;
+(get_entity_allocation)(const entity *ent) {
+  return __get_entity_allocation(ent);
 }
 
 void
-set_entity_allocation (entity *ent, ent_allocation al) {
-  ent->allocation = al;
+(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);
@@ -316,15 +348,16 @@ const char *get_allocation_name(ent_allocation all)
 
 
 ent_visibility
-get_entity_visibility (entity *ent) {
-  return ent->visibility;
+(get_entity_visibility)(const entity *ent) {
+  return __get_entity_visibility(ent);
 }
 
 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;
@@ -333,7 +366,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);
@@ -344,13 +377,14 @@ const char *get_visibility_name(ent_visibility vis)
 }
 
 ent_variability
-get_entity_variability (entity *ent) {
-  return 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));
 
@@ -360,6 +394,11 @@ set_entity_variability (entity *ent, ent_variability var)
     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)) {
@@ -373,7 +412,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);
@@ -385,21 +424,19 @@ const char *get_variability_name(ent_variability var)
 }
 
 ent_volatility
-get_entity_volatility (entity *ent) {
-  assert (ent);
-  return ent->volatility;
+(get_entity_volatility)(const entity *ent) {
+  return __get_entity_volatility(ent);
 }
 
 void
-set_entity_volatility (entity *ent, ent_volatility vol) {
-  assert (ent);
-  ent->volatility = vol;
+(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);
@@ -409,23 +446,19 @@ const char *get_volatility_name(ent_volatility var)
 }
 
 peculiarity
-get_entity_peculiarity (entity *ent) {
-  assert (ent);
-  return ent->peculiarity;
+(get_entity_peculiarity)(const entity *ent) {
+  return __get_entity_peculiarity(ent);
 }
 
 void
-set_entity_peculiarity (entity *ent, peculiarity pec) {
-  assert (ent);
-  /* @@@ why peculiarity only for methods? */
-  assert (is_method_type(ent->type));
-  ent->peculiarity = pec;
+(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);
@@ -435,19 +468,30 @@ const char *get_peculiarity_name(peculiarity var)
 #undef X
 }
 
+/* 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);
+}
+
 /* Set has no effect for existent entities of type method. */
 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);
 }
 
 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;
@@ -458,15 +502,18 @@ set_atomic_ent_value(entity *ent, ir_node *val) {
 int is_irn_const_expression(ir_node *n) {
   ir_mode *m;
 
+  /* we are in dange 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_Add:
-    if (is_irn_const_expression(get_Add_left(n)))
-      return is_irn_const_expression(get_Add_right(n));
   case iro_Conv:
   case iro_Cast:
     return is_irn_const_expression(get_irn_n(n, 0));
@@ -482,15 +529,38 @@ 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;
+  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:
@@ -499,7 +569,7 @@ ir_node *copy_const_value(ir_node *n) {
     nn = new_Unknown(m); break;
   default:
     DDMN(n);
-    assert(0 && "opdope invalid or not implemented");
+    assert(0 && "opcode invalid or not implemented");
     nn = NULL;
     break;
   }
@@ -512,11 +582,11 @@ new_compound_graph_path(type *tp, int length) {
   assert(is_type(tp) && is_compound_type(tp));
   assert(length > 0);
 
-  res = (compound_graph_path *) malloc (sizeof(compound_graph_path) + (length-1) * sizeof(entity *));
-  res->kind = k_ir_compound_graph_path;
-  res->tp = tp;
-  res->len = length;
-  memset(res->nodes, 0, sizeof(entity *) * length);
+  res = calloc (1, sizeof(*res) + (length-1) * sizeof(res->nodes[0]));
+  res->kind          = k_ir_compound_graph_path;
+  res->tp            = tp;
+  res->len           = length;
+  res ->arr_indicees = calloc(length, sizeof(*res ->arr_indicees));
   return res;
 }
 
@@ -524,6 +594,7 @@ 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);
 }
 
@@ -570,50 +641,64 @@ set_compound_graph_path_node(compound_graph_path *gr, int pos, entity *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. */
 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);
 }
 
 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;
 }
 
 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));
 }
 
 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];
 }
 
 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);
@@ -625,9 +710,24 @@ remove_compound_ent_value(entity *ent, entity *value_ent) {
 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));
-  path = new_compound_graph_path(get_entity_owner(ent), 1);
+  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);
 }
 
@@ -649,14 +749,14 @@ 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]);
   }*/
 
 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);
@@ -665,7 +765,7 @@ get_compound_ent_value_member(entity *ent, int pos) {
 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);
@@ -677,6 +777,7 @@ 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(get_array_n_dimensions(arrtp) == 1);
@@ -687,35 +788,269 @@ set_array_entity_values(entity *ent, tarval **values, int num_vals) {
   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;
 }
 
+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 indicees 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 indicees as firm nodes.  But the 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));
+    }
+  }
+
+}
+
+/* FIXME MMB: the memcpy is very strange */
+static int *resize (int *buf, int new_size) {
+  int *new_buf = (int *)calloc(new_size, sizeof(*new_buf));
+  memcpy(new_buf, buf, new_size>1);
+  free(buf);
+  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 = calloc(size, sizeof(*permutation));
+  for (i = 0; i < n_vals; ++i) {
+    int pos = get_compound_ent_value_offset_bits(ent, i);
+    while (pos >= size) {
+      size = size + 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);
+}
+
 int
-get_entity_offset (entity *ent) {
-  return ent->offset;
+(get_entity_offset_bits)(const entity *ent) {
+  return __get_entity_offset_bits(ent);
 }
 
 void
-set_entity_offset (entity *ent, int offset) {
-  ent->offset = offset;
+(set_entity_offset_bytes)(entity *ent, int offset) {
+  __set_entity_offset_bytes(ent, offset);
 }
 
 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);
+(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);
-  assert(is_class_type(get_entity_owner(ent)));
-  return (ARR_LEN (ent->overwrites));
+get_entity_n_overwrites(entity *ent) {
+  assert(ent && is_class_type(get_entity_owner(ent)));
+  return (ARR_LEN(ent->overwrites));
 }
 
 int
@@ -730,16 +1065,14 @@ get_entity_overwrites_index(entity *ent, entity *overwritten) {
 
 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];
 }
 
 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;
 }
@@ -751,7 +1084,7 @@ 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;
     }
@@ -759,15 +1092,13 @@ remove_entity_overwrites(entity *ent, entity *overwritten) {
 
 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);
 }
 
 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));
 }
 
@@ -783,27 +1114,25 @@ get_entity_overwrittenby_index(entity *ent, entity *overwrites) {
 
 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];
 }
 
 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;
     }
@@ -811,83 +1140,85 @@ 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);
 }
 
 ir_graph *
-get_entity_irg(entity *ent) {
-  assert (ent);
-  assert (is_method_type(ent->type));
-  return ent->irg;
+(get_entity_irg)(const entity *ent) {
+  return __get_entity_irg(ent);
 }
 
 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);
+   * 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);
+  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");
+  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;
 }
 
 
 bool entity_visited(entity *ent) {
+  assert(ent && ent->kind == k_entity);
   return get_entity_visited(ent) >= type_visited;
 }
 
 bool entity_not_visited(entity *ent) {
+  assert(ent && ent->kind == k_entity);
   return get_entity_visited(ent) < type_visited;
 }
 
@@ -907,11 +1238,17 @@ static entity *resolve_ent_polymorphy2 (type *dynamic_class, entity* static_ent)
   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 DEBUG_libfirm
   if (!res) {
     printf(" Could not find entity "); DDME(static_ent);
     printf("  in "); DDMT(dynamic_class);
@@ -919,90 +1256,8 @@ entity *resolve_ent_polymorphy(type *dynamic_class, entity* static_ent) {
     dump_entity(static_ent);
     dump_type(get_entity_owner(static_ent));
     dump_type(dynamic_class);
-
   }
+#endif
   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);
-  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));
-
-  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    %2d %s", get_entity_offset(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(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 */