X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Fentity.c;h=818602338b2911996adff23cf75978de295da1e4;hb=67e3ef5e7088c2254daeb2a72e0950bef6ca0256;hp=609bb00b8df81aea5a042692a21fe73bf9cef349;hpb=3e5692defee7bec4dcd584b83d1c79baaf6a63c7;p=libfirm

diff --git a/ir/tr/entity.c b/ir/tr/entity.c
index 609bb00b8..818602338 100644
--- a/ir/tr/entity.c
+++ b/ir/tr/entity.c
@@ -13,6 +13,8 @@
 
 # include <stdlib.h>
 # include <stddef.h>
+# include <string.h>
+
 # include "entity_t.h"
 # include "mangle.h"
 # include "typegmod_t.h"
@@ -65,8 +67,12 @@ new_entity (type *owner, ident *name, type *type)
   res->owner = owner;
   res->name = name;
   res->type = type;
-  res->allocation = dynamic_allocated;
+  if (get_type_tpop(type) == type_method)
+    res->allocation = static_allocated;
+  else
+    res->allocation = automatic_allocated;
   res->visibility = local;
+  res->offset = -1;
   if (is_method_type(type)) {
     res->variability = constant;
     rem = current_ir_graph;
@@ -76,8 +82,13 @@ new_entity (type *owner, ident *name, type *type)
   } else {
     res->variability = uninitialized;
   }
+  res->peculiarity = existent;
+  res->volatility = non_volatile;
   res->ld_name = NULL;
   res->overwrites = NEW_ARR_F(entity *, 1);
+  res->overwrittenby = NEW_ARR_F(entity *, 1);
+
+  res->irg = NULL;
 
   res->visit = 0;
 
@@ -88,6 +99,7 @@ new_entity (type *owner, ident *name, type *type)
 inline void free_entity_attrs(entity *ent) {
   assert(ent);
   DEL_ARR_F(ent->overwrites);
+  DEL_ARR_F(ent->overwrittenby);
 }
 
 entity *
@@ -100,6 +112,7 @@ copy_entity_own (entity *old, type *new_owner) {
   memcpy (new, old, sizeof (entity));
   new->owner = new_owner;
   new->overwrites = DUP_ARR_F(entity *, old->overwrites);
+  new->overwrittenby = DUP_ARR_F(entity *, old->overwrittenby);
 
   insert_entity_in_owner (new);
 
@@ -116,6 +129,7 @@ copy_entity_name (entity *old, ident *new_name) {
   new->name = new_name;
   new->ld_name = NULL;
   new->overwrites = DUP_ARR_F(entity *, old->overwrites);
+  new->overwrittenby = DUP_ARR_F(entity *, old->overwrittenby);
 
   insert_entity_in_owner (new);
 
@@ -135,7 +149,7 @@ get_entity_ident    (entity *ent) {
 }
 
 /*
-void   set_entity_ld_name  (entity *, char *ld_name);
+void   set_entitye_ld_name  (entity *, char *ld_name);
 void   set_entity_ld_ident (entity *, ident *ld_ident);
 */
 
@@ -172,6 +186,11 @@ set_entity_ld_ident (entity *ent, ident *ld_ident) {
   ent->ld_name = ld_ident;
 }
 
+inline const char *
+get_entity_ld_name (entity *ent) {
+  return id_to_str(get_entity_ld_ident(ent));
+}
+
 /*
 char  *get_entity_ld_name  (entity *);
 void   set_entity_ld_name  (entity *, char *ld_name);
@@ -234,10 +253,36 @@ set_entity_variability (entity *ent, ent_variability var){
   ent->variability = var;
 }
 
+
+inline ent_volatility
+get_entity_volatility (entity *ent) {
+  return ent->volatility;
+}
+
+inline void
+set_entity_volatility (entity *ent, ent_volatility vol) {
+  ent->volatility = vol;
+}
+
+inline peculiarity
+get_entity_peculiarity (entity *ent) {
+  assert (ent);
+  //assert (is_method_type(ent->type));
+  return ent->peculiarity;
+}
+
+inline void
+set_entity_peculiarity (entity *ent, peculiarity pec) {
+  assert (ent);
+  assert (is_method_type(ent->type));
+  ent->peculiarity = pec;
+}
+
 /* Set has no effect for entities of type method. */
 inline ir_node *
 get_atomic_ent_value(entity *ent) {
-  assert(ent); assert(is_atomic_entity(ent)); assert((ent->variability != uninitialized));
+  assert(ent); assert(is_atomic_entity(ent));
+  assert((ent->variability != uninitialized));
   return ent->value;
 }
 
@@ -249,6 +294,31 @@ set_atomic_ent_value(entity *ent, ir_node *val) {
 }
 
 
+ir_node *copy_const_value(ir_node *n) {
+  ir_node *nn;
+  ir_mode *m;
+
+  m = get_irn_mode(n);
+  switch(get_irn_opcode(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;
+  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;
+  }
+  return nn;
+}
+
+/* Copies the value represented by the entity to current_block
+   in current_ir_graph. */
+ir_node *copy_atomic_ent_value(entity *ent) {
+  assert(ent && is_atomic_entity(ent) && (ent->variability != uninitialized));
+  return copy_const_value(ent->value);
+}
+
 /* A value of a compound entity is a pair of value and the corresponding member of
    the compound. */
 inline void
@@ -258,6 +328,21 @@ add_compound_ent_value(entity *ent, ir_node *val, entity *member) {
   ARR_APP1 (entity *, ent->val_ents, 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
+copy_and_add_compound_ent_value(entity *ent, ir_node *val, entity *member) {
+  ir_graph *rem = current_ir_graph;
+
+  assert(get_entity_variability(ent) != uninitialized);
+  current_ir_graph = get_const_code_irg();
+
+  val = copy_const_value(val);
+  add_compound_ent_value(ent, val, member);
+  current_ir_graph = rem;
+}
+
 inline int
 get_compound_ent_n_values(entity *ent) {
   assert(ent && is_compound_entity(ent) && (ent->variability != uninitialized));
@@ -270,6 +355,13 @@ get_compound_ent_value(entity *ent, int pos) {
   return ent->values[pos+1];
 }
 
+/* Copies the value i of the entity to current_block in current_ir_graph. */
+ir_node *
+copy_compound_ent_value(entity *ent, int pos) {
+  assert(ent && is_compound_entity(ent) && (ent->variability != uninitialized));
+  return copy_const_value(ent->values[pos+1]);
+}
+
 inline entity   *
 get_compound_ent_value_member(entity *ent, int pos) {
   assert(ent && is_compound_entity(ent) && (ent->variability != uninitialized));
@@ -283,6 +375,28 @@ set_compound_ent_value(entity *ent, ir_node *val, entity *member, int pos) {
   ent->val_ents[pos+1] = member;
 }
 
+void
+set_array_entity_values(entity *ent, tarval **values, int num_vals) {
+  int i;
+  ir_graph *rem = current_ir_graph;
+  type *arrtp = get_entity_type(ent);
+  ir_node *val;
+
+  assert(is_array_type(arrtp));
+  assert(get_array_n_dimensions(arrtp) == 1);
+  /* One bound is sufficient, the nunmber of constant fields makes the
+     size. */
+  assert(get_array_lower_bound (arrtp, 0) || get_array_upper_bound (arrtp, 0));
+  assert(get_entity_variability(ent) != uninitialized);
+  current_ir_graph = get_const_code_irg();
+
+  for (i = 0; i < num_vals; i++) {
+    val = new_Const(get_tv_mode (values[i]), values[i]);
+    add_compound_ent_value(ent, val, get_array_element_entity(arrtp));
+  }
+  current_ir_graph = rem;
+}
+
 inline int
 get_entity_offset (entity *ent) {
   return ent->offset;
@@ -296,27 +410,64 @@ set_entity_offset (entity *ent, int offset) {
 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);
 }
 
 inline int
-get_entity_n_overwrites (entity *ent){
+get_entity_n_overwrites (entity *ent) {
   assert(ent);
+  assert(is_class_type(get_entity_owner(ent)));
   return (ARR_LEN (ent->overwrites))-1;
 }
 
 inline entity *
-get_entity_overwrites   (entity *ent, int pos){
+get_entity_overwrites   (entity *ent, int pos) {
   assert(ent);
+  assert(is_class_type(get_entity_owner(ent)));
+  assert(pos < get_entity_n_overwrites(ent));
   return ent->overwrites[pos+1];
 }
 
 inline void
 set_entity_overwrites   (entity *ent, int pos, entity *overwritten) {
   assert(ent);
+  assert(is_class_type(get_entity_owner(ent)));
+  assert(pos < get_entity_n_overwrites(ent));
   ent->overwrites[pos+1] = overwritten;
 }
 
+inline void
+add_entity_overwrittenby   (entity *ent, entity *overwrites) {
+  assert(ent);
+  assert(is_class_type(get_entity_owner(ent)));
+  add_entity_overwrites(overwrites, ent);
+}
+
+inline int
+get_entity_n_overwrittenby (entity *ent) {
+  assert(ent);
+  assert(is_class_type(get_entity_owner(ent)));
+  return (ARR_LEN (ent->overwrittenby))-1;
+}
+
+inline entity *
+get_entity_overwrittenby   (entity *ent, int pos) {
+  assert(ent);
+  assert(is_class_type(get_entity_owner(ent)));
+  assert(pos < get_entity_n_overwrittenby(ent));
+  return ent->overwrittenby[pos+1];
+}
+
+inline void
+set_entity_overwrittenby   (entity *ent, int pos, entity *overwrites) {
+  assert(ent);
+  assert(is_class_type(get_entity_owner(ent)));
+  assert(pos < get_entity_n_overwrittenby(ent));
+  ent->overwrittenby[pos+1] = overwrites;
+}
+
 /* A link to store intermediate information */
 void *
 get_entity_link(entity *ent) {
@@ -340,19 +491,23 @@ get_entity_irg(entity *ent) {
 inline void
 set_entity_irg(entity *ent, ir_graph *irg) {
   assert (ent && ent->type);
-  assert (irg);
+  /* Wie kann man die Referenz auf einen IRG löschen, z.B. wenn die
+   * Methode selbst nicht mehr aufgerufen werden kann, die Entität
+   * aber erhalten bleiben soll. */
+  /* assert (irg); */
   assert (is_method_type(ent->type));
+  assert (ent->peculiarity == existent);
   ent->irg = irg;
 }
 
 int is_atomic_entity(entity *ent) {
-  type* t = ent->type;
+  type* t = get_entity_type(ent);
   return (is_primitive_type(t) || is_pointer_type(t) ||
 	  is_enumeration_type(t) || is_method_type(t));
 }
 
 int is_compound_entity(entity *ent) {
-  type* t = ent->type;
+  type* t = get_entity_type(ent);
   return (is_class_type(t) || is_struct_type(t) ||
 	  is_array_type(t) || is_union_type(t));
 }