X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Ftype.c;h=5588894011c56731c86b5dd0635205ad721749bc;hb=aeccc4a872226c8e08e6241bcd56b846e400c52d;hp=b7a14d2cc34fb61bc8dab004d77882388a9dd31f;hpb=13463272ad3cf0c725999886651b5e779a45dd9d;p=libfirm

diff --git a/ir/tr/type.c b/ir/tr/type.c
index b7a14d2cc..558889401 100644
--- a/ir/tr/type.c
+++ b/ir/tr/type.c
@@ -32,6 +32,7 @@
 # include <stddef.h>
 # include "type_t.h"
 # include "tpop_t.h"
+# include "typegmod_t.h"
 # include "array.h"
 
 /*******************************************************************/
@@ -43,8 +44,11 @@ unsigned long type_visited;
 inline type *
 new_type(tp_op *type_op, ir_mode *mode, ident* name) {
   type *res;
+  int node_size ;
 
-  int node_size = offsetof (type, attr) +  type_op->attr_size;
+  assert(type_op != type_id);
+
+  node_size = offsetof (type, attr) +  type_op->attr_size;
   res = (type *) xmalloc (node_size);
   add_irp_type(res);   /* Remember the new type global. */
 
@@ -55,10 +59,38 @@ new_type(tp_op *type_op, ir_mode *mode, ident* name) {
   res->state = layout_undefined;
   res->size = -1;
   res->visit = 0;
+  res -> link = NULL;
 
   return res;
 }
 
+void free_type_attrs(type *tp) {
+  switch(get_type_tpop_code(tp)) {
+  case tpo_class:       { free_class_attrs(tp);       } break;
+  case tpo_struct:      { free_struct_attrs(tp);      } break;
+  case tpo_method:      { free_method_attrs(tp);      } break;
+  case tpo_union:       { free_union_attrs(tp);       } break;
+  case tpo_array:       { free_array_attrs(tp);       } break;
+  case tpo_enumeration: { free_enumeration_attrs(tp); } break;
+  case tpo_pointer:     { free_pointer_attrs(tp);     } break;
+  case tpo_primitive:   { free_primitive_attrs(tp);   } break;
+  default: break;
+  }
+}
+
+/* set/get the link field */
+void *get_type_link(type *tp)
+{
+  assert(tp);
+  return(tp -> link);
+}
+
+void set_type_link(type *tp, void *l)
+{
+  assert(tp);
+  tp -> link = l;
+}
+
 tp_op*      get_type_tpop(type *tp) {
   assert(tp);
   return tp->type_op;
@@ -68,18 +100,22 @@ ident*      get_type_tpop_nameid(type *tp) {
   assert(tp);
   return tp->type_op->name;
 }
+
 const char* get_type_tpop_name(type *tp) {
   assert(tp);
   return id_to_str(tp->type_op->name);
 }
+
 tp_opcode    get_type_tpop_code(type *tp) {
   assert(tp);
   return tp->type_op->code;
 }
+
 ir_mode*    get_type_mode(type *tp) {
   assert(tp);
   return tp->mode;
 }
+
 void        set_type_mode(type *tp, ir_mode* m) {
   assert(tp);
   tp->mode = m;
@@ -87,18 +123,22 @@ void        set_type_mode(type *tp, ir_mode* m) {
   if ((tp->type_op == type_pointer) || (tp->type_op == type_primitive))
     tp->size == get_mode_size(m);
 }
-ident*      get_type_nameid(type *tp) {
+
+ident*      get_type_ident(type *tp) {
   assert(tp);
   return tp->name;
 }
-void        set_type_nameid(type *tp, ident* id) {
+
+void        set_type_ident(type *tp, ident* id) {
   assert(tp);
   tp->name = id;
 }
+
 const char* get_type_name(type *tp) {
   assert(tp);
   return id_to_str(tp->name);
 }
+
 int         get_type_size(type *tp) {
   assert(tp);
   return tp->size;
@@ -166,6 +206,12 @@ type   *new_type_class (ident *name) {
 
   return res;
 }
+inline void free_class_attrs(type *clss) {
+  assert(clss && (clss->type_op == type_class));
+  DEL_ARR_F(clss->attr.ca.members);
+  DEL_ARR_F(clss->attr.ca.subtypes);
+  DEL_ARR_F(clss->attr.ca.supertypes);
+}
 /* manipulate private fields of class type  */
 void    add_class_member   (type *clss, entity *member) {
   assert(clss && (clss->type_op == type_class));
@@ -188,16 +234,21 @@ void    remove_class_member(type *clss, entity *member) {
   assert(clss && (clss->type_op == type_class));
   for (i = 1; i < (ARR_LEN (clss->attr.ca.members))-1; i++)
     if (clss->attr.ca.members[i+1] == member) {
+      for(i++; i < (ARR_LEN (clss->attr.ca.members)) - 1; i++)
+	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;
     }
-  for(i++; i < (ARR_LEN (clss->attr.ca.members))-1; i++)
-    clss->attr.ca.members[i] = clss->attr.ca.members[i+1];
-  --_ARR_DESCR((clss->attr.ca.members))->nelts;
 }
 
 void    add_class_subtype   (type *clss, type *subtype) {
+  int i;
   assert(clss && (clss->type_op == type_class));
   ARR_APP1 (type *, clss->attr.ca.subtypes, subtype);
+  for (i = 0; i < get_class_n_supertype(subtype); i++)
+    if (get_class_supertype(subtype, i) == clss)
+      /* Class already registered */
+      return;
   ARR_APP1 (type *, subtype->attr.ca.supertypes, clss);
 }
 int     get_class_n_subtype (type *clss) {
@@ -206,7 +257,7 @@ int     get_class_n_subtype (type *clss) {
 }
 type   *get_class_subtype   (type *clss, int pos) {
   assert(clss && (clss->type_op == type_class));
-  return clss->attr.ca.subtypes[pos+1];
+  return clss->attr.ca.subtypes[pos+1] = skip_tid(clss->attr.ca.subtypes[pos+1]);
 }
 void    set_class_subtype   (type *clss, type *subtype, int pos) {
   assert(clss && (clss->type_op == type_class));
@@ -217,16 +268,22 @@ void    remove_class_subtype(type *clss, type *subtype) {
   assert(clss && (clss->type_op == type_class));
   for (i = 1; i < (ARR_LEN (clss->attr.ca.subtypes))-1; i++)
     if (clss->attr.ca.subtypes[i+1] == subtype) {
+      for(i++; i < (ARR_LEN (clss->attr.ca.subtypes))-1; i++)
+	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;
     }
-  for(i++; i < (ARR_LEN (clss->attr.ca.subtypes))-1; i++)
-    clss->attr.ca.subtypes[i] = clss->attr.ca.subtypes[i+1];
-  --_ARR_DESCR((clss->attr.ca.subtypes))->nelts;
 }
 
 void    add_class_supertype   (type *clss, type *supertype) {
+  int i;
   assert(clss && (clss->type_op == type_class));
+  assert(supertype && (supertype -> type_op == type_class));
   ARR_APP1 (type *, clss->attr.ca.supertypes, supertype);
+  for (i = 0; i < get_class_n_subtype(supertype); i++)
+    if (get_class_subtype(supertype, i) == clss)
+      /* Class already registered */
+      return;
   ARR_APP1 (type *, supertype->attr.ca.subtypes, clss);
 }
 int     get_class_n_supertype (type *clss) {
@@ -235,7 +292,7 @@ int     get_class_n_supertype (type *clss) {
 }
 type   *get_class_supertype   (type *clss, int pos) {
   assert(clss && (clss->type_op == type_class));
-  return clss->attr.ca.supertypes[pos+1];
+  return clss->attr.ca.supertypes[pos+1] = skip_tid(clss->attr.ca.supertypes[pos+1]);
 }
 void    set_class_supertype   (type *clss, type *supertype, int pos) {
   assert(clss && (clss->type_op == type_class));
@@ -246,11 +303,11 @@ void    remove_class_supertype(type *clss, type *supertype) {
   assert(clss && (clss->type_op == type_class));
   for (i = 1; i < (ARR_LEN (clss->attr.ca.supertypes))-1; i++)
     if (clss->attr.ca.supertypes[i+1] == supertype) {
+      for(i++; i < (ARR_LEN (clss->attr.ca.supertypes))-1; i++)
+	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;
     }
-  for(i++; i < (ARR_LEN (clss->attr.ca.supertypes))-1; i++)
-    clss->attr.ca.supertypes[i] = clss->attr.ca.supertypes[i+1];
-  --_ARR_DESCR((clss->attr.ca.supertypes))->nelts;
 }
 /* typecheck */
 bool    is_class_type(type *clss) {
@@ -269,6 +326,10 @@ type   *new_type_struct (ident *name) {
   res->attr.sa.members = NEW_ARR_F (entity *, 1);
   return res;
 }
+inline void free_struct_attrs (type *strct) {
+  assert(strct && (strct->type_op == type_struct));
+  DEL_ARR_F(strct->attr.sa.members);
+}
 /* manipulate private fields of struct */
 void    add_struct_member   (type *strct, entity *member) {
   assert(strct && (strct->type_op == type_struct));
@@ -291,11 +352,11 @@ void    remove_struct_member(type *strct, entity *member) {
   assert(strct && (strct->type_op == type_struct));
   for (i = 1; i < (ARR_LEN (strct->attr.sa.members))-1; i++)
     if (strct->attr.sa.members[i+1] == member) {
+      for(i++; i < (ARR_LEN (strct->attr.sa.members))-1; i++)
+	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;
     }
-  for(i++; i < (ARR_LEN (strct->attr.sa.members))-1; i++)
-    strct->attr.sa.members[i] = strct->attr.sa.members[i+1];
-  --_ARR_DESCR((strct->attr.sa.members))->nelts;
 }
 /* typecheck */
 bool    is_struct_type(type *strct) {
@@ -318,7 +379,11 @@ type *new_type_method (ident *name, int n_param, int n_res) {
   res->attr.ma.res_type   = (type **) xmalloc (sizeof (type *) * n_res);
   return res;
 }
-
+inline void free_method_attrs(type *method) {
+  assert(method && (method->type_op == type_method));
+  free(method->attr.ma.param_type);
+  free(method->attr.ma.res_type);
+}
 /* manipulate private fields of method. */
 int   get_method_n_params  (type *method) {
   assert(method && (method->type_op == type_method));
@@ -326,7 +391,7 @@ int   get_method_n_params  (type *method) {
 }
 type *get_method_param_type(type *method, int pos) {
   assert(method && (method->type_op == type_method));
-  return method->attr.ma.param_type[pos];
+  return method->attr.ma.param_type[pos] = skip_tid(method->attr.ma.param_type[pos]);
 }
 void  set_method_param_type(type *method, int pos, type* type) {
   assert(method && (method->type_op == type_method));
@@ -339,7 +404,7 @@ int   get_method_n_res   (type *method) {
 }
 type *get_method_res_type(type *method, int pos) {
   assert(method && (method->type_op == type_method));
-  return method->attr.ma.res_type[pos];
+  return method->attr.ma.res_type[pos] = skip_tid(method->attr.ma.res_type[pos]);
 }
 void  set_method_res_type(type *method, int pos, type* type) {
   assert(method && (method->type_op == type_method));
@@ -366,6 +431,10 @@ type  *new_type_uni (ident *name) {
   res->attr.ua.members = NEW_ARR_F (entity *, 1);
   return res;
 }
+inline void free_union_attrs (type *uni) {
+  assert(uni && (uni->type_op == type_union));
+  DEL_ARR_F(uni->attr.ua.members);
+}
 /* manipulate private fields of struct */
 #if 0
 int    get_union_n_types      (type *uni) {
@@ -374,7 +443,7 @@ int    get_union_n_types      (type *uni) {
 }
 type  *get_union_unioned_type (type *uni, int pos) {
   assert(uni && (uni->type_op == type_union));
-  return uni->attr.ua.unioned_type[pos];
+  return uni->attr.ua.unioned_type[pos] = skip_tid(uni->attr.ua.unioned_type[pos]);
 }
 void   set_union_unioned_type (type *uni, int pos, type *type) {
   assert(uni && (uni->type_op == type_union));
@@ -414,11 +483,11 @@ void   remove_union_member(type *uni, entity *member) {
   assert(uni && (uni->type_op == type_union));
   for (i = 1; i < (ARR_LEN (uni->attr.ua.members))-1; i++)
     if (uni->attr.ua.members[i+1] == member) {
+      for(i++; i < (ARR_LEN (uni->attr.ua.members))-1; i++)
+	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;
     }
-  for(i++; i < (ARR_LEN (uni->attr.ua.members))-1; i++)
-    uni->attr.ua.members[i] = uni->attr.ua.members[i+1];
-  --_ARR_DESCR((uni->attr.ua.members))->nelts;
 }
 
 /* typecheck */
@@ -444,6 +513,11 @@ type *new_type_array         (ident *name, int n_dimensions,
   new_entity(res, name, element_type);
   return res;
 }
+inline void free_array_attrs (type *array) {
+  assert(array && (array->type_op == type_array));
+  free(array->attr.aa.lower_bound);
+  free(array->attr.aa.upper_bound);
+}
 
 /* manipulate private fields of array type */
 int   get_array_n_dimensions (type *array) {
@@ -478,7 +552,7 @@ void  set_array_element_type (type *array, type *type) {
 }
 type *get_array_element_type (type *array) {
   assert(array && (array->type_op == type_array));
-  return array->attr.aa.element_type;
+  return array->attr.aa.element_type = skip_tid(array->attr.aa.element_type);
 }
 void  set_array_element_entity (type *array, entity *ent) {
   assert(array && (array->type_op == type_array));
@@ -508,6 +582,11 @@ type   *new_type_enumeration    (ident *name, int n_enums) {
   res->attr.ea.enum_nameid = (ident  **) xmalloc (sizeof (ident  *) * n_enums);
   return res;
 }
+inline void free_enumeration_attrs(type *enumeration) {
+  assert(enumeration && (enumeration->type_op == type_enumeration));
+  free(enumeration->attr.ea.enumer);
+  free(enumeration->attr.ea.enum_nameid);
+}
 
 /* manipulate fields of enumeration type. */
 int     get_enumeration_n_enums (type *enumeration) {
@@ -554,6 +633,9 @@ type *new_type_pointer           (ident *name, type *points_to) {
   res->state = layout_fixed;
   return res;
 }
+inline void free_pointer_attrs (type *pointer) {
+  assert(pointer && (pointer->type_op == type_pointer));
+}
 /* manipulate fields of type_pointer */
 void  set_pointer_points_to_type (type *pointer, type *type) {
   assert(pointer && (pointer->type_op == type_pointer));
@@ -561,7 +643,7 @@ void  set_pointer_points_to_type (type *pointer, type *type) {
 }
 type *get_pointer_points_to_type (type *pointer) {
   assert(pointer && (pointer->type_op == type_pointer));
-  return pointer->attr.pa.points_to;
+  return pointer->attr.pa.points_to = skip_tid(pointer->attr.pa.points_to);
 }
 
 /* typecheck */
@@ -583,6 +665,9 @@ type *new_type_primitive (ident *name, ir_mode *mode) {
   res->state = layout_fixed;
   return res;
 }
+inline void free_primitive_attrs (type *primitive) {
+  assert(primitive && (primitive->type_op == type_primitive));
+}
 
 /* typecheck */
 bool  is_primitive_type  (type *primitive) {