- skip_Id nodes when returning the entity initializer: this should fix ldst_opt_id.c
[libfirm] / ir / tr / entity.c
index bd17601..380ee1e 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -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 "irhooks.h"
 #include "irprintf.h"
 
-/* All this is needed to build the constant node for methods: */
 #include "irprog_t.h"
 #include "ircons.h"
 #include "tv_t.h"
-#include "irdump.h"  /* for output if errors occur. */
-
-#include "callgraph.h"  /* for dumping debug output */
-
-/**
- * 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 "irdump.h"
+#include "irgraph_t.h"
+#include "callgraph.h"
+#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;
@@ -157,10 +127,11 @@ new_rd_entity(dbg_info *db, ir_type *owner, ident *name, ir_type *type)
 
        if (is_Method_type(type)) {
                symconst_symbol sym;
+               ir_mode *mode = is_Method_type(type) ? mode_P_code : mode_P_data;
                sym.entity_p            = res;
                rem                     = current_ir_graph;
                current_ir_graph        = get_const_code_irg();
-               res->value              = new_SymConst(sym, symconst_addr_ent);
+               res->value              = new_SymConst(mode, sym, symconst_addr_ent);
                current_ir_graph        = rem;
                res->allocation         = allocation_static;
                res->variability        = variability_constant;
@@ -169,7 +140,6 @@ new_rd_entity(dbg_info *db, ir_type *owner, ident *name, ir_type *type)
                res->attr.mtd_attr.param_access       = NULL;
                res->attr.mtd_attr.param_weight       = NULL;
                res->attr.mtd_attr.irg                = NULL;
-               res->attr.mtd_attr.section            = section_text;
        } else if (is_compound_type(type)) {
                res->variability = variability_uninitialized;
                res->value       = NULL;
@@ -231,17 +201,23 @@ 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);
@@ -254,26 +230,62 @@ static void free_entity_attrs(ir_entity *ent) {
        }
 }  /* free_entity_attrs */
 
+/**
+ * Creates a deep copy of an entity.
+ */
+static ir_entity *deep_entity_copy(ir_entity *old)
+{
+       ir_entity *newe = XMALLOC(ir_entity);
+
+       *newe = *old;
+       if (is_compound_entity(old)) {
+               if (old->has_initializer) {
+                       /* FIXME: the initializers are NOT copied */
+               } else {
+                       newe->attr.cmpd_attr.values    = NULL;
+                       newe->attr.cmpd_attr.val_paths = NULL;
+                       if (old->attr.cmpd_attr.values)
+                               newe->attr.cmpd_attr.values = DUP_ARR_F(ir_node *, old->attr.cmpd_attr.values);
+
+                       /* FIXME: the compound graph paths are NOT copied */
+                       if (old->attr.cmpd_attr.val_paths)
+                               newe->attr.cmpd_attr.val_paths = DUP_ARR_F(compound_graph_path *, old->attr.cmpd_attr.val_paths);
+               }
+       } else if (is_method_entity(old)) {
+               /* do NOT copy them, reanalyze. This might be the best solution */
+               newe->attr.mtd_attr.param_access = NULL;
+               newe->attr.mtd_attr.param_weight = NULL;
+       }
+
+#ifdef DEBUG_libfirm
+       newe->nr = get_irp_new_node_nr();
+#endif
+       return newe;
+}
+/*
+ * Copies the entity if the new_owner is different from the
+ * owner of the old entity,  else returns the old entity.
+ */
 ir_entity *
 copy_entity_own(ir_entity *old, ir_type *new_owner) {
        ir_entity *newe;
        assert(is_entity(old));
        assert(is_compound_type(new_owner));
+       assert(get_type_state(new_owner) != layout_fixed);
+
+       if (old->owner == new_owner)
+               return old;
 
-       if (old->owner == new_owner) return old;
-       newe = xmalloc(sizeof(*newe));
-       memcpy(newe, old, sizeof(*newe));
+       /* create a deep copy so we are safe of aliasing and double-freeing. */
+       newe = deep_entity_copy(old);
        newe->owner = new_owner;
+
        if (is_Class_type(new_owner)) {
                newe->overwrites    = NEW_ARR_F(ir_entity *, 0);
                newe->overwrittenby = NEW_ARR_F(ir_entity *, 0);
        }
-#ifdef DEBUG_libfirm
-       newe->nr = get_irp_new_node_nr();
-#endif
 
        insert_entity_in_owner(newe);
-
        return newe;
 }  /* copy_entity_own */
 
@@ -283,24 +295,19 @@ 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));
-       memcpy(newe, old, sizeof(*newe));
+       newe = deep_entity_copy(old);
        newe->name = new_name;
        newe->ld_name = NULL;
+
        if (is_Class_type(newe->owner)) {
                newe->overwrites    = DUP_ARR_F(ir_entity *, old->overwrites);
                newe->overwrittenby = DUP_ARR_F(ir_entity *, old->overwrittenby);
        }
-#ifdef DEBUG_libfirm
-       newe->nr = get_irp_new_node_nr();
-#endif
-
        insert_entity_in_owner(newe);
 
        return newe;
 }  /* copy_entity_name */
 
-
 void
 free_entity(ir_entity *ent) {
        assert(ent && ent->kind == k_entity);
@@ -556,27 +563,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 */
+ir_entity_usage (get_entity_usage)(const ir_entity *ent) {
+       return _get_entity_usage(ent);
+}
 
-/* 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 */
-
-/* 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
@@ -604,6 +597,7 @@ set_atomic_ent_value(ir_entity *ent, ir_node *val) {
        assert(is_atomic_entity(ent) && (ent->variability != variability_uninitialized));
        if (is_Method_type(ent->type) && (ent->peculiarity == peculiarity_existent))
                return;
+       assert(get_irn_mode(val) == get_type_mode(ent->type));
        ent->value = val;
 }  /* set_atomic_ent_value */
 
@@ -647,10 +641,10 @@ ir_node *copy_const_value(dbg_info *dbg, ir_node *n) {
        m = get_irn_mode(n);
        switch (get_irn_opcode(n)) {
        case iro_Const:
-               nn = new_d_Const_type(dbg, m, get_Const_tarval(n), get_Const_type(n));
+               nn = new_d_Const_type(dbg, get_Const_tarval(n), get_Const_type(n));
                break;
        case iro_SymConst:
-               nn = new_d_SymConst_type(dbg, get_SymConst_symbol(n), get_SymConst_kind(n),
+               nn = new_d_SymConst_type(dbg, get_irn_mode(n), get_SymConst_symbol(n), get_SymConst_kind(n),
                        get_SymConst_value_type(n));
                break;
        case iro_Add:
@@ -685,6 +679,116 @@ ir_node *copy_const_value(dbg_info *dbg, ir_node *n) {
        return nn;
 }  /* copy_const_value */
 
+static ir_initializer_t null_initializer = { IR_INITIALIZER_NULL };
+
+ir_initializer_t *get_initializer_null(void)
+{
+       return &null_initializer;
+}
+
+ir_initializer_t *create_initializer_const(ir_node *value)
+{
+       struct obstack *obst = get_irg_obstack(get_const_code_irg());
+
+       ir_initializer_t *initializer
+               = obstack_alloc(obst, sizeof(ir_initializer_const_t));
+       initializer->kind         = IR_INITIALIZER_CONST;
+       initializer->consti.value = value;
+
+       return initializer;
+}
+
+ir_initializer_t *create_initializer_tarval(tarval *tv)
+{
+       struct obstack *obst = get_irg_obstack(get_const_code_irg());
+
+       ir_initializer_t *initializer
+               = obstack_alloc(obst, sizeof(ir_initializer_tarval_t));
+       initializer->kind         = IR_INITIALIZER_TARVAL;
+       initializer->tarval.value = tv;
+
+       return initializer;
+}
+
+ir_initializer_t *create_initializer_compound(unsigned n_entries)
+{
+       struct obstack *obst = get_irg_obstack(get_const_code_irg());
+
+       size_t i;
+       size_t size  = sizeof(ir_initializer_compound_t)
+                    + (n_entries-1) * sizeof(ir_initializer_t*);
+
+       ir_initializer_t *initializer = obstack_alloc(obst, size);
+       initializer->kind                    = IR_INITIALIZER_COMPOUND;
+       initializer->compound.n_initializers = n_entries;
+
+       for(i = 0; i < n_entries; ++i) {
+               initializer->compound.initializers[i] = get_initializer_null();
+       }
+
+       return initializer;
+}
+
+ir_node *get_initializer_const_value(const ir_initializer_t *initializer)
+{
+       assert(initializer->kind == IR_INITIALIZER_CONST);
+       return skip_Id(initializer->consti.value);
+}
+
+tarval *get_initializer_tarval_value(const ir_initializer_t *initializer)
+{
+       assert(initializer->kind == IR_INITIALIZER_TARVAL);
+       return initializer->tarval.value;
+}
+
+unsigned get_initializer_compound_n_entries(const ir_initializer_t *initializer)
+{
+       assert(initializer->kind == IR_INITIALIZER_COMPOUND);
+       return initializer->compound.n_initializers;
+}
+
+void set_initializer_compound_value(ir_initializer_t *initializer,
+                                    unsigned index, ir_initializer_t *value)
+{
+       assert(initializer->kind == IR_INITIALIZER_COMPOUND);
+       assert(index < initializer->compound.n_initializers);
+
+       initializer->compound.initializers[index] = value;
+}
+
+ir_initializer_t *get_initializer_compound_value(
+               const ir_initializer_t *initializer, unsigned index)
+{
+       assert(initializer->kind == IR_INITIALIZER_COMPOUND);
+       assert(index < initializer->compound.n_initializers);
+
+       return initializer->compound.initializers[index];
+}
+
+ir_initializer_kind_t get_initializer_kind(const ir_initializer_t *initializer)
+{
+       return initializer->kind;
+}
+
+static void check_entity_initializer(ir_entity *entity)
+{
+       /* TODO */
+       (void) entity;
+}
+
+void set_entity_initializer(ir_entity *entity, ir_initializer_t *initializer)
+{
+       entity->attr.initializer = initializer;
+       entity->has_initializer  = 1;
+       check_entity_initializer(entity);
+}
+
+ir_initializer_t *get_entity_initializer(const ir_entity *entity)
+{
+       assert(entity->has_initializer);
+       return entity->attr.initializer;
+}
+
 /* Creates a new compound graph path. */
 compound_graph_path *
 new_compound_graph_path(ir_type *tp, int length) {
@@ -772,6 +876,12 @@ set_compound_graph_path_array_index(compound_graph_path *gr, int pos, int index)
        gr->list[pos].index = index;
 }  /* set_compound_graph_path_array_index */
 
+ir_type *
+get_compound_graph_path_type(const compound_graph_path *gr) {
+       assert(gr && is_compound_graph_path(gr));
+       return gr->tp;
+}
+
 /* A value of a compound entity is a pair of value and the corresponding path to a member of
    the compound. */
 void
@@ -793,6 +903,7 @@ set_compound_ent_value_w_path(ir_entity *ent, ir_node *val, compound_graph_path
 
 int
 get_compound_ent_n_values(ir_entity *ent) {
+       assert(!ent->has_initializer);
        assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
        return ARR_LEN(ent->attr.cmpd_attr.values);
 }  /* get_compound_ent_n_values */
@@ -800,6 +911,7 @@ get_compound_ent_n_values(ir_entity *ent) {
 ir_node *
 get_compound_ent_value(ir_entity *ent, int pos) {
        assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
+       assert(!ent->has_initializer);
        assert(0 <= pos && pos < ARR_LEN(ent->attr.cmpd_attr.values));
        return ent->attr.cmpd_attr.values[pos];
 }  /* get_compound_ent_value */
@@ -807,6 +919,7 @@ get_compound_ent_value(ir_entity *ent, int pos) {
 compound_graph_path *
 get_compound_ent_value_path(ir_entity *ent, int pos) {
        assert(is_compound_entity(ent) && (ent->variability != variability_uninitialized));
+       assert(!ent->has_initializer);
        assert(0 <= pos && pos < ARR_LEN(ent->attr.cmpd_attr.val_paths));
        return ent->attr.cmpd_attr.val_paths[pos];
 }  /* get_compound_ent_value_path */
@@ -815,10 +928,9 @@ get_compound_ent_value_path(ir_entity *ent, int pos) {
  * Returns non-zero, if two compound_graph_pathes are equal
  *
  * @param path1            the first path
- * @param visited_indices
  * @param path2            the second path
  */
-static int equal_paths(compound_graph_path *path1, int *visited_indices, compound_graph_path *path2) {
+static int equal_paths(compound_graph_path *path1, compound_graph_path *path2) {
        int i;
        int len1 = get_compound_graph_path_length(path1);
        int len2 = get_compound_graph_path_length(path2);
@@ -832,20 +944,12 @@ static int equal_paths(compound_graph_path *path1, int *visited_indices, compoun
 
                if (node1 != node2) return 0;
 
-               /* FIXME: Strange code. What is it good for? */
                tp = get_entity_owner(node1);
                if (is_Array_type(tp)) {
-                       long low;
-
-                       /* Compute the index of this node. */
-                       assert(get_array_n_dimensions(tp) == 1 && "multidim not implemented");
-
-                       low = get_array_lower_bound_int(tp, 0);
-                       if (low + visited_indices[i] < get_compound_graph_path_array_index(path2, i)) {
-                               visited_indices[i]++;
+                       int index1 = get_compound_graph_path_array_index(path1, i);
+                       int index2 = get_compound_graph_path_array_index(path2, i);
+                       if (index1 != index2)
                                return 0;
-                       } else
-                               assert(low + visited_indices[i] == get_compound_graph_path_array_index(path2, i));
                }
        }
        return 1;
@@ -855,45 +959,28 @@ static int equal_paths(compound_graph_path *path1, int *visited_indices, compoun
  * Returns the position of a value with the given path.
  * The path must contain array indices for all array element entities.
  *
- * @todo  This implementation is very slow (O(number of initializers^2) and should
- *        be replaced when the new tree oriented
+ * @todo  This implementation is very slow (O(number of initializers * |path|)
+ *        and should be replaced when the new tree oriented
  *        value representation is finally implemented.
  */
 static int get_compound_ent_pos_by_path(ir_entity *ent, compound_graph_path *path) {
        int i, n_paths = get_compound_ent_n_values(ent);
-       int *visited_indices;
-       int path_len = get_compound_graph_path_length(path);
 
-       NEW_ARR_A(int *, visited_indices, path_len);
-       memset(visited_indices, 0, sizeof(*visited_indices) * path_len);
        for (i = 0; i < n_paths; i ++) {
-               if (equal_paths(get_compound_ent_value_path(ent, i), visited_indices, path))
+               compound_graph_path *gr = get_compound_ent_value_path(ent, i);
+               if (equal_paths(gr, path))
                        return i;
        }
-
-#if 0
-       {
-               int j;
-               printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
-               printf("Entity %s : ", get_entity_name(ent));
-               for (j = 0; j < get_compound_graph_path_length(path); ++j) {
-                       ir_entity *node = get_compound_graph_path_node(path, j);
-                       printf("%s", get_entity_name(node));
-                       if (is_Array_type(get_entity_owner(node)))
-                               printf("[%d]", get_compound_graph_path_array_index(path, j));
-               }
-               printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
-       }
-#endif
-
-       assert(0 && "path not found");
        return -1;
 }  /* get_compound_ent_pos_by_path */
 
 /* Returns a constant value given the access path.
  *  The path must contain array indices for all array element entities. */
 ir_node *get_compound_ent_value_by_path(ir_entity *ent, compound_graph_path *path) {
-       return get_compound_ent_value(ent, get_compound_ent_pos_by_path(ent, path));
+       int pos = get_compound_ent_pos_by_path(ent, path);
+       if (pos >= 0)
+               return get_compound_ent_value(ent, pos);
+       return NULL;
 }  /* get_compound_ent_value_by_path */
 
 
@@ -985,57 +1072,58 @@ set_array_entity_values(ir_entity *ent, tarval **values, int num_vals) {
 }  /* set_array_entity_values */
 
 /* Return the overall offset of value at position pos in bytes. */
-int get_compound_ent_value_offset_bytes(ir_entity *ent, int pos) {
+unsigned get_compound_ent_value_offset_bytes(ir_entity *ent, int pos) {
        compound_graph_path *path;
        int path_len, i;
-       int offset = 0;
+       unsigned offset = 0;
        ir_type *curr_tp;
 
        assert(get_type_state(get_entity_type(ent)) == layout_fixed);
 
-       path = get_compound_ent_value_path(ent, pos);
+       path     = get_compound_ent_value_path(ent, pos);
        path_len = get_compound_graph_path_length(path);
-       curr_tp = path->tp;
+       curr_tp  = path->tp;
 
        for (i = 0; i < path_len; ++i) {
-               ir_entity *node = get_compound_graph_path_node(path, i);
-               ir_type *node_tp = get_entity_type(node);
-
                if (is_Array_type(curr_tp)) {
-                       int size  = get_type_size_bits(node_tp);
-                       int align = get_type_alignment_bits(node_tp);
-                       int idx;
+                       ir_type *elem_type = get_array_element_type(curr_tp);
+                       unsigned size      = get_type_size_bytes(elem_type);
+                       unsigned align     = get_type_alignment_bytes(elem_type);
+                       int      idx;
 
                        assert(size > 0);
                        if(size % align > 0) {
                                size += align - (size % align);
                        }
-                       assert(size % 8 == 0);
-                       size /= 8;
                        idx = get_compound_graph_path_array_index(path, i);
                        assert(idx >= 0);
                        offset += size * idx;
+                       curr_tp = elem_type;
                } else {
+                       ir_entity *node = get_compound_graph_path_node(path, i);
                        offset += get_entity_offset(node);
+                       curr_tp = get_entity_type(node);
                }
-               curr_tp = node_tp;
        }
 
        return offset;
 }  /* get_compound_ent_value_offset_bytes */
 
 /* Return the offset in bits from the last byte address. */
-int get_compound_ent_value_offset_bit_remainder(ir_entity *ent, int pos) {
+unsigned get_compound_ent_value_offset_bit_remainder(ir_entity *ent, int pos) {
        compound_graph_path *path;
        int path_len;
        ir_entity *last_node;
 
        assert(get_type_state(get_entity_type(ent)) == layout_fixed);
 
-       path = get_compound_ent_value_path(ent, pos);
-       path_len = get_compound_graph_path_length(path);
+       path      = get_compound_ent_value_path(ent, pos);
+       path_len  = get_compound_graph_path_length(path);
        last_node = get_compound_graph_path_node(path, path_len - 1);
 
+       if(last_node == NULL)
+               return 0;
+
        return get_entity_offset_bits_remainder(last_node);
 }  /* get_compound_ent_value_offset_bit_remainder */
 
@@ -1213,18 +1301,6 @@ void set_entity_vtable_number(ir_entity *ent, unsigned vtable_number) {
        ent->attr.mtd_attr.vtable_number = vtable_number;
 }  /* set_entity_vtable_number */
 
-/* Returns the section of a method. */
-ir_img_section get_method_img_section(const ir_entity *ent) {
-       assert(is_method_entity((ir_entity *)ent));
-       return ent->attr.mtd_attr.section;
-}  /* get_method_img_section */
-
-/* Sets the section of a method. */
-void set_method_img_section(ir_entity *ent, ir_img_section section) {
-       assert(is_method_entity(ent));
-       ent->attr.mtd_attr.section = section;
-}  /* set_method_img_section */
-
 int
 (is_entity)(const void *thing) {
        return _is_entity(thing);
@@ -1259,11 +1335,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 */
 
@@ -1367,5 +1443,6 @@ void firm_init_entity(void)
 
        current_ir_graph      = get_const_code_irg();
        sym.entity_p          = unknown_entity;
-       unknown_entity->value = new_SymConst(sym, symconst_addr_ent);
+       /* TODO: we need two unknown_entities here, one for code and one for data */
+       unknown_entity->value = new_SymConst(mode_P_data, sym, symconst_addr_ent);
 }  /* firm_init_entity */