- fixed access to outer variables

[cparser] / entity_t.h

diff --git a/entity_t.h b/entity_t.h
index c8870f3..e6ad01f 100644 (file)
--- a/entity_t.h
+++ b/entity_t.h
@@ -23,11 +23,13 @@
 #include "lexer.h"
 #include "symbol.h"
 #include "entity.h"
+#include <libfirm/firm_types.h>
 
 typedef enum {
        ENTITY_INVALID,
        ENTITY_VARIABLE,
        ENTITY_COMPOUND_MEMBER,
+       ENTITY_PARAMETER,
        ENTITY_FUNCTION,
        ENTITY_TYPEDEF,
        ENTITY_STRUCT,
@@ -87,7 +89,8 @@ typedef enum decl_modifier_t {
        DM_FASTCALL          = 1 << 22,
        DM_STDCALL           = 1 << 23,
        DM_THISCALL          = 1 << 24,
-       DM_DEPRECATED        = 1 << 25
+       DM_DEPRECATED        = 1 << 25,
+       DM_RETURNS_TWICE     = 1 << 26,
 } decl_modifier_t;
 
 typedef unsigned decl_modifiers_t;
@@ -126,7 +129,6 @@ struct compound_t {
        scope_t           members;
        decl_modifiers_t  modifiers;
        bool              complete            : 1;
-       bool              has_flexible_member : 1;
 
        /* ast2firm info */
        ir_type          *irtype;
@@ -189,7 +191,9 @@ struct declaration_t {
 
 struct compound_member_t {
        declaration_t  base;
-       bool           read : 1;
+       unsigned char  alignment;
+       bool           read          : 1;
+       bool           address_taken : 1;  /**< Set if the address of this declaration was taken. */
 
        /* ast2firm info */
        ir_entity *entity;
@@ -201,7 +205,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. */
 
@@ -215,17 +219,86 @@ struct variable_t {
        } v;
 };
 
+struct parameter_t {
+       declaration_t  base;
+       bool           address_taken : 1;
+       bool           read          : 1;
+
+       /* ast2firm info */
+       union {
+               unsigned int  value_number;
+               ir_entity    *entity;
+       } 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 {
@@ -241,6 +314,7 @@ union entity_t {
        typedef_t          typedefe;
        declaration_t      declaration;
        variable_t         variable;
+       parameter_t        parameter;
        function_t         function;
        compound_member_t  compound_member;
 };
@@ -248,7 +322,11 @@ union entity_t {
 static inline bool is_declaration(const entity_t *entity)
 {
        return entity->kind == ENTITY_FUNCTION || entity->kind == ENTITY_VARIABLE
+               || entity->kind == ENTITY_PARAMETER
                || entity->kind == ENTITY_COMPOUND_MEMBER;
 }
 
+
+const char *get_entity_kind_name(entity_kind_t kind);
+
 #endif