X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Fentity.c;h=8bc79552d07b2343165132830be1e34980001582;hb=7a68aade04d8cac3d294dd8c4448e7b71f53b9b3;hp=6e305b41c78ab67758b35535c885e130d41723d7;hpb=43c39160eb7c8b6d92dcf72e0c3bf10c1298bab2;p=libfirm

diff --git a/ir/tr/entity.c b/ir/tr/entity.c
index 6e305b41c..8bc79552d 100644
--- a/ir/tr/entity.c
+++ b/ir/tr/entity.c
@@ -1,8 +1,8 @@
 /* Copyright (C) 1998 - 2000 by Universitaet Karlsruhe
-** All rights reserved.
-**
-** Authors: Martin Trapp, Christian Schaefer
-**
+* All rights reserved.
+*
+* Authors: Martin Trapp, Christian Schaefer
+*
 */
 
 /* $Id$ */
@@ -20,8 +20,9 @@
 # include "typegmod_t.h"
 # include "array.h"
 /* All this is needed to build the constant node for methods: */
-# include "irprog.h"
+# include "irprog_t.h"
 # include "ircons.h"
+# include "tv_t.h"
 
 /*******************************************************************/
 /** general                                                       **/
@@ -36,7 +37,10 @@ init_entity (void)
 /** ENTITY                                                        **/
 /*******************************************************************/
 
-INLINE type *get_entity_owner (entity *ent);
+/* 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) {
   type *owner = ent->owner;
@@ -63,6 +67,8 @@ new_entity (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->kind = k_entity;
   assert_legal_owner_of_ent(owner);
@@ -79,10 +85,12 @@ new_entity (type *owner, ident *name, type *type)
     res->variability = constant;
     rem = current_ir_graph;
     current_ir_graph = get_const_code_irg();
-    res->value = new_Const(mode_P, tarval_P_from_entity(res));
+    res->value = new_Const(mode_P, new_tarval_from_entity(res, mode_P));
     current_ir_graph = rem;
   } else {
     res->variability = uninitialized;
+    res->value = NULL;
+    res->values = NULL;
   }
   res->peculiarity = existent;
   res->volatility = non_volatile;
@@ -92,6 +100,10 @@ new_entity (type *owner, ident *name, type *type)
 
   res->irg = NULL;
 
+#ifdef DEBUG_libfirm
+  res->nr = get_irp_new_node_nr();
+#endif
+
   res->visit = 0;
 
   /* Remember entity in it's owner. */
@@ -121,6 +133,7 @@ copy_entity_own (entity *old, type *new_owner) {
   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);
@@ -130,6 +143,14 @@ copy_entity_own (entity *old, type *new_owner) {
     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);
+  }
+#ifdef DEBUG_libfirm
+  new->nr = get_irp_new_node_nr();
+#endif
 
   insert_entity_in_owner (new);
 
@@ -145,20 +166,38 @@ copy_entity_name (entity *old, ident *new_name) {
   memcpy (new, old, sizeof (entity));
   new->name = new_name;
   new->ld_name = NULL;
-  new->overwrites = DUP_ARR_F(entity *, old->overwrites);
-  new->overwrittenby = DUP_ARR_F(entity *, old->overwrittenby);
+  if (is_class_type(new->owner)) {
+    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();
+#endif
 
   insert_entity_in_owner (new);
 
   return new;
 }
 
+
 void
 free_entity (entity *ent) {
+  free_tarval_entity(ent);
   free_entity_attrs(ent);
   free(ent);
 }
 
+/* Outputs a unique number for this node */
+INLINE long
+get_entity_nr(entity *ent) {
+  assert(ent);
+#ifdef DEBUG_libfirm
+  return ent->nr;
+#else
+  return 0;
+#endif
+}
+
 INLINE const char *
 get_entity_name (entity *ent) {
   assert (ent);
@@ -251,8 +290,8 @@ 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));
+  /* @@@ Test that the owner type is not local, but how??
+         && get_class_visibility(get_entity_owner(ent)) != local));*/
   ent->visibility = vis;
 }
 
@@ -280,6 +319,19 @@ set_entity_variability (entity *ent, ent_variability var){
   ent->variability = var;
 }
 
+/* return the name of the variablity */
+const char *get_variability_name(ent_variability var)
+{
+#define X(a)	case a: return #a
+  switch (var) {
+    X(uninitialized);
+    X(initialized);
+    X(part_constant);
+    X(constant);
+    default: return "BAD VALUE";
+  }
+#undef X
+}
 
 INLINE ent_volatility
 get_entity_volatility (entity *ent) {
@@ -293,6 +345,18 @@ set_entity_volatility (entity *ent, ent_volatility vol) {
   ent->volatility = vol;
 }
 
+/* return the name of the volatility */
+const char *get_volatility_name(ent_volatility var)
+{
+#define X(a)	case a: return #a
+  switch (var) {
+    X(non_volatile);
+    X(is_volatile);
+    default: return "BAD VALUE";
+  }
+#undef X
+}
+
 INLINE peculiarity
 get_entity_peculiarity (entity *ent) {
   assert (ent);
@@ -307,6 +371,19 @@ set_entity_peculiarity (entity *ent, peculiarity pec) {
   ent->peculiarity = pec;
 }
 
+/* return the name of the peculiarity */
+const char *get_peculiarity_name(peculiarity var)
+{
+#define X(a)	case a: return #a
+  switch (var) {
+    X(description);
+    X(inherited);
+    X(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) {
@@ -336,7 +413,9 @@ ir_node *copy_const_value(ir_node *n) {
   case iro_Add:
     nn = new_Add(copy_const_value(get_Add_left(n)), copy_const_value(get_Add_right(n)), m); break;
   default:
-    assert(0 && "opdope invalid or not implemented"); break;
+    assert(0 && "opdope invalid or not implemented");
+    nn=NULL;
+    break;
   }
   return nn;
 }
@@ -430,7 +509,7 @@ 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_tv_mode (values[i]), values[i]);
+    val = new_Const(get_tarval_mode (values[i]), values[i]);
     add_compound_ent_value(ent, val, get_array_element_entity(arrtp));
   }
   current_ir_graph = rem;
@@ -461,6 +540,16 @@ get_entity_n_overwrites (entity *ent) {
   return (ARR_LEN (ent->overwrites))-1;
 }
 
+int
+get_entity_overwrites_index(entity *ent, entity *overwritten) {
+  int i;
+  assert(ent && is_class_type(get_entity_owner(ent)));
+  for (i = 0; i < get_entity_n_overwrites(ent); i++)
+    if (get_entity_overwrites(ent, i) == overwritten)
+      return i;
+  return -1;
+}
+
 INLINE entity *
 get_entity_overwrites   (entity *ent, int pos) {
   assert(ent);
@@ -477,6 +566,19 @@ set_entity_overwrites   (entity *ent, int pos, entity *overwritten) {
   ent->overwrites[pos+1] = 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++)
+    if (ent->overwrites[i] == overwritten) {
+      for(; i < (ARR_LEN (ent->overwrites))-1; i++)
+	ent->overwrites[i] = ent->overwrites[i+1];
+      ARR_SETLEN(entity*, ent->overwrites, ARR_LEN(ent->overwrites) - 1);
+      break;
+    }
+}
+
 INLINE void
 add_entity_overwrittenby   (entity *ent, entity *overwrites) {
   assert(ent);
@@ -491,6 +593,16 @@ get_entity_n_overwrittenby (entity *ent) {
   return (ARR_LEN (ent->overwrittenby))-1;
 }
 
+int
+get_entity_overwrittenby_index(entity *ent, entity *overwrites) {
+  int i;
+  assert(ent && is_class_type(get_entity_owner(ent)));
+  for (i = 0; i < get_entity_n_overwrittenby(ent); i++)
+    if (get_entity_overwrittenby(ent, i) == overwrites)
+      return i;
+  return -1;
+}
+
 INLINE entity *
 get_entity_overwrittenby   (entity *ent, int pos) {
   assert(ent);
@@ -507,6 +619,18 @@ set_entity_overwrittenby   (entity *ent, int pos, entity *overwrites) {
   ent->overwrittenby[pos+1] = 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++)
+    if (ent->overwrittenby[i] == overwrites) {
+      for(; i < (ARR_LEN (ent->overwrittenby))-1; i++)
+	ent->overwrittenby[i] = ent->overwrittenby[i+1];
+      ARR_SETLEN(entity*, ent->overwrittenby, ARR_LEN(ent->overwrittenby) - 1);
+      break;
+    }
+}
+
 /* A link to store intermediate information */
 void *
 get_entity_link(entity *ent) {
@@ -539,6 +663,14 @@ set_entity_irg(entity *ent, ir_graph *irg) {
   ent->irg = irg;
 }
 
+int is_entity (void *thing) {
+  assert(thing);
+  if (get_kind(thing) == k_entity)
+    return 1;
+  else
+    return 0;
+}
+
 int is_atomic_entity(entity *ent) {
   type* t = get_entity_type(ent);
   return (is_primitive_type(t) || is_pointer_type(t) ||
@@ -571,3 +703,11 @@ void        mark_entity_visited(entity *ent) {
   assert (ent);
   ent->visit = type_visited;
 }
+
+
+INLINE bool entity_visited(entity *ent) {
+  return get_entity_visited(ent) >= type_visited;
+}
+INLINE bool entity_not_visited(entity *ent) {
+  return get_entity_visited(ent) < type_visited;
+}