X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Ftype_t.h;h=14f4d6f31c9806d60b218ff1bbd345d0094e7fdf;hb=ca42e4ac671c49f7ba8e9dfffd805abf49b2c733;hp=ccc4795db93ee5ae0b37f09f6a0fe57fa6fb4ba7;hpb=1ce363f80e6a204d4011f85813362d9bd1d0e7e4;p=libfirm

diff --git a/ir/tr/type_t.h b/ir/tr/type_t.h
index ccc4795db..14f4d6f31 100644
--- a/ir/tr/type_t.h
+++ b/ir/tr/type_t.h
@@ -27,7 +27,6 @@
 #ifndef FIRM_TR_TYPE_T_H
 #define FIRM_TR_TYPE_T_H
 
-#include "firm_config.h"
 #include "typerep.h"
 #include "tpop_t.h"
 #include "irgraph.h"
@@ -75,7 +74,7 @@ typedef struct {
 	int n_res;                      /**< Number of results. */
 	tp_ent_pair *res_type;          /**< Array of result type/value ir_entity pairs. */
 	ir_type *value_ress;            /**< A type whose entities represent copied value results. */
-	variadicity variadicity;        /**< The variadicity of the method. */
+	ir_variadicity variadicity;        /**< The variadicity of the method. */
 	int first_variadic_param;       /**< The index of the first variadic parameter or -1 if non-variadic .*/
 	unsigned additional_properties; /**< Set of additional method properties. */
 	unsigned irg_calling_conv;      /**< A set of calling convention flags. */
@@ -120,12 +119,6 @@ typedef struct {
 	ir_type *base_type;  /**< For bitfield types: The base primitive type, NULL else. */
 } pri_attr;
 
-
-/*
-typedef struct {        * No private attr, must be smaller than others! *
-} id_attr;
-*/
-
 /** General type attributes. */
 typedef union {
 	cls_attr ca;      /**< Attributes of a class type */
@@ -140,13 +133,16 @@ typedef union {
 
 /** Additional type flags. */
 enum type_flags {
-	tf_none             =  0, /**< No flags. */
-	tf_frame_type       =  1, /**< Set if this is a frame type. */
-	tf_value_param_type =  2, /**< Set if this is a value param type. */
-	tf_lowered_type     =  4, /**< Set if this is a lowered type. */
-	tf_layout_fixed     =  8, /**< Set if the layout of a type is fixed */
-	tf_global_type      = 16, /**< Set only for the global type */
-	tf_tls_type         = 32, /**< Set only for the tls type */
+	tf_none             =   0, /**< No flags. */
+	tf_lowered_type     =   1, /**< Set if this is a lowered type. */
+	tf_layout_fixed     =   2, /**< Set if the layout of a type is fixed */
+
+	tf_frame_type       =   4, /**< Set if this is a frame type. */
+	tf_value_param_type =   8, /**< Set if this is a value param type. */
+	tf_global_type      =  16, /**< Set only for the global type */
+	tf_tls_type         =  32, /**< Set only for the tls type */
+	tf_constructors     =  64, /**< Set only for the constructors segment type */
+	tf_destructors      = 128, /**< Set only for the destructors segment type */
 };
 
 /**
@@ -173,7 +169,6 @@ enum type_flags {
  *  - type_op:     A tp_op specifying the kind of the type.
  *  - name:        An identifier specifying the name of the type.  To be
  *                 set by the frontend.
- *  - visibility:  The visibility of this type.
  *  - size:        The size of the type, i.e. an entity of this type will
  *                 occupy size bits in memory.  In several cases this is
  *                 determined when fixing the layout of this type (class,
@@ -225,9 +220,9 @@ struct ir_type {
 	                              calculated automatically by get_type_alignment().
 	                              Alignment must be given in bytes. */
 	ir_mode *mode;           /**< The mode for atomic types */
-	unsigned long visit;     /**< visited counter for walks of the type information */
+	ir_visited_t visit;      /**< visited counter for walks of the type information */
 	void *link;              /**< holds temporary data - like in irnode_t.h */
-	struct dbg_info *dbi;    /**< A pointer to information for debug support. */
+	type_dbg_info *dbi;      /**< A pointer to information for debug support. */
 	ir_type *assoc_type;     /**< The associated lowered/unlowered type */
 
 	/* ------------- fields for analyses ---------------*/
@@ -245,15 +240,13 @@ struct ir_type {
  *
  *   @param type_op  the kind of this type.  May not be type_id.
  *   @param mode     the mode to be used for this type, may be NULL
- *   @param name     an ident for the name of this type.
  *   @param db       debug info
  *
  *   @return A new type of the given type.  The remaining private attributes are not
  *           initialized.  The type is in state layout_undefined.
  */
-ir_type *
-new_type(tp_op *type_op, ir_mode *mode, ident *name, dbg_info *db);
-void free_type_attrs       (ir_type *tp);
+ir_type *new_type(const tp_op *type_op, ir_mode *mode, type_dbg_info *db);
+void free_type_attrs(ir_type *tp);
 
 void free_class_entities      (ir_type *clss);
 void free_struct_entities     (ir_type *strct);
@@ -285,170 +278,173 @@ void set_union_size(ir_type *tp, unsigned bytes);
 void set_array_size(ir_type *tp, unsigned bytes);
 void set_default_size(ir_type *tp, unsigned bytes);
 
-/**
- * Initialize the type module.
+/** Set and get a class' dfn --
+ * This is an undocumented field, subject to change! */
+void set_class_dfn(ir_type *clss, int dfn);
+int  get_class_dfn(const ir_type *clss);
+
+void add_compound_member(ir_type *compound, ir_entity *entity);
+void remove_compound_member(ir_type *compound, ir_entity *entity);
+
+/** Initialize the type module. */
+void ir_init_type(void);
+
+/** free internal datastructures of type module */
+void ir_finish_type(void);
+
+/** Clone an existing method type.
+ *
+ * @param tp      the method type to clone.
+ * @param prefix  if non-null, will be the prefix for the name of
+ *                the cloned type
  *
- * @param builtin_db       debug info for built-in objects
- * @param default_cc_mask  default calling conventions for methods
+ * @return the cloned method type.
  */
-void firm_init_type(dbg_info *builtin_db, unsigned default_cc_mask);
-
+ir_type *clone_type_method(ir_type *tp);
 
 /* ------------------- *
  *  inline functions   *
  * ------------------- */
 
-extern unsigned long firm_type_visited;
+extern ir_visited_t firm_type_visited;
 
-static INLINE void _set_master_type_visited(unsigned long val) { firm_type_visited = val; }
-static INLINE unsigned long _get_master_type_visited(void)     { return firm_type_visited; }
-static INLINE void _inc_master_type_visited(void)              { ++firm_type_visited; }
+static inline void _set_master_type_visited(ir_visited_t val) { firm_type_visited = val; }
+static inline ir_visited_t _get_master_type_visited(void)     { return firm_type_visited; }
+static inline void _inc_master_type_visited(void)             { ++firm_type_visited; }
 
-static INLINE void *
-_get_type_link(const ir_type *tp) {
+static inline void *_get_type_link(const ir_type *tp)
+{
 	assert(tp && tp->kind == k_type);
 	return(tp -> link);
 }
 
-static INLINE void
-_set_type_link(ir_type *tp, void *l) {
+static inline void _set_type_link(ir_type *tp, void *l)
+{
 	assert(tp && tp->kind == k_type);
 	tp -> link = l;
 }
 
-static INLINE const tp_op*
-_get_type_tpop(const ir_type *tp) {
+static inline const tp_op *_get_type_tpop(const ir_type *tp)
+{
 	assert(tp && tp->kind == k_type);
 	return tp->type_op;
 }
 
-static INLINE ident*
-_get_type_tpop_nameid(const ir_type *tp) {
+static inline ident *_get_type_tpop_nameid(const ir_type *tp)
+{
 	assert(tp && tp->kind == k_type);
 	return get_tpop_ident(tp->type_op);
 }
 
-static INLINE tp_opcode
-_get_type_tpop_code(const ir_type *tp) {
+static inline tp_opcode _get_type_tpop_code(const ir_type *tp)
+{
 	assert(tp && tp->kind == k_type);
 	return get_tpop_code(tp->type_op);
 }
 
-static INLINE ir_mode *
-_get_type_mode(const ir_type *tp) {
+static inline ir_mode *_get_type_mode(const ir_type *tp)
+{
 	assert(tp && tp->kind == k_type);
 	return tp->mode;
 }
 
-static INLINE ident *
-_get_type_ident(const ir_type *tp) {
-	assert(tp && tp->kind == k_type);
-	return tp->name;
-}
-
-static INLINE void
-_set_type_ident(ir_type *tp, ident* id) {
-	assert(tp && tp->kind == k_type);
-	tp->name = id;
-}
-
-static INLINE unsigned
-_get_type_size_bytes(const ir_type *tp) {
+static inline unsigned _get_type_size_bytes(const ir_type *tp)
+{
 	assert(tp && tp->kind == k_type);
 	return tp->size;
 }
 
-static INLINE ir_type_state
-_get_type_state(const ir_type *tp) {
+static inline ir_type_state _get_type_state(const ir_type *tp)
+{
 	assert(tp && tp->kind == k_type);
 	return tp->flags & tf_layout_fixed ? layout_fixed : layout_undefined;
 }
 
-static INLINE unsigned long
-_get_type_visited(const ir_type *tp) {
+static inline ir_visited_t _get_type_visited(const ir_type *tp)
+{
 	assert(tp && tp->kind == k_type);
 	return tp->visit;
 }
 
-static INLINE void
-_set_type_visited(ir_type *tp, unsigned long num) {
+static inline void _set_type_visited(ir_type *tp, ir_visited_t num)
+{
 	assert(tp && tp->kind == k_type);
 	tp->visit = num;
 }
 
-static INLINE void
-_mark_type_visited(ir_type *tp) {
+static inline void _mark_type_visited(ir_type *tp)
+{
 	assert(tp && tp->kind == k_type);
 	assert(tp->visit < firm_type_visited);
 	tp->visit = firm_type_visited;
 }
 
-static INLINE int
-_type_visited(const ir_type *tp) {
+static inline int _type_visited(const ir_type *tp)
+{
 	assert(tp && tp->kind == k_type);
 	return tp->visit >= firm_type_visited;
 }
 
-static INLINE int
-_type_not_visited(const ir_type *tp) {
+static inline int _type_not_visited(const ir_type *tp)
+{
 	assert(tp && tp->kind == k_type);
 	return tp->visit  < firm_type_visited;
 }
 
-static INLINE dbg_info *
-_get_type_dbg_info(const ir_type *tp) {
+static inline type_dbg_info *_get_type_dbg_info(const ir_type *tp)
+{
 	return tp->dbi;
 }
 
-static INLINE void
-_set_type_dbg_info(ir_type *tp, dbg_info *db) {
+static inline void _set_type_dbg_info(ir_type *tp, type_dbg_info *db)
+{
 	tp->dbi = db;
 }
 
-static INLINE int
-_is_type(const void *thing) {
+static inline int _is_type(const void *thing)
+{
 	return (get_kind(thing) == k_type);
 }
 
-static INLINE int
-_is_class_type(const ir_type *clss) {
+static inline int _is_class_type(const ir_type *clss)
+{
 	assert(clss);
 	return (clss->type_op == type_class);
 }
 
-static INLINE int
-_get_class_n_members (const ir_type *clss) {
+static inline int _get_class_n_members (const ir_type *clss)
+{
 	assert(clss && (clss->type_op == type_class));
 	return (ARR_LEN (clss->attr.ca.members));
 }
 
-static INLINE ir_entity *
-_get_class_member   (const ir_type *clss, int pos) {
+static inline ir_entity *_get_class_member(const ir_type *clss, int pos)
+{
 	assert(clss && (clss->type_op == type_class));
 	assert(pos >= 0 && pos < _get_class_n_members(clss));
 	return clss->attr.ca.members[pos];
 }
 
-static INLINE unsigned
-_get_class_vtable_size(const ir_type *clss) {
+static inline unsigned _get_class_vtable_size(const ir_type *clss)
+{
 	assert(clss && (clss->type_op == type_class));
 	return clss->attr.ca.vtable_size;
 }
 
-static INLINE void
-_set_class_vtable_size(ir_type *clss, unsigned vtable_size) {
+static inline void _set_class_vtable_size(ir_type *clss, unsigned vtable_size)
+{
 	assert(clss && (clss->type_op == type_class));
 	clss->attr.ca.vtable_size = vtable_size;
 }
 
-static INLINE int
-_is_class_final(const ir_type *clss) {
+static inline int _is_class_final(const ir_type *clss)
+{
 	assert(clss && (clss->type_op == type_class));
 	return clss->attr.ca.clss_flags & cf_final_class;
 }
 
-static INLINE void
-_set_class_final(ir_type *clss, int final) {
+static inline void _set_class_final(ir_type *clss, int final)
+{
 	assert(clss && (clss->type_op == type_class));
 	if (final)
 		clss->attr.ca.clss_flags |= cf_final_class;
@@ -456,14 +452,14 @@ _set_class_final(ir_type *clss, int final) {
 		clss->attr.ca.clss_flags &= ~cf_final_class;
 }
 
-static INLINE int
-_is_class_interface(const ir_type *clss) {
+static inline int _is_class_interface(const ir_type *clss)
+{
 	assert(clss && (clss->type_op == type_class));
 	return clss->attr.ca.clss_flags & cf_interface_class;
 }
 
-static INLINE void
-_set_class_interface(ir_type *clss, int final) {
+static inline void _set_class_interface(ir_type *clss, int final)
+{
 	assert(clss && (clss->type_op == type_class));
 	if (final)
 		clss->attr.ca.clss_flags |= cf_interface_class;
@@ -471,14 +467,14 @@ _set_class_interface(ir_type *clss, int final) {
 		clss->attr.ca.clss_flags &= ~cf_interface_class;
 }
 
-static INLINE int
-_is_class_abstract(const ir_type *clss) {
+static inline int _is_class_abstract(const ir_type *clss)
+{
 	assert(clss && (clss->type_op == type_class));
 	return clss->attr.ca.clss_flags & cf_absctract_class;
-	}
+}
 
-static INLINE void
-_set_class_abstract(ir_type *clss, int final) {
+static inline void _set_class_abstract(ir_type *clss, int final)
+{
 	assert(clss && (clss->type_op == type_class));
 	if (final)
 		clss->attr.ca.clss_flags |= cf_absctract_class;
@@ -486,76 +482,76 @@ _set_class_abstract(ir_type *clss, int final) {
 		clss->attr.ca.clss_flags &= ~cf_absctract_class;
 }
 
-static INLINE int
-_is_struct_type(const ir_type *strct) {
+static inline int _is_struct_type(const ir_type *strct)
+{
 	assert(strct);
 	return (strct->type_op == type_struct);
 }
 
-static INLINE int
-_is_method_type(const ir_type *method) {
+static inline int _is_method_type(const ir_type *method)
+{
 	assert(method);
 	return (method->type_op == type_method);
 }
 
-static INLINE int
-_is_union_type(const ir_type *uni) {
+static inline int _is_union_type(const ir_type *uni)
+{
 	assert(uni);
 	return (uni->type_op == type_union);
 }
 
-static INLINE int
-_is_array_type(const ir_type *array) {
+static inline int _is_array_type(const ir_type *array)
+{
 	assert(array);
 	return (array->type_op == type_array);
 }
 
-static INLINE int
-_is_enumeration_type(const ir_type *enumeration) {
+static inline int _is_enumeration_type(const ir_type *enumeration)
+{
 	assert(enumeration);
 	return (enumeration->type_op == type_enumeration);
 }
 
-static INLINE int
-_is_pointer_type(const ir_type *pointer) {
+static inline int _is_pointer_type(const ir_type *pointer)
+{
 	assert(pointer);
 	return (pointer->type_op == type_pointer);
 }
 
 /** Returns true if a type is a primitive type. */
-static INLINE int
-_is_primitive_type(const ir_type *primitive) {
+static inline int _is_primitive_type(const ir_type *primitive)
+{
 	assert(primitive && primitive->kind == k_type);
 	return (primitive->type_op == type_primitive);
 }
 
-static INLINE int
-_is_atomic_type(const ir_type *tp) {
+static inline int _is_atomic_type(const ir_type *tp)
+{
 	assert(tp && tp->kind == k_type);
 	return (_is_primitive_type(tp) || _is_pointer_type(tp) ||
 	        _is_enumeration_type(tp));
 }
 
-static INLINE int
-_get_method_n_params(const ir_type *method) {
+static inline int _get_method_n_params(const ir_type *method)
+{
 	assert(method && (method->type_op == type_method));
 	return method->attr.ma.n_params;
 }
 
-static INLINE int
-_get_method_n_ress(const ir_type *method) {
+static inline int _get_method_n_ress(const ir_type *method)
+{
 	assert(method && (method->type_op == type_method));
 	return method->attr.ma.n_res;
 }
 
-static INLINE unsigned
-_get_method_additional_properties(const ir_type *method) {
+static inline unsigned _get_method_additional_properties(const ir_type *method)
+{
 	assert(method && (method->type_op == type_method));
 	return method->attr.ma.additional_properties;
 }
 
-static INLINE void
-_set_method_additional_properties(ir_type *method, unsigned mask) {
+static inline void _set_method_additional_properties(ir_type *method, unsigned mask)
+{
 	assert(method && (method->type_op == type_method));
 
 	/* do not allow to set the mtp_property_inherited flag or
@@ -563,8 +559,8 @@ _set_method_additional_properties(ir_type *method, unsigned mask) {
 	method->attr.ma.additional_properties = mask & ~mtp_property_inherited;
 }
 
-static INLINE void
-_set_method_additional_property(ir_type *method, mtp_additional_property flag) {
+static inline void _set_method_additional_property(ir_type *method, mtp_additional_property flag)
+{
 	assert(method && (method->type_op == type_method));
 
 	/* do not allow to set the mtp_property_inherited flag or
@@ -572,14 +568,14 @@ _set_method_additional_property(ir_type *method, mtp_additional_property flag) {
 	method->attr.ma.additional_properties |= flag & ~mtp_property_inherited;
 }
 
-static INLINE unsigned
-_get_method_calling_convention(const ir_type *method) {
+static inline unsigned _get_method_calling_convention(const ir_type *method)
+{
 	assert(method && (method->type_op == type_method));
 	return method->attr.ma.irg_calling_conv;
 }
 
-static INLINE void
-_set_method_calling_convention(ir_type *method, unsigned cc_mask) {
+static inline void _set_method_calling_convention(ir_type *method, unsigned cc_mask)
+{
 	assert(method && (method->type_op == type_method));
 	method->attr.ma.irg_calling_conv = cc_mask;
 }
@@ -594,8 +590,6 @@ _set_method_calling_convention(ir_type *method, unsigned cc_mask) {
 #define get_type_tpop_nameid(tp)          _get_type_tpop_nameid(tp)
 #define get_type_tpop_code(tp)            _get_type_tpop_code(tp)
 #define get_type_mode(tp)                 _get_type_mode(tp)
-#define get_type_ident(tp)                _get_type_ident(tp)
-#define set_type_ident(tp, id)            _set_type_ident(tp, id)
 #define get_type_size_bytes(tp)           _get_type_size_bytes(tp)
 #define get_type_state(tp)                _get_type_state(tp)
 #define get_type_visited(tp)              _get_type_visited(tp)