X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=inline;f=ir%2Ftr%2Fentity_t.h;h=ea87cee7c241675094f19c6ab1490ee1ba7f2b6e;hb=0aa3f54e9f29fbed49bb4781c28ab1157499a92e;hp=c17d9f7b17048481f21ca11cb6ce0fb7afbf8021;hpb=dd6793ed8b75dd86637857ce795f07607a6d77ec;p=libfirm

diff --git a/ir/tr/entity_t.h b/ir/tr/entity_t.h
index c17d9f7b1..ea87cee7c 100644
--- a/ir/tr/entity_t.h
+++ b/ir/tr/entity_t.h
@@ -32,6 +32,44 @@
 #include "type_t.h"
 #include "ident.h"
 
+#define is_entity(thing)                         _is_entity(thing)
+#define get_entity_name(ent)                     _get_entity_name(ent)
+#define get_entity_ident(ent)                    _get_entity_ident(ent)
+#define set_entity_ident(ent, id)                _set_entity_ident(ent, id)
+#define get_entity_owner(ent)                    _get_entity_owner(ent)
+#define get_entity_ld_ident(ent)                 _get_entity_ld_ident(ent)
+#define set_entity_ld_ident(ent, ld_ident)       _set_entity_ld_ident(ent, ld_ident)
+#define get_entity_ld_name(ent)                  _get_entity_ld_name(ent)
+#define get_entity_type(ent)                     _get_entity_type(ent)
+#define get_entity_linkage(ent)                  _get_entity_linkage(ent)
+#define get_entity_volatility(ent)               _get_entity_volatility(ent)
+#define set_entity_volatility(ent, vol)          _set_entity_volatility(ent, vol)
+#define set_entity_alignment(ent, alignment)     _set_entity_alignment(ent, alignment)
+#define get_entity_alignment(ent)                _get_entity_alignment(ent)
+#define get_entity_align(ent)                    _get_entity_align(ent)
+#define set_entity_align(ent, a)                 _set_entity_align(ent, a)
+#define is_entity_compiler_generated(ent)        _is_entity_compiler_generated(ent)
+#define set_entity_compiler_generated(ent, flag) _set_entity_compiler_generated(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)
+#define set_entity_offset_bits_remainder(ent, o) _set_entity_offset_bits_remainder(ent, o)
+#define get_entity_link(ent)                     _get_entity_link(ent)
+#define set_entity_link(ent, l)                  _set_entity_link(ent, l)
+#define get_entity_irg(ent)                      _get_entity_irg(ent)
+#define is_parameter_entity(ent)                 _is_parameter_entity(ent)
+#define get_entity_parameter_number(ent)         _get_entity_parameter_number(ent)
+#define get_entity_visited(ent)                  _get_entity_visited(ent)
+#define set_entity_visited(ent, num)             _set_entity_visited(ent, num)
+#define mark_entity_visited(ent)                 _mark_entity_visited(ent)
+#define entity_visited(ent)                      _entity_visited(ent)
+#define entity_not_visited(ent)                  _entity_not_visited(ent)
+#define get_entity_repr_class(ent)               _get_entity_repr_class(ent)
+#define get_entity_dbg_info(ent)                 _get_entity_dbg_info(ent)
+#define set_entity_dbg_info(ent, db)             _set_entity_dbg_info(ent, db)
+
 typedef struct ir_initializer_base_t {
 	ir_initializer_kind_t kind;
 } ir_initializer_base_t;
@@ -73,7 +111,7 @@ union ir_initializer_t {
 typedef struct method_ent_attr {
 	ir_graph *irg;                 /**< The corresponding irg if known.
 	                                    The ir_graph constructor automatically sets this field. */
-	mtp_additional_properties irg_add_properties;   /**< Additional graph properties can be
+	mtp_additional_properties properties;   /**< Additional graph properties can be
 	                                    stored in a entity if no irg is available. */
 
 	unsigned vtable_number;        /**< For a dynamically called method, the number assigned
@@ -191,33 +229,33 @@ static inline int _is_entity(const void *thing)
 	return get_kind(thing) == k_entity;
 }
 
-static inline const char *_get_entity_name(const ir_entity *ent)
+static inline ident *_get_entity_ident(const ir_entity *ent)
 {
-	assert(ent && ent->kind == k_entity);
-	return get_id_str(get_entity_ident(ent));
+	assert(ent->kind == k_entity);
+	return ent->name;
 }
 
-static inline ident *_get_entity_ident(const ir_entity *ent)
+static inline const char *_get_entity_name(const ir_entity *ent)
 {
-	assert(ent && ent->kind == k_entity);
-	return ent->name;
+	assert(ent->kind == k_entity);
+	return get_id_str(get_entity_ident(ent));
 }
 
 static inline void _set_entity_ident(ir_entity *ent, ident *id)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	ent->name = id;
 }
 
 static inline ir_type *_get_entity_owner(const ir_entity *ent)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	return ent->owner;
 }
 
 static inline ident *_get_entity_ld_ident(const ir_entity *ent)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	if (ent->ld_name == NULL)
 		return ent->name;
 	return ent->ld_name;
@@ -225,127 +263,127 @@ static inline ident *_get_entity_ld_ident(const ir_entity *ent)
 
 static inline void _set_entity_ld_ident(ir_entity *ent, ident *ld_ident)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	ent->ld_name = ld_ident;
 }
 
 static inline const char *_get_entity_ld_name(const ir_entity *ent)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	return get_id_str(get_entity_ld_ident(ent));
 }
 
 static inline ir_type *_get_entity_type(const ir_entity *ent)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	return ent->type;
 }
 
 static inline ir_linkage _get_entity_linkage(const ir_entity *ent)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	return (ir_linkage) ent->linkage;
 }
 
 static inline ir_volatility _get_entity_volatility(const ir_entity *ent)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	return (ir_volatility) ent->volatility;
 }
 
 static inline void _set_entity_volatility(ir_entity *ent, ir_volatility vol)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	ent->volatility = vol;
 }
 
 static inline unsigned _get_entity_alignment(const ir_entity *ent)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	return ent->alignment;
 }
 
 static inline void _set_entity_alignment(ir_entity *ent, unsigned alignment)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	ent->alignment = alignment;
 }
 
 static inline ir_align _get_entity_aligned(const ir_entity *ent)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	return (ir_align) ent->aligned;
 }
 
 static inline void _set_entity_aligned(ir_entity *ent, ir_align a)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	ent->aligned = a;
 }
 
 static inline int _is_entity_compiler_generated(const ir_entity *ent)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	return ent->compiler_gen;
 }
 
 static inline void _set_entity_compiler_generated(ir_entity *ent, int flag)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	ent->compiler_gen = flag ? 1 : 0;
 }
 
 static inline ir_entity_usage _get_entity_usage(const ir_entity *ent)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	return (ir_entity_usage) ent->usage;
 }
 
 static inline void _set_entity_usage(ir_entity *ent, ir_entity_usage state)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	ent->usage = state;
 }
 
 static inline int _get_entity_offset(const ir_entity *ent)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	return ent->offset;
 }
 
 static inline void _set_entity_offset(ir_entity *ent, int offset)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	ent->offset = offset;
 }
 
 static inline unsigned char _get_entity_offset_bits_remainder(const ir_entity *ent)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	return ent->offset_bit_remainder;
 }
 
 static inline void _set_entity_offset_bits_remainder(ir_entity *ent, unsigned char offset)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	ent->offset_bit_remainder = offset;
 }
 
 static inline void *_get_entity_link(const ir_entity *ent)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	return ent->link;
 }
 
 static inline void _set_entity_link(ir_entity *ent, void *l)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	ent->link = l;
 }
 
 static inline ir_graph *_get_entity_irg(const ir_entity *ent)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	if (!is_Method_type(ent->type) || is_unknown_entity(ent)) {
 		return NULL;
 	}
@@ -355,19 +393,19 @@ static inline ir_graph *_get_entity_irg(const ir_entity *ent)
 
 static inline ir_visited_t _get_entity_visited(const ir_entity *ent)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	return ent->visit;
 }
 
 static inline void _set_entity_visited(ir_entity *ent, ir_visited_t num)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	ent->visit = num;
 }
 
 static inline void _mark_entity_visited(ir_entity *ent)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	ent->visit = firm_type_visited;
 }
 
@@ -394,7 +432,7 @@ static inline size_t _get_entity_parameter_number(const ir_entity *entity)
 
 static inline ir_type *_get_entity_repr_class(const ir_entity *ent)
 {
-	assert(ent && ent->kind == k_entity);
+	assert(ent->kind == k_entity);
 	return ent->repr_class;
 }
 
@@ -408,42 +446,4 @@ static inline void _set_entity_dbg_info(ir_entity *ent, dbg_info *db)
 	ent->dbi = db;
 }
 
-#define is_entity(thing)                         _is_entity(thing)
-#define get_entity_name(ent)                     _get_entity_name(ent)
-#define get_entity_ident(ent)                    _get_entity_ident(ent)
-#define set_entity_ident(ent, id)                _set_entity_ident(ent, id)
-#define get_entity_owner(ent)                    _get_entity_owner(ent)
-#define get_entity_ld_ident(ent)                 _get_entity_ld_ident(ent)
-#define set_entity_ld_ident(ent, ld_ident)       _set_entity_ld_ident(ent, ld_ident)
-#define get_entity_ld_name(ent)                  _get_entity_ld_name(ent)
-#define get_entity_type(ent)                     _get_entity_type(ent)
-#define get_entity_linkage(ent)                  _get_entity_linkage(ent)
-#define get_entity_volatility(ent)               _get_entity_volatility(ent)
-#define set_entity_volatility(ent, vol)          _set_entity_volatility(ent, vol)
-#define set_entity_alignment(ent, alignment)     _set_entity_alignment(ent, alignment)
-#define get_entity_alignment(ent)                _get_entity_alignment(ent)
-#define get_entity_align(ent)                    _get_entity_align(ent)
-#define set_entity_align(ent, a)                 _set_entity_align(ent, a)
-#define is_entity_compiler_generated(ent)        _is_entity_compiler_generated(ent)
-#define set_entity_compiler_generated(ent, flag) _set_entity_compiler_generated(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)
-#define set_entity_offset_bits_remainder(ent, o) _set_entity_offset_bits_remainder(ent, o)
-#define get_entity_link(ent)                     _get_entity_link(ent)
-#define set_entity_link(ent, l)                  _set_entity_link(ent, l)
-#define get_entity_irg(ent)                      _get_entity_irg(ent)
-#define is_parameter_entity(ent)                 _is_parameter_entity(ent)
-#define get_entity_parameter_number(ent)         _get_entity_parameter_number(ent)
-#define get_entity_visited(ent)                  _get_entity_visited(ent)
-#define set_entity_visited(ent, num)             _set_entity_visited(ent, num)
-#define mark_entity_visited(ent)                 _mark_entity_visited(ent)
-#define entity_visited(ent)                      _entity_visited(ent)
-#define entity_not_visited(ent)                  _entity_not_visited(ent)
-#define get_entity_repr_class(ent)               _get_entity_repr_class(ent)
-#define get_entity_dbg_info(ent)                 _get_entity_dbg_info(ent)
-#define set_entity_dbg_info(ent, db)             _set_entity_dbg_info(ent, db)
-
 #endif