X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast_t.h;h=0b7f9f6f602fbbb9feba2b040c1c6011961b8caa;hb=f9b99f31447f156dd8f835ab26573da2722d81a0;hp=b3b8bb9e3db8c981d1b3f9bc9eaa28511868a2cd;hpb=712027274baa81ffc562d9334c9b7215b6f53bac;p=cparser diff --git a/ast_t.h b/ast_t.h index b3b8bb9..0b7f9f6 100644 --- a/ast_t.h +++ b/ast_t.h @@ -35,7 +35,7 @@ extern struct obstack ast_obstack; /** * Expression kinds. */ -typedef enum { +typedef enum expression_kind_t { EXPR_UNKNOWN = 0, EXPR_INVALID, EXPR_REFERENCE, @@ -61,6 +61,7 @@ typedef enum { EXPR_VA_START, EXPR_VA_ARG, EXPR_STATEMENT, + EXPR_LABEL_ADDRESS, /**< GCC extension &&label operator */ EXPR_UNARY_FIRST, EXPR_UNARY_NEGATE = EXPR_UNARY_FIRST, @@ -76,8 +77,7 @@ typedef enum { EXPR_UNARY_CAST, EXPR_UNARY_CAST_IMPLICIT, /**< compiler generated cast */ EXPR_UNARY_ASSUME, /**< MS __assume() */ - EXPR_UNARY_BITFIELD_EXTRACT, - EXPR_UNARY_LAST = EXPR_UNARY_BITFIELD_EXTRACT, + EXPR_UNARY_LAST = EXPR_UNARY_ASSUME, EXPR_BINARY_FIRST, EXPR_BINARY_ADD = EXPR_BINARY_FIRST, @@ -121,7 +121,7 @@ typedef enum { EXPR_BINARY_LAST = EXPR_BINARY_ISUNORDERED, } expression_kind_t; -typedef enum { +typedef enum funcname_kind_t { FUNCNAME_FUNCTION, /**< C99 __func__, older __FUNCTION__ */ FUNCNAME_PRETTY_FUNCTION, /**< GNUC __PRETTY_FUNCTION__ */ FUNCNAME_FUNCSIG, /**< MS __FUNCSIG__ */ @@ -181,8 +181,7 @@ typedef enum { case EXPR_UNARY_PREFIX_DECREMENT: \ case EXPR_UNARY_CAST: \ case EXPR_UNARY_CAST_IMPLICIT: \ - case EXPR_UNARY_ASSUME: \ - case EXPR_UNARY_BITFIELD_EXTRACT: + case EXPR_UNARY_ASSUME: /** * A scope containing declarations. @@ -190,12 +189,18 @@ typedef enum { struct scope_t { declaration_t *declarations; /**< List of declarations in this scope. */ declaration_t *last_declaration; /**< last declaration in this scope. */ + scope_t *parent; /**< points to the parent scope. */ + unsigned depth; /**< while parsing, the depth of this scope in the scope stack. */ + bool is_parameter; /**< Set if this scope is a parameter scope. */ }; struct expression_base_t { expression_kind_t kind; type_t *type; source_position_t source_position; +#ifndef NDEBUG + bool transformed; +#endif }; struct const_expression_t { @@ -252,6 +257,8 @@ struct builtin_prefetch_expression_t { struct reference_expression_t { expression_base_t base; declaration_t *declaration; + bool is_outer_ref; /**< Set, if this referenced a variable + outside of an inner function */ }; struct call_argument_t { @@ -279,8 +286,6 @@ struct binary_expression_t { struct select_expression_t { expression_base_t base; expression_t *compound; - symbol_t *symbol; - declaration_t *compound_entry; }; @@ -288,7 +293,7 @@ struct array_access_expression_t { expression_base_t base; expression_t *array_ref; expression_t *index; - bool flipped; /* index/ref was written in a 5[a] way */ + bool flipped; /**< index/ref was written in a 5[a] way */ }; struct typeprop_expression_t { @@ -338,6 +343,11 @@ struct classify_type_expression_t { expression_t *type_expression; }; +struct label_address_expression_t { + expression_base_t base; + declaration_t *declaration; +}; + union expression_t { expression_kind_t kind; expression_base_t base; @@ -362,9 +372,10 @@ union expression_t { conditional_expression_t conditional; statement_expression_t statement; classify_type_expression_t classify_type; + label_address_expression_t label_address; }; -typedef enum { +typedef enum storage_class_tag_t { STORAGE_CLASS_NONE, STORAGE_CLASS_EXTERN, STORAGE_CLASS_STATIC, @@ -377,15 +388,16 @@ typedef enum { STORAGE_CLASS_THREAD_STATIC, } storage_class_tag_t; -typedef enum { +typedef enum namespace_t { NAMESPACE_NORMAL, NAMESPACE_STRUCT, NAMESPACE_UNION, NAMESPACE_ENUM, NAMESPACE_LABEL, + NAMESPACE_LOCAL_LABEL } namespace_t; -typedef enum { +typedef enum initializer_kind_t { INITIALIZER_VALUE, INITIALIZER_LIST, INITIALIZER_STRING, @@ -508,42 +520,59 @@ typedef enum gnu_attribute_kind_t { /** * Extended microsoft modifier. */ -typedef enum { - DM_DLLIMPORT = (1 << 0), - DM_DLLEXPORT = (1 << 1), - DM_THREAD = (1 << 2), - DM_NAKED = (1 << 3), - DM_MICROSOFT_INLINE = (1 << 4), - DM_FORCEINLINE = (1 << 5), - DM_SELECTANY = (1 << 6), - DM_NOTHROW = (1 << 7), - DM_NOVTABLE = (1 << 8), - DM_NORETURN = (1 << 9), - DM_NOINLINE = (1 << 10), - DM_RESTRICT = (1 << 11), - DM_NOALIAS = (1 << 12) +typedef enum decl_modifier_t { + DM_DLLIMPORT = 1 << 0, + DM_DLLEXPORT = 1 << 1, + DM_THREAD = 1 << 2, + DM_NAKED = 1 << 3, + DM_MICROSOFT_INLINE = 1 << 4, + DM_FORCEINLINE = 1 << 5, + DM_SELECTANY = 1 << 6, + DM_NOTHROW = 1 << 7, + DM_NOVTABLE = 1 << 8, + DM_NORETURN = 1 << 9, + 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 } decl_modifier_t; -typedef unsigned short decl_modifiers_t; +typedef unsigned decl_modifiers_t; struct declaration_t { unsigned char namespc; unsigned char declared_storage_class; unsigned char storage_class; unsigned char alignment; /**< Alignment of the declaration, 0 for default. */ - decl_modifiers_t decl_modifiers; /**< MS __declspec modifiers. */ + decl_modifiers_t modifiers; /**< modifiers. */ const char *deprecated_string; /**< MS deprecated string if any. */ symbol_t *get_property_sym; /**< MS get property. */ symbol_t *put_property_sym; /**< MS put property. */ - unsigned int address_taken : 1; + unsigned int address_taken : 1; /**< Set if the address of this declaration was taken. */ unsigned int is_inline : 1; unsigned int used : 1; /**< Set if the declaration is used. */ - unsigned int deprecated : 1; /**< Microsoft or GNU deprecated attribute. */ + unsigned int implicit : 1; /**< Set for implicit (not found in source code) declarations. */ + unsigned int need_closure : 1; /**< Inner function needs closure. */ + unsigned int goto_to_outer : 1; /**< Inner function has goto to outer function. */ type_t *type; + il_size_t offset; /**< The offset of this member inside a compound. */ symbol_t *symbol; + string_t *asm_name; /**< GCC extension: ASM label. */ source_position_t source_position; union { - bool complete; /**< used to indicate wether struct/union types are already defined or if just the name is declared */ + bool complete; /**< used to indicate whether struct/union types are already defined or if just the name is declared */ statement_t *statement; initializer_t *initializer; expression_t *enum_value; @@ -568,7 +597,7 @@ struct declaration_t { } v; }; -typedef enum { +typedef enum statement_kind_t { STATEMENT_INVALID, STATEMENT_EMPTY, STATEMENT_COMPOUND, @@ -586,14 +615,19 @@ typedef enum { STATEMENT_DO_WHILE, STATEMENT_FOR, STATEMENT_ASM, - STATEMENT_MS_TRY, - STATEMENT_LEAVE + STATEMENT_MS_TRY, /**< MS __try/__finally or __try/__except */ + STATEMENT_LEAVE /**< MS __leave */ } statement_kind_t; struct statement_base_t { statement_kind_t kind; statement_t *next; source_position_t source_position; + statement_t *parent; + bool reachable; +#ifndef NDEBUG + bool transformed; +#endif }; struct invalid_statement_t { @@ -629,24 +663,32 @@ struct if_statement_t { }; struct switch_statement_t { - statement_base_t base; + statement_base_t base; expression_t *expression; statement_t *body; - case_label_statement_t *first_case, *last_case; + case_label_statement_t *first_case, *last_case; /**< List of all cases, including default. */ + case_label_statement_t *default_label; /**< The default label if existent. */ + unsigned long default_proj_nr; /**< The Proj-number for the default Proj. */ }; struct goto_statement_t { statement_base_t base; - declaration_t *label; /**< The destination label. */ - goto_statement_t *next; /**< links all goto statements of a function */ + declaration_t *label; /**< The destination label. */ + expression_t *expression; /**< The expression for an assigned goto. */ + goto_statement_t *next; /**< links all goto statements of a function */ + bool outer_fkt_jmp; /**< Set if this goto jump to an outer function. */ }; struct case_label_statement_t { statement_base_t base; - expression_t *expression; /**< The case label expression, NULL for default label. */ - expression_t *end_range; /**< For GNUC case a .. b: the end range expression, NULL else. */ + expression_t *expression; /**< The case label expression, NULL for default label. */ + expression_t *end_range; /**< For GNUC case a .. b: the end range expression, NULL else. */ + case_label_statement_t *next; /**< link to the next case label in switch */ statement_t *statement; - case_label_statement_t *next; /**< link to the next case label in switch */ + long first_case; /**< The folded value of expression. */ + long last_case; /**< The folded value of end_range. */ + bool is_bad; /**< If set marked as bad to suppress warnings. */ + bool is_empty_range; /**< If set marked this as an empty range. */ }; struct label_statement_t { @@ -680,13 +722,15 @@ struct for_statement_t { expression_t *step; statement_t *body; scope_t scope; + bool condition_reachable:1; + bool step_reachable:1; }; -struct asm_constraint_t { - string_t constraints; - expression_t *expression; - symbol_t *symbol; - asm_constraint_t *next; +struct asm_argument_t { + string_t constraints; + expression_t *expression; + symbol_t *symbol; + asm_argument_t *next; }; struct asm_clobber_t { @@ -695,12 +739,12 @@ struct asm_clobber_t { }; struct asm_statement_t { - statement_base_t base; - string_t asm_text; - asm_constraint_t *inputs; - asm_constraint_t *outputs; - asm_clobber_t *clobbers; - bool is_volatile; + statement_base_t base; + string_t asm_text; + asm_argument_t *inputs; + asm_argument_t *outputs; + asm_clobber_t *clobbers; + bool is_volatile; }; struct ms_try_statement_t { @@ -735,7 +779,8 @@ union statement_t { }; struct translation_unit_t { - scope_t scope; + scope_t scope; + statement_t *global_asm; }; static inline