X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=entity_t.h;h=b61be49b66938b68b3088d96d45de9af54c369a6;hb=4633763eb3f6ebdc9b39a2c5a9d5a17a8ecab502;hp=76f8110a6d46ba071d887ebea4fecec28348a837;hpb=0e799d695fb50c6e40ac46d3611c2a611312146e;p=cparser

diff --git a/entity_t.h b/entity_t.h
index 76f8110..b61be49 100644
--- a/entity_t.h
+++ b/entity_t.h
@@ -45,9 +45,7 @@ typedef unsigned char entity_kind_t;
 typedef enum namespace_tag_t {
 	NAMESPACE_INVALID,
 	NAMESPACE_NORMAL,
-	NAMESPACE_STRUCT,
-	NAMESPACE_UNION,
-	NAMESPACE_ENUM,
+	NAMESPACE_TAG,
 	NAMESPACE_LABEL
 } namespace_tag_t;
 typedef unsigned char entity_namespace_t;
@@ -129,7 +127,6 @@ struct compound_t {
 	scope_t           members;
 	decl_modifiers_t  modifiers;
 	bool              complete            : 1;
-	bool              has_flexible_member : 1;
 
 	/* ast2firm info */
 	ir_type          *irtype;
@@ -192,6 +189,7 @@ struct declaration_t {
 
 struct compound_member_t {
 	declaration_t  base;
+	unsigned char  alignment;
 	bool           read          : 1;
 	bool           address_taken : 1;  /**< Set if the address of this declaration was taken. */
 
@@ -205,7 +203,7 @@ struct variable_t {
 	bool           thread_local  : 1;  /**< GCC __thread */
 	bool           address_taken : 1;  /**< Set if the address of this declaration was taken. */
 	bool           read          : 1;
-	unsigned char  alignment;          /**< Alignment of the declaration, 0 for default. */
+	unsigned char  alignment;
 	symbol_t      *get_property_sym;   /**< MS get property. */
 	symbol_t      *put_property_sym;   /**< MS put property. */
 
@@ -231,17 +229,74 @@ 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;
 	bool           need_closure  : 1;  /**< Inner function needs closure. */
 	bool           goto_to_outer : 1;  /**< Inner function has goto to outer function. */
 
+	builtin_kind_t btk;
 	scope_t        parameters;
 	statement_t   *statement;
 
 	/* ast2firm info */
 	ir_entity     *entity;
+	ir_node       *static_link;        /**< if need_closure is set, the node representing
+										    the static link. */
 };
 
 union entity_t {