X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast_t.h;h=e65c3c85d75b745eeb26a250e0f154dac67d9aed;hb=1e7458bc3eba2e714c913fa35aa397d54ed99a42;hp=342d546b4f8e514c34caeb692105661778fa9ba6;hpb=26b0ae39a6c0f1b157b62ac9f228f3c3e0e2407c;p=cparser diff --git a/ast_t.h b/ast_t.h index 342d546..e65c3c8 100644 --- a/ast_t.h +++ b/ast_t.h @@ -25,10 +25,13 @@ typedef enum { EXPR_ARRAY_ACCESS, EXPR_SIZEOF, EXPR_CLASSIFY_TYPE, + EXPR_ALIGNOF, EXPR_FUNCTION, EXPR_PRETTY_FUNCTION, EXPR_BUILTIN_SYMBOL, + EXPR_BUILTIN_CONSTANT_P, + EXPR_BUILTIN_PREFETCH, EXPR_OFFSETOF, EXPR_VA_START, EXPR_VA_ARG, @@ -46,8 +49,10 @@ typedef enum { EXPR_UNARY_PREFIX_INCREMENT, EXPR_UNARY_PREFIX_DECREMENT, EXPR_UNARY_CAST, - EXPR_UNARY_CAST_IMPLICIT, /* compiler generated cast */ - EXPR_UNARY_LAST = EXPR_UNARY_CAST_IMPLICIT, + EXPR_UNARY_CAST_IMPLICIT, /**< compiler generated cast */ + EXPR_UNARY_ASSUME, /**< MS __assume() */ + EXPR_UNARY_BITFIELD_EXTRACT, + EXPR_UNARY_LAST = EXPR_UNARY_BITFIELD_EXTRACT, EXPR_BINARY_FIRST, EXPR_BINARY_ADD = EXPR_BINARY_FIRST, @@ -81,6 +86,7 @@ typedef enum { EXPR_BINARY_BITWISE_OR_ASSIGN, EXPR_BINARY_COMMA, + EXPR_BINARY_BUILTIN_EXPECT, EXPR_BINARY_ISGREATER, EXPR_BINARY_ISGREATEREQUAL, EXPR_BINARY_ISLESS, @@ -88,7 +94,7 @@ typedef enum { EXPR_BINARY_ISLESSGREATER, EXPR_BINARY_ISUNORDERED, EXPR_BINARY_LAST = EXPR_BINARY_ISUNORDERED, -} expression_type_t; +} expression_kind_t; /* convenience macros */ #define EXPR_BINARY_CASES \ @@ -122,6 +128,7 @@ typedef enum { case EXPR_BINARY_BITWISE_XOR_ASSIGN: \ case EXPR_BINARY_BITWISE_OR_ASSIGN: \ case EXPR_BINARY_COMMA: \ + case EXPR_BINARY_BUILTIN_EXPECT: \ case EXPR_BINARY_ISGREATER: \ case EXPR_BINARY_ISGREATEREQUAL: \ case EXPR_BINARY_ISLESS: \ @@ -141,14 +148,16 @@ typedef enum { case EXPR_UNARY_PREFIX_INCREMENT: \ case EXPR_UNARY_PREFIX_DECREMENT: \ case EXPR_UNARY_CAST: \ - case EXPR_UNARY_CAST_IMPLICIT: + case EXPR_UNARY_CAST_IMPLICIT: \ + case EXPR_UNARY_ASSUME: \ + case EXPR_UNARY_BITFIELD_EXTRACT: struct context_t { - declaration_t *declarations; + declaration_t *declarations; /**< List of declarations in this context. */ }; struct expression_base_t { - expression_type_t type; + expression_kind_t kind; type_t *datatype; source_position_t source_position; }; @@ -163,7 +172,7 @@ struct const_expression_t { struct string_literal_expression_t { expression_base_t expression; - const char *value; + string_t value; }; struct wide_string_literal_expression_t { @@ -176,6 +185,18 @@ struct builtin_symbol_expression_t { symbol_t *symbol; }; +struct builtin_constant_expression_t { + expression_base_t expression; + expression_t *value; +}; + +struct builtin_prefetch_expression_t { + expression_base_t expression; + expression_t *adr; + expression_t *rw; + expression_t *locality; +}; + struct reference_expression_t { expression_base_t expression; symbol_t *symbol; @@ -225,6 +246,11 @@ struct sizeof_expression_t { expression_t *size_expression; }; +struct alignof_expression_t { + expression_base_t expression; + type_t *type; +}; + struct designator_t { symbol_t *symbol; expression_t *array_access; @@ -266,12 +292,14 @@ struct classify_type_expression_t { }; union expression_t { - expression_type_t type; + expression_kind_t kind; expression_base_t base; const_expression_t conste; string_literal_expression_t string; wide_string_literal_expression_t wide_string; builtin_symbol_expression_t builtin_symbol; + builtin_constant_expression_t builtin_constant; + builtin_prefetch_expression_t builtin_prefetch; reference_expression_t reference; call_expression_t call; unary_expression_t unary; @@ -285,6 +313,7 @@ union expression_t { conditional_expression_t conditional; statement_expression_t statement; classify_type_expression_t classify_type; + alignof_expression_t alignofe; }; typedef enum { @@ -313,10 +342,10 @@ typedef enum { INITIALIZER_LIST, INITIALIZER_STRING, INITIALIZER_WIDE_STRING -} initializer_type_t; +} initializer_kind_t; struct initializer_base_t { - initializer_type_t type; + initializer_kind_t kind; }; struct initializer_value_t { @@ -331,8 +360,8 @@ struct initializer_list_t { }; struct initializer_string_t { - initializer_base_t initializer; - const char *string; + initializer_base_t initializer; + string_t string; }; struct initializer_wide_string_t { @@ -341,7 +370,7 @@ struct initializer_wide_string_t { }; union initializer_t { - initializer_type_t type; + initializer_kind_t kind; initializer_base_t base; initializer_value_t value; initializer_list_t list; @@ -349,9 +378,23 @@ union initializer_t { initializer_wide_string_t wide_string; }; +typedef enum { + DM_DLLIMPORT = (1 << 0), + DM_DLLEXPORT = (1 << 1), + DM_THREAD = (1 << 2), + DM_NAKED = (1 << 3), + DM_FORCEINLINE = (1 << 4), + DM_NOTHROW = (1 << 5), + DM_NORETURN = (1 << 6), + DM_NOINLINE = (1 << 7) +} decl_modifier_t; + +typedef unsigned short decl_modifiers_t; + struct declaration_t { unsigned char namespc; unsigned char storage_class; + decl_modifiers_t modifiers; unsigned int address_taken : 1; unsigned int is_inline : 1; type_t *type; @@ -371,12 +414,13 @@ struct declaration_t { /** next declaration with same symbol */ declaration_t *symbol_next; - unsigned char declaration_type; /* used in ast2firm module */ + /* the following fields are used in ast2firm module */ + unsigned char declaration_kind; union { - unsigned int value_number; /* used in ast2firm module */ - ir_entity *entity; /* used in ast2firm module */ - ir_node *block; /* used in ast2firm module */ - tarval *enum_val; /* used in ast2firm module */ + unsigned int value_number; + ir_entity *entity; + ir_node *block; + tarval *enum_val; } v; }; @@ -397,10 +441,10 @@ typedef enum { STATEMENT_DO_WHILE, STATEMENT_FOR, STATEMENT_ASM -} statement_type_t; +} statement_kind_t; struct statement_base_t { - statement_type_t type; + statement_kind_t kind; statement_t *next; source_position_t source_position; }; @@ -430,20 +474,23 @@ struct if_statement_t { }; struct switch_statement_t { - statement_base_t statement; - expression_t *expression; - statement_t *body; + statement_base_t statement; + expression_t *expression; + statement_t *body; + case_label_statement_t *first_case, *last_case; }; struct goto_statement_t { statement_base_t statement; declaration_t *label; + goto_statement_t *next; /**< link all goto statements in a function */ }; struct case_label_statement_t { - statement_base_t statement; - expression_t *expression; - statement_t *label_statement; + statement_base_t statement; + expression_t *expression; + statement_t *label_statement; + case_label_statement_t *next; /**< link to the next case label in the switch */ }; struct label_statement_t { @@ -479,20 +526,20 @@ struct for_statement_t { }; struct asm_constraint_t { - const char *constraints; + string_t constraints; expression_t *expression; symbol_t *symbol; asm_constraint_t *next; }; struct asm_clobber_t { - const char *clobber; + string_t clobber; asm_clobber_t *next; }; struct asm_statement_t { statement_base_t statement; - const char *asm_text; + string_t asm_text; asm_constraint_t *inputs; asm_constraint_t *outputs; asm_clobber_t *clobbers; @@ -500,7 +547,7 @@ struct asm_statement_t { }; union statement_t { - statement_type_t type; + statement_kind_t kind; statement_base_t base; return_statement_t returns; compound_statement_t compound;