X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Ftr%2Ftype.c;h=42511dda70e2b65579d0811d29047f153e807651;hb=217c4f3a0ffc115825dbebb2270ab1d20c246e97;hp=d28ddf6ccbeab86b349a5ac11bd20bbeae850300;hpb=2de99b2cd23f65c266ce080ec2f3773580fea462;p=libfirm

diff --git a/ir/tr/type.c b/ir/tr/type.c
index d28ddf6cc..42511dda7 100644
--- a/ir/tr/type.c
+++ b/ir/tr/type.c
@@ -68,8 +68,8 @@
 /** TYPE                                                          **/
 /*******************************************************************/
 
-type *none_type;    type *get_none_type(void)    { return none_type;    }
-type *unknown_type; type *get_unknown_type(void) { return unknown_type; }
+type *firm_none_type;    type *get_none_type(void)    { return firm_none_type;    }
+type *firm_unknown_type; type *get_unknown_type(void) { return firm_unknown_type; }
 
 
 #ifdef DEBUG_libfirm
@@ -86,21 +86,21 @@ void init_type(void) {
   value_ress_suffix   = new_id_from_str(VALUE_RESS_SUFFIX);
 
   /* construct none and unknown type. */
-  none_type    = new_type(tpop_none,    mode_BAD, new_id_from_str("type_none"));
-  set_type_size_bits(none_type, 0);
-  set_type_state (none_type, layout_fixed);
-  remove_irp_type(none_type);
-  unknown_type = new_type(tpop_unknown, mode_ANY, new_id_from_str("type_unknown"));
-  set_type_size_bits(unknown_type, 0);
-  set_type_state (unknown_type, layout_fixed);
-  remove_irp_type(unknown_type);
+  firm_none_type    = new_type(tpop_none,    mode_BAD, new_id_from_str("type_none"));
+  set_type_size_bits(firm_none_type, 0);
+  set_type_state (firm_none_type, layout_fixed);
+  remove_irp_type(firm_none_type);
+  firm_unknown_type = new_type(tpop_unknown, mode_ANY, new_id_from_str("type_unknown"));
+  set_type_size_bits(firm_unknown_type, 0);
+  set_type_state (firm_unknown_type, layout_fixed);
+  remove_irp_type(firm_unknown_type);
 }
 
 unsigned long type_visited;
 
-void (set_master_type_visited)(unsigned long val) { __set_master_type_visited(val); }
-unsigned long (get_master_type_visited)(void)     { return __get_master_type_visited(); }
-void (inc_master_type_visited)(void)              { __inc_master_type_visited(); }
+void (set_master_type_visited)(unsigned long val) { _set_master_type_visited(val); }
+unsigned long (get_master_type_visited)(void)     { return _get_master_type_visited(); }
+void (inc_master_type_visited)(void)              { _inc_master_type_visited(); }
 
 
 type *
@@ -116,17 +116,18 @@ new_type(tp_op *type_op, ir_mode *mode, ident* name) {
   memset(res, 0, node_size);
   add_irp_type(res);   /* Remember the new type global. */
 
-  res->kind    = k_type;
-  res->type_op = type_op;
-  res->mode    = mode;
-  res->name    = name;
-  res->state   = layout_undefined;
-  res->size    = -1;
-  res->align   = -1;
-  res->visit   = 0;
-  res -> link  = NULL;
+  res->kind       = k_type;
+  res->type_op    = type_op;
+  res->mode       = mode;
+  res->name       = name;
+  res->visibility = visibility_external_allocated;
+  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();
+  res->nr         = get_irp_new_node_nr();
 #endif /* defined DEBUG_libfirm */
 
   return res;
@@ -140,7 +141,7 @@ void        free_type(type *tp) {
   /* Free the attributes of the type. */
   free_type_attrs(tp);
   /* Free entities automatically allocated with the type */
-  if (is_array_type(tp))
+  if (is_Array_type(tp))
     free_entity(get_array_element_entity(tp));
   /* And now the type itself... */
   tp->kind = k_BAD;
@@ -178,20 +179,20 @@ void free_type_attrs(type *tp) {
 /* set/get the link field */
 void *(get_type_link)(const type *tp)
 {
-  return __get_type_link(tp);
+  return _get_type_link(tp);
 }
 
 void (set_type_link)(type *tp, void *l)
 {
-  __set_type_link(tp, l);
+  _set_type_link(tp, l);
 }
 
 const tp_op *(get_type_tpop)(const type *tp) {
-  return __get_type_tpop(tp);
+  return _get_type_tpop(tp);
 }
 
 ident *(get_type_tpop_nameid)(const type *tp) {
-  return __get_type_tpop_nameid(tp);
+  return _get_type_tpop_nameid(tp);
 }
 
 const char* get_type_tpop_name(const type *tp) {
@@ -200,11 +201,11 @@ const char* get_type_tpop_name(const type *tp) {
 }
 
 tp_opcode (get_type_tpop_code)(const type *tp) {
-  return __get_type_tpop_code(tp);
+  return _get_type_tpop_code(tp);
 }
 
 ir_mode *(get_type_mode)(const type *tp) {
-  return __get_type_mode(tp);
+  return _get_type_mode(tp);
 }
 
 void        set_type_mode(type *tp, ir_mode* m) {
@@ -244,11 +245,11 @@ void        set_type_mode(type *tp, ir_mode* m) {
 }
 
 ident *(get_type_ident)(const type *tp) {
-  return __get_type_ident(tp);
+  return _get_type_ident(tp);
 }
 
 void (set_type_ident)(type *tp, ident* id) {
-  __set_type_ident(tp, id);
+  _set_type_ident(tp, id);
 }
 
 /* Outputs a unique number for this node */
@@ -267,11 +268,62 @@ const char* get_type_name(const type *tp) {
 }
 
 int (get_type_size_bytes)(const type *tp) {
-  return __get_type_size_bytes(tp);
+  return _get_type_size_bytes(tp);
 }
 
 int (get_type_size_bits)(const type *tp) {
-  return __get_type_size_bits(tp);
+  return _get_type_size_bits(tp);
+}
+
+
+visibility get_type_visibility (const type *tp) {
+#if 0
+  visibility res =  visibility_local;
+  if (is_compound_type(tp)) {
+
+    if (is_Array_type(tp)) {
+      entity *mem = get_array_element_entity(tp);
+      if (get_entity_visibility(mem) != visibility_local)
+	res = visibility_external_visible;
+    } else {
+      int i, n_mems = get_compound_n_members(tp);
+      for (i = 0; i < n_mems; ++i) {
+	entity *mem = get_compound_member(tp, i);
+	if (get_entity_visibility(mem) != visibility_local)
+	  res = visibility_external_visible;
+      }
+    }
+  }
+  return res;
+#endif
+  assert(is_type(tp));
+  return tp->visibility;
+}
+
+void       set_type_visibility (type *tp, visibility v) {
+  assert(is_type(tp));
+#if 0
+  /* check for correctness */
+  if (v != visibility_external_allocated) {
+    visibility res =  visibility_local;
+    if (is_compound_type(tp)) {
+      if (is_Array_type(tp)) {
+	entity *mem = get_array_element_entity(tp);
+	if (get_entity_visibility(mem) >  res)
+	  res = get_entity_visibility(mem);
+      } else {
+	int i, n_mems = get_compound_n_members(tp);
+	for (i = 0; i < n_mems; ++i) {
+	  entity *mem = get_compound_member(tp, i);
+	  if (get_entity_visibility(mem) > res)
+	    res = get_entity_visibility(mem);
+	}
+      }
+    }
+    assert(res < v);
+  }
+#endif
+  tp->visibility = v;
 }
 
 void
@@ -311,7 +363,7 @@ int get_type_alignment_bits(type *tp) {
   /* alignment NOT set calculate it "on demand" */
   if (tp->mode)
     align = get_mode_size_bits(tp->mode);
-  else if (is_array_type(tp))
+  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);
@@ -325,7 +377,7 @@ int get_type_alignment_bits(type *tp) {
         align = a;
     }
   }
-  else if (is_method_type(tp))
+  else if (is_Method_type(tp))
     align = 0;
 
   /* write back */
@@ -348,8 +400,20 @@ set_type_alignment_bytes(type *tp, int align) {
   set_type_size_bits(tp, 8*align);
 }
 
+/* Returns a human readable string for the enum entry. */
+const char *get_type_state_name(type_state s) {
+#define X(a)    case a: return #a;
+  switch (s) {
+    X(layout_undefined);
+    X(layout_fixed);
+  }
+  return "<unknown>";
+#undef X
+}
+
+
 type_state (get_type_state)(const type *tp) {
-  return __get_type_state(tp);
+  return _get_type_state(tp);
 }
 
 void
@@ -374,7 +438,7 @@ set_type_state(type *tp, type_state state) {
           { 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))) ||
+        assert(is_Method_type(get_entity_type(get_class_member(tp, i))) ||
            (get_entity_allocation(get_class_member(tp, i)) == allocation_automatic));
                    */
       }
@@ -409,29 +473,29 @@ set_type_state(type *tp, type_state state) {
 }
 
 unsigned long (get_type_visited)(const type *tp) {
-  return __get_type_visited(tp);
+  return _get_type_visited(tp);
 }
 
 void (set_type_visited)(type *tp, unsigned long num) {
-  __set_type_visited(tp, num);
+  _set_type_visited(tp, num);
 }
 
 /* Sets visited field in type to type_visited. */
 void (mark_type_visited)(type *tp) {
-  __mark_type_visited(tp);
+  _mark_type_visited(tp);
 }
 
 /* @@@ name clash with master flag
 int (type_visited)(const type *tp) {
-  return __type_visited(tp);
+  return _type_visited(tp);
 }*/
 
 int (type_not_visited)(const type *tp) {
-  return __type_not_visited(tp);
+  return _type_not_visited(tp);
 }
 
 int (is_type)(const void *thing) {
-  return __is_type(thing);
+  return _is_type(thing);
 }
 
 /* Checks whether two types are structural equal.*/
@@ -740,7 +804,7 @@ void    add_class_member   (type *clss, entity *member) {
 }
 
 int     (get_class_n_members) (const type *clss) {
-  return __get_class_n_members(clss);
+  return _get_class_n_members(clss);
 }
 
 int     get_class_member_index(type *clss, entity *mem) {
@@ -753,7 +817,7 @@ int     get_class_member_index(type *clss, entity *mem) {
 }
 
 entity *(get_class_member)   (const type *clss, int pos) {
-  return __get_class_member(clss, pos);
+  return _get_class_member(clss, pos);
 }
 
 entity *get_class_member_by_name(type *clss, ident *name) {
@@ -814,6 +878,14 @@ type   *get_class_subtype   (type *clss, int pos) {
   assert(pos >= 0 && pos < get_class_n_subtypes(clss));
   return clss->attr.ca.subtypes[pos] = skip_tid(clss->attr.ca.subtypes[pos]);
 }
+int     get_class_subtype_index(type *clss, const type *subclass) {
+  int i, n_subtypes = get_class_n_subtypes(clss);
+  assert(is_Class_type(subclass));
+  for (i = 0; i < n_subtypes; ++i) {
+    if (get_class_subtype(clss, i) == subclass) return i;
+  }
+  return -1;
+}
 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));
@@ -847,10 +919,9 @@ int     get_class_n_supertypes (const type *clss) {
   return (ARR_LEN (clss->attr.ca.supertypes));
 }
 int get_class_supertype_index(type *clss, type *super_clss) {
-  int i;
-  assert(clss && (clss->type_op == type_class));
+  int i, n_supertypes = get_class_n_supertypes(clss);
   assert(super_clss && (super_clss->type_op == type_class));
-  for (i = 0; i < get_class_n_supertypes(clss); i++)
+  for (i = 0; i < n_supertypes; i++)
     if (get_class_supertype(clss, i) == super_clss)
       return i;
   return -1;
@@ -878,14 +949,14 @@ void    remove_class_supertype(type *clss, type *supertype) {
 }
 
 const char *get_peculiarity_string(peculiarity p) {
+#define X(a)    case a: return #a
   switch (p) {
-  case peculiarity_description:
-    return "peculiarity_description";
-  case peculiarity_inherited:
-    return "peculiarity_inherited";
-  default:
-    return "peculiarity_existent";
+    X(peculiarity_description);
+    X(peculiarity_inherited);
+    X(peculiarity_existent);
   }
+#undef X
+  return "invalid peculiarity";
 }
 
 peculiarity get_class_peculiarity (const type *clss) {
@@ -910,23 +981,8 @@ int get_class_dfn (const type *clss)
 }
 
 /* typecheck */
-int (is_class_type)(const type *clss) {
-  return __is_class_type(clss);
-}
-
-/* Returns true if low is subclass of high. */
-int is_subclass_of(type *low, type *high) {
-  int i;
-  assert(is_class_type(low) && is_class_type(high));
-  if (low == high) return 1;
-  /* depth first search from high downwards. */
-  for (i = 0; i < get_class_n_subtypes(high); i++) {
-    if (low == get_class_subtype(high, i))
-      return 1;
-    if (is_subclass_of(low, get_class_subtype(high, i)))
-      return 1;
-  }
-  return 0;
+int (is_Class_type)(const type *clss) {
+  return _is_class_type(clss);
 }
 
 /*----------------------------------------------------------------**/
@@ -1003,8 +1059,8 @@ void    remove_struct_member(type *strct, entity *member) {
 }
 
 /* typecheck */
-int (is_struct_type)(const type *strct) {
-  return __is_struct_type(strct);
+int (is_Struct_type)(const type *strct) {
+  return _is_struct_type(strct);
 }
 
 /*******************************************************************/
@@ -1236,8 +1292,8 @@ void set_method_first_variadic_param_index(type *method, int index)
 }
 
 /* typecheck */
-int (is_method_type)(const type *method) {
-  return __is_method_type(method);
+int (is_Method_type)(const type *method) {
+  return _is_method_type(method);
 }
 
 /*-----------------------------------------------------------------*/
@@ -1331,8 +1387,8 @@ void   remove_union_member(type *uni, entity *member) {
 }
 
 /* typecheck */
-int (is_union_type)(const type *uni) {
-  return __is_union_type(uni);
+int (is_Union_type)(const type *uni) {
+  return _is_union_type(uni);
 }
 
 /*-----------------------------------------------------------------*/
@@ -1341,12 +1397,11 @@ int (is_union_type)(const type *uni) {
 
 
 /* create a new type array -- set dimension sizes independently */
-type *new_type_array         (ident *name, int n_dimensions,
-                  type *element_type) {
+type *new_type_array(ident *name, int n_dimensions, type *element_type) {
   type *res;
   int i;
   ir_graph *rem = current_ir_graph;
-  assert(!is_method_type(element_type));
+  assert(!is_Method_type(element_type));
 
   res = new_type(type_array, NULL, name);
   res->attr.aa.n_dimensions = n_dimensions;
@@ -1356,9 +1411,9 @@ type *new_type_array         (ident *name, int n_dimensions,
 
   current_ir_graph = get_const_code_irg();
   for (i = 0; i < n_dimensions; i++) {
-    res->attr.aa.lower_bound[i]  = new_Unknown(mode_Iu);
-    res->attr.aa.upper_bound[i]  = new_Unknown(mode_Iu);
-    res->attr.aa.order[i] = i;
+    res->attr.aa.lower_bound[i] = new_Unknown(mode_Iu);
+    res->attr.aa.upper_bound[i] = new_Unknown(mode_Iu);
+    res->attr.aa.order[i]       = i;
   }
   current_ir_graph = rem;
 
@@ -1472,14 +1527,27 @@ 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 (const type *array, int dimension) {
   assert(array && (array->type_op == type_array));
   return array->attr.aa.order[dimension];
 }
 
+int find_array_dimension(const type *array, int order) {
+  int dim;
+
+  assert(array && (array->type_op == type_array));
+
+  for (dim = 0; dim < array->attr.aa.n_dimensions; ++dim) {
+    if (array->attr.aa.order[dim] == order)
+      return dim;
+  }
+  return -1;
+}
+
 void  set_array_element_type (type *array, type *tp) {
   assert(array && (array->type_op == type_array));
-  assert(!is_method_type(tp));
+  assert(!is_Method_type(tp));
   array->attr.aa.element_type = tp;
 }
 type *get_array_element_type (type *array) {
@@ -1499,8 +1567,8 @@ entity *get_array_element_entity (const type *array) {
 }
 
 /* typecheck */
-int (is_array_type)(const type *array) {
-  return __is_array_type(array);
+int (is_Array_type)(const type *array) {
+  return _is_array_type(array);
 }
 
 /*-----------------------------------------------------------------*/
@@ -1563,8 +1631,8 @@ const char *get_enumeration_name(const type *enumeration, int pos) {
 }
 
 /* typecheck */
-int (is_enumeration_type)(const type *enumeration) {
-  return __is_enumeration_type(enumeration);
+int (is_Enumeration_type)(const type *enumeration) {
+  return _is_enumeration_type(enumeration);
 }
 
 /*-----------------------------------------------------------------*/
@@ -1604,21 +1672,21 @@ type *get_pointer_points_to_type (type *pointer) {
 }
 
 /* typecheck */
-int (is_pointer_type)(const type *pointer) {
-  return __is_pointer_type(pointer);
+int (is_Pointer_type)(const type *pointer) {
+  return _is_pointer_type(pointer);
 }
 
 /* Returns the first pointer type that has as points_to tp.
  *  Not efficient: O(#types).
- *  If not found returns unknown_type. */
+ *  If not found returns firm_unknown_type. */
 type *find_pointer_type_to_type (type *tp) {
   int i;
   for (i = 0; i < get_irp_n_types(); ++i) {
     type *found = get_irp_type(i);
-    if (is_pointer_type(found) && get_pointer_points_to_type(found) == tp)
+    if (is_Pointer_type(found) && get_pointer_points_to_type(found) == tp)
       return (found);
   }
-  return unknown_type;
+  return firm_unknown_type;
 }
 
 
@@ -1649,8 +1717,8 @@ void free_primitive_attrs (type *primitive) {
 }
 
 /* typecheck */
-int (is_primitive_type)(const type *primitive) {
-  return __is_primitive_type(primitive);
+int (is_Primitive_type)(const type *primitive) {
+  return _is_primitive_type(primitive);
 }
 
 /*-----------------------------------------------------------------*/
@@ -1659,7 +1727,7 @@ int (is_primitive_type)(const type *primitive) {
 
 
 int (is_atomic_type)(const type *tp) {
-  return __is_atomic_type(tp);
+  return _is_atomic_type(tp);
 }
 
 /*
@@ -1669,11 +1737,11 @@ int get_compound_n_members(const type *tp)
 {
   int res = 0;
 
-  if (is_struct_type(tp))
+  if (is_Struct_type(tp))
     res = get_struct_n_members(tp);
-  else if (is_class_type(tp))
+  else if (is_Class_type(tp))
     res = get_class_n_members(tp);
-  else if (is_union_type(tp))
+  else if (is_Union_type(tp))
     res = get_union_n_members(tp);
   else
     assert(0 && "need struct, union or class for member count");
@@ -1688,11 +1756,11 @@ entity *get_compound_member(const type *tp, int pos)
 {
   entity *res;
 
-  if (is_struct_type(tp))
+  if (is_Struct_type(tp))
     res = get_struct_member(tp, pos);
-  else if (is_class_type(tp))
+  else if (is_Class_type(tp))
     res = get_class_member(tp, pos);
-  else if (is_union_type(tp))
+  else if (is_Union_type(tp))
     res = get_union_member(tp, pos);
   else
   {