X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Ftype.c;h=524ed981fdfcbc94aa2348282a06f406b4a0548d;hb=ec68b2aaadb9504d101e6cbc4a58c69f3897f489;hp=eb057407005a50bf30280afa53de5b09227e1234;hpb=79e991959fc8aee13e1b1d92220bde34a22afd92;p=libfirm

diff --git a/ir/tr/type.c b/ir/tr/type.c
index eb0574070..524ed981f 100644
--- a/ir/tr/type.c
+++ b/ir/tr/type.c
@@ -36,22 +36,33 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #endif
 
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
 
 # include <stdlib.h>
 # include <stddef.h>
-# include <string.h>
+
 # include "type_t.h"
-# include "tpop_t.h"
+
+# include "xmalloc.h"
 # include "irprog_t.h"
+# include "ircons.h"
+# include "tpop_t.h"
 # include "typegmod.h"
-# include "array.h"
-# include "irprog.h"
 # include "mangle.h"
-# include "tv.h"
-# include "ircons.h"
+# include "tv_t.h"
+
+# include "array.h"
 
 /*******************************************************************/
 /** TYPE                                                          **/
@@ -101,7 +112,8 @@ new_type(tp_op *type_op, ir_mode *mode, ident* name) {
   assert(!id_contains_char(name, ' ') && "type name should not contain spaces");
 
   node_size = offsetof(type, attr) +  type_op->attr_size;
-  res = (type *) xmalloc (node_size);
+  res = xmalloc (node_size);
+  memset(res, 0, node_size);
   add_irp_type(res);   /* Remember the new type global. */
 
   res->kind    = k_type;
@@ -110,11 +122,12 @@ new_type(tp_op *type_op, ir_mode *mode, ident* name) {
   res->name    = name;
   res->state   = layout_undefined;
   res->size    = -1;
+  res->align   = -1;
   res->visit   = 0;
   res -> link  = NULL;
 #ifdef DEBUG_libfirm
   res->nr      = get_irp_new_node_nr();
-#endif
+#endif /* defined DEBUG_libfirm */
 
   return res;
 }
@@ -163,7 +176,7 @@ void free_type_attrs(type *tp) {
 }
 
 /* set/get the link field */
-void *(get_type_link)(type *tp)
+void *(get_type_link)(const type *tp)
 {
   return __get_type_link(tp);
 }
@@ -173,24 +186,24 @@ void (set_type_link)(type *tp, void *l)
   __set_type_link(tp, l);
 }
 
-tp_op *(get_type_tpop)(type *tp) {
+const tp_op *(get_type_tpop)(const type *tp) {
   return __get_type_tpop(tp);
 }
 
-ident *(get_type_tpop_nameid)(type *tp) {
+ident *(get_type_tpop_nameid)(const type *tp) {
   return __get_type_tpop_nameid(tp);
 }
 
-const char* get_type_tpop_name(type *tp) {
+const char* get_type_tpop_name(const type *tp) {
   assert(tp && tp->kind == k_type);
   return get_id_str(tp->type_op->name);
 }
 
-tp_opcode (get_type_tpop_code)(type *tp) {
+tp_opcode (get_type_tpop_code)(const type *tp) {
   return __get_type_tpop_code(tp);
 }
 
-ir_mode *(get_type_mode)(type *tp) {
+ir_mode *(get_type_mode)(const type *tp) {
   return __get_type_mode(tp);
 }
 
@@ -198,11 +211,11 @@ void        set_type_mode(type *tp, ir_mode* m) {
   assert(tp && tp->kind == k_type);
 
   assert(((tp->type_op != type_primitive)   || mode_is_data(m))     &&
-	 /* Modes of primitives must be data */
-	 ((tp->type_op != type_enumeration) || mode_is_int(m))      &&
+     /* Modes of primitives must be data */
+     ((tp->type_op != type_enumeration) || mode_is_int(m))      &&
          /* Modes of enumerations must be integers */
-	 ((tp->type_op != type_pointer)     || mode_is_reference(m))   );
-	 /* Modes of pointers must be references. */
+     ((tp->type_op != type_pointer)     || mode_is_reference(m))   );
+     /* Modes of pointers must be references. */
 
   switch (get_type_tpop_code(tp)) {
   case tpo_primitive:
@@ -221,8 +234,8 @@ void        set_type_mode(type *tp, ir_mode* m) {
   case tpo_class:
     /* for classes and structs we allow to set a mode if the layout is fixed AND the size matches */
     assert(get_type_state(tp) == layout_fixed &&
-	   tp->size == get_mode_size_bits(m) &&
-	   "mode don't match struct/class layout");
+       tp->size == get_mode_size_bits(m) &&
+       "mode don't match struct/class layout");
     tp->mode = m;
     break;
   default:
@@ -230,7 +243,7 @@ void        set_type_mode(type *tp, ir_mode* m) {
   }
 }
 
-ident *(get_type_ident)(type *tp) {
+ident *(get_type_ident)(const type *tp) {
   return __get_type_ident(tp);
 }
 
@@ -239,20 +252,20 @@ void (set_type_ident)(type *tp, ident* id) {
 }
 
 /* Outputs a unique number for this node */
-long (get_type_nr)(type *tp) {
+long (get_type_nr)(const type *tp) {
   return __get_type_nr(tp);
 }
 
-const char* get_type_name(type *tp) {
+const char* get_type_name(const type *tp) {
   assert(tp && tp->kind == k_type);
   return (get_id_str(tp->name));
 }
 
-int (get_type_size_bytes)(type *tp) {
+int (get_type_size_bytes)(const type *tp) {
   return __get_type_size_bytes(tp);
 }
 
-int (get_type_size_bits)(type *tp) {
+int (get_type_size_bits)(const type *tp) {
   return __get_type_size_bits(tp);
 }
 
@@ -278,7 +291,59 @@ set_type_size_bytes(type *tp, int size) {
   set_type_size_bits(tp, 8*size);
 }
 
-type_state (get_type_state)(type *tp) {
+int get_type_alignment_bytes(type *tp) {
+  int align = get_type_alignment_bits(tp);
+
+  return align < 0 ? align : (align + 7) >> 3;
+}
+
+int get_type_alignment_bits(type *tp) {
+  int align = 8;
+
+  if (tp->align > 0)
+    return tp->align;
+
+  /* alignment NOT set calculate it "on demand" */
+  if (tp->mode)
+    align = get_mode_size_bits(tp->mode);
+  else if (is_array_type(tp))
+    align = get_type_alignment_bits(get_array_element_type(tp));
+  else if (is_compound_type(tp)) {
+    int i, n = get_compound_n_members(tp);
+
+    align = 0;
+    for (i = 0; i < n; ++i) {
+      type *t = get_entity_type(get_compound_member(tp, i));
+      int   a = get_type_alignment_bits(t);
+
+      if (a > align)
+        align = a;
+    }
+  }
+  else if (is_method_type(tp))
+    align = 0;
+
+  /* write back */
+  tp->align = align;
+
+  return align;
+}
+
+void
+set_type_alignment_bits(type *tp, int align) {
+  assert(tp && tp->kind == k_type);
+  /* Methods don't have an alignment. */
+  if (tp->type_op != type_method) {
+    tp->align = align;
+  }
+}
+
+void
+set_type_alignment_bytes(type *tp, int align) {
+  set_type_size_bits(tp, 8*align);
+}
+
+type_state (get_type_state)(const type *tp) {
   return __get_type_state(tp);
 }
 
@@ -296,41 +361,41 @@ set_type_state(type *tp, type_state state) {
     switch (get_type_tpop_code(tp)) {
     case tpo_class:
       {
-	assert(get_type_size_bits(tp) > -1);
-	if (tp != get_glob_type()) {
-	  int n_mem = get_class_n_members(tp);
-	  for (i = 0; i < n_mem; i++) {
-	    if (get_entity_offset_bits(get_class_member(tp, i)) <= -1)
-	      { DDMT(tp); DDME(get_class_member(tp, i)); }
-	    assert(get_entity_offset_bits(get_class_member(tp, i)) > -1);
+    assert(get_type_size_bits(tp) > -1);
+    if (tp != get_glob_type()) {
+      int n_mem = get_class_n_members(tp);
+      for (i = 0; i < n_mem; i++) {
+        if (get_entity_offset_bits(get_class_member(tp, i)) <= -1)
+          { DDMT(tp); DDME(get_class_member(tp, i)); }
+        assert(get_entity_offset_bits(get_class_member(tp, i)) > -1);
             /* TR ??
-	    assert(is_method_type(get_entity_type(get_class_member(tp, i))) ||
-		   (get_entity_allocation(get_class_member(tp, i)) == allocation_automatic));
+        assert(is_method_type(get_entity_type(get_class_member(tp, i))) ||
+           (get_entity_allocation(get_class_member(tp, i)) == allocation_automatic));
                    */
-	  }
-	}
+      }
+    }
       } break;
     case tpo_struct:
       {
-	assert(get_type_size_bits(tp) > -1);
-	for (i = 0; i < get_struct_n_members(tp); i++) {
-	  assert(get_entity_offset_bits(get_struct_member(tp, i)) > -1);
-	  assert((get_entity_allocation(get_struct_member(tp, i)) == allocation_automatic));
-	}
+        assert(get_type_size_bits(tp) > -1);
+        for (i = 0; i < get_struct_n_members(tp); i++) {
+          assert(get_entity_offset_bits(get_struct_member(tp, i)) > -1);
+          assert((get_entity_allocation(get_struct_member(tp, i)) == allocation_automatic));
+        }
       } break;
     case tpo_union:
       { /* ?? */
       } break;
     case tpo_array:
       { /* ??
-	 Check order?
-	 Assure that only innermost dimension is dynamic? */
+         Check order?
+         Assure that only innermost dimension is dynamic? */
       } break;
     case tpo_enumeration:
       {
-	assert(get_type_mode != NULL);
-	for (i = 0; i < get_enumeration_n_enums(tp); i++)
-	  assert(get_enumeration_enum(tp, i) != NULL);
+        assert(get_type_mode != NULL);
+        for (i = 0; i < get_enumeration_n_enums(tp); i++)
+          assert(get_enumeration_enum(tp, i) != NULL);
       } break;
     default: break;
     } /* switch (tp) */
@@ -338,7 +403,7 @@ set_type_state(type *tp, type_state state) {
   tp->state = state;
 }
 
-unsigned long (get_type_visited)(type *tp) {
+unsigned long (get_type_visited)(const type *tp) {
   return __get_type_visited(tp);
 }
 
@@ -352,15 +417,15 @@ void (mark_type_visited)(type *tp) {
 }
 
 /* @@@ name clash with master flag
-int (type_visited)(type *tp) {
+int (type_visited)(const type *tp) {
   return __type_visited(tp);
 }*/
 
-int (type_not_visited)(type *tp) {
+int (type_not_visited)(const type *tp) {
   return __type_not_visited(tp);
 }
 
-int (is_type)(void *thing) {
+int (is_type)(const void *thing) {
   return __is_type(thing);
 }
 
@@ -393,15 +458,15 @@ bool equal_type(type *typ1, type *typ2) {
     for (i = 0; i < get_class_n_members(typ1); i++) {
       entity *e1 = get_class_member(typ1, i);
       for (j = 0; j < get_class_n_members(typ2); j++) {
-	entity *e2 = get_class_member(typ2, j);
-	if (get_entity_name(e1) == get_entity_name(e2))
-	  m[i] = e2;
+        entity *e2 = get_class_member(typ2, j);
+        if (get_entity_name(e1) == get_entity_name(e2))
+          m[i] = e2;
       }
     }
     for (i = 0; i < get_class_n_members(typ1); i++) {
       if (!m[i]  ||  /* Found no counterpart */
-	  !equal_entity(get_class_member(typ1, i), m[i]))
-	return false;
+          !equal_entity(get_class_member(typ1, i), m[i]))
+        return false;
     }
     /** Compare the supertypes **/
     t = alloca(sizeof(entity *) * get_class_n_supertypes(typ1));
@@ -410,15 +475,15 @@ bool equal_type(type *typ1, type *typ2) {
     for (i = 0; i < get_class_n_supertypes(typ1); i++) {
       type *t1 = get_class_supertype(typ1, i);
       for (j = 0; j < get_class_n_supertypes(typ2); j++) {
-	type *t2 = get_class_supertype(typ2, j);
-	if (get_type_ident(t2) == get_type_ident(t1))
-	  t[i] = t2;
+        type *t2 = get_class_supertype(typ2, j);
+        if (get_type_ident(t2) == get_type_ident(t1))
+          t[i] = t2;
       }
     }
     for (i = 0; i < get_class_n_supertypes(typ1); i++) {
       if (!t[i]  ||  /* Found no counterpart */
-	  get_class_supertype(typ1, i) != t[i])
-	return false;
+          get_class_supertype(typ1, i) != t[i])
+        return false;
     }
   } break;
   case tpo_struct:      {
@@ -429,15 +494,15 @@ bool equal_type(type *typ1, type *typ2) {
     for (i = 0; i < get_struct_n_members(typ1); i++) {
       entity *e1 = get_struct_member(typ1, i);
       for (j = 0; j < get_struct_n_members(typ2); j++) {
-	entity *e2 = get_struct_member(typ2, j);
-	if (get_entity_name(e1) == get_entity_name(e2))
-	  m[i] = e2;
+        entity *e2 = get_struct_member(typ2, j);
+        if (get_entity_name(e1) == get_entity_name(e2))
+          m[i] = e2;
       }
     }
     for (i = 0; i < get_struct_n_members(typ1); i++) {
       if (!m[i]  ||  /* Found no counterpart */
-	  !equal_entity(get_struct_member(typ1, i), m[i]))
-	return false;
+          !equal_entity(get_struct_member(typ1, i), m[i]))
+        return false;
     }
   } break;
   case tpo_method:      {
@@ -459,11 +524,11 @@ bool equal_type(type *typ1, type *typ2) {
 
     for (i = 0; i < n_param1; i++) {
       if (!equal_type(get_method_param_type(typ1, i), get_method_param_type(typ2, i)))
-	return false;
+    return false;
     }
     for (i = 0; i < get_method_n_ress(typ1); i++) {
       if (!equal_type(get_method_res_type(typ1, i), get_method_res_type(typ2, i)))
-	return false;
+        return false;
     }
   } break;
   case tpo_union:       {
@@ -474,15 +539,15 @@ bool equal_type(type *typ1, type *typ2) {
     for (i = 0; i < get_union_n_members(typ1); i++) {
       entity *e1 = get_union_member(typ1, i);
       for (j = 0; j < get_union_n_members(typ2); j++) {
-	entity *e2 = get_union_member(typ2, j);
-	if (get_entity_name(e1) == get_entity_name(e2))
-	  m[i] = e2;
+        entity *e2 = get_union_member(typ2, j);
+        if (get_entity_name(e1) == get_entity_name(e2))
+          m[i] = e2;
       }
     }
     for (i = 0; i < get_union_n_members(typ1); i++) {
       if (!m[i]  ||  /* Found no counterpart */
-	  !equal_entity(get_union_member(typ1, i), m[i]))
-	return false;
+          !equal_entity(get_union_member(typ1, i), m[i]))
+        return false;
     }
   } break;
   case tpo_array:       {
@@ -492,10 +557,10 @@ bool equal_type(type *typ1, type *typ2) {
       return false;
     for(i = 0; i < get_array_n_dimensions(typ1); i++) {
       if (get_array_lower_bound(typ1, i) != get_array_lower_bound(typ2, i) ||
-	  get_array_upper_bound(typ1, i) != get_array_upper_bound(typ2, i))
-	return false;
+          get_array_upper_bound(typ1, i) != get_array_upper_bound(typ2, i))
+        return false;
       if (get_array_order(typ1, i) != get_array_order(typ2, i))
-	assert(0 && "type compare with different dimension orders not implemented");
+        assert(0 && "type compare with different dimension orders not implemented");
     }
   } break;
   case tpo_enumeration: {
@@ -533,16 +598,16 @@ bool smaller_type (type *st, type *lt) {
     for (i = 0; i < get_struct_n_members(st); i++) {
       entity *se = get_struct_member(st, i);
       for (j = 0; j < get_struct_n_members(lt); j++) {
-	entity *le = get_struct_member(lt, j);
-	if (get_entity_name(le) == get_entity_name(se))
-	  m[i] = le;
+    entity *le = get_struct_member(lt, j);
+    if (get_entity_name(le) == get_entity_name(se))
+      m[i] = le;
       }
     }
     for (i = 0; i < get_struct_n_members(st); i++) {
       if (!m[i]  ||  /* Found no counterpart */
-	  !smaller_type(get_entity_type(get_struct_member(st, i)),
-			get_entity_type(m[i])))
-	return false;
+          !smaller_type(get_entity_type(get_struct_member(st, i)),
+                get_entity_type(m[i])))
+        return false;
     }
   } break;
   case tpo_method:      {
@@ -552,11 +617,11 @@ bool smaller_type (type *st, type *lt) {
     if (get_method_n_ress(st) != get_method_n_ress(lt)) return false;
     for (i = 0; i < get_method_n_params(st); i++) {
       if (!smaller_type(get_method_param_type(st, i), get_method_param_type(lt, i)))
-	return false;
+        return false;
     }
     for (i = 0; i < get_method_n_ress(st); i++) {
       if (!smaller_type(get_method_res_type(st, i), get_method_res_type(lt, i)))
-	return false;
+        return false;
     }
   } break;
   case tpo_union:       {
@@ -567,16 +632,16 @@ bool smaller_type (type *st, type *lt) {
     for (i = 0; i < get_union_n_members(st); i++) {
       entity *se = get_union_member(st, i);
       for (j = 0; j < get_union_n_members(lt); j++) {
-	entity *le = get_union_member(lt, j);
-	if (get_entity_name(le) == get_entity_name(se))
-	  m[i] = le;
-      }
+        entity *le = get_union_member(lt, j);
+        if (get_entity_name(le) == get_entity_name(se))
+          m[i] = le;
+          }
     }
     for (i = 0; i < get_union_n_members(st); i++) {
       if (!m[i]  ||  /* Found no counterpart */
-	  !smaller_type(get_entity_type(get_union_member(st, i)),
-			get_entity_type(m[i])))
-	return false;
+          !smaller_type(get_entity_type(get_union_member(st, i)),
+                get_entity_type(m[i])))
+        return false;
     }
   } break;
   case tpo_array:       {
@@ -587,23 +652,23 @@ bool smaller_type (type *st, type *lt) {
     let = get_array_element_type(lt);
     if (set != let) {
       /* If the elt types are different, set must be convertible
-	 to let, and they must have the same size so that address
-	 computations work out.  To have a size the layout must
-	 be fixed. */
+         to let, and they must have the same size so that address
+         computations work out.  To have a size the layout must
+         be fixed. */
       if ((get_type_state(set) != layout_fixed) ||
-	  (get_type_state(let) != layout_fixed))
-	return false;
+          (get_type_state(let) != layout_fixed))
+        return false;
       if (!smaller_type(set, let) ||
-	  get_type_size_bits(set) != get_type_size_bits(let))
-	return false;
+          get_type_size_bits(set) != get_type_size_bits(let))
+        return false;
     }
     for(i = 0; i < get_array_n_dimensions(st); i++) {
       if (get_array_lower_bound(lt, i))
-	if(get_array_lower_bound(st, i) != get_array_lower_bound(lt, i))
-	  return false;
+        if(get_array_lower_bound(st, i) != get_array_lower_bound(lt, i))
+          return false;
       if (get_array_upper_bound(lt, i))
-	if(get_array_upper_bound(st, i) != get_array_upper_bound(lt, i))
-	  return false;
+        if(get_array_upper_bound(st, i) != get_array_upper_bound(lt, i))
+          return false;
     }
   } break;
   case tpo_enumeration: {
@@ -611,7 +676,7 @@ bool smaller_type (type *st, type *lt) {
   } break;
   case tpo_pointer:     {
     if (!smaller_type(get_pointer_points_to_type(st),
-		      get_pointer_points_to_type(lt)))
+              get_pointer_points_to_type(lt)))
       return false;
   } break;
   case tpo_primitive:   {
@@ -633,9 +698,9 @@ type   *new_type_class (ident *name) {
 
   res = new_type(type_class, NULL, name);
 
-  res->attr.ca.members     = NEW_ARR_F (entity *, 1);
-  res->attr.ca.subtypes    = NEW_ARR_F (type *, 1);
-  res->attr.ca.supertypes  = NEW_ARR_F (type *, 1);
+  res->attr.ca.members     = NEW_ARR_F (entity *, 0);
+  res->attr.ca.subtypes    = NEW_ARR_F (type *, 0);
+  res->attr.ca.supertypes  = NEW_ARR_F (type *, 0);
   res->attr.ca.peculiarity = peculiarity_existent;
   res->attr.ca.dfn         = 0;
 
@@ -667,7 +732,7 @@ void    add_class_member   (type *clss, entity *member) {
   ARR_APP1 (entity *, clss->attr.ca.members, member);
 }
 
-int     (get_class_n_members) (type *clss) {
+int     (get_class_n_members) (const type *clss) {
   return __get_class_n_members(clss);
 }
 
@@ -680,7 +745,7 @@ int     get_class_member_index(type *clss, entity *mem) {
   return -1;
 }
 
-entity *(get_class_member)   (type *clss, int pos) {
+entity *(get_class_member)   (const type *clss, int pos) {
   return __get_class_member(clss, pos);
 }
 
@@ -698,13 +763,13 @@ entity *get_class_member_by_name(type *clss, ident *name) {
 void    set_class_member   (type *clss, entity *member, int pos) {
   assert(clss && (clss->type_op == type_class));
   assert(pos >= 0 && pos < get_class_n_members(clss));
-  clss->attr.ca.members[pos+1] = member;
+  clss->attr.ca.members[pos] = member;
 }
 void    set_class_members  (type *clss, entity **members, int arity) {
   int i;
   assert(clss && (clss->type_op == type_class));
   DEL_ARR_F(clss->attr.ca.members);
-  clss->attr.ca.members    = NEW_ARR_F (entity *, 1);
+  clss->attr.ca.members    = NEW_ARR_F (entity *, 0);
   for (i = 0; i < arity; i++) {
     set_entity_owner(members[i], clss);
     ARR_APP1 (entity *, clss->attr.ca.members, members[i]);
@@ -713,10 +778,10 @@ void    set_class_members  (type *clss, entity **members, int arity) {
 void    remove_class_member(type *clss, entity *member) {
   int i;
   assert(clss && (clss->type_op == type_class));
-  for (i = 1; i < (ARR_LEN (clss->attr.ca.members)); i++) {
+  for (i = 0; i < (ARR_LEN (clss->attr.ca.members)); i++) {
     if (clss->attr.ca.members[i] == member) {
       for(; i < (ARR_LEN (clss->attr.ca.members)) - 1; i++)
-	clss->attr.ca.members[i] = clss->attr.ca.members[i + 1];
+    clss->attr.ca.members[i] = clss->attr.ca.members[i + 1];
       ARR_SETLEN(entity*, clss->attr.ca.members, ARR_LEN(clss->attr.ca.members) - 1);
       break;
     }
@@ -733,27 +798,27 @@ void    add_class_subtype   (type *clss, type *subtype) {
       return;
   ARR_APP1 (type *, subtype->attr.ca.supertypes, clss);
 }
-int     get_class_n_subtypes (type *clss) {
+int     get_class_n_subtypes (const type *clss) {
   assert(clss && (clss->type_op == type_class));
-  return (ARR_LEN (clss->attr.ca.subtypes))-1;
+  return (ARR_LEN (clss->attr.ca.subtypes));
 }
 type   *get_class_subtype   (type *clss, int pos) {
   assert(clss && (clss->type_op == type_class));
   assert(pos >= 0 && pos < get_class_n_subtypes(clss));
-  return clss->attr.ca.subtypes[pos+1] = skip_tid(clss->attr.ca.subtypes[pos+1]);
+  return clss->attr.ca.subtypes[pos] = skip_tid(clss->attr.ca.subtypes[pos]);
 }
 void    set_class_subtype   (type *clss, type *subtype, int pos) {
   assert(clss && (clss->type_op == type_class));
   assert(pos >= 0 && pos < get_class_n_subtypes(clss));
-  clss->attr.ca.subtypes[pos+1] = subtype;
+  clss->attr.ca.subtypes[pos] = subtype;
 }
 void    remove_class_subtype(type *clss, type *subtype) {
   int i;
   assert(clss && (clss->type_op == type_class));
-  for (i = 1; i < (ARR_LEN (clss->attr.ca.subtypes)); i++)
+  for (i = 0; i < (ARR_LEN (clss->attr.ca.subtypes)); i++)
     if (clss->attr.ca.subtypes[i] == subtype) {
       for(; i < (ARR_LEN (clss->attr.ca.subtypes))-1; i++)
-	clss->attr.ca.subtypes[i] = clss->attr.ca.subtypes[i+1];
+    clss->attr.ca.subtypes[i] = clss->attr.ca.subtypes[i+1];
       ARR_SETLEN(entity*, clss->attr.ca.subtypes, ARR_LEN(clss->attr.ca.subtypes) - 1);
       break;
     }
@@ -770,9 +835,9 @@ void    add_class_supertype   (type *clss, type *supertype) {
       return;
   ARR_APP1 (type *, supertype->attr.ca.subtypes, clss);
 }
-int     get_class_n_supertypes (type *clss) {
+int     get_class_n_supertypes (const type *clss) {
   assert(clss && (clss->type_op == type_class));
-  return (ARR_LEN (clss->attr.ca.supertypes))-1;
+  return (ARR_LEN (clss->attr.ca.supertypes));
 }
 int get_class_supertype_index(type *clss, type *super_clss) {
   int i;
@@ -786,37 +851,41 @@ int get_class_supertype_index(type *clss, type *super_clss) {
 type   *get_class_supertype   (type *clss, int pos) {
   assert(clss && (clss->type_op == type_class));
   assert(pos >= 0 && pos < get_class_n_supertypes(clss));
-  return clss->attr.ca.supertypes[pos+1] = skip_tid(clss->attr.ca.supertypes[pos+1]);
+  return clss->attr.ca.supertypes[pos] = skip_tid(clss->attr.ca.supertypes[pos]);
 }
 void    set_class_supertype   (type *clss, type *supertype, int pos) {
   assert(clss && (clss->type_op == type_class));
   assert(pos >= 0 && pos < get_class_n_supertypes(clss));
-  clss->attr.ca.supertypes[pos+1] = supertype;
+  clss->attr.ca.supertypes[pos] = supertype;
 }
 void    remove_class_supertype(type *clss, type *supertype) {
   int i;
   assert(clss && (clss->type_op == type_class));
-  for (i = 1; i < (ARR_LEN (clss->attr.ca.supertypes)); i++)
+  for (i = 0; i < (ARR_LEN (clss->attr.ca.supertypes)); i++)
     if (clss->attr.ca.supertypes[i] == supertype) {
       for(; i < (ARR_LEN (clss->attr.ca.supertypes))-1; i++)
-	clss->attr.ca.supertypes[i] = clss->attr.ca.supertypes[i+1];
+    clss->attr.ca.supertypes[i] = clss->attr.ca.supertypes[i+1];
       ARR_SETLEN(entity*, clss->attr.ca.supertypes, ARR_LEN(clss->attr.ca.supertypes) - 1);
       break;
     }
 }
 
-char *get_peculiarity_string(peculiarity p) {
-  if (p == peculiarity_description)
+const char *get_peculiarity_string(peculiarity p) {
+  switch (p) {
+  case peculiarity_description:
     return "peculiarity_description";
-  if (p == peculiarity_inherited)
+  case peculiarity_inherited:
     return "peculiarity_inherited";
-  return "peculiarity_existent";
+  default:
+    return "peculiarity_existent";
+  }
 }
 
-peculiarity get_class_peculiarity (type *clss) {
+peculiarity get_class_peculiarity (const type *clss) {
   assert(clss && (clss->type_op == type_class));
   return clss->attr.ca.peculiarity;
 }
+
 void        set_class_peculiarity (type *clss, peculiarity pec) {
   assert(clss && (clss->type_op == type_class));
   assert(pec != peculiarity_inherited);  /* There is no inheritance of types in libFirm. */
@@ -828,13 +897,13 @@ void set_class_dfn (type *clss, int dfn)
   clss->attr.ca.dfn        = dfn;
 }
 
-int get_class_dfn (type *clss)
+int get_class_dfn (const type *clss)
 {
   return (clss->attr.ca.dfn);
 }
 
 /* typecheck */
-int (is_class_type)(type *clss) {
+int (is_class_type)(const type *clss) {
   return __is_class_type(clss);
 }
 
@@ -860,7 +929,7 @@ bool is_subclass_of(type *low, type *high) {
 type   *new_type_struct (ident *name) {
   type *res;
   res = new_type(type_struct, NULL, name);
-  res->attr.sa.members = NEW_ARR_F (entity *, 1);
+  res->attr.sa.members = NEW_ARR_F (entity *, 0);
   return res;
 }
 type   *new_d_type_struct (ident *name, dbg_info* db) {
@@ -880,9 +949,9 @@ void free_struct_attrs (type *strct) {
 }
 
 /* manipulate private fields of struct */
-int     get_struct_n_members (type *strct) {
+int     get_struct_n_members (const type *strct) {
   assert(strct && (strct->type_op == type_struct));
-  return (ARR_LEN (strct->attr.sa.members))-1;
+  return (ARR_LEN (strct->attr.sa.members));
 }
 
 void    add_struct_member   (type *strct, entity *member) {
@@ -892,10 +961,10 @@ void    add_struct_member   (type *strct, entity *member) {
   ARR_APP1 (entity *, strct->attr.sa.members, member);
 }
 
-entity *get_struct_member   (type *strct, int pos) {
+entity *get_struct_member   (const type *strct, int pos) {
   assert(strct && (strct->type_op == type_struct));
   assert(pos >= 0 && pos < get_struct_n_members(strct));
-  return strct->attr.sa.members[pos+1];
+  return strct->attr.sa.members[pos];
 }
 
 int     get_struct_member_index(type *strct, entity *mem) {
@@ -911,22 +980,22 @@ void    set_struct_member   (type *strct, int pos, entity *member) {
   assert(strct && (strct->type_op == type_struct));
   assert(pos >= 0 && pos < get_struct_n_members(strct));
   assert(get_entity_type(member)->type_op != type_method);/* @@@ lowerfirm !!*/
-  strct->attr.sa.members[pos+1] = member;
+  strct->attr.sa.members[pos] = member;
 }
 void    remove_struct_member(type *strct, entity *member) {
   int i;
   assert(strct && (strct->type_op == type_struct));
-  for (i = 1; i < (ARR_LEN (strct->attr.sa.members)); i++)
+  for (i = 0; i < (ARR_LEN (strct->attr.sa.members)); i++)
     if (strct->attr.sa.members[i] == member) {
       for(; i < (ARR_LEN (strct->attr.sa.members))-1; i++)
-	strct->attr.sa.members[i] = strct->attr.sa.members[i+1];
+    strct->attr.sa.members[i] = strct->attr.sa.members[i+1];
       ARR_SETLEN(entity*, strct->attr.sa.members, ARR_LEN(strct->attr.sa.members) - 1);
       break;
     }
 }
 
 /* typecheck */
-int (is_struct_type)(type *strct) {
+int (is_struct_type)(const type *strct) {
   return __is_struct_type(strct);
 }
 
@@ -967,10 +1036,10 @@ type *new_type_method (ident *name, int n_param, int n_res) {
   res->state                        = layout_fixed;
   res->size                         = get_mode_size_bits(mode_P_mach);
   res->attr.ma.n_params             = n_param;
-  res->attr.ma.param_type           = (type **) xmalloc (sizeof (type *) * n_param);
+  res->attr.ma.param_type           = xcalloc(n_param, sizeof(res->attr.ma.param_type[0]));
   res->attr.ma.value_params         = NULL;
   res->attr.ma.n_res                = n_res;
-  res->attr.ma.res_type             = (type **) xmalloc (sizeof (type *) * n_res);
+  res->attr.ma.res_type             = xcalloc(n_res, sizeof(res->attr.ma.res_type[0]));
   res->attr.ma.value_ress           = NULL;
   res->attr.ma.variadicity          = variadicity_non_variadic;
   res->attr.ma.first_variadic_param = -1;
@@ -1004,7 +1073,7 @@ void free_method_attrs(type *method) {
 }
 
 /* manipulate private fields of method. */
-int   get_method_n_params  (type *method) {
+int   get_method_n_params  (const type *method) {
   assert(method && (method->type_op == type_method));
   return method->attr.ma.n_params;
 }
@@ -1037,23 +1106,23 @@ entity *get_method_value_param_ent(type *method, int pos) {
   if (!method->attr.ma.value_params)
     method->attr.ma.value_params
       = build_value_type(mangle_u(get_type_ident(method), value_params_suffix),
-			 get_method_n_params(method), method->attr.ma.param_type);
+             get_method_n_params(method), method->attr.ma.param_type);
   assert((get_entity_type(get_struct_member(method->attr.ma.value_params, pos))
-	  != method->attr.ma.value_params)
-	 && "param type not yet set");
+      != method->attr.ma.value_params)
+     && "param type not yet set");
   return get_struct_member(method->attr.ma.value_params, pos);
 }
 
 /*
  * Returns a type that represents the copied value arguments.
  */
-type *get_method_value_param_type(type *method)
+type *get_method_value_param_type(const type *method)
 {
   assert(method && (method->type_op == type_method));
   return method->attr.ma.value_params;
 }
 
-int   get_method_n_ress   (type *method) {
+int   get_method_n_ress   (const type *method) {
   assert(method && (method->type_op == type_method));
   return method->attr.ma.n_res;
 }
@@ -1087,16 +1156,16 @@ entity *get_method_value_res_ent(type *method, int pos) {
   if (!method->attr.ma.value_ress)
     method->attr.ma.value_ress
       = build_value_type(mangle_u(get_type_ident(method), value_ress_suffix),
-			 get_method_n_ress(method), method->attr.ma.res_type);
+             get_method_n_ress(method), method->attr.ma.res_type);
   assert((get_entity_type(get_struct_member(method->attr.ma.value_ress, pos)) != method->attr.ma.value_ress)
-	 && "result type not yet set");
+     && "result type not yet set");
   return get_struct_member(method->attr.ma.value_ress, pos);
 }
 
 /*
  * Returns a type that represents the copied value results.
  */
-type *get_method_value_res_type(type *method) {
+type *get_method_value_res_type(const type *method) {
   assert(method && (method->type_op == type_method));
   return method->attr.ma.value_ress;
 }
@@ -1104,7 +1173,7 @@ type *get_method_value_res_type(type *method) {
 /* Returns the null-terminated name of this variadicity. */
 const char *get_variadicity_name(variadicity vari)
 {
-#define X(a)	case a: return #a
+#define X(a)    case a: return #a
   switch (vari) {
     X(variadicity_non_variadic);
     X(variadicity_variadic);
@@ -1114,7 +1183,7 @@ const char *get_variadicity_name(variadicity vari)
 #undef X
 }
 
-variadicity get_method_variadicity(type *method)
+variadicity get_method_variadicity(const type *method)
 {
   assert(method && (method->type_op == type_method));
   return method->attr.ma.variadicity;
@@ -1132,7 +1201,7 @@ void set_method_variadicity(type *method, variadicity vari)
  * of the method type plus one is returned for variadic functions.
  * Non-variadic function types always return -1 here.
  */
-int get_method_first_variadic_param_index(type *method)
+int get_method_first_variadic_param_index(const type *method)
 {
   assert(method && (method->type_op == type_method));
 
@@ -1159,7 +1228,7 @@ void set_method_first_variadic_param_index(type *method, int index)
 }
 
 /* typecheck */
-int (is_method_type)(type *method) {
+int (is_method_type)(const type *method) {
   return __is_method_type(method);
 }
 
@@ -1171,9 +1240,9 @@ int (is_method_type)(type *method) {
 type  *new_type_union (ident *name) {
   type *res;
   res = new_type(type_union, NULL, name);
-  /*res->attr.ua.unioned_type = (type **)  xmalloc (sizeof (type *)  * n_types);
-    res->attr.ua.delim_names  = (ident **) xmalloc (sizeof (ident *) * n_types); */
-  res->attr.ua.members = NEW_ARR_F (entity *, 1);
+  /*res->attr.ua.unioned_type = xcalloc(n_types, sizeof(res->attr.ua.unioned_type[0]));
+    res->attr.ua.delim_names  = xcalloc(n_types, sizeof(res->attr.ua.delim_names[0])); */
+  res->attr.ua.members = NEW_ARR_F (entity *, 0);
   return res;
 }
 type  *new_d_type_union (ident *name, dbg_info* db) {
@@ -1223,38 +1292,38 @@ void   set_union_delim_nameid (type *uni, int pos, ident *id) {
   uni->attr.ua.delim_names[pos] = id;
 }
 #endif
-int    get_union_n_members      (type *uni) {
+int    get_union_n_members      (const type *uni) {
   assert(uni && (uni->type_op == type_union));
-  return (ARR_LEN (uni->attr.ua.members))-1;
+  return (ARR_LEN (uni->attr.ua.members));
 }
 void    add_union_member   (type *uni, entity *member) {
   assert(uni && (uni->type_op == type_union));
   ARR_APP1 (entity *, uni->attr.ua.members, member);
 }
-entity  *get_union_member (type *uni, int pos) {
+entity  *get_union_member (const type *uni, int pos) {
   assert(uni && (uni->type_op == type_union));
   assert(pos >= 0 && pos < get_union_n_members(uni));
-  return uni->attr.ua.members[pos+1];
+  return uni->attr.ua.members[pos];
 }
 void   set_union_member (type *uni, int pos, entity *member) {
   assert(uni && (uni->type_op == type_union));
   assert(pos >= 0 && pos < get_union_n_members(uni));
-  uni->attr.ua.members[pos+1] = member;
+  uni->attr.ua.members[pos] = member;
 }
 void   remove_union_member(type *uni, entity *member) {
   int i;
   assert(uni && (uni->type_op == type_union));
-  for (i = 1; i < (ARR_LEN (uni->attr.ua.members)); i++)
+  for (i = 0; i < (ARR_LEN (uni->attr.ua.members)); i++)
     if (uni->attr.ua.members[i] == member) {
       for(; i < (ARR_LEN (uni->attr.ua.members))-1; i++)
-	uni->attr.ua.members[i] = uni->attr.ua.members[i+1];
+    uni->attr.ua.members[i] = uni->attr.ua.members[i+1];
       ARR_SETLEN(entity*, uni->attr.ua.members, ARR_LEN(uni->attr.ua.members) - 1);
       break;
     }
 }
 
 /* typecheck */
-int (is_union_type)(type *uni) {
+int (is_union_type)(const type *uni) {
   return __is_union_type(uni);
 }
 
@@ -1265,7 +1334,7 @@ int (is_union_type)(type *uni) {
 
 /* create a new type array -- set dimension sizes independently */
 type *new_type_array         (ident *name, int n_dimensions,
-			      type *element_type) {
+                  type *element_type) {
   type *res;
   int i;
   ir_graph *rem = current_ir_graph;
@@ -1273,9 +1342,9 @@ type *new_type_array         (ident *name, int n_dimensions,
 
   res = new_type(type_array, NULL, name);
   res->attr.aa.n_dimensions = n_dimensions;
-  res->attr.aa.lower_bound  = (ir_node **) xmalloc (sizeof (ir_node *) * n_dimensions);
-  res->attr.aa.upper_bound  = (ir_node **) xmalloc (sizeof (ir_node *) * n_dimensions);
-  res->attr.aa.order  = (int *) xmalloc (sizeof (int) * n_dimensions);
+  res->attr.aa.lower_bound  = xcalloc(n_dimensions, sizeof(*res->attr.aa.lower_bound));
+  res->attr.aa.upper_bound  = xcalloc(n_dimensions, sizeof(*res->attr.aa.upper_bound));
+  res->attr.aa.order        = xcalloc(n_dimensions, sizeof(*res->attr.aa.order));
 
   current_ir_graph = get_const_code_irg();
   for (i = 0; i < n_dimensions; i++) {
@@ -1286,13 +1355,13 @@ type *new_type_array         (ident *name, int n_dimensions,
   current_ir_graph = rem;
 
   res->attr.aa.element_type = element_type;
-  new_entity(res, mangle_u(name, id_from_str("elem_ent", 8)), element_type);
+  new_entity(res, mangle_u(name, new_id_from_chars("elem_ent", 8)), element_type);
 
   return res;
 }
 
 type *new_d_type_array (ident *name, int n_dimensions,
-			type *element_type, dbg_info* db) {
+            type *element_type, dbg_info* db) {
   type *res = new_type_array (name, n_dimensions, element_type);
   set_type_dbg_info(res, db);
   return res;
@@ -1309,14 +1378,14 @@ void free_array_attrs (type *array) {
 }
 
 /* manipulate private fields of array type */
-int   get_array_n_dimensions (type *array) {
+int   get_array_n_dimensions (const type *array) {
   assert(array && (array->type_op == type_array));
   return array->attr.aa.n_dimensions;
 }
 
 void
 set_array_bounds (type *array, int dimension, ir_node * lower_bound,
-		  ir_node * upper_bound) {
+          ir_node * upper_bound) {
   assert(array && (array->type_op == type_array));
   assert(lower_bound && "lower_bound node may not be NULL.");
   assert(upper_bound && "upper_bound node may not be NULL.");
@@ -1326,12 +1395,12 @@ set_array_bounds (type *array, int dimension, ir_node * lower_bound,
 }
 void
 set_array_bounds_int (type *array, int dimension, int lower_bound,
-		      int upper_bound) {
+              int upper_bound) {
   ir_graph *rem = current_ir_graph;
   current_ir_graph = get_const_code_irg();
   set_array_bounds (array, dimension,
-		    new_Const(mode_Iu, new_tarval_from_long (lower_bound, mode_Iu)),
-		    new_Const(mode_Iu, new_tarval_from_long (upper_bound, mode_Iu )));
+            new_Const(mode_Iu, new_tarval_from_long (lower_bound, mode_Iu)),
+            new_Const(mode_Iu, new_tarval_from_long (upper_bound, mode_Iu )));
   current_ir_graph = rem;
 }
 void
@@ -1344,7 +1413,7 @@ void  set_array_lower_bound_int (type *array, int dimension, int lower_bound) {
   ir_graph *rem = current_ir_graph;
   current_ir_graph = get_const_code_irg();
   set_array_lower_bound  (array, dimension,
-			  new_Const(mode_Iu, new_tarval_from_long (lower_bound, mode_Iu)));
+              new_Const(mode_Iu, new_tarval_from_long (lower_bound, mode_Iu)));
   current_ir_graph = rem;
 }
 void
@@ -1357,31 +1426,45 @@ void  set_array_upper_bound_int (type *array, int dimension, int upper_bound) {
   ir_graph *rem = current_ir_graph;
   current_ir_graph = get_const_code_irg();
   set_array_upper_bound  (array, dimension,
-			  new_Const(mode_Iu, new_tarval_from_long (upper_bound, mode_Iu)));
+              new_Const(mode_Iu, new_tarval_from_long (upper_bound, mode_Iu)));
   current_ir_graph = rem;
 }
-int       has_array_lower_bound  (type *array, int dimension) {
+int      has_array_lower_bound  (const type *array, int dimension) {
   assert(array && (array->type_op == type_array));
   return (get_irn_op(array->attr.aa.lower_bound[dimension]) != op_Unknown);
 }
-ir_node * get_array_lower_bound  (type *array, int dimension) {
+ir_node *get_array_lower_bound  (const type *array, int dimension) {
   assert(array && (array->type_op == type_array));
   return array->attr.aa.lower_bound[dimension];
 }
-int       has_array_upper_bound  (type *array, int dimension) {
+long     get_array_lower_bound_int  (const type *array, int dimension) {
+  ir_node *node;
+  assert(array && (array->type_op == type_array));
+  node = array->attr.aa.lower_bound[dimension];
+  assert(get_irn_op(node) == op_Const);
+  return get_tarval_long(get_Const_tarval(node));
+}
+int       has_array_upper_bound  (const type *array, int dimension) {
   assert(array && (array->type_op == type_array));
   return (get_irn_op(array->attr.aa.upper_bound[dimension]) != op_Unknown);
 }
-ir_node * get_array_upper_bound  (type *array, int dimension) {
+ir_node * get_array_upper_bound  (const type *array, int dimension) {
   assert(array && (array->type_op == type_array));
   return array->attr.aa.upper_bound[dimension];
 }
+long     get_array_upper_bound_int  (const type *array, int dimension) {
+  ir_node *node;
+  assert(array && (array->type_op == type_array));
+  node = array->attr.aa.upper_bound[dimension];
+  assert(get_irn_op(node) == op_Const);
+  return get_tarval_long(get_Const_tarval(node));
+}
 
 void set_array_order (type *array, int dimension, int order) {
   assert(array && (array->type_op == type_array));
   array->attr.aa.order[dimension] = order;
 }
-int  get_array_order (type *array, int dimension) {
+int  get_array_order (const type *array, int dimension) {
   assert(array && (array->type_op == type_array));
   return array->attr.aa.order[dimension];
 }
@@ -1402,13 +1485,13 @@ void  set_array_element_entity (type *array, entity *ent) {
   array->attr.aa.element_ent = ent;
   array->attr.aa.element_type = get_entity_type(ent);
 }
-entity *get_array_element_entity (type *array) {
+entity *get_array_element_entity (const type *array) {
   assert(array && (array->type_op == type_array));
   return array->attr.aa.element_ent;
 }
 
 /* typecheck */
-int (is_array_type)(type *array) {
+int (is_array_type)(const type *array) {
   return __is_array_type(array);
 }
 
@@ -1421,10 +1504,8 @@ type   *new_type_enumeration    (ident *name, int n_enums) {
   type *res;
   res = new_type(type_enumeration, NULL, name);
   res->attr.ea.n_enums     = n_enums;
-  res->attr.ea.enumer      = (tarval **)xmalloc(sizeof(res->attr.ea.enumer[0]) * n_enums);
-  res->attr.ea.enum_nameid = (ident  **)xmalloc(sizeof(res->attr.ea.enum_nameid[0]) * n_enums);
-  memset(res->attr.ea.enumer,      0, sizeof(res->attr.ea.enumer[0])      * n_enums);
-  memset(res->attr.ea.enum_nameid, 0, sizeof(res->attr.ea.enum_nameid[0]) * n_enums);
+  res->attr.ea.enumer      = xcalloc(n_enums, sizeof(res->attr.ea.enumer[0]));
+  res->attr.ea.enum_nameid = xcalloc(n_enums, sizeof(res->attr.ea.enum_nameid[0]));
   return res;
 }
 type   *new_d_type_enumeration    (ident *name, int n_enums, dbg_info* db) {
@@ -1443,7 +1524,7 @@ void free_enumeration_attrs(type *enumeration) {
 }
 
 /* manipulate fields of enumeration type. */
-int     get_enumeration_n_enums (type *enumeration) {
+int     get_enumeration_n_enums (const type *enumeration) {
   assert(enumeration && (enumeration->type_op == type_enumeration));
   return enumeration->attr.ea.n_enums;
 }
@@ -1452,7 +1533,7 @@ void    set_enumeration_enum    (type *enumeration, int pos, tarval *con) {
   assert(pos >= 0 && pos < get_enumeration_n_enums(enumeration));
   enumeration->attr.ea.enumer[pos] = con;
 }
-tarval *get_enumeration_enum    (type *enumeration, int pos) {
+tarval *get_enumeration_enum    (const type *enumeration, int pos) {
   assert(enumeration && (enumeration->type_op == type_enumeration));
   assert(pos >= 0 && pos < get_enumeration_n_enums(enumeration));
   return enumeration->attr.ea.enumer[pos];
@@ -1462,19 +1543,19 @@ void    set_enumeration_nameid  (type *enumeration, int pos, ident *id) {
   assert(pos >= 0 && pos < get_enumeration_n_enums(enumeration));
   enumeration->attr.ea.enum_nameid[pos] = id;
 }
-ident  *get_enumeration_nameid  (type *enumeration, int pos) {
+ident  *get_enumeration_nameid  (const type *enumeration, int pos) {
   assert(enumeration && (enumeration->type_op == type_enumeration));
   assert(pos >= 0 && pos < get_enumeration_n_enums(enumeration));
   return enumeration->attr.ea.enum_nameid[pos];
 }
-const char *get_enumeration_name(type *enumeration, int pos) {
+const char *get_enumeration_name(const type *enumeration, int pos) {
   assert(enumeration && (enumeration->type_op == type_enumeration));
   assert(pos >= 0 && pos < get_enumeration_n_enums(enumeration));
   return get_id_str(enumeration->attr.ea.enum_nameid[pos]);
 }
 
 /* typecheck */
-int (is_enumeration_type)(type *enumeration) {
+int (is_enumeration_type)(const type *enumeration) {
   return __is_enumeration_type(enumeration);
 }
 
@@ -1515,7 +1596,7 @@ type *get_pointer_points_to_type (type *pointer) {
 }
 
 /* typecheck */
-int (is_pointer_type)(type *pointer) {
+int (is_pointer_type)(const type *pointer) {
   return __is_pointer_type(pointer);
 }
 
@@ -1560,7 +1641,7 @@ void free_primitive_attrs (type *primitive) {
 }
 
 /* typecheck */
-int (is_primitive_type)(type *primitive) {
+int (is_primitive_type)(const type *primitive) {
   return __is_primitive_type(primitive);
 }
 
@@ -1569,14 +1650,14 @@ int (is_primitive_type)(type *primitive) {
 /*-----------------------------------------------------------------*/
 
 
-int (is_atomic_type)(type *tp) {
+int (is_atomic_type)(const type *tp) {
   return __is_atomic_type(tp);
 }
 
 /*
  * Gets the number of elements in a firm compound type.
  */
-int get_compound_n_members(type *tp)
+int get_compound_n_members(const type *tp)
 {
   int res = 0;
 
@@ -1595,7 +1676,7 @@ int get_compound_n_members(type *tp)
 /*
  * Gets the member of a firm compound type at position pos.
  */
-entity *get_compound_member(type *tp, int pos)
+entity *get_compound_member(const type *tp, int pos)
 {
   entity *res;
 
@@ -1608,72 +1689,14 @@ entity *get_compound_member(type *tp, int pos)
   else
   {
     assert(0 && "need struct, union or class to get a member");
-    res=NULL;
+    res = NULL;
   }
 
   return res;
 }
 
 
-int is_compound_type(type *tp) {
+int is_compound_type(const type *tp) {
   assert(tp && tp->kind == k_type);
-  return (is_class_type(tp) || is_struct_type(tp) ||
-	  is_array_type(tp) || is_union_type(tp));
-}
-
-
-#ifdef DEBUG_libfirm
-int dump_node_opcode(FILE *F, ir_node *n); /* from irdump.c */
-
-void dump_type (type *tp) {
-  int i;
-
-  printf("%s type %s (%ld)", get_tpop_name(get_type_tpop(tp)), get_type_name(tp), get_type_nr(tp));
-
-  switch (get_type_tpop_code(tp)) {
-
-  case tpo_class:
-    printf("\n  members: ");
-    for (i = 0; i < get_class_n_members(tp); ++i) {
-      entity *mem = get_class_member(tp, i);
-      printf("\n    (%3d) %s:\t %s",
-	     get_entity_offset_bits(mem), get_type_name(get_entity_type(mem)), get_entity_name(mem));
-    }
-    printf("\n  supertypes: ");
-    for (i = 0; i < get_class_n_supertypes(tp); ++i) {
-      type *stp = get_class_supertype(tp, i);
-      printf("\n    %s", get_type_name(stp));
-    }
-    printf("\n  subtypes: ");
-    for (i = 0; i < get_class_n_subtypes(tp); ++i) {
-      type *stp = get_class_subtype(tp, i);
-      printf("\n    %s", get_type_name(stp));
-    }
-
-    printf("\n  peculiarity: %s", get_peculiarity_string(get_class_peculiarity(tp)));
-    break;
-
-  case tpo_union:
-  case tpo_struct:
-    printf("\n  members: ");
-    for (i = 0; i < get_compound_n_members(tp); ++i) {
-      entity *mem = get_compound_member(tp, i);
-      printf("\n    (%3d) %s:\t %s",
-	     get_entity_offset_bits(mem), get_type_name(get_entity_type(mem)), get_entity_name(mem));
-    }
-    break;
-
-  case tpo_pointer: {
-    type *tt = get_pointer_points_to_type(tp);
-
-    printf("\n  points to %s (%ld)", get_type_name(tt), get_type_nr(tt));
-  } break;
-
-  default:
-    printf(": details not implemented\n");
-  }
-  printf("\n\n");
+  return tp->type_op->flags & TP_OP_FLAG_COMPOUND;
 }
-#else  /* DEBUG_libfirm */
-void dump_type (type *tp) {}
-#endif /* DEBUG_libfirm */