X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=entity_t.h;h=c9670f0d541cd1118719244951a4c9f6abac9731;hb=86e613f57ea7f1eac5b020163a1ab045ee198142;hp=27e5c9d34c74ef76b4cebbea2cc694221e898ae3;hpb=f9580ab07acfdbde64386a8e3d12a1f56dcf4a54;p=cparser

diff --git a/entity_t.h b/entity_t.h
index 27e5c9d..c9670f0 100644
--- a/entity_t.h
+++ b/entity_t.h
@@ -25,6 +25,7 @@
 #include "entity.h"
 #include "attribute.h"
 #include <libfirm/firm_types.h>
+#include "builtins.h"
 
 typedef enum {
 	ENTITY_INVALID,
@@ -156,7 +157,7 @@ struct enum_value_t {
 	type_t        *enum_type;
 
 	/* ast2firm info */
-	tarval        *tv;
+	ir_tarval     *tv;
 };
 
 struct label_t {
@@ -199,10 +200,11 @@ struct declaration_t {
 
 struct compound_member_t {
 	declaration_t  base;
-	bool           read          : 1;
-	bool           address_taken : 1;  /**< Set if the address of this declaration was taken. */
-	unsigned short offset;     /**< the offset of this member in the compound */
+	il_size_t      offset;     /**< the offset of this member in the compound */
 	unsigned char  bit_offset; /**< extra bit offset for bitfield members */
+	bool           read          : 1;
+	bool           address_taken : 1;  /**< Set if the address of this
+	                                        declaration was taken. */
 
 	/* ast2firm info */
 	ir_entity *entity;
@@ -240,60 +242,6 @@ struct parameter_t {
 	} v;
 };
 
-/**
- * GNU builtin or MS intrinsic functions.
- */
-typedef enum builtin_kind_t {
-	bk_none = 0,                   /**< no builtin */
-	bk_gnu_builtin_alloca,         /**< GNU __builtin_alloca */
-	bk_gnu_builtin_huge_val,       /**< GNU __builtin_huge_val */
-	bk_gnu_builtin_inf,            /**< GNU __builtin_inf */
-	bk_gnu_builtin_inff,           /**< GNU __builtin_inff */
-	bk_gnu_builtin_infl,           /**< GNU __builtin_infl */
-	bk_gnu_builtin_nan,            /**< GNU __builtin_nan */
-	bk_gnu_builtin_nanf,           /**< GNU __builtin_nanf */
-	bk_gnu_builtin_nanl,           /**< GNU __builtin_nanl */
-	bk_gnu_builtin_va_end,         /**< GNU __builtin_va_end */
-	bk_gnu_builtin_expect,         /**< GNU __builtin_expect */
-	bk_gnu_builtin_return_address, /**< GNU __builtin_return_address */
-	bk_gnu_builtin_frame_address,  /**< GNU __builtin_frame_address */
-	bk_gnu_builtin_ffs,            /**< GNU __builtin_ffs */
-	bk_gnu_builtin_clz,            /**< GNU __builtin_clz */
-	bk_gnu_builtin_ctz,            /**< GNU __builtin_ctz */
-	bk_gnu_builtin_popcount,       /**< GNU __builtin_popcount */
-	bk_gnu_builtin_parity,         /**< GNU __builtin_parity */
-	bk_gnu_builtin_prefetch,       /**< GNU __builtin_prefetch */
-	bk_gnu_builtin_trap,           /**< GNU __builtin_trap */
-
-	bk_ms_rotl,                    /**< MS _rotl */
-	bk_ms_rotr,                    /**< MS _rotr */
-	bk_ms_rotl64,                  /**< MS _rotl64 */
-	bk_ms_rotr64,                  /**< MS _rotr64 */
-	bk_ms_byteswap_ushort,         /**< MS _byteswap_ushort */
-	bk_ms_byteswap_ulong,          /**< MS _byteswap_ulong */
-	bk_ms_byteswap_uint64,         /**< MS _byteswap_uint64 */
-
-	bk_ms__debugbreak,             /**< MS __debugbreak */
-	bk_ms_ReturnAddress,           /**< MS _ReturnAddress */
-	bk_ms_AddressOfReturnAddress,  /**< MS _AddressOfReturnAddress */
-	bk_ms__popcount,               /**< MS __popcount */
-	bk_ms_enable,                  /**< MS _enable */
-	bk_ms_disable,                 /**< MS _disable */
-	bk_ms__inbyte,                 /**< MS __inbyte */
-	bk_ms__inword,                 /**< MS __inword */
-	bk_ms__indword,                /**< MS __indword */
-	bk_ms__outbyte,                /**< MS __outbyte */
-	bk_ms__outword,                /**< MS __outword */
-	bk_ms__outdword,               /**< MS __outdword */
-	bk_ms__ud2,                    /**< MS __ud2 */
-	bk_ms_BitScanForward,          /**< MS _BitScanForward */
-	bk_ms_BitScanReverse,          /**< MS _BitScanReverse */
-	bk_ms_InterlockedExchange,     /**< MS _InterlockedExchange */
-	bk_ms_InterlockedExchange64,   /**< MS _InterlockedExchange64 */
-	bk_ms__readeflags,             /**< MS __readflags */
-	bk_ms__writeeflags,            /**< MS __writeflags */
-} builtin_kind_t;
-
 struct function_t {
 	declaration_t  base;
 	bool           is_inline     : 1;
@@ -347,4 +295,6 @@ static inline bool is_declaration(const entity_t *entity)
 
 const char *get_entity_kind_name(entity_kind_t kind);
 
+entity_t *allocate_entity_zero(entity_kind_t kind);
+
 #endif