- remove artifacts of old initializer implementation
[libfirm] / ir / tr / entity.c
index c174f12..89f4716 100644 (file)
@@ -23,9 +23,7 @@
  * @author  Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Michael Beck
  * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <string.h>
 #include <stdlib.h>
 #include "tv_t.h"
 #include "irdump.h"
 #include "irgraph_t.h"
-
 #include "callgraph.h"
-
-/**
- * An interval initializer.
- */
-typedef struct interval_initializer interval_initializer;
-
-/**
- * A value initializer.
- */
-typedef struct value_initializer value_initializer;
-
-struct interval_initializer {
-       int                  first_index; /**< The first index of the initialized interval. */
-       int                  last_index;  /**< The last index of the initialized interval. */
-       interval_initializer *next;       /**< Points to the next interval initializer. */
-};
-
-struct value_initializer {
-       ir_entity *ent;           /**< The initialized entity. */
-       value_initializer *next;  /**< Points to the next value initializer. */
-};
-
-typedef union initializer {
-       ir_node              *value;     /**< The value of the initializer. */
-       ir_node              **values;   /**< The values of an interval. */
-       value_initializer    *val_init;  /**< Points the the head of the next value initializers. */
-       interval_initializer *int_init;  /**< Points to the head of the next value initializers. */
-} initializer;
+#include "error.h"
 
 /*-----------------------------------------------------------------*/
 /** general                                                       **/
@@ -94,7 +64,7 @@ ir_entity *get_unknown_entity(void) { return unknown_entity; }
 /**
  * Add an entity to it's already set owner type.
  */
-static INLINE void insert_entity_in_owner(ir_entity *ent) {
+static inline void insert_entity_in_owner(ir_entity *ent) {
        ir_type *owner = ent->owner;
        switch (get_type_tpop_code(owner)) {
        case tpo_class:
@@ -109,7 +79,8 @@ static INLINE void insert_entity_in_owner(ir_entity *ent) {
        case tpo_array:
                set_array_element_entity(owner, ent);
                break;
-       default: assert(0);
+       default:
+               panic("Unsupported type kind");
        }
 }  /* insert_entity_in_owner */
 
@@ -123,7 +94,7 @@ static INLINE void insert_entity_in_owner(ir_entity *ent) {
  *
  * @return the new created entity
  */
-static INLINE ir_entity *
+static inline ir_entity *
 new_rd_entity(dbg_info *db, ir_type *owner, ident *name, ir_type *type)
 {
        ir_entity *res;
@@ -131,8 +102,7 @@ new_rd_entity(dbg_info *db, ir_type *owner, ident *name, ir_type *type)
 
        assert(!id_contains_char(name, ' ') && "entity name should not contain spaces");
 
-       res = xmalloc(sizeof(*res));
-       memset(res, 0, sizeof(*res));
+       res = XMALLOCZ(ir_entity);
 
        res->kind    = k_entity;
        res->name    = name;
@@ -146,7 +116,7 @@ new_rd_entity(dbg_info *db, ir_type *owner, ident *name, ir_type *type)
        res->align                = align_is_aligned;
        res->stickyness           = stickyness_unsticky;
        res->peculiarity          = peculiarity_existent;
-       res->address_taken        = ir_address_taken_unknown;
+       res->usage                = ir_usage_unknown;
        res->final                = 0;
        res->compiler_gen         = 0;
        res->backend_marked       = 0;
@@ -231,17 +201,22 @@ static void free_entity_attrs(ir_entity *ent) {
                assert(ent->overwrittenby == NULL);
        }
        if (is_compound_entity(ent)) {
-               if (ent->attr.cmpd_attr.val_paths) {
-                       for (i = get_compound_ent_n_values(ent) - 1; i >= 0; --i)
-                               if (ent->attr.cmpd_attr.val_paths[i]) {
-                                       /* free_compound_graph_path(ent->attr.cmpd_attr.val_paths[i]) ;  * @@@ warum nich? */
-                                       /* Geht nich: wird mehrfach verwendet!!! ==> mehrfach frei gegeben. */
-                                       /* DEL_ARR_F(ent->attr.cmpd_attr.val_paths); */
-                               }
-                               ent->attr.cmpd_attr.val_paths = NULL;
+               if (ent->has_initializer) {
+                       /* TODO: free initializers */
+               } else {
+                       if (ent->attr.cmpd_attr.val_paths) {
+                               for (i = get_compound_ent_n_values(ent) - 1; i >= 0; --i)
+                                       if (ent->attr.cmpd_attr.val_paths[i]) {
+                                               /* free_compound_graph_path(ent->attr.cmpd_attr.val_paths[i]) ;  * @@@ warum nich? */
+                                               /* Geht nich: wird mehrfach verwendet!!! ==> mehrfach frei gegeben. */
+                                               DEL_ARR_F(ent->attr.cmpd_attr.val_paths);
+                                       }
+                                       ent->attr.cmpd_attr.val_paths = NULL;
+                       }
+                       if (ent->attr.cmpd_attr.values)
+                               DEL_ARR_F(ent->attr.cmpd_attr.values);
+                       ent->attr.cmpd_attr.values = NULL;
                }
-               /* if (ent->attr.cmpd_attr.values) DEL_ARR_F(ent->attr.cmpd_attr.values); *//* @@@ warum nich? */
-               ent->attr.cmpd_attr.values = NULL;
        } else if (is_method_entity(ent)) {
                if (ent->attr.mtd_attr.param_access) {
                        DEL_ARR_F(ent->attr.mtd_attr.param_access);
@@ -266,7 +241,7 @@ copy_entity_own(ir_entity *old, ir_type *new_owner) {
        assert(get_type_state(new_owner) != layout_fixed);
 
        if (old->owner == new_owner) return old;
-       newe = xmalloc(sizeof(*newe));
+       newe = XMALLOC(ir_entity);
        memcpy(newe, old, sizeof(*newe));
        newe->owner = new_owner;
        if (is_Class_type(new_owner)) {
@@ -288,7 +263,7 @@ copy_entity_name(ir_entity *old, ident *new_name) {
        assert(old && old->kind == k_entity);
 
        if (old->name == new_name) return old;
-       newe = xmalloc(sizeof(*newe));
+       newe = XMALLOC(ir_entity);
        memcpy(newe, old, sizeof(*newe));
        newe->name = new_name;
        newe->ld_name = NULL;
@@ -561,27 +536,13 @@ void (set_entity_backend_marked)(ir_entity *ent, int flag) {
        _set_entity_backend_marked(ent, flag);
 }  /* set_entity_backend_marked */
 
-/* Checks if the address of an entity was taken. */
-ir_address_taken_state (get_entity_address_taken)(const ir_entity *ent) {
-       return _get_entity_address_taken(ent);
-}  /* is_entity_address_taken */
-
-/* Sets/resets the address taken flag. */
-void (set_entity_address_taken)(ir_entity *ent, ir_address_taken_state flag) {
-       _set_entity_address_taken(ent, flag);
-}  /* set_entity_address_taken */
+ir_entity_usage (get_entity_usage)(const ir_entity *ent) {
+       return _get_entity_usage(ent);
+}
 
-/* Return the name of the address_taken state. */
-const char *get_address_taken_state_name(ir_address_taken_state state) {
-#define X(a)    case a: return #a
-       switch (state) {
-       X(ir_address_not_taken);
-       X(ir_address_taken_unknown);
-       X(ir_address_taken);
-    default: return "BAD VALUE";
-       }
-#undef X
-}  /* get_address_taken_state_name */
+void (set_entity_usage)(ir_entity *ent, ir_entity_usage flags) {
+       _set_entity_usage(ent, flags);
+}
 
 /* Get the entity's stickyness */
 ir_stickyness
@@ -1347,11 +1308,11 @@ int equal_entity(ir_entity *ent1, ir_entity *ent2) {
 }  /* equal_entity */
 
 
-unsigned long (get_entity_visited)(ir_entity *ent) {
+ir_visited_t (get_entity_visited)(ir_entity *ent) {
        return _get_entity_visited(ent);
 }  /* get_entity_visited */
 
-void (set_entity_visited)(ir_entity *ent, unsigned long num) {
+void (set_entity_visited)(ir_entity *ent, ir_visited_t num) {
        _set_entity_visited(ent, num);
 }  /* set_entity_visited */