X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=entity_t.h;h=c0142ea078c7a406cf68b041071d0ef4750a661c;hb=3c84e06d01aaed7971067d7cc1924f6e20bcd0ba;hp=3081d77af4053e69017fb8b5be3ba9c6e84c70cc;hpb=912addb873c5f8b193970fe4f0926ff89aec3fc8;p=cparser diff --git a/entity_t.h b/entity_t.h index 3081d77..c0142ea 100644 --- a/entity_t.h +++ b/entity_t.h @@ -1,6 +1,6 @@ /* * This file is part of cparser. - * Copyright (C) 2007-2008 Matthias Braun + * Copyright (C) 2007-2009 Matthias Braun * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -23,6 +23,7 @@ #include "lexer.h" #include "symbol.h" #include "entity.h" +#include "attribute.h" #include typedef enum { @@ -32,6 +33,7 @@ typedef enum { ENTITY_PARAMETER, ENTITY_FUNCTION, ENTITY_TYPEDEF, + ENTITY_CLASS, ENTITY_STRUCT, ENTITY_UNION, ENTITY_ENUM, @@ -45,9 +47,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; @@ -77,32 +77,30 @@ typedef enum decl_modifier_t { DM_NOINLINE = 1 << 10, DM_RESTRICT = 1 << 11, DM_NOALIAS = 1 << 12, - DM_PACKED = 1 << 13, - DM_TRANSPARENT_UNION = 1 << 14, - DM_CONST = 1 << 15, - DM_PURE = 1 << 16, - DM_CONSTRUCTOR = 1 << 17, - DM_DESTRUCTOR = 1 << 18, - DM_UNUSED = 1 << 19, - DM_USED = 1 << 20, - DM_CDECL = 1 << 21, - DM_FASTCALL = 1 << 22, - DM_STDCALL = 1 << 23, - DM_THISCALL = 1 << 24, - DM_DEPRECATED = 1 << 25, - DM_RETURNS_TWICE = 1 << 26, + DM_TRANSPARENT_UNION = 1 << 13, + DM_CONST = 1 << 14, + DM_PURE = 1 << 15, + DM_CONSTRUCTOR = 1 << 16, + DM_DESTRUCTOR = 1 << 17, + DM_UNUSED = 1 << 18, + DM_USED = 1 << 19, + DM_CDECL = 1 << 20, + DM_FASTCALL = 1 << 21, + DM_STDCALL = 1 << 22, + DM_THISCALL = 1 << 23, + DM_DEPRECATED = 1 << 24, + DM_RETURNS_TWICE = 1 << 25, + DM_MALLOC = 1 << 26, } decl_modifier_t; -typedef unsigned decl_modifiers_t; - /** * A scope containing entities. */ struct scope_t { entity_t *entities; - entity_t *last_entity; - unsigned depth; /**< while parsing, the depth of this scope in the - scope stack. */ + entity_t *last_entity; /**< pointer to last entity (so appending is fast) */ + unsigned depth; /**< while parsing, the depth of this scope in the + scope stack. */ }; /** @@ -128,8 +126,13 @@ struct compound_t { entity_t *alias; /* used for name mangling of anonymous types */ scope_t members; decl_modifiers_t modifiers; - bool complete : 1; - bool has_flexible_member : 1; + bool layouted : 1; + bool complete : 1; + bool transparent_union : 1; + bool packed : 1; + + il_alignment_t alignment; + il_size_t size; /* ast2firm info */ ir_type *irtype; @@ -173,18 +176,20 @@ struct typedef_t { entity_base_t base; decl_modifiers_t modifiers; type_t *type; + il_alignment_t alignment; bool builtin : 1; }; struct declaration_t { entity_base_t base; + type_t *type; storage_class_t declared_storage_class; storage_class_t storage_class; decl_modifiers_t modifiers; - const char *deprecated_string; /**< MS deprecated string if any. */ - bool used : 1; /**< Set if the declaration is used. */ - bool implicit : 1; /**< Set for implicit (not found in source code) declarations. */ - type_t *type; + il_alignment_t alignment; + attribute_t *attributes; + bool used : 1; /**< Set if the declaration is used. */ + bool implicit : 1; /**< Set for implicit (not found in source code) declarations. */ /* ast2firm info */ unsigned char kind; @@ -192,25 +197,26 @@ 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. */ + unsigned short offset; /**< the offset of this member in the compound */ + unsigned char bit_offset; /**< extra bit offset for bitfield members */ /* ast2firm info */ ir_entity *entity; - il_size_t offset; /**< The offset of this member inside a compound. */ }; struct variable_t { - declaration_t base; - 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; - symbol_t *get_property_sym; /**< MS get property. */ - symbol_t *put_property_sym; /**< MS put property. */ + declaration_t base; + bool thread_local : 1; /**< GCC __thread */ + bool restricta : 1; + bool deprecated : 1; + bool noalias : 1; + + bool address_taken : 1; /**< Set if the address of this declaration was taken. */ + bool read : 1; - initializer_t *initializer; + initializer_t *initializer; /* ast2firm info */ union { @@ -257,15 +263,39 @@ typedef enum builtin_kind_t { 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. */ @@ -274,7 +304,9 @@ struct function_t { statement_t *statement; /* ast2firm info */ - ir_entity *entity; + ir_entity *irentity; + ir_node *static_link; /**< if need_closure is set, the node representing + the static link. */ }; union entity_t { @@ -295,14 +327,22 @@ union entity_t { compound_member_t compound_member; }; +#define DECLARATION_KIND_CASES \ + case ENTITY_FUNCTION: \ + case ENTITY_VARIABLE: \ + case ENTITY_PARAMETER: \ + case ENTITY_COMPOUND_MEMBER: + 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; + switch(entity->kind) { + DECLARATION_KIND_CASES + return true; + default: + return false; + } } - const char *get_entity_kind_name(entity_kind_t kind); #endif