X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Fentity.c;h=8b79c9f66bf62de94635fd02045fea08f1277768;hb=3663d1cfe641a78f9d7bc1f4df7f875757cbde9f;hp=ca7fff3e15a67c2bacad1ff7b4224e8c100f4387;hpb=0fa3829724b2f75bdfce909508ba29f9c2b78ca2;p=libfirm

diff --git a/ir/tr/entity.c b/ir/tr/entity.c
index ca7fff3e1..8b79c9f66 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"
@@ -34,7 +36,7 @@ init_entity (void)
 /** ENTITY                                                        **/
 /*******************************************************************/
 
-inline void insert_entity_in_owner (entity *ent) {
+INLINE void insert_entity_in_owner (entity *ent) {
   type *owner = ent->owner;
   switch (get_type_tpop_code(owner)) {
   case tpo_class: {
@@ -94,7 +96,7 @@ new_entity (type *owner, ident *name, type *type)
   insert_entity_in_owner (res);
   return res;
 }
-inline void free_entity_attrs(entity *ent) {
+INLINE void free_entity_attrs(entity *ent) {
   assert(ent);
   DEL_ARR_F(ent->overwrites);
   DEL_ARR_F(ent->overwrittenby);
@@ -134,7 +136,7 @@ copy_entity_name (entity *old, ident *new_name) {
   return new;
 }
 
-inline const char *
+INLINE const char *
 get_entity_name (entity *ent) {
   assert (ent);
   return id_to_str(get_entity_ident(ent));
@@ -147,22 +149,22 @@ 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);
 */
 
-inline type *
+INLINE type *
 get_entity_owner (entity *ent) {
   return ent->owner = skip_tid(ent->owner);
 }
 
-inline void
+INLINE void
 set_entity_owner (entity *ent, type *owner) {
   assert_legal_owner_of_ent(owner);
   ent->owner = owner;
 }
 
-inline void   /* should this go into type.c? */
+INLINE void   /* should this go into type.c? */
 assert_legal_owner_of_ent(type *owner) {
   assert (get_type_tpop_code(owner) == tpo_class ||
           get_type_tpop_code(owner) == tpo_union ||
@@ -171,7 +173,7 @@ assert_legal_owner_of_ent(type *owner) {
 							-- to select fields! */
 }
 
-inline ident *
+INLINE ident *
 get_entity_ld_ident (entity *ent)
 {
   if (ent->ld_name == NULL)
@@ -179,12 +181,12 @@ get_entity_ld_ident (entity *ent)
   return ent->ld_name;
 }
 
-inline void
+INLINE void
 set_entity_ld_ident (entity *ent, ident *ld_ident) {
   ent->ld_name = ld_ident;
 }
 
-inline const char *
+INLINE const char *
 get_entity_ld_name (entity *ent) {
   return id_to_str(get_entity_ld_ident(ent));
 }
@@ -194,45 +196,45 @@ char  *get_entity_ld_name  (entity *);
 void   set_entity_ld_name  (entity *, char *ld_name);
 */
 
-inline type *
+INLINE type *
 get_entity_type (entity *ent) {
   return ent->type = skip_tid(ent->type);
 }
 
-inline void
+INLINE void
 set_entity_type (entity *ent, type *type) {
   ent->type = type;
 }
 
 
-inline ent_allocation
+INLINE ent_allocation
 get_entity_allocation (entity *ent) {
   return ent->allocation;
 }
 
-inline void
+INLINE void
 set_entity_allocation (entity *ent, ent_allocation al) {
   ent->allocation = al;
 }
 
 
-inline ent_visibility
+INLINE ent_visibility
 get_entity_visibility (entity *ent) {
   return ent->visibility;
 }
 
-inline void
+INLINE void
 set_entity_visibility (entity *ent, ent_visibility vis) {
   if (vis != local) assert(ent->allocation == static_allocated);
   ent->visibility = vis;
 }
 
-inline ent_variability
+INLINE ent_variability
 get_entity_variability (entity *ent) {
   return ent->variability;
 }
 
-inline void
+INLINE void
 set_entity_variability (entity *ent, ent_variability var){
   if (var == part_constant)
     assert(is_class_type(ent->type) || is_struct_type(ent->type));
@@ -252,45 +254,49 @@ set_entity_variability (entity *ent, ent_variability var){
 }
 
 
-inline ent_volatility
+INLINE ent_volatility
 get_entity_volatility (entity *ent) {
+  assert (ent);
   return ent->volatility;
 }
 
-inline void
+INLINE void
 set_entity_volatility (entity *ent, ent_volatility vol) {
+  assert (ent);
   ent->volatility = vol;
 }
 
-inline peculiarity
+INLINE peculiarity
 get_entity_peculiarity (entity *ent) {
   assert (ent);
-  assert (is_method_type(ent->type));
   return ent->peculiarity;
 }
 
-inline void
+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;
 }
 
 /* Set has no effect for entities of type method. */
-inline ir_node *
+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;
 }
 
-inline void
+INLINE void
 set_atomic_ent_value(entity *ent, ir_node *val) {
   assert(ent && is_atomic_entity(ent) && (ent->variability != uninitialized));
   if (is_method_type(ent->type)) return;
   ent->value = val;
 }
 
-ir_node *copy_value(ir_node *n) {
+
+ir_node *copy_const_value(ir_node *n) {
   ir_node *nn;
   ir_mode *m;
 
@@ -301,54 +307,63 @@ ir_node *copy_value(ir_node *n) {
   case iro_SymConst:
     nn = new_SymConst(get_SymConst_type_or_id(n), get_SymConst_kind(n)); break;
   case iro_Add:
-    nn = new_Add(copy_value(get_Add_left(n)), copy_value(get_Add_right(n)), m); break;
+    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_value(ent->value);
-}
-
 /* A value of a compound entity is a pair of value and the corresponding member of
    the compound. */
-inline void
+INLINE void
 add_compound_ent_value(entity *ent, ir_node *val, entity *member) {
   assert(ent && is_compound_entity(ent) && (ent->variability != uninitialized));
   ARR_APP1 (ir_node *, ent->values, val);
   ARR_APP1 (entity *, ent->val_ents, member);
 }
 
-inline int
+/* 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));
   return (ARR_LEN (ent->values))-1;
 }
 
-inline ir_node  *
+INLINE ir_node  *
 get_compound_ent_value(entity *ent, int pos) {
   assert(ent && is_compound_entity(ent) && (ent->variability != uninitialized));
   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) {
+/* 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_value(ent->values[pos+1]);
-}
+  return copy_const_value(ent->values[pos+1]);
+  }*/
 
-inline entity   *
+INLINE entity   *
 get_compound_ent_value_member(entity *ent, int pos) {
   assert(ent && is_compound_entity(ent) && (ent->variability != uninitialized));
   return ent->val_ents[pos+1];
 }
 
-inline void
+INLINE void
 set_compound_ent_value(entity *ent, ir_node *val, entity *member, int pos) {
   assert(ent && is_compound_entity(ent) && (ent->variability != uninitialized));
   ent->values[pos+1] = val;
@@ -364,28 +379,30 @@ set_array_entity_values(entity *ent, tarval **values, int num_vals) {
 
   assert(is_array_type(arrtp));
   assert(get_array_n_dimensions(arrtp) == 1);
-  assert(get_array_lower_bound (arrtp, 0) && get_array_upper_bound (arrtp, 0));
+  /* 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]);
-    set_compound_ent_value(ent, val, get_array_element_entity(arrtp), i);
+    add_compound_ent_value(ent, val, get_array_element_entity(arrtp));
   }
   current_ir_graph = rem;
 }
 
-inline int
+INLINE int
 get_entity_offset (entity *ent) {
   return ent->offset;
 }
 
-inline void
+INLINE void
 set_entity_offset (entity *ent, int offset) {
   ent->offset = offset;
 }
 
-inline void
+INLINE void
 add_entity_overwrites   (entity *ent, entity *overwritten) {
   assert(ent);
   assert(is_class_type(get_entity_owner(ent)));
@@ -393,14 +410,14 @@ add_entity_overwrites   (entity *ent, entity *overwritten) {
   ARR_APP1 (entity *, overwritten->overwrittenby, ent);
 }
 
-inline int
+INLINE int
 get_entity_n_overwrites (entity *ent) {
   assert(ent);
   assert(is_class_type(get_entity_owner(ent)));
   return (ARR_LEN (ent->overwrites))-1;
 }
 
-inline entity *
+INLINE entity *
 get_entity_overwrites   (entity *ent, int pos) {
   assert(ent);
   assert(is_class_type(get_entity_owner(ent)));
@@ -408,7 +425,7 @@ get_entity_overwrites   (entity *ent, int pos) {
   return ent->overwrites[pos+1];
 }
 
-inline void
+INLINE void
 set_entity_overwrites   (entity *ent, int pos, entity *overwritten) {
   assert(ent);
   assert(is_class_type(get_entity_owner(ent)));
@@ -416,21 +433,21 @@ set_entity_overwrites   (entity *ent, int pos, entity *overwritten) {
   ent->overwrites[pos+1] = overwritten;
 }
 
-inline void
+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
+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 *
+INLINE entity *
 get_entity_overwrittenby   (entity *ent, int pos) {
   assert(ent);
   assert(is_class_type(get_entity_owner(ent)));
@@ -438,7 +455,7 @@ get_entity_overwrittenby   (entity *ent, int pos) {
   return ent->overwrittenby[pos+1];
 }
 
-inline void
+INLINE void
 set_entity_overwrittenby   (entity *ent, int pos, entity *overwrites) {
   assert(ent);
   assert(is_class_type(get_entity_owner(ent)));
@@ -459,17 +476,20 @@ set_entity_link(entity *ent, void *l) {
   ent->link = l;
 }
 
-inline ir_graph *
+INLINE ir_graph *
 get_entity_irg(entity *ent) {
   assert (ent);
   assert (is_method_type(ent->type));
   return ent->irg;
 }
 
-inline void
+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;