X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Fentity_t.h;h=b217ae872eda584284d4474f2e9970cb25767bbb;hb=38249b0311df91904bb3a566a770efe650f40efc;hp=e77952317f569415087596c4d4e58613ec40f764;hpb=bd84c0c27fb6a39f8d2fe340c50dab076bacbb63;p=libfirm

diff --git a/ir/tr/entity_t.h b/ir/tr/entity_t.h
index e77952317..b217ae872 100644
--- a/ir/tr/entity_t.h
+++ b/ir/tr/entity_t.h
@@ -29,7 +29,6 @@
 #include <assert.h>
 
 #include "firm_common_t.h"
-#include "firm_config.h"
 
 #include "typerep.h"
 #include "type_t.h"
@@ -40,17 +39,26 @@ typedef struct ir_initializer_base_t {
 	ir_initializer_kind_t kind;
 } ir_initializer_base_t;
 
+/**
+ * An compound initializer.
+ */
 typedef struct ir_initializer_compound_t {
 	ir_initializer_base_t  base;
 	unsigned               n_initializers;
 	ir_initializer_t      *initializers[1];
 } ir_initializer_compound_t;
 
+/**
+ * An initializer containing an ir_node,
+ */
 typedef struct ir_initializer_const_t {
 	ir_initializer_base_t  base;
 	ir_node               *value;
 } ir_initializer_const_t ;
 
+/**
+ * An initializer containing a tarval.
+ */
 typedef struct ir_initializer_tarval_t {
 	ir_initializer_base_t  base;
 	tarval                *value;
@@ -105,8 +113,8 @@ typedef struct method_ent_attr {
 	                                    in the virtual function table. */
 
 	ptr_access_kind *param_access; /**< the parameter access */
-	float *param_weight;           /**< The weight of method's parameters. Parameters
-	                                    with a high weight are good for procedure cloning. */
+	unsigned *param_weight;        /**< The weight of method's parameters. Parameters
+	                                    with a high weight are good candidates for procedure cloning. */
 } method_ent_attr;
 
 
@@ -135,18 +143,18 @@ struct ir_entity {
 	unsigned align:1;              /**< Specifies alignment of entities content. */
 	unsigned stickyness:2;         /**< Specifies whether this entity is sticky.  */
 	unsigned peculiarity:3;        /**< The peculiarity of this entity. */
-	unsigned address_taken:3;      /**< A flag that can be set to mark address taken entities. */
+	unsigned usage:4;              /**< flag indicating usage types of this entity. */
 	unsigned final:1;              /**< If set, this entity cannot be overridden. */
 	unsigned compiler_gen:1;       /**< If set, this entity was compiler generated. */
 	unsigned backend_marked:1;     /**< If set, this entity was marked by the backend for emission. */
-	unsigned has_initializer:1;
+	unsigned has_initializer:1;    /**< if set, this entity is initialized by new style initializers. */
 	int offset;                    /**< Offset in bytes for this entity.  Fixed when layout
 	                                    of owner is determined. */
 	unsigned char offset_bit_remainder;
 	                               /**< If the entity is a bit field, this is the offset of
 	                                    the start of the bit field within the byte specified
 	                                    by offset. */
-	unsigned long visit;           /**< visited counter for walks of the type information. */
+	ir_visited_t visit;            /**< visited counter for walks of the type information. */
 	struct dbg_info *dbi;          /**< A pointer to information for debug support. */
 	void *link;                    /**< To store some intermediate information. */
 	ir_type *repr_class;           /**< If this entity represents a class info, the associated class. */
@@ -180,36 +188,36 @@ void firm_init_entity(void);
 
 
 /* ----------------------- inline functions ------------------------ */
-static INLINE int
+static inline int
 _is_entity(const void *thing) {
 	return get_kind(thing) == k_entity;
 }
 
-static INLINE const char *
+static inline const char *
 _get_entity_name(const ir_entity *ent) {
 	assert(ent && ent->kind == k_entity);
 	return get_id_str(get_entity_ident(ent));
 }
 
-static INLINE ident *
+static inline ident *
 _get_entity_ident(const ir_entity *ent) {
 	assert(ent && ent->kind == k_entity);
 	return ent->name;
 }
 
-static INLINE void
+static inline void
 _set_entity_ident(ir_entity *ent, ident *id) {
 	assert(ent && ent->kind == k_entity);
 	ent->name = id;
 }
 
-static INLINE ir_type *
+static inline ir_type *
 _get_entity_owner(ir_entity *ent) {
 	assert(ent && ent->kind == k_entity);
 	return ent->owner = skip_tid(ent->owner);
 }
 
-static INLINE ident *
+static inline ident *
 _get_entity_ld_ident(ir_entity *ent)
 {
 	assert(ent && ent->kind == k_entity);
@@ -218,79 +226,79 @@ _get_entity_ld_ident(ir_entity *ent)
 	return ent->ld_name;
 }
 
-static INLINE void
+static inline void
 _set_entity_ld_ident(ir_entity *ent, ident *ld_ident) {
 	assert(ent && ent->kind == k_entity);
 	ent->ld_name = ld_ident;
 }
 
-static INLINE const char *
+static inline const char *
 _get_entity_ld_name(ir_entity *ent) {
 	assert(ent && ent->kind == k_entity);
 	return get_id_str(get_entity_ld_ident(ent));
 }
 
-static INLINE ir_type *
+static inline ir_type *
 _get_entity_type(ir_entity *ent) {
 	assert(ent && ent->kind == k_entity);
 	return ent->type = skip_tid(ent->type);
 }
 
-static INLINE void
+static inline void
 _set_entity_type(ir_entity *ent, ir_type *type) {
 	assert(ent && ent->kind == k_entity);
 	ent->type = type;
 }
 
-static INLINE ir_allocation
+static inline ir_allocation
 _get_entity_allocation(const ir_entity *ent) {
 	assert(ent && ent->kind == k_entity);
 	return ent->allocation;
 }
 
-static INLINE void
+static inline void
 _set_entity_allocation(ir_entity *ent, ir_allocation al) {
 	assert(ent && ent->kind == k_entity);
 	ent->allocation = al;
 }
 
-static INLINE ir_visibility
+static inline ir_visibility
 _get_entity_visibility(const ir_entity *ent) {
 	assert(ent && ent->kind == k_entity);
 	return ent->visibility;
 }
 
-static INLINE ir_variability
+static inline ir_variability
 _get_entity_variability(const ir_entity *ent) {
 	assert(ent && ent->kind == k_entity);
 	return ent->variability;
 }
 
-static INLINE ir_volatility
+static inline ir_volatility
 _get_entity_volatility(const ir_entity *ent) {
 	assert(ent && ent->kind == k_entity);
 	return ent->volatility;
 }
 
-static INLINE void
+static inline void
 _set_entity_volatility(ir_entity *ent, ir_volatility vol) {
 	assert(ent && ent->kind == k_entity);
 	ent->volatility = vol;
 }
 
-static INLINE ir_align
+static inline ir_align
 _get_entity_align(const ir_entity *ent) {
 	assert(ent && ent->kind == k_entity);
 	return ent->align;
 }
 
-static INLINE void
+static inline void
 _set_entity_align(ir_entity *ent, ir_align a) {
 	assert(ent && ent->kind == k_entity);
 	ent->align = a;
 }
 
-static INLINE ir_peculiarity
+static inline ir_peculiarity
 _get_entity_peculiarity(const ir_entity *ent) {
 	assert(ent && ent->kind == k_entity);
 	return ent->peculiarity;
@@ -303,7 +311,7 @@ _get_entity_peculiarity(const ir_entity *ent) {
  *       describe a field?  With inherited the situation changed.  So
  *       I removed the assertion.  GL, 28.2.05
  */
-static INLINE void
+static inline void
 _set_entity_peculiarity(ir_entity *ent, ir_peculiarity pec) {
 	assert(ent && ent->kind == k_entity);
 	/* @@@ why peculiarity only for methods? */
@@ -312,106 +320,103 @@ _set_entity_peculiarity(ir_entity *ent, ir_peculiarity pec) {
 	ent->peculiarity = pec;
 }
 
-static INLINE ir_stickyness
+static inline ir_stickyness
 _get_entity_stickyness(const ir_entity *ent) {
 	assert(ent && ent->kind == k_entity);
 	return ent->stickyness;
 }
 
-static INLINE void
+static inline void
 _set_entity_stickyness(ir_entity *ent, ir_stickyness stickyness) {
 	assert(ent && ent->kind == k_entity);
 	ent->stickyness = stickyness;
 }
 
-static INLINE int
+static inline int
 _is_entity_final(const ir_entity *ent) {
 	assert(ent && ent->kind == k_entity);
 	return (int)ent->final;
 }
 
-static INLINE void
+static inline void
 _set_entity_final(ir_entity *ent, int final) {
 	assert(ent && ent->kind == k_entity);
 	ent->final = final ? 1 : 0;
 }
 
-static INLINE int
+static inline int
 _is_entity_compiler_generated(const ir_entity *ent) {
 	assert(ent && ent->kind == k_entity);
 	return ent->compiler_gen;
 }
 
-static INLINE void
+static inline void
 _set_entity_compiler_generated(ir_entity *ent, int flag) {
 	assert(ent && ent->kind == k_entity);
 	ent->compiler_gen = flag ? 1 : 0;
 }
 
-static INLINE int
+static inline int
 _is_entity_backend_marked(const ir_entity *ent) {
 	assert(ent && ent->kind == k_entity);
 	return ent->backend_marked;
 }
 
-static INLINE void
+static inline void
 _set_entity_backend_marked(ir_entity *ent, int flag) {
 	assert(ent && ent->kind == k_entity);
 	ent->backend_marked = flag ? 1 : 0;
 }
 
-static INLINE ir_address_taken_state
-_get_entity_address_taken(const ir_entity *ent) {
+static inline ir_entity_usage
+_get_entity_usage(const ir_entity *ent) {
 	assert(ent && ent->kind == k_entity);
-	return ent->address_taken;
+	return ent->usage;
 }
 
-static INLINE void
-_set_entity_address_taken(ir_entity *ent, ir_address_taken_state state) {
+static inline void
+_set_entity_usage(ir_entity *ent, ir_entity_usage state) {
 	assert(ent && ent->kind == k_entity);
-	assert(state == ir_address_not_taken ||
-			state == ir_address_taken_unknown ||
-			state == ir_address_taken);
-	ent->address_taken = state;
+	ent->usage = state;
 }
 
-static INLINE int
+static inline int
 _get_entity_offset(const ir_entity *ent) {
 	assert(ent && ent->kind == k_entity);
 	return ent->offset;
 }
 
-static INLINE void
+static inline void
 _set_entity_offset(ir_entity *ent, int offset) {
 	assert(ent && ent->kind == k_entity);
 	ent->offset = offset;
 }
 
-static INLINE unsigned char
+static inline unsigned char
 _get_entity_offset_bits_remainder(const ir_entity *ent) {
 	assert(ent && ent->kind == k_entity);
 	return ent->offset_bit_remainder;
 }
 
-static INLINE void
+static inline void
 _set_entity_offset_bits_remainder(ir_entity *ent, unsigned char offset) {
 	assert(ent && ent->kind == k_entity);
 	ent->offset_bit_remainder = offset;
 }
 
-static INLINE void *
+static inline void *
 _get_entity_link(const ir_entity *ent) {
 	assert(ent && ent->kind == k_entity);
 	return ent->link;
 }
 
-static INLINE void
+static inline void
 _set_entity_link(ir_entity *ent, void *l) {
 	assert(ent && ent->kind == k_entity);
 	ent->link = l;
 }
 
-static INLINE ir_graph *
+static inline ir_graph *
 _get_entity_irg(const ir_entity *ent) {
 	ir_graph *irg;
 	assert(ent && ent->kind == k_entity);
@@ -422,46 +427,46 @@ _get_entity_irg(const ir_entity *ent) {
 	return irg;
 }
 
-static INLINE unsigned long
+static inline ir_visited_t
 _get_entity_visited(ir_entity *ent) {
 	assert(ent && ent->kind == k_entity);
 	return ent->visit;
 }
 
-static INLINE void
-_set_entity_visited(ir_entity *ent, unsigned long num) {
+static inline void
+_set_entity_visited(ir_entity *ent, ir_visited_t num) {
 	assert(ent && ent->kind == k_entity);
 	ent->visit = num;
 }
 
-static INLINE void
+static inline void
 _mark_entity_visited(ir_entity *ent) {
 	assert(ent && ent->kind == k_entity);
 	ent->visit = firm_type_visited;
 }
 
-static INLINE int
+static inline int
 _entity_visited(ir_entity *ent) {
 	return _get_entity_visited(ent) >= firm_type_visited;
 }
 
-static INLINE int
+static inline int
 _entity_not_visited(ir_entity *ent) {
 	return _get_entity_visited(ent) < firm_type_visited;
 }
 
-static INLINE ir_type *
+static inline ir_type *
 _get_entity_repr_class(const ir_entity *ent) {
 	assert(ent && ent->kind == k_entity);
 	return ent->repr_class;
 }
 
-static INLINE dbg_info *
+static inline dbg_info *
 _get_entity_dbg_info(const ir_entity *ent) {
 	return ent->dbi;
 }
 
-static INLINE void
+static inline void
 _set_entity_dbg_info(ir_entity *ent, dbg_info *db) {
 	ent->dbi = db;
 }
@@ -495,8 +500,8 @@ _set_entity_dbg_info(ir_entity *ent, dbg_info *db) {
 #define set_entity_compiler_generated(ent, flag) _set_entity_compiler_generated(ent, flag)
 #define is_entity_backend_marked(ent)            _is_entity_backend_marked(ent)
 #define set_entity_backend_marked(ent, flag)     _set_entity_backend_marked(ent, flag)
-#define get_entity_address_taken(ent)            _get_entity_address_taken(ent)
-#define set_entity_address_taken(ent, flag)      _set_entity_address_taken(ent, flag)
+#define get_entity_usage(ent)                    _get_entity_usage(ent)
+#define set_entity_usage(ent, flags)             _set_entity_usage(ent, flags)
 #define get_entity_offset(ent)                   _get_entity_offset(ent)
 #define set_entity_offset(ent, offset)           _set_entity_offset(ent, offset)
 #define get_entity_offset_bits_remainder(ent)    _get_entity_offset_bits_remainder(ent)