X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Fentity.c;h=5cf9e2ecc1dbeb19e63a46885bb9cc89e6afe79e;hb=6449e683c808a19471a7b2362b73e4dfb4c248d3;hp=28b00b29426c49f7b9f4bb5c378c5848fd8483f2;hpb=58278afc9917d9fc28ae5a4def6e1d9e53d7179f;p=libfirm

diff --git a/ir/tr/entity.c b/ir/tr/entity.c
index 28b00b294..5cf9e2ecc 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,7 +20,7 @@
 # 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"
 
 /*******************************************************************/
@@ -36,7 +36,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 +66,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 +84,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, tarval_P_from_entity(res));
     current_ir_graph = rem;
   } else {
     res->variability = uninitialized;
+    res->value = NULL;
+    res->values = NULL;
   }
   res->peculiarity = existent;
   res->volatility = non_volatile;
@@ -92,6 +99,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 +132,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 +142,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 +165,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_tv_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);
@@ -248,7 +286,11 @@ get_entity_visibility (entity *ent) {
 
 INLINE void
 set_entity_visibility (entity *ent, ent_visibility vis) {
-  if (vis != local) assert(ent->allocation == static_allocated);
+  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));
   ent->visibility = vis;
 }
 
@@ -457,6 +499,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);
@@ -473,6 +525,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);
@@ -487,6 +552,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);
@@ -503,6 +578,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) {
@@ -535,6 +622,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) ||
@@ -547,21 +642,31 @@ int is_compound_entity(entity *ent) {
 	  is_array_type(t) || is_union_type(t));
 }
 
+/* @@@ not implemnted!!! */
 bool equal_entity(entity *ent1, entity *ent2) {
+  printf(" calling unimplemented equal entity!!! \n");
   return true;
 }
 
 
-unsigned long get_entity_visited(entity *entity) {
-  assert (entity);
-  return entity->visit;
+unsigned long get_entity_visited(entity *ent) {
+  assert (ent);
+  return ent->visit;
 }
-void        set_entity_visited(entity *entity, unsigned long num) {
-  assert (entity);
-  entity->visit = num;
+void        set_entity_visited(entity *ent, unsigned long num) {
+  assert (ent);
+  ent->visit = num;
 }
 /* Sets visited field in entity to entity_visited. */
-void        mark_entity_visited(entity *entity) {
-  assert (entity);
-  entity->visit = type_visited;
+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;
 }