X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=7321f2dd95afc60176a25b45d4b3a5fa0140dac1;hb=4633337d25ebd26db4dc4034216acee7e22765e7;hp=5ab84186a1996c683142f7fac024f905cb7a0b1e;hpb=3ac3f322bfdcf74b4794e3a85ccc8209893afadf;p=cparser diff --git a/parser.c b/parser.c index 5ab8418..7321f2d 100644 --- a/parser.c +++ b/parser.c @@ -34,6 +34,7 @@ #include "type_hash.h" #include "ast_t.h" #include "entity_t.h" +#include "attribute_t.h" #include "lang_features.h" #include "walk_statements.h" #include "warning.h" @@ -50,27 +51,6 @@ typedef struct { entity_namespace_t namespc; } stack_entry_t; -typedef struct argument_list_t argument_list_t; -struct argument_list_t { - long argument; - argument_list_t *next; -}; - -typedef struct gnu_attribute_t gnu_attribute_t; -struct gnu_attribute_t { - gnu_attribute_kind_t kind; /**< The kind of the GNU attribute. */ - gnu_attribute_t *next; - bool invalid; /**< Set if this attribute had argument errors, */ - bool has_arguments; /**< True, if this attribute has arguments. */ - union { - size_t value; - string_t string; - symbol_t *symbol; - long argument; /**< Single argument. */ - argument_list_t *arguments; /**< List of argument expressions. */ - } u; -}; - typedef struct declaration_specifiers_t declaration_specifiers_t; struct declaration_specifiers_t { source_position_t source_position; @@ -78,12 +58,7 @@ struct declaration_specifiers_t { unsigned char alignment; /**< Alignment, 0 if not set. */ bool is_inline : 1; bool thread_local : 1; /**< GCC __thread */ - bool deprecated : 1; - decl_modifiers_t modifiers; /**< declaration modifiers */ - gnu_attribute_t *gnu_attributes; /**< list of GNU attributes */ - const char *deprecated_string; /**< can be set if declaration was marked deprecated. */ - symbol_t *get_property_sym; /**< the name of the get property if set. */ - symbol_t *put_property_sym; /**< the name of the put property if set. */ + attribute_t *attributes; /**< list of attributes */ type_t *type; }; @@ -98,14 +73,6 @@ typedef struct parse_initializer_env_t { bool must_be_constant; } parse_initializer_env_t; -/** - * Capture a MS __base extension. - */ -typedef struct based_spec_t { - source_position_t source_position; - variable_t *base_variable; -} based_spec_t; - typedef entity_t* (*parsed_declaration_func) (entity_t *declaration, bool is_definition); /** The current token. */ @@ -149,27 +116,6 @@ static declaration_t **incomplete_arrays; /** special symbol used for anonymous entities. */ static const symbol_t *sym_anonymous = NULL; -/* symbols for Microsoft extended-decl-modifier */ -static const symbol_t *sym_align = NULL; -static const symbol_t *sym_allocate = NULL; -static const symbol_t *sym_dllimport = NULL; -static const symbol_t *sym_dllexport = NULL; -static const symbol_t *sym_naked = NULL; -static const symbol_t *sym_noinline = NULL; -static const symbol_t *sym_returns_twice = NULL; -static const symbol_t *sym_noreturn = NULL; -static const symbol_t *sym_nothrow = NULL; -static const symbol_t *sym_novtable = NULL; -static const symbol_t *sym_property = NULL; -static const symbol_t *sym_get = NULL; -static const symbol_t *sym_put = NULL; -static const symbol_t *sym_selectany = NULL; -static const symbol_t *sym_thread = NULL; -static const symbol_t *sym_uuid = NULL; -static const symbol_t *sym_deprecated = NULL; -static const symbol_t *sym_restrict = NULL; -static const symbol_t *sym_noalias = NULL; - /** The token anchor set */ static unsigned char token_anchor_set[T_LAST_TOKEN]; @@ -179,8 +125,6 @@ static unsigned char token_anchor_set[T_LAST_TOKEN]; /** true if we are in GCC mode. */ #define GNU_MODE ((c_mode & _GNUC) || in_gcc_extension) -static type_t *type_valist; - static statement_t *parse_compound_statement(bool inside_expression_statement); static statement_t *parse_statement(void); @@ -192,6 +136,9 @@ static void parse_external(void); static void parse_compound_type_entries(compound_t *compound_declaration); +static void check_call_argument(type_t *expected_type, + call_argument_t *argument, unsigned pos); + typedef enum declarator_flags_t { DECL_FLAGS_NONE = 0, DECL_MAY_BE_ABSTRACT = 1U << 0, @@ -206,6 +153,9 @@ static entity_t *record_entity(entity_t *entity, bool is_definition); static void semantic_comparison(binary_expression_t *expression); +static void create_gnu_builtins(void); +static void create_microsoft_intrinsics(void); + #define STORAGE_CLASSES \ STORAGE_CLASSES_NO_EXTERN \ case T_extern: @@ -249,6 +199,11 @@ static void semantic_comparison(binary_expression_t *expression); case T_unsigned: \ case T_void: \ case T_wchar_t: \ + case T__int8: \ + case T__int16: \ + case T__int32: \ + case T__int64: \ + case T__int128: \ COMPLEX_SPECIFIERS \ IMAGINARY_SPECIFIERS @@ -288,28 +243,18 @@ static void semantic_comparison(binary_expression_t *expression); case T___FUNCTION__: \ case T___PRETTY_FUNCTION__: \ case T___alignof__: \ - case T___builtin_alloca: \ case T___builtin_classify_type: \ case T___builtin_constant_p: \ - case T___builtin_expect: \ - case T___builtin_huge_val: \ - case T___builtin_inf: \ - case T___builtin_inff: \ - case T___builtin_infl: \ case T___builtin_isgreater: \ case T___builtin_isgreaterequal: \ case T___builtin_isless: \ case T___builtin_islessequal: \ case T___builtin_islessgreater: \ case T___builtin_isunordered: \ - case T___builtin_nan: \ - case T___builtin_nanf: \ - case T___builtin_nanl: \ case T___builtin_offsetof: \ - case T___builtin_prefetch: \ case T___builtin_va_arg: \ - case T___builtin_va_end: \ case T___builtin_va_start: \ + case T___builtin_va_copy: \ case T___func__: \ case T___noop: \ case T__assume: \ @@ -359,6 +304,8 @@ static size_t get_entity_struct_size(entity_kind_t kind) /** * Allocate an entity of given kind and initialize all * fields with zero. + * + * @param kind the kind of the entity to allocate */ static entity_t *allocate_entity_zero(entity_kind_t kind) { @@ -409,34 +356,33 @@ static size_t get_statement_struct_size(statement_kind_t kind) static size_t get_expression_struct_size(expression_kind_t kind) { static const size_t sizes[] = { - [EXPR_INVALID] = sizeof(expression_base_t), - [EXPR_REFERENCE] = sizeof(reference_expression_t), - [EXPR_REFERENCE_ENUM_VALUE] = sizeof(reference_expression_t), - [EXPR_CONST] = sizeof(const_expression_t), - [EXPR_CHARACTER_CONSTANT] = sizeof(const_expression_t), - [EXPR_WIDE_CHARACTER_CONSTANT] = sizeof(const_expression_t), - [EXPR_STRING_LITERAL] = sizeof(string_literal_expression_t), - [EXPR_WIDE_STRING_LITERAL] = sizeof(wide_string_literal_expression_t), - [EXPR_COMPOUND_LITERAL] = sizeof(compound_literal_expression_t), - [EXPR_CALL] = sizeof(call_expression_t), - [EXPR_UNARY_FIRST] = sizeof(unary_expression_t), - [EXPR_BINARY_FIRST] = sizeof(binary_expression_t), - [EXPR_CONDITIONAL] = sizeof(conditional_expression_t), - [EXPR_SELECT] = sizeof(select_expression_t), - [EXPR_ARRAY_ACCESS] = sizeof(array_access_expression_t), - [EXPR_SIZEOF] = sizeof(typeprop_expression_t), - [EXPR_ALIGNOF] = sizeof(typeprop_expression_t), - [EXPR_CLASSIFY_TYPE] = sizeof(classify_type_expression_t), - [EXPR_FUNCNAME] = sizeof(funcname_expression_t), - [EXPR_BUILTIN_SYMBOL] = sizeof(builtin_symbol_expression_t), - [EXPR_BUILTIN_CONSTANT_P] = sizeof(builtin_constant_expression_t), - [EXPR_BUILTIN_ADDRESS] = sizeof(builtin_address_expression_t), - [EXPR_BUILTIN_PREFETCH] = sizeof(builtin_prefetch_expression_t), - [EXPR_OFFSETOF] = sizeof(offsetof_expression_t), - [EXPR_VA_START] = sizeof(va_start_expression_t), - [EXPR_VA_ARG] = sizeof(va_arg_expression_t), - [EXPR_STATEMENT] = sizeof(statement_expression_t), - [EXPR_LABEL_ADDRESS] = sizeof(label_address_expression_t), + [EXPR_INVALID] = sizeof(expression_base_t), + [EXPR_REFERENCE] = sizeof(reference_expression_t), + [EXPR_REFERENCE_ENUM_VALUE] = sizeof(reference_expression_t), + [EXPR_CONST] = sizeof(const_expression_t), + [EXPR_CHARACTER_CONSTANT] = sizeof(const_expression_t), + [EXPR_WIDE_CHARACTER_CONSTANT] = sizeof(const_expression_t), + [EXPR_STRING_LITERAL] = sizeof(string_literal_expression_t), + [EXPR_WIDE_STRING_LITERAL] = sizeof(wide_string_literal_expression_t), + [EXPR_COMPOUND_LITERAL] = sizeof(compound_literal_expression_t), + [EXPR_CALL] = sizeof(call_expression_t), + [EXPR_UNARY_FIRST] = sizeof(unary_expression_t), + [EXPR_BINARY_FIRST] = sizeof(binary_expression_t), + [EXPR_CONDITIONAL] = sizeof(conditional_expression_t), + [EXPR_SELECT] = sizeof(select_expression_t), + [EXPR_ARRAY_ACCESS] = sizeof(array_access_expression_t), + [EXPR_SIZEOF] = sizeof(typeprop_expression_t), + [EXPR_ALIGNOF] = sizeof(typeprop_expression_t), + [EXPR_CLASSIFY_TYPE] = sizeof(classify_type_expression_t), + [EXPR_FUNCNAME] = sizeof(funcname_expression_t), + [EXPR_BUILTIN_CONSTANT_P] = sizeof(builtin_constant_expression_t), + [EXPR_BUILTIN_TYPES_COMPATIBLE_P] = sizeof(builtin_types_compatible_expression_t), + [EXPR_OFFSETOF] = sizeof(offsetof_expression_t), + [EXPR_VA_START] = sizeof(va_start_expression_t), + [EXPR_VA_ARG] = sizeof(va_arg_expression_t), + [EXPR_VA_COPY] = sizeof(va_copy_expression_t), + [EXPR_STATEMENT] = sizeof(statement_expression_t), + [EXPR_LABEL_ADDRESS] = sizeof(label_address_expression_t), }; if (kind >= EXPR_UNARY_FIRST && kind <= EXPR_UNARY_LAST) { return sizes[EXPR_UNARY_FIRST]; @@ -468,6 +414,8 @@ static statement_t *allocate_statement_zero(statement_kind_t kind) /** * Allocate an expression node of given kind and initialize all * fields with zero. + * + * @param kind the kind of the expression to allocate */ static expression_t *allocate_expression_zero(expression_kind_t kind) { @@ -549,6 +497,14 @@ static type_t *allocate_type_zero(type_kind_t kind) return res; } +static function_parameter_t *allocate_parameter(type_t *const type) +{ + function_parameter_t *const param = obstack_alloc(type_obst, sizeof(*param)); + memset(param, 0, sizeof(*param)); + param->type = type; + return param; +} + /** * Returns the size of an initializer node. * @@ -837,6 +793,21 @@ static entity_t *get_entity(const symbol_t *const symbol, return NULL; } +/* §6.2.3:1 24) There is only one name space for tags even though three are + * possible. */ +static entity_t *get_tag(symbol_t const *const symbol, + entity_kind_tag_t const kind) +{ + entity_t *entity = get_entity(symbol, NAMESPACE_TAG); + if (entity != NULL && entity->kind != kind) { + errorf(HERE, + "'%Y' defined as wrong kind of tag (previous definition %P)", + symbol, &entity->base.source_position); + entity = NULL; + } + return entity; +} + /** * pushs an entity on the environment stack and links the corresponding symbol * it. @@ -978,7 +949,7 @@ static int get_rank(const type_t *type) } /** - * Do integer promotion for a given type. + * §6.3.1.1:2 Do integer promotion for a given type. * * @param type the type to promote * @return the promoted type @@ -1030,7 +1001,7 @@ static bool is_null_pointer_constant(const expression_t *expression) return is_type_integer(type) && is_constant_expression(expression) && - fold_constant(expression) == 0; + !fold_constant_to_bool(expression); } /** @@ -1121,7 +1092,7 @@ static void report_assign_error(assign_error_t error, type_t *orig_type_left, } } -/** Implements the rules from § 6.5.16.1 */ +/** Implements the rules from §6.5.16.1 */ static assign_error_t semantic_assign(type_t *orig_type_left, const expression_t *const right) { @@ -1218,75 +1189,6 @@ static string_t parse_string_literals(void) return result; } -static const char *const gnu_attribute_names[GNU_AK_LAST] = { - [GNU_AK_CONST] = "const", - [GNU_AK_VOLATILE] = "volatile", - [GNU_AK_CDECL] = "cdecl", - [GNU_AK_STDCALL] = "stdcall", - [GNU_AK_FASTCALL] = "fastcall", - [GNU_AK_DEPRECATED] = "deprecated", - [GNU_AK_NOINLINE] = "noinline", - [GNU_AK_RETURNS_TWICE] = "returns_twice", - [GNU_AK_NORETURN] = "noreturn", - [GNU_AK_NAKED] = "naked", - [GNU_AK_PURE] = "pure", - [GNU_AK_ALWAYS_INLINE] = "always_inline", - [GNU_AK_MALLOC] = "malloc", - [GNU_AK_WEAK] = "weak", - [GNU_AK_CONSTRUCTOR] = "constructor", - [GNU_AK_DESTRUCTOR] = "destructor", - [GNU_AK_NOTHROW] = "nothrow", - [GNU_AK_TRANSPARENT_UNION] = "transparent_union", - [GNU_AK_COMMON] = "common", - [GNU_AK_NOCOMMON] = "nocommon", - [GNU_AK_PACKED] = "packed", - [GNU_AK_SHARED] = "shared", - [GNU_AK_NOTSHARED] = "notshared", - [GNU_AK_USED] = "used", - [GNU_AK_UNUSED] = "unused", - [GNU_AK_NO_INSTRUMENT_FUNCTION] = "no_instrument_function", - [GNU_AK_WARN_UNUSED_RESULT] = "warn_unused_result", - [GNU_AK_LONGCALL] = "longcall", - [GNU_AK_SHORTCALL] = "shortcall", - [GNU_AK_LONG_CALL] = "long_call", - [GNU_AK_SHORT_CALL] = "short_call", - [GNU_AK_FUNCTION_VECTOR] = "function_vector", - [GNU_AK_INTERRUPT] = "interrupt", - [GNU_AK_INTERRUPT_HANDLER] = "interrupt_handler", - [GNU_AK_NMI_HANDLER] = "nmi_handler", - [GNU_AK_NESTING] = "nesting", - [GNU_AK_NEAR] = "near", - [GNU_AK_FAR] = "far", - [GNU_AK_SIGNAL] = "signal", - [GNU_AK_EIGTHBIT_DATA] = "eightbit_data", - [GNU_AK_TINY_DATA] = "tiny_data", - [GNU_AK_SAVEALL] = "saveall", - [GNU_AK_FLATTEN] = "flatten", - [GNU_AK_SSEREGPARM] = "sseregparm", - [GNU_AK_EXTERNALLY_VISIBLE] = "externally_visible", - [GNU_AK_RETURN_TWICE] = "return_twice", - [GNU_AK_MAY_ALIAS] = "may_alias", - [GNU_AK_MS_STRUCT] = "ms_struct", - [GNU_AK_GCC_STRUCT] = "gcc_struct", - [GNU_AK_DLLIMPORT] = "dllimport", - [GNU_AK_DLLEXPORT] = "dllexport", - [GNU_AK_ALIGNED] = "aligned", - [GNU_AK_ALIAS] = "alias", - [GNU_AK_SECTION] = "section", - [GNU_AK_FORMAT] = "format", - [GNU_AK_FORMAT_ARG] = "format_arg", - [GNU_AK_WEAKREF] = "weakref", - [GNU_AK_NONNULL] = "nonnull", - [GNU_AK_TLS_MODEL] = "tls_model", - [GNU_AK_VISIBILITY] = "visibility", - [GNU_AK_REGPARM] = "regparm", - [GNU_AK_MODE] = "mode", - [GNU_AK_MODEL] = "model", - [GNU_AK_TRAP_EXIT] = "trap_exit", - [GNU_AK_SP_SWITCH] = "sp_switch", - [GNU_AK_SENTINEL] = "sentinel" -}; - /** * compare two string, ignoring double underscores on the second. */ @@ -1303,619 +1205,282 @@ static int strcmp_underscore(const char *s1, const char *s2) return strcmp(s1, s2); } -/** - * Allocate a new gnu temporal attribute of given kind. - */ -static gnu_attribute_t *allocate_gnu_attribute(gnu_attribute_kind_t kind) +static attribute_t *allocate_attribute_zero(attribute_kind_t kind) { - gnu_attribute_t *attribute = obstack_alloc(&temp_obst, sizeof(*attribute)); - attribute->kind = kind; - attribute->next = NULL; - attribute->invalid = false; - attribute->has_arguments = false; - + attribute_t *attribute = allocate_ast_zero(sizeof(*attribute)); + attribute->kind = kind; return attribute; } /** - * Parse one constant expression argument of the given attribute. + * Parse (gcc) attribute argument. From gcc comments in gcc source: + * + * attribute: + * __attribute__ ( ( attribute-list ) ) + * + * attribute-list: + * attrib + * attribute_list , attrib + * + * attrib: + * empty + * any-word + * any-word ( identifier ) + * any-word ( identifier , nonempty-expr-list ) + * any-word ( expr-list ) + * + * where the "identifier" must not be declared as a type, and + * "any-word" may be any identifier (including one declared as a + * type), a reserved word storage class specifier, type specifier or + * type qualifier. ??? This still leaves out most reserved keywords + * (following the old parser), shouldn't we include them, and why not + * allow identifiers declared as types to start the arguments? + * + * Matze: this all looks confusing and little systematic, so we're even less + * strict and parse any list of things which are identifiers or + * (assignment-)expressions. */ -static void parse_gnu_attribute_const_arg(gnu_attribute_t *attribute) +static attribute_argument_t *parse_attribute_arguments(void) { - expression_t *expression; - add_anchor_token(')'); - expression = parse_constant_expression(); - rem_anchor_token(')'); - expect(')', end_error); - attribute->u.argument = fold_constant(expression); - return; -end_error: - attribute->invalid = true; -} + if (token.type == ')') + return NULL; -/** - * Parse a list of constant expressions arguments of the given attribute. - */ -static void parse_gnu_attribute_const_arg_list(gnu_attribute_t *attribute) -{ - argument_list_t **list = &attribute->u.arguments; - argument_list_t *entry; - expression_t *expression; - add_anchor_token(')'); - add_anchor_token(','); + attribute_argument_t *first = NULL; + attribute_argument_t *last = NULL; while (true) { - expression = parse_constant_expression(); - entry = obstack_alloc(&temp_obst, sizeof(entry)); - entry->argument = fold_constant(expression); - entry->next = NULL; - *list = entry; - list = &entry->next; - if (token.type != ',') - break; - next_token(); - } - rem_anchor_token(','); - rem_anchor_token(')'); - expect(')', end_error); - return; -end_error: - attribute->invalid = true; -} - -/** - * Parse one string literal argument of the given attribute. - */ -static void parse_gnu_attribute_string_arg(gnu_attribute_t *attribute, - string_t *string) -{ - add_anchor_token('('); - if (token.type != T_STRING_LITERAL) { - parse_error_expected("while parsing attribute directive", - T_STRING_LITERAL, NULL); - goto end_error; - } - *string = parse_string_literals(); - rem_anchor_token('('); - expect(')', end_error); - return; -end_error: - attribute->invalid = true; -} + attribute_argument_t *argument = allocate_ast_zero(sizeof(*argument)); + + /* is it an identifier */ + if (token.type == T_IDENTIFIER + && (look_ahead(1)->type == ',' || look_ahead(1)->type == ')')) { + symbol_t *symbol = token.v.symbol; + argument->kind = ATTRIBUTE_ARGUMENT_SYMBOL; + argument->v.symbol = symbol; + next_token(); + } else { + /* must be an expression */ + expression_t *expression = parse_assignment_expression(); -/** - * Parse one tls model of the given attribute. - */ -static void parse_gnu_attribute_tls_model_arg(gnu_attribute_t *attribute) -{ - static const char *const tls_models[] = { - "global-dynamic", - "local-dynamic", - "initial-exec", - "local-exec" - }; - string_t string = { NULL, 0 }; - parse_gnu_attribute_string_arg(attribute, &string); - if (string.begin != NULL) { - for (size_t i = 0; i < 4; ++i) { - if (strcmp(tls_models[i], string.begin) == 0) { - attribute->u.value = i; - return; - } + argument->kind = ATTRIBUTE_ARGUMENT_EXPRESSION; + argument->v.expression = expression; } - errorf(HERE, "'%s' is an unrecognized tls model", string.begin); - } - attribute->invalid = true; -} -/** - * Parse one tls model of the given attribute. - */ -static void parse_gnu_attribute_visibility_arg(gnu_attribute_t *attribute) -{ - static const char *const visibilities[] = { - "default", - "protected", - "hidden", - "internal" - }; - string_t string = { NULL, 0 }; - parse_gnu_attribute_string_arg(attribute, &string); - if (string.begin != NULL) { - for (size_t i = 0; i < 4; ++i) { - if (strcmp(visibilities[i], string.begin) == 0) { - attribute->u.value = i; - return; - } + /* append argument */ + if (last == NULL) { + first = argument; + } else { + last->next = argument; } - errorf(HERE, "'%s' is an unrecognized visibility", string.begin); - } - attribute->invalid = true; -} + last = argument; -/** - * Parse one (code) model of the given attribute. - */ -static void parse_gnu_attribute_model_arg(gnu_attribute_t *attribute) -{ - static const char *const visibilities[] = { - "small", - "medium", - "large" - }; - string_t string = { NULL, 0 }; - parse_gnu_attribute_string_arg(attribute, &string); - if (string.begin != NULL) { - for (int i = 0; i < 3; ++i) { - if (strcmp(visibilities[i], string.begin) == 0) { - attribute->u.value = i; - return; - } + if (token.type == ',') { + next_token(); + continue; } - errorf(HERE, "'%s' is an unrecognized model", string.begin); + expect(')', end_error); + break; } - attribute->invalid = true; + + return first; + +end_error: + /* TODO... */ + return first; } -/** - * Parse one mode of the given attribute. - */ -static void parse_gnu_attribute_mode_arg(gnu_attribute_t *attribute) +static attribute_t *parse_attribute_asm(void) { - add_anchor_token(')'); + eat(T_asm); - if (token.type != T_IDENTIFIER) { - expect(T_IDENTIFIER, end_error); - } + attribute_t *attribute = allocate_attribute_zero(ATTRIBUTE_GNU_ASM); - attribute->u.symbol = token.v.symbol; - next_token(); + expect('(', end_error); + attribute->a.arguments = parse_attribute_arguments(); + return attribute; - rem_anchor_token(')'); - expect(')', end_error); - return; end_error: - attribute->invalid = true; + return NULL; } -/** - * Parse one interrupt argument of the given attribute. - */ -static void parse_gnu_attribute_interrupt_arg(gnu_attribute_t *attribute) +static symbol_t *get_symbol_from_token(void) { - static const char *const interrupts[] = { - "IRQ", - "FIQ", - "SWI", - "ABORT", - "UNDEF" - }; - string_t string = { NULL, 0 }; - parse_gnu_attribute_string_arg(attribute, &string); - if (string.begin != NULL) { - for (size_t i = 0; i < 5; ++i) { - if (strcmp(interrupts[i], string.begin) == 0) { - attribute->u.value = i; - return; - } - } - errorf(HERE, "'%s' is not an interrupt", string.begin); + switch(token.type) { + case T_IDENTIFIER: + return token.v.symbol; + case T_auto: + case T_char: + case T_double: + case T_enum: + case T_extern: + case T_float: + case T_int: + case T_long: + case T_register: + case T_short: + case T_static: + case T_struct: + case T_union: + case T_unsigned: + case T_void: + case T_bool: + case T__Bool: + case T_class: + case T_explicit: + case T_export: + case T_wchar_t: + case T_const: + case T_signed: + case T___real__: + case T___imag__: + case T_restrict: + case T_volatile: + case T_inline: + /* maybe we need more tokens ... add them on demand */ + return get_token_symbol(&token); + default: + return NULL; } - attribute->invalid = true; } -/** - * Parse ( identifier, const expression, const expression ) - */ -static void parse_gnu_attribute_format_args(gnu_attribute_t *attribute) +static attribute_t *parse_attribute_gnu_single(void) { - static const char *const format_names[] = { - "printf", - "scanf", - "strftime", - "strfmon" - }; - int i; - - if (token.type != T_IDENTIFIER) { - parse_error_expected("while parsing format attribute directive", T_IDENTIFIER, NULL); + /* parse "any-word" */ + symbol_t *symbol = get_symbol_from_token(); + if (symbol == NULL) { + parse_error_expected("while parsing attribute((", T_IDENTIFIER, NULL); goto end_error; } - const char *name = token.v.symbol->string; - for (i = 0; i < 4; ++i) { - if (strcmp_underscore(format_names[i], name) == 0) + + const char *name = symbol->string; + next_token(); + + attribute_kind_t kind; + for (kind = ATTRIBUTE_GNU_FIRST; kind <= ATTRIBUTE_GNU_LAST; ++kind) { + const char *attribute_name = get_attribute_name(kind); + if (attribute_name != NULL + && strcmp_underscore(attribute_name, name) == 0) break; } - if (i >= 4) { - if (warning.attribute) - warningf(HERE, "'%s' is an unrecognized format function type", name); + + if (kind >= ATTRIBUTE_GNU_LAST) { + if (warning.attribute) { + warningf(HERE, "unknown attribute '%s' ignored", name); + } + /* TODO: we should still save the attribute in the list... */ + kind = ATTRIBUTE_UNKNOWN; } - next_token(); - expect(',', end_error); - add_anchor_token(')'); - add_anchor_token(','); - parse_constant_expression(); - rem_anchor_token(','); - rem_anchor_token(')'); + attribute_t *attribute = allocate_attribute_zero(kind); - expect(',', end_error); - add_anchor_token(')'); - parse_constant_expression(); - rem_anchor_token(')'); - expect(')', end_error); - return; -end_error: - attribute->u.value = true; -} + /* parse arguments */ + if (token.type == '(') { + next_token(); + attribute->a.arguments = parse_attribute_arguments(); + } -/** - * Check that a given GNU attribute has no arguments. - */ -static void check_no_argument(gnu_attribute_t *attribute, const char *name) -{ - if (!attribute->has_arguments) - return; + return attribute; - /* should have no arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - eat_until_matching_token('('); - /* we have already consumed '(', so we stop before ')', eat it */ - eat(')'); - attribute->invalid = true; +end_error: + return NULL; } -/** - * Parse one GNU attribute. - * - * Note that attribute names can be specified WITH or WITHOUT - * double underscores, ie const or __const__. - * - * The following attributes are parsed without arguments - * const - * volatile - * cdecl - * stdcall - * fastcall - * deprecated - * noinline - * noreturn - * naked - * pure - * always_inline - * malloc - * weak - * constructor - * destructor - * nothrow - * transparent_union - * common - * nocommon - * packed - * shared - * notshared - * used - * unused - * no_instrument_function - * warn_unused_result - * longcall - * shortcall - * long_call - * short_call - * function_vector - * interrupt_handler - * nmi_handler - * nesting - * near - * far - * signal - * eightbit_data - * tiny_data - * saveall - * flatten - * sseregparm - * externally_visible - * return_twice - * may_alias - * ms_struct - * gcc_struct - * dllimport - * dllexport - * - * The following attributes are parsed with arguments - * aligned( const expression ) - * alias( string literal ) - * section( string literal ) - * format( identifier, const expression, const expression ) - * format_arg( const expression ) - * tls_model( string literal ) - * visibility( string literal ) - * regparm( const expression ) - * model( string leteral ) - * trap_exit( const expression ) - * sp_switch( string literal ) - * - * The following attributes might have arguments - * weak_ref( string literal ) - * non_null( const expression // ',' ) - * interrupt( string literal ) - * sentinel( constant expression ) - */ -static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) +static attribute_t *parse_attribute_gnu(void) { - gnu_attribute_t *head = *attributes; - gnu_attribute_t *last = *attributes; - decl_modifiers_t modifiers = 0; - gnu_attribute_t *attribute; + attribute_t *first = NULL; + attribute_t *last = NULL; eat(T___attribute__); expect('(', end_error); expect('(', end_error); - if (token.type != ')') { - /* find the end of the list */ - if (last != NULL) { - while (last->next != NULL) - last = last->next; - } - - /* non-empty attribute list */ - while (true) { - const char *name; - if (token.type == T_const) { - name = "const"; - } else if (token.type == T_volatile) { - name = "volatile"; - } else if (token.type == T_cdecl) { - /* __attribute__((cdecl)), WITH ms mode */ - name = "cdecl"; - } else if (token.type == T_IDENTIFIER) { - const symbol_t *sym = token.v.symbol; - name = sym->string; - } else { - parse_error_expected("while parsing GNU attribute", T_IDENTIFIER, NULL); - break; - } - - next_token(); - - int i; - for (i = 0; i < GNU_AK_LAST; ++i) { - if (strcmp_underscore(gnu_attribute_names[i], name) == 0) - break; - } - gnu_attribute_kind_t kind = (gnu_attribute_kind_t)i; - - attribute = NULL; - if (kind == GNU_AK_LAST) { - if (warning.attribute) - warningf(HERE, "'%s' attribute directive ignored", name); - - /* skip possible arguments */ - if (token.type == '(') { - eat_until_matching_token(')'); - } - } else { - /* check for arguments */ - attribute = allocate_gnu_attribute(kind); - if (token.type == '(') { - next_token(); - if (token.type == ')') { - /* empty args are allowed */ - next_token(); - } else - attribute->has_arguments = true; - } - - switch (kind) { - case GNU_AK_VOLATILE: - case GNU_AK_NAKED: - case GNU_AK_MALLOC: - case GNU_AK_WEAK: - case GNU_AK_COMMON: - case GNU_AK_NOCOMMON: - case GNU_AK_SHARED: - case GNU_AK_NOTSHARED: - case GNU_AK_NO_INSTRUMENT_FUNCTION: - case GNU_AK_WARN_UNUSED_RESULT: - case GNU_AK_LONGCALL: - case GNU_AK_SHORTCALL: - case GNU_AK_LONG_CALL: - case GNU_AK_SHORT_CALL: - case GNU_AK_FUNCTION_VECTOR: - case GNU_AK_INTERRUPT_HANDLER: - case GNU_AK_NMI_HANDLER: - case GNU_AK_NESTING: - case GNU_AK_NEAR: - case GNU_AK_FAR: - case GNU_AK_SIGNAL: - case GNU_AK_EIGTHBIT_DATA: - case GNU_AK_TINY_DATA: - case GNU_AK_SAVEALL: - case GNU_AK_FLATTEN: - case GNU_AK_SSEREGPARM: - case GNU_AK_EXTERNALLY_VISIBLE: - case GNU_AK_RETURN_TWICE: - case GNU_AK_MAY_ALIAS: - case GNU_AK_MS_STRUCT: - case GNU_AK_GCC_STRUCT: - goto no_arg; - - case GNU_AK_CDECL: modifiers |= DM_CDECL; goto no_arg; - case GNU_AK_FASTCALL: modifiers |= DM_FASTCALL; goto no_arg; - case GNU_AK_STDCALL: modifiers |= DM_STDCALL; goto no_arg; - case GNU_AK_UNUSED: modifiers |= DM_UNUSED; goto no_arg; - case GNU_AK_USED: modifiers |= DM_USED; goto no_arg; - case GNU_AK_PURE: modifiers |= DM_PURE; goto no_arg; - case GNU_AK_CONST: modifiers |= DM_CONST; goto no_arg; - case GNU_AK_ALWAYS_INLINE: modifiers |= DM_FORCEINLINE; goto no_arg; - case GNU_AK_DLLIMPORT: modifiers |= DM_DLLIMPORT; goto no_arg; - case GNU_AK_DLLEXPORT: modifiers |= DM_DLLEXPORT; goto no_arg; - case GNU_AK_PACKED: modifiers |= DM_PACKED; goto no_arg; - case GNU_AK_NOINLINE: modifiers |= DM_NOINLINE; goto no_arg; - case GNU_AK_RETURNS_TWICE: modifiers |= DM_RETURNS_TWICE; goto no_arg; - case GNU_AK_NORETURN: modifiers |= DM_NORETURN; goto no_arg; - case GNU_AK_NOTHROW: modifiers |= DM_NOTHROW; goto no_arg; - case GNU_AK_TRANSPARENT_UNION: modifiers |= DM_TRANSPARENT_UNION; goto no_arg; - case GNU_AK_CONSTRUCTOR: modifiers |= DM_CONSTRUCTOR; goto no_arg; - case GNU_AK_DESTRUCTOR: modifiers |= DM_DESTRUCTOR; goto no_arg; - case GNU_AK_DEPRECATED: modifiers |= DM_DEPRECATED; goto no_arg; - - case GNU_AK_ALIGNED: - /* __align__ may be used without an argument */ - if (attribute->has_arguments) { - parse_gnu_attribute_const_arg(attribute); - } - break; + if (token.type == ')') { + next_token(); + expect(')', end_error); + return first; + } - case GNU_AK_FORMAT_ARG: - case GNU_AK_REGPARM: - case GNU_AK_TRAP_EXIT: - if (!attribute->has_arguments) { - /* should have arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - attribute->invalid = true; - } else - parse_gnu_attribute_const_arg(attribute); - break; - case GNU_AK_ALIAS: - case GNU_AK_SECTION: - case GNU_AK_SP_SWITCH: - if (!attribute->has_arguments) { - /* should have arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - attribute->invalid = true; - } else - parse_gnu_attribute_string_arg(attribute, &attribute->u.string); - break; - case GNU_AK_FORMAT: - if (!attribute->has_arguments) { - /* should have arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - attribute->invalid = true; - } else - parse_gnu_attribute_format_args(attribute); - break; - case GNU_AK_WEAKREF: - /* may have one string argument */ - if (attribute->has_arguments) - parse_gnu_attribute_string_arg(attribute, &attribute->u.string); - break; - case GNU_AK_NONNULL: - if (attribute->has_arguments) - parse_gnu_attribute_const_arg_list(attribute); - break; - case GNU_AK_TLS_MODEL: - if (!attribute->has_arguments) { - /* should have arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - } else - parse_gnu_attribute_tls_model_arg(attribute); - break; - case GNU_AK_VISIBILITY: - if (!attribute->has_arguments) { - /* should have arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - } else - parse_gnu_attribute_visibility_arg(attribute); - break; - case GNU_AK_MODEL: - if (!attribute->has_arguments) { - /* should have arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - } else { - parse_gnu_attribute_model_arg(attribute); - } - break; - case GNU_AK_MODE: - if (!attribute->has_arguments) { - /* should have arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - } else { - parse_gnu_attribute_mode_arg(attribute); - } - break; - case GNU_AK_INTERRUPT: - /* may have one string argument */ - if (attribute->has_arguments) - parse_gnu_attribute_interrupt_arg(attribute); - break; - case GNU_AK_SENTINEL: - /* may have one string argument */ - if (attribute->has_arguments) - parse_gnu_attribute_const_arg(attribute); - break; - case GNU_AK_LAST: - /* already handled */ - break; + while (true) { + attribute_t *attribute = parse_attribute_gnu_single(); + if (attribute == NULL) + goto end_error; -no_arg: - check_no_argument(attribute, name); - } - } - if (attribute != NULL) { - if (last != NULL) { - last->next = attribute; - last = attribute; - } else { - head = last = attribute; - } - } + if (last == NULL) { + first = attribute; + } else { + last->next = attribute; + } + last = attribute; - if (token.type != ',') - break; + if (token.type == ')') { next_token(); + break; } + expect(',', end_error); } expect(')', end_error); - expect(')', end_error); -end_error: - *attributes = head; - return modifiers; +end_error: + return first; } -/** - * Parse GNU attributes. - */ -static decl_modifiers_t parse_attributes(gnu_attribute_t **attributes) +/** Parse attributes. */ +static attribute_t *parse_attributes(attribute_t *first) { - decl_modifiers_t modifiers = 0; - + attribute_t *last = first; while (true) { + if (last != NULL) { + while (last->next != NULL) + last = last->next; + } + + attribute_t *attribute; switch (token.type) { case T___attribute__: - modifiers |= parse_gnu_attribute(attributes); - continue; + attribute = parse_attribute_gnu(); + break; case T_asm: + attribute = parse_attribute_asm(); + break; + + case T_cdecl: next_token(); - expect('(', end_error); - if (token.type != T_STRING_LITERAL) { - parse_error_expected("while parsing assembler attribute", - T_STRING_LITERAL, NULL); - eat_until_matching_token('('); - break; - } else { - parse_string_literals(); - } - expect(')', end_error); - continue; + attribute = allocate_attribute_zero(ATTRIBUTE_MS_CDECL); + break; - case T_cdecl: modifiers |= DM_CDECL; break; - case T__fastcall: modifiers |= DM_FASTCALL; break; - case T__stdcall: modifiers |= DM_STDCALL; break; + case T__fastcall: + next_token(); + attribute = allocate_attribute_zero(ATTRIBUTE_MS_FASTCALL); + break; + + case T__forceinline: + next_token(); + attribute = allocate_attribute_zero(ATTRIBUTE_MS_FORCEINLINE); + break; + + case T__stdcall: + next_token(); + attribute = allocate_attribute_zero(ATTRIBUTE_MS_STDCALL); + break; case T___thiscall: + next_token(); /* TODO record modifier */ if (warning.other) warningf(HERE, "Ignoring declaration modifier %K", &token); + attribute = allocate_attribute_zero(ATTRIBUTE_MS_THISCALL); break; -end_error: - default: return modifiers; + default: + return first; } - next_token(); + if (last == NULL) { + first = attribute; + } else { + last->next = attribute; + } + last = attribute; } } @@ -2042,6 +1607,10 @@ static void mark_vars_read(expression_t *const expr, entity_t *lhs_ent) mark_vars_read(expr->va_arge.ap, lhs_ent); return; + case EXPR_VA_COPY: + mark_vars_read(expr->va_copye.src, lhs_ent); + return; + case EXPR_UNARY_CAST: /* Special case: Use void cast to mark a variable as "read" */ if (is_type_atomic(skip_typeref(expr->base.type), ATOMIC_TYPE_VOID)) @@ -2138,10 +1707,8 @@ unary: case EXPR_CLASSIFY_TYPE: case EXPR_ALIGNOF: case EXPR_FUNCNAME: - case EXPR_BUILTIN_SYMBOL: case EXPR_BUILTIN_CONSTANT_P: - case EXPR_BUILTIN_ADDRESS: - case EXPR_BUILTIN_PREFETCH: + case EXPR_BUILTIN_TYPES_COMPATIBLE_P: case EXPR_OFFSETOF: case EXPR_STATEMENT: // TODO case EXPR_LABEL_ADDRESS: @@ -2231,7 +1798,7 @@ static initializer_t *initializer_from_expression(type_t *orig_type, { /* TODO check that expression is a constant expression */ - /* § 6.7.8.14/15 char array may be initialized by string literals */ + /* §6.7.8.14/15 char array may be initialized by string literals */ type_t *type = skip_typeref(orig_type); type_t *expr_type_orig = expression->base.type; type_t *expr_type = skip_typeref(expr_type_orig); @@ -2295,7 +1862,7 @@ static bool is_initializer_constant(const expression_t *expression) /** * Parses an scalar initializer. * - * § 6.7.8.11; eat {} without warning + * §6.7.8.11; eat {} without warning */ static initializer_t *parse_scalar_initializer(type_t *type, bool must_be_constant) @@ -2546,7 +2113,7 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, goto failed; } - long index = fold_constant(array_index); + long index = fold_constant_to_int(array_index); if (!used_in_offsetof) { if (index < 0) { errorf(&designator->source_position, @@ -2626,18 +2193,6 @@ static void advance_current_object(type_path_t *path, size_t top_path_level) } } -/** - * skip until token is found. - */ -static void skip_until(int type) -{ - while (token.type != type) { - if (token.type == T_EOF) - return; - next_token(); - } -} - /** * skip any {...} blocks until a closing bracket is reached. */ @@ -2911,7 +2466,7 @@ static initializer_t *parse_initializer(parse_initializer_env_t *env) result = parse_scalar_initializer(type, env->must_be_constant); } - /* § 6.7.8:22 array initializers for arrays with unknown size determine + /* §6.7.8:22 array initializers for arrays with unknown size determine * the array type size */ if (is_type_array(type) && type->array.size_expression == NULL && result != NULL) { @@ -2971,8 +2526,6 @@ static void append_entity(scope_t *scope, entity_t *entity) static compound_t *parse_compound_type_specifier(bool is_struct) { - gnu_attribute_t *attributes = NULL; - decl_modifiers_t modifiers = 0; if (is_struct) { eat(T_struct); } else { @@ -2983,18 +2536,17 @@ static compound_t *parse_compound_type_specifier(bool is_struct) compound_t *compound = NULL; if (token.type == T___attribute__) { - modifiers |= parse_attributes(&attributes); + parse_attributes(NULL); } + entity_kind_tag_t const kind = is_struct ? ENTITY_STRUCT : ENTITY_UNION; if (token.type == T_IDENTIFIER) { + /* the compound has a name, check if we have seen it already */ symbol = token.v.symbol; next_token(); - namespace_tag_t const namespc = - is_struct ? NAMESPACE_STRUCT : NAMESPACE_UNION; - entity_t *entity = get_entity(symbol, namespc); + entity_t *entity = get_tag(symbol, kind); if (entity != NULL) { - assert(entity->kind == (is_struct ? ENTITY_STRUCT : ENTITY_UNION)); compound = &entity->compound; if (compound->base.parent_scope != current_scope && (token.type == '{' || token.type == ';')) { @@ -3023,12 +2575,10 @@ static compound_t *parse_compound_type_specifier(bool is_struct) } if (compound == NULL) { - entity_kind_t kind = is_struct ? ENTITY_STRUCT : ENTITY_UNION; - entity_t *entity = allocate_entity_zero(kind); - compound = &entity->compound; + entity_t *entity = allocate_entity_zero(kind); + compound = &entity->compound; - compound->base.namespc = - (is_struct ? NAMESPACE_STRUCT : NAMESPACE_UNION); + compound->base.namespc = NAMESPACE_TAG; compound->base.source_position = token.source_position; compound->base.symbol = symbol; compound->base.parent_scope = current_scope; @@ -3040,15 +2590,15 @@ static compound_t *parse_compound_type_specifier(bool is_struct) if (token.type == '{') { parse_compound_type_entries(compound); - modifiers |= parse_attributes(&attributes); + parse_attributes(NULL); + /* ISO/IEC 14882:1998(E) §7.1.3:5 */ if (symbol == NULL) { assert(anonymous_entity == NULL); anonymous_entity = (entity_t*)compound; } } - compound->modifiers |= modifiers; return compound; } @@ -3103,7 +2653,6 @@ end_error: static type_t *parse_enum_specifier(void) { - gnu_attribute_t *attributes = NULL; entity_t *entity; symbol_t *symbol; @@ -3112,9 +2661,8 @@ static type_t *parse_enum_specifier(void) symbol = token.v.symbol; next_token(); - entity = get_entity(symbol, NAMESPACE_ENUM); + entity = get_tag(symbol, ENTITY_ENUM); if (entity != NULL) { - assert(entity->kind == ENTITY_ENUM); if (entity->base.parent_scope != current_scope && (token.type == '{' || token.type == ';')) { /* we're in an inner scope and have a definition. Shadow @@ -3136,7 +2684,7 @@ static type_t *parse_enum_specifier(void) if (entity == NULL) { entity = allocate_entity_zero(ENTITY_ENUM); - entity->base.namespc = NAMESPACE_ENUM; + entity->base.namespc = NAMESPACE_TAG; entity->base.source_position = token.source_position; entity->base.symbol = symbol; entity->base.parent_scope = current_scope; @@ -3154,8 +2702,9 @@ static type_t *parse_enum_specifier(void) entity->enume.complete = true; parse_enum_entries(type); - parse_attributes(&attributes); + parse_attributes(NULL); + /* ISO/IEC 14882:1998(E) §7.1.3:5 */ if (symbol == NULL) { assert(anonymous_entity == NULL); anonymous_entity = entity; @@ -3203,7 +2752,7 @@ static type_t *parse_typeof(void) type = parse_typename(); } else { expression = parse_expression(); - type = expression->base.type; + type = revert_automatic_type_conversion(expression); } break; @@ -3274,167 +2823,142 @@ static type_t *get_typedef_type(symbol_t *symbol) return type; } -/** - * check for the allowed MS alignment values. - */ -static bool check_alignment_value(long long intvalue) +static attribute_t *parse_attribute_ms_property(attribute_t *attribute) { - if (intvalue < 1 || intvalue > 8192) { - errorf(HERE, "illegal alignment value"); - return false; - } - unsigned v = (unsigned)intvalue; - for (unsigned i = 1; i <= 8192; i += i) { - if (i == v) - return true; + expect('(', end_error); + + attribute_property_argument_t *property + = allocate_ast_zero(sizeof(*property)); + + while (true) { + if (token.type != T_IDENTIFIER) { + parse_error_expected("while parsing property declspec", + T_IDENTIFIER, NULL); + goto end_error; + } + + bool is_put; + symbol_t *symbol = token.v.symbol; + next_token(); + if (strcmp(symbol->string, "put") == 0) { + is_put = true; + } else if (strcmp(symbol->string, "get") == 0) { + is_put = false; + } else { + errorf(HERE, "expected put or get in property declspec"); + goto end_error; + } + expect('=', end_error); + if (token.type != T_IDENTIFIER) { + parse_error_expected("while parsing property declspec", + T_IDENTIFIER, NULL); + goto end_error; + } + if (is_put) { + property->put_symbol = token.v.symbol; + } else { + property->get_symbol = token.v.symbol; + } + next_token(); + if (token.type == ')') + break; + expect(',', end_error); } - errorf(HERE, "alignment must be power of two"); - return false; + + attribute->a.property = property; + + expect(')', end_error); + +end_error: + return attribute; } -#define DET_MOD(name, tag) do { \ - if (*modifiers & tag && warning.other) warningf(HERE, #name " used more than once"); \ - *modifiers |= tag; \ -} while (0) +static attribute_t *parse_microsoft_extended_decl_modifier_single(void) +{ + attribute_kind_t kind = ATTRIBUTE_UNKNOWN; + if (token.type == T_restrict) { + kind = ATTRIBUTE_MS_RESTRICT; + next_token(); + } else if (token.type == T_IDENTIFIER) { + const char *name = token.v.symbol->string; + next_token(); + for (attribute_kind_t k = ATTRIBUTE_MS_FIRST; k <= ATTRIBUTE_MS_LAST; + ++k) { + const char *attribute_name = get_attribute_name(k); + if (attribute_name != NULL && strcmp(attribute_name, name) == 0) { + kind = k; + break; + } + } + + if (kind == ATTRIBUTE_UNKNOWN && warning.attribute) { + warningf(HERE, "unknown __declspec '%s' ignored", name); + } + } else { + parse_error_expected("while parsing __declspec", T_IDENTIFIER, NULL); + return NULL; + } + + attribute_t *attribute = allocate_attribute_zero(kind); -static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *specifiers) + if (kind == ATTRIBUTE_MS_PROPERTY) { + return parse_attribute_ms_property(attribute); + } + + /* parse arguments */ + if (token.type == '(') { + next_token(); + attribute->a.arguments = parse_attribute_arguments(); + } + + return attribute; +} + +static attribute_t *parse_microsoft_extended_decl_modifier(attribute_t *first) { - decl_modifiers_t *modifiers = &specifiers->modifiers; + eat(T__declspec); + + expect('(', end_error); + + if (token.type == ')') { + next_token(); + return NULL; + } + + add_anchor_token(')'); + attribute_t *last = first; while (true) { - if (token.type == T_restrict) { - next_token(); - DET_MOD(restrict, DM_RESTRICT); - goto end_loop; - } else if (token.type != T_IDENTIFIER) - break; - symbol_t *symbol = token.v.symbol; - if (symbol == sym_align) { - next_token(); - expect('(', end_error); - if (token.type != T_INTEGER) - goto end_error; - if (check_alignment_value(token.v.intvalue)) { - if (specifiers->alignment != 0 && warning.other) - warningf(HERE, "align used more than once"); - specifiers->alignment = (unsigned char)token.v.intvalue; - } - next_token(); - expect(')', end_error); - } else if (symbol == sym_allocate) { - next_token(); - expect('(', end_error); - if (token.type != T_IDENTIFIER) - goto end_error; - (void)token.v.symbol; - expect(')', end_error); - } else if (symbol == sym_dllimport) { - next_token(); - DET_MOD(dllimport, DM_DLLIMPORT); - } else if (symbol == sym_dllexport) { - next_token(); - DET_MOD(dllexport, DM_DLLEXPORT); - } else if (symbol == sym_thread) { - next_token(); - DET_MOD(thread, DM_THREAD); - } else if (symbol == sym_naked) { - next_token(); - DET_MOD(naked, DM_NAKED); - } else if (symbol == sym_noinline) { - next_token(); - DET_MOD(noinline, DM_NOINLINE); - } else if (symbol == sym_returns_twice) { - next_token(); - DET_MOD(returns_twice, DM_RETURNS_TWICE); - } else if (symbol == sym_noreturn) { - next_token(); - DET_MOD(noreturn, DM_NORETURN); - } else if (symbol == sym_nothrow) { - next_token(); - DET_MOD(nothrow, DM_NOTHROW); - } else if (symbol == sym_novtable) { - next_token(); - DET_MOD(novtable, DM_NOVTABLE); - } else if (symbol == sym_property) { - next_token(); - expect('(', end_error); - for (;;) { - bool is_get = false; - if (token.type != T_IDENTIFIER) - goto end_error; - if (token.v.symbol == sym_get) { - is_get = true; - } else if (token.v.symbol == sym_put) { - } else { - errorf(HERE, "Bad property name '%Y'", token.v.symbol); - goto end_error; - } - next_token(); - expect('=', end_error); - if (token.type != T_IDENTIFIER) - goto end_error; - if (is_get) { - if (specifiers->get_property_sym != NULL) { - errorf(HERE, "get property name already specified"); - } else { - specifiers->get_property_sym = token.v.symbol; - } - } else { - if (specifiers->put_property_sym != NULL) { - errorf(HERE, "put property name already specified"); - } else { - specifiers->put_property_sym = token.v.symbol; - } - } - next_token(); - if (token.type == ',') { - next_token(); - continue; - } - break; - } - expect(')', end_error); - } else if (symbol == sym_selectany) { - next_token(); - DET_MOD(selectany, DM_SELECTANY); - } else if (symbol == sym_uuid) { - next_token(); - expect('(', end_error); - if (token.type != T_STRING_LITERAL) - goto end_error; - next_token(); - expect(')', end_error); - } else if (symbol == sym_deprecated) { - next_token(); - if (specifiers->deprecated != 0 && warning.other) - warningf(HERE, "deprecated used more than once"); - specifiers->deprecated = true; - if (token.type == '(') { - next_token(); - if (token.type == T_STRING_LITERAL) { - specifiers->deprecated_string = token.v.string.begin; - next_token(); - } else { - errorf(HERE, "string literal expected"); - } - expect(')', end_error); - } - } else if (symbol == sym_noalias) { - next_token(); - DET_MOD(noalias, DM_NOALIAS); + if (last != NULL) { + while (last->next != NULL) + last = last->next; + } + + attribute_t *attribute + = parse_microsoft_extended_decl_modifier_single(); + if (attribute == NULL) + goto end_error; + + if (last == NULL) { + first = attribute; } else { - if (warning.other) - warningf(HERE, "Unknown modifier '%Y' ignored", token.v.symbol); - next_token(); - if (token.type == '(') - skip_until(')'); + last->next = attribute; } -end_loop: - if (token.type == ',') - next_token(); + last = attribute; + + if (token.type == ')') { + break; + } + expect(',', end_error); } + + rem_anchor_token(')'); + expect(')', end_error); + return first; + end_error: - return; + rem_anchor_token(')'); + return first; } static entity_t *create_error_entity(symbol_t *symbol, entity_kind_tag_t kind) @@ -3454,44 +2978,54 @@ static entity_t *create_error_entity(symbol_t *symbol, entity_kind_tag_t kind) return entity; } -static void parse_microsoft_based(based_spec_t *based_spec) +static entity_t *pack_bitfield_members(il_size_t *size, type_t *type, + size_t offset, entity_t *first) { - if (token.type != T_IDENTIFIER) { - parse_error_expected("while parsing __based", T_IDENTIFIER, NULL); - return; - } - symbol_t *symbol = token.v.symbol; - entity_t *entity = get_entity(symbol, NAMESPACE_NORMAL); + /* TODO: packed handling */ + type_t *base_type = skip_typeref(type->bitfield.base_type); + size_t remaining_bits = get_type_size(base_type) * BITS_PER_BYTE; + size_t bit_offset = 0; - if (entity == NULL || entity->base.kind != ENTITY_VARIABLE) { - errorf(HERE, "'%Y' is not a variable name.", symbol); - entity = create_error_entity(symbol, ENTITY_VARIABLE); - } else { - variable_t *variable = &entity->variable; + entity_t *member; + for (member = first; member != NULL; member = member->base.next) { + /* TODO: make this an assert */ + if (member->kind != ENTITY_COMPOUND_MEMBER) + continue; - if (based_spec->base_variable != NULL) { - errorf(HERE, "__based type qualifier specified more than once"); - } - based_spec->source_position = token.source_position; - based_spec->base_variable = variable; + type_t *member_type = member->declaration.type; + if (member_type->kind != TYPE_BITFIELD) + break; + if (base_type != NULL + && skip_typeref(member_type->bitfield.base_type) != base_type) + break; - type_t *const type = variable->base.type; + size_t bit_size = member_type->bitfield.bit_size; + if (bit_size > remaining_bits) + break; - if (is_type_valid(type)) { - if (! is_type_pointer(skip_typeref(type))) { - errorf(HERE, "variable in __based modifier must have pointer type instead of '%T'", type); - } - if (variable->base.base.parent_scope != file_scope) { - errorf(HERE, "a nonstatic local variable may not be used in a __based specification"); - } + member->compound_member.offset = offset; + member->compound_member.bit_offset = bit_offset; + + bit_offset += bit_size; + + /* 0-size members end current bucket. multiple 0-size buckets + * seem to not start-end multiple buckets */ + if (bit_size == 0) { + remaining_bits = 0; + } else { + remaining_bits -= bit_size; } } - next_token(); + assert(member != first); + + *size += (bit_offset + (BITS_PER_BYTE-1)) / BITS_PER_BYTE; + + return member; } /** - * Finish the construction of a struct type by calculating - * its size, offsets, alignment. + * Finish the construction of a struct type by calculating its size, offsets, + * alignment. */ static void finish_struct_type(compound_type_t *type) { @@ -3501,22 +3035,32 @@ static void finish_struct_type(compound_type_t *type) if (!compound->complete) return; - il_size_t size = 0; il_size_t offset; - il_alignment_t alignment = 1; - bool need_pad = false; + il_size_t size = 0; + il_alignment_t alignment = compound->alignment; + bool need_pad = false; entity_t *entry = compound->members.entities; - for (; entry != NULL; entry = entry->base.next) { - if (entry->kind != ENTITY_COMPOUND_MEMBER) + while (entry != NULL) { + if (entry->kind != ENTITY_COMPOUND_MEMBER) { + entry = entry->base.next; continue; + } - type_t *m_type = skip_typeref(entry->declaration.type); - if (! is_type_valid(m_type)) { - /* simply ignore errors here */ + type_t *m_type = entry->declaration.type; + type_t *skipped = skip_typeref(m_type); + if (! is_type_valid(skipped)) { + entry = entry->base.next; continue; } - il_alignment_t m_alignment = m_type->base.alignment; + + type_t *base_type = m_type; + if (skipped->kind == TYPE_BITFIELD) { + base_type = m_type->bitfield.base_type; + } + + il_alignment_t m_alignment = get_type_alignment(base_type); + il_size_t m_size = get_type_size(base_type); if (m_alignment > alignment) alignment = m_alignment; @@ -3524,11 +3068,15 @@ static void finish_struct_type(compound_type_t *type) if (offset > size) need_pad = true; - entry->compound_member.offset = offset; - size = offset + m_type->base.size; - } - if (type->base.alignment != 0) { - alignment = type->base.alignment; + + if (skipped->kind == TYPE_BITFIELD) { + entry = pack_bitfield_members(&size, m_type, offset, entry); + } else { + entry->compound_member.offset = offset; + size = offset + m_size; + + entry = entry->base.next; + } } offset = (size + alignment - 1) & -alignment; @@ -3537,17 +3085,16 @@ static void finish_struct_type(compound_type_t *type) if (need_pad) { if (warning.padded) { - warningf(&compound->base.source_position, "'%T' needs padding", type); - } - } else { - if (compound->modifiers & DM_PACKED && warning.packed) { - warningf(&compound->base.source_position, - "superfluous packed attribute on '%T'", type); + warningf(&compound->base.source_position, "'%T' needs padding", + type); } + } else if (compound->packed && warning.packed) { + warningf(&compound->base.source_position, + "superfluous packed attribute on '%T'", type); } - type->base.size = offset; - type->base.alignment = alignment; + compound->size = offset; + compound->alignment = alignment; } /** @@ -3563,108 +3110,35 @@ static void finish_union_type(compound_type_t *type) return; il_size_t size = 0; - il_alignment_t alignment = 1; + il_alignment_t alignment = compound->alignment; entity_t *entry = compound->members.entities; for (; entry != NULL; entry = entry->base.next) { if (entry->kind != ENTITY_COMPOUND_MEMBER) continue; - type_t *m_type = skip_typeref(entry->declaration.type); - if (! is_type_valid(m_type)) + type_t *m_type = entry->declaration.type; + if (! is_type_valid(skip_typeref(m_type))) continue; entry->compound_member.offset = 0; - if (m_type->base.size > size) - size = m_type->base.size; - if (m_type->base.alignment > alignment) - alignment = m_type->base.alignment; - } - if (type->base.alignment != 0) { - alignment = type->base.alignment; + il_size_t m_size = get_type_size(m_type); + if (m_size > size) + size = m_size; + il_alignment_t m_alignment = get_type_alignment(m_type); + if (m_alignment > alignment) + alignment = m_alignment; } size = (size + alignment - 1) & -alignment; - type->base.size = size; - type->base.alignment = alignment; -} - -static type_t *handle_attribute_mode(const gnu_attribute_t *attribute, - type_t *orig_type) -{ - type_t *type = skip_typeref(orig_type); - - /* at least: byte, word, pointer, list of machine modes - * __XXX___ is interpreted as XXX */ - - /* This isn't really correct, the backend should provide a list of machine - * specific modes (according to gcc philosophy that is...) */ - const char *symbol_str = attribute->u.symbol->string; - bool sign = is_type_signed(type); - atomic_type_kind_t akind; - if (strcmp_underscore("QI", symbol_str) == 0 || - strcmp_underscore("byte", symbol_str) == 0) { - akind = sign ? ATOMIC_TYPE_CHAR : ATOMIC_TYPE_UCHAR; - } else if (strcmp_underscore("HI", symbol_str) == 0) { - akind = sign ? ATOMIC_TYPE_SHORT : ATOMIC_TYPE_USHORT; - } else if (strcmp_underscore("SI", symbol_str) == 0 - || strcmp_underscore("word", symbol_str) == 0 - || strcmp_underscore("pointer", symbol_str) == 0) { - akind = sign ? ATOMIC_TYPE_INT : ATOMIC_TYPE_UINT; - } else if (strcmp_underscore("DI", symbol_str) == 0) { - akind = sign ? ATOMIC_TYPE_LONGLONG : ATOMIC_TYPE_ULONGLONG; - } else { - if (warning.other) - warningf(HERE, "ignoring unknown mode '%s'", symbol_str); - return orig_type; - } - - if (type->kind == TYPE_ATOMIC) { - type_t *copy = duplicate_type(type); - copy->atomic.akind = akind; - return identify_new_type(copy); - } else if (type->kind == TYPE_ENUM) { - type_t *copy = duplicate_type(type); - copy->enumt.akind = akind; - return identify_new_type(copy); - } else if (is_type_pointer(type)) { - warningf(HERE, "__attribute__((mode)) on pointers not implemented yet (ignored)"); - return type; - } - - errorf(HERE, "__attribute__((mode)) only allowed on integer, enum or pointer type"); - return orig_type; -} -static type_t *handle_type_attributes(const gnu_attribute_t *attributes, - type_t *type) -{ - const gnu_attribute_t *attribute = attributes; - for ( ; attribute != NULL; attribute = attribute->next) { - if (attribute->invalid) - continue; - - if (attribute->kind == GNU_AK_MODE) { - type = handle_attribute_mode(attribute, type); - } else if (attribute->kind == GNU_AK_ALIGNED) { - int alignment = 32; /* TODO: fill in maximum useful alignment for - target machine */ - if (attribute->has_arguments) - alignment = attribute->u.argument; - - type_t *copy = duplicate_type(type); - copy->base.alignment = attribute->u.argument; - type = identify_new_type(copy); - } - } - - return type; + compound->size = size; + compound->alignment = alignment; } static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) { type_t *type = NULL; type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE; - type_modifiers_t modifiers = TYPE_MODIFIER_NONE; unsigned type_specifiers = 0; bool newtype = false; bool saw_error = false; @@ -3673,8 +3147,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) specifiers->source_position = token.source_position; while (true) { - specifiers->modifiers - |= parse_attributes(&specifiers->gnu_attributes); + specifiers->attributes = parse_attributes(specifiers->attributes); switch (token.type) { /* storage class */ @@ -3693,15 +3166,11 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) MATCH_STORAGE_CLASS(T_extern, STORAGE_CLASS_EXTERN) MATCH_STORAGE_CLASS(T_static, STORAGE_CLASS_STATIC) MATCH_STORAGE_CLASS(T_auto, STORAGE_CLASS_AUTO) - MATCH_STORAGE_CLASS(T_register, STORAGE_CLASS_REGISTER) - - case T__declspec: - next_token(); - expect('(', end_error); - add_anchor_token(')'); - parse_microsoft_extended_decl_modifier(specifiers); - rem_anchor_token(')'); - expect(')', end_error); + MATCH_STORAGE_CLASS(T_register, STORAGE_CLASS_REGISTER) + + case T__declspec: + specifiers->attributes + = parse_microsoft_extended_decl_modifier(specifiers->attributes); break; case T___thread: @@ -3779,16 +3248,18 @@ wrong_thread_stoarge_class: MATCH_SPECIFIER(T_void, SPECIFIER_VOID, "void"); MATCH_SPECIFIER(T_wchar_t, SPECIFIER_WCHAR_T, "wchar_t"); - case T__forceinline: - /* only in microsoft mode */ - specifiers->modifiers |= DM_FORCEINLINE; - /* FALLTHROUGH */ - case T_inline: next_token(); specifiers->is_inline = true; break; +#if 0 + case T__forceinline: + next_token(); + specifiers->modifiers |= DM_FORCEINLINE; + break; +#endif + case T_long: if (type_specifiers & SPECIFIER_LONG_LONG) { errorf(HERE, "multiple type specifiers given"); @@ -3800,28 +3271,33 @@ wrong_thread_stoarge_class: next_token(); break; - case T_struct: { +#define CHECK_DOUBLE_TYPE() \ + if ( type != NULL) \ + errorf(HERE, "multiple data types in declaration specifiers"); + + case T_struct: + CHECK_DOUBLE_TYPE(); type = allocate_type_zero(TYPE_COMPOUND_STRUCT); type->compound.compound = parse_compound_type_specifier(true); finish_struct_type(&type->compound); break; - } - case T_union: { + case T_union: + CHECK_DOUBLE_TYPE(); type = allocate_type_zero(TYPE_COMPOUND_UNION); type->compound.compound = parse_compound_type_specifier(false); - if (type->compound.compound->modifiers & DM_TRANSPARENT_UNION) - modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION; finish_union_type(&type->compound); break; - } case T_enum: + CHECK_DOUBLE_TYPE(); type = parse_enum_specifier(); break; case T___typeof__: + CHECK_DOUBLE_TYPE(); type = parse_typeof(); break; case T___builtin_va_list: + CHECK_DOUBLE_TYPE(); type = duplicate_type(type_valist); next_token(); break; @@ -3895,8 +3371,7 @@ wrong_thread_stoarge_class: } finish_specifiers: - specifiers->modifiers - |= parse_attributes(&specifiers->gnu_attributes); + specifiers->attributes = parse_attributes(specifiers->attributes); in_gcc_extension = old_gcc_extension; @@ -4075,21 +3550,13 @@ warn_about_long_long: type = allocate_type_zero(TYPE_ATOMIC); type->atomic.akind = atomic_type; } - type->base.alignment = get_atomic_type_alignment(atomic_type); - unsigned const size = get_atomic_type_size(atomic_type); - type->base.size = - type_specifiers & SPECIFIER_COMPLEX ? size * 2 : size; newtype = true; } else if (type_specifiers != 0) { errorf(HERE, "multiple datatypes in declaration"); } /* FIXME: check type qualifiers here */ - - if (specifiers->modifiers & DM_TRANSPARENT_UNION) - modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION; type->base.qualifiers = qualifiers; - type->base.modifiers = modifiers; if (newtype) { type = identify_new_type(type); @@ -4097,7 +3564,8 @@ warn_about_long_long: type = typehash_insert(type); } - type = handle_type_attributes(specifiers->gnu_attributes, type); + if (specifiers->attributes != NULL) + type = handle_type_attributes(specifiers->attributes, type); specifiers->type = type; return; @@ -4176,9 +3644,29 @@ static void semantic_parameter_incomplete(const entity_t *entity) type_t *type = skip_typeref(entity->declaration.type); if (is_type_incomplete(type)) { errorf(&entity->base.source_position, - "parameter '%Y' has incomplete type '%T'", entity->base.symbol, - entity->declaration.type); + "parameter '%#T' has incomplete type", + entity->declaration.type, entity->base.symbol); + } +} + +static bool has_parameters(void) +{ + /* func(void) is not a parameter */ + if (token.type == T_IDENTIFIER) { + entity_t const *const entity = get_entity(token.v.symbol, NAMESPACE_NORMAL); + if (entity == NULL) + return true; + if (entity->kind != ENTITY_TYPEDEF) + return true; + if (skip_typeref(entity->typedefe.type) != type_void) + return true; + } else if (token.type != T_void) { + return true; } + if (look_ahead(1)->type != ')') + return true; + next_token(); + return false; } /** @@ -4209,61 +3697,49 @@ static void parse_parameters(function_type_t *type, scope_t *scope) goto parameters_finished; } - function_parameter_t *parameter; - function_parameter_t *last_parameter = NULL; + if (has_parameters()) { + function_parameter_t **anchor = &type->parameters; + for (;;) { + switch (token.type) { + case T_DOTDOTDOT: + next_token(); + type->variadic = true; + goto parameters_finished; - while (true) { - switch (token.type) { - case T_DOTDOTDOT: - next_token(); - type->variadic = true; - goto parameters_finished; + case T_IDENTIFIER: + case T___extension__: + DECLARATION_START + { + entity_t *entity = parse_parameter(); + if (entity->kind == ENTITY_TYPEDEF) { + errorf(&entity->base.source_position, + "typedef not allowed as function parameter"); + break; + } + assert(is_declaration(entity)); - case T_IDENTIFIER: - case T___extension__: - DECLARATION_START - { - entity_t *entity = parse_parameter(); - if (entity->kind == ENTITY_TYPEDEF) { - errorf(&entity->base.source_position, - "typedef not allowed as function parameter"); - break; - } - assert(is_declaration(entity)); + semantic_parameter_incomplete(entity); - /* func(void) is not a parameter */ - if (last_parameter == NULL - && token.type == ')' - && entity->base.symbol == NULL - && skip_typeref(entity->declaration.type) == type_void) { - goto parameters_finished; - } - semantic_parameter_incomplete(entity); + function_parameter_t *const parameter = + allocate_parameter(entity->declaration.type); - parameter = obstack_alloc(type_obst, sizeof(parameter[0])); - memset(parameter, 0, sizeof(parameter[0])); - parameter->type = entity->declaration.type; + if (scope != NULL) { + append_entity(scope, entity); + } - if (scope != NULL) { - append_entity(scope, entity); + *anchor = parameter; + anchor = ¶meter->next; + break; } - if (last_parameter != NULL) { - last_parameter->next = parameter; - } else { - type->parameters = parameter; + default: + goto parameters_finished; } - last_parameter = parameter; - break; - } - - default: - goto parameters_finished; - } - if (token.type != ',') { - goto parameters_finished; + if (token.type != ',') { + goto parameters_finished; + } + next_token(); } - next_token(); } @@ -4283,67 +3759,68 @@ typedef enum construct_type_kind_t { CONSTRUCT_ARRAY } construct_type_kind_t; -typedef struct construct_type_t construct_type_t; -struct construct_type_t { +typedef union construct_type_t construct_type_t; + +typedef struct construct_type_base_t { construct_type_kind_t kind; construct_type_t *next; +} construct_type_base_t; + +typedef struct parsed_pointer_t { + construct_type_base_t base; + type_qualifiers_t type_qualifiers; + variable_t *base_variable; /**< MS __based extension. */ +} parsed_pointer_t; + +typedef struct parsed_reference_t { + construct_type_base_t base; +} parsed_reference_t; + +typedef struct construct_function_type_t { + construct_type_base_t base; + type_t *function_type; +} construct_function_type_t; + +typedef struct parsed_array_t { + construct_type_base_t base; + type_qualifiers_t type_qualifiers; + bool is_static; + bool is_variable; + expression_t *size; +} parsed_array_t; + +union construct_type_t { + construct_type_kind_t kind; + construct_type_base_t base; + parsed_pointer_t pointer; + parsed_reference_t reference; + construct_function_type_t function; + parsed_array_t array; }; -typedef struct parsed_pointer_t parsed_pointer_t; -struct parsed_pointer_t { - construct_type_t construct_type; - type_qualifiers_t type_qualifiers; - variable_t *base_variable; /**< MS __based extension. */ -}; - -typedef struct parsed_reference_t parsed_reference_t; -struct parsed_reference_t { - construct_type_t construct_type; -}; - -typedef struct construct_function_type_t construct_function_type_t; -struct construct_function_type_t { - construct_type_t construct_type; - type_t *function_type; -}; - -typedef struct parsed_array_t parsed_array_t; -struct parsed_array_t { - construct_type_t construct_type; - type_qualifiers_t type_qualifiers; - bool is_static; - bool is_variable; - expression_t *size; -}; - -typedef struct construct_base_type_t construct_base_type_t; -struct construct_base_type_t { - construct_type_t construct_type; - type_t *type; -}; - -static construct_type_t *parse_pointer_declarator(variable_t *base_variable) +static construct_type_t *parse_pointer_declarator(void) { eat('*'); parsed_pointer_t *pointer = obstack_alloc(&temp_obst, sizeof(pointer[0])); memset(pointer, 0, sizeof(pointer[0])); - pointer->construct_type.kind = CONSTRUCT_POINTER; - pointer->type_qualifiers = parse_type_qualifiers(); - pointer->base_variable = base_variable; + pointer->base.kind = CONSTRUCT_POINTER; + pointer->type_qualifiers = parse_type_qualifiers(); + //pointer->base_variable = base_variable; - return &pointer->construct_type; + return (construct_type_t*) pointer; } static construct_type_t *parse_reference_declarator(void) { eat('&'); - parsed_reference_t *reference = obstack_alloc(&temp_obst, sizeof(reference[0])); - memset(reference, 0, sizeof(reference[0])); - reference->construct_type.kind = CONSTRUCT_REFERENCE; + construct_type_t *cons = obstack_alloc(&temp_obst, sizeof(cons->reference)); + parsed_reference_t *reference = &cons->reference; + memset(reference, 0, sizeof(*reference)); + cons->kind = CONSTRUCT_REFERENCE; - return (construct_type_t*)reference; + return cons; } static construct_type_t *parse_array_declarator(void) @@ -4351,9 +3828,10 @@ static construct_type_t *parse_array_declarator(void) eat('['); add_anchor_token(']'); - parsed_array_t *array = obstack_alloc(&temp_obst, sizeof(array[0])); - memset(array, 0, sizeof(array[0])); - array->construct_type.kind = CONSTRUCT_ARRAY; + construct_type_t *cons = obstack_alloc(&temp_obst, sizeof(cons->array)); + parsed_array_t *array = &cons->array; + memset(array, 0, sizeof(*array)); + cons->kind = CONSTRUCT_ARRAY; if (token.type == T_static) { array->is_static = true; @@ -4374,6 +3852,16 @@ static construct_type_t *parse_array_declarator(void) next_token(); } else if (token.type != ']') { expression_t *const size = parse_assignment_expression(); + + /* §6.7.5.2:1 Array size must have integer type */ + type_t *const orig_type = size->base.type; + type_t *const type = skip_typeref(orig_type); + if (!is_type_integer(type) && is_type_valid(type)) { + errorf(&size->base.source_position, + "array size '%E' must have integer type but has type '%T'", + size, orig_type); + } + array->size = size; mark_vars_read(size, NULL); } @@ -4382,17 +3870,17 @@ static construct_type_t *parse_array_declarator(void) expect(']', end_error); end_error: - return &array->construct_type; + return cons; } -static construct_type_t *parse_function_declarator(scope_t *scope, - decl_modifiers_t modifiers) +static construct_type_t *parse_function_declarator(scope_t *scope) { type_t *type = allocate_type_zero(TYPE_FUNCTION); function_type_t *ftype = &type->function; ftype->linkage = current_linkage; +#if 0 switch (modifiers & (DM_CDECL | DM_STDCALL | DM_FASTCALL | DM_THISCALL)) { case DM_NONE: break; case DM_CDECL: ftype->calling_convention = CC_CDECL; break; @@ -4404,101 +3892,98 @@ static construct_type_t *parse_function_declarator(scope_t *scope, errorf(HERE, "multiple calling conventions in declaration"); break; } +#endif parse_parameters(ftype, scope); - construct_function_type_t *construct_function_type = - obstack_alloc(&temp_obst, sizeof(construct_function_type[0])); - memset(construct_function_type, 0, sizeof(construct_function_type[0])); - construct_function_type->construct_type.kind = CONSTRUCT_FUNCTION; - construct_function_type->function_type = type; + construct_type_t *cons = obstack_alloc(&temp_obst, sizeof(cons->function)); + construct_function_type_t *function = &cons->function; + memset(function, 0, sizeof(*function)); + cons->kind = CONSTRUCT_FUNCTION; + function->function_type = type; - return &construct_function_type->construct_type; + return cons; } typedef struct parse_declarator_env_t { + bool may_be_abstract : 1; + bool must_be_abstract : 1; decl_modifiers_t modifiers; symbol_t *symbol; source_position_t source_position; scope_t parameters; + attribute_t *attributes; } parse_declarator_env_t; -static construct_type_t *parse_inner_declarator(parse_declarator_env_t *env, - bool may_be_abstract) +static construct_type_t *parse_inner_declarator(parse_declarator_env_t *env) { /* construct a single linked list of construct_type_t's which describe * how to construct the final declarator type */ - construct_type_t *first = NULL; - construct_type_t *last = NULL; - gnu_attribute_t *attributes = NULL; - - decl_modifiers_t modifiers = parse_attributes(&attributes); + construct_type_t *first = NULL; + construct_type_t **anchor = &first; - /* MS __based extension */ - based_spec_t base_spec; - base_spec.base_variable = NULL; + env->attributes = parse_attributes(env->attributes); for (;;) { construct_type_t *type; + //variable_t *based = NULL; /* MS __based extension */ switch (token.type) { case '&': if (!(c_mode & _CXX)) errorf(HERE, "references are only available for C++"); - if (base_spec.base_variable != NULL && warning.other) { - warningf(&base_spec.source_position, - "__based does not precede a pointer operator, ignored"); - } type = parse_reference_declarator(); - /* consumed */ - base_spec.base_variable = NULL; - break; - - case '*': - type = parse_pointer_declarator(base_spec.base_variable); - /* consumed */ - base_spec.base_variable = NULL; break; - case T__based: + case T__based: { +#if 0 + source_position_t const pos = *HERE; next_token(); expect('(', end_error); add_anchor_token(')'); - parse_microsoft_based(&base_spec); + based = parse_microsoft_based(); rem_anchor_token(')'); expect(')', end_error); - continue; + if (token.type != '*') { + if (token.type == T__based) { + errorf(&pos, "__based type modifier specified more than once"); + } else if (warning.other) { + warningf(&pos, + "__based does not precede a pointer declarator, ignored"); + } + continue; + } +#else + panic("based currently disabled"); +#endif + /* FALLTHROUGH */ + } + + case '*': + type = parse_pointer_declarator(); + break; default: goto ptr_operator_end; } - if (last == NULL) { - first = type; - last = type; - } else { - last->next = type; - last = type; - } + *anchor = type; + anchor = &type->base.next; /* TODO: find out if this is correct */ - modifiers |= parse_attributes(&attributes); - } -ptr_operator_end: - if (base_spec.base_variable != NULL && warning.other) { - warningf(&base_spec.source_position, - "__based does not precede a pointer operator, ignored"); + env->attributes = parse_attributes(env->attributes); } - if (env != NULL) { - modifiers |= env->modifiers; - env->modifiers = modifiers; - } +ptr_operator_end: ; +#if 0 + modifiers |= env->modifiers; + env->modifiers = modifiers; +#endif construct_type_t *inner_types = NULL; switch (token.type) { case T_IDENTIFIER: - if (env == NULL) { + if (env->must_be_abstract) { errorf(HERE, "no identifier expected in typename"); } else { env->symbol = token.v.symbol; @@ -4513,34 +3998,35 @@ ptr_operator_end: if (look_ahead(1)->type != ')') { next_token(); add_anchor_token(')'); - inner_types = parse_inner_declarator(env, may_be_abstract); + inner_types = parse_inner_declarator(env); if (inner_types != NULL) { /* All later declarators only modify the return type */ - env = NULL; + env->must_be_abstract = true; } rem_anchor_token(')'); expect(')', end_error); } break; default: - if (may_be_abstract) + if (env->may_be_abstract) break; parse_error_expected("while parsing declarator", T_IDENTIFIER, '(', NULL); eat_until_anchor(); return NULL; } - construct_type_t *p = last; + construct_type_t **const p = anchor; - while (true) { + for (;;) { construct_type_t *type; switch (token.type) { case '(': { scope_t *scope = NULL; - if (env != NULL) + if (!env->must_be_abstract) { scope = &env->parameters; + } - type = parse_function_declarator(scope, modifiers); + type = parse_function_declarator(scope); break; } case '[': @@ -4550,109 +4036,33 @@ ptr_operator_end: goto declarator_finished; } - /* insert in the middle of the list (behind p) */ - if (p != NULL) { - type->next = p->next; - p->next = type; - } else { - type->next = first; - first = type; - } - if (last == p) { - last = type; - } + /* insert in the middle of the list (at p) */ + type->base.next = *p; + *p = type; + if (anchor == p) + anchor = &type->base.next; } declarator_finished: - /* append inner_types at the end of the list, we don't to set last anymore + /* append inner_types at the end of the list, we don't to set anchor anymore * as it's not needed anymore */ - if (last == NULL) { - assert(first == NULL); - first = inner_types; - } else { - last->next = inner_types; - } + *anchor = inner_types; return first; end_error: return NULL; } -static void parse_declaration_attributes(entity_t *entity) -{ - gnu_attribute_t *attributes = NULL; - decl_modifiers_t modifiers = parse_attributes(&attributes); - - if (entity == NULL) - return; - - type_t *type; - if (entity->kind == ENTITY_TYPEDEF) { - modifiers |= entity->typedefe.modifiers; - type = entity->typedefe.type; - } else { - assert(is_declaration(entity)); - modifiers |= entity->declaration.modifiers; - type = entity->declaration.type; - } - if (type == NULL) - return; - - gnu_attribute_t *attribute = attributes; - for ( ; attribute != NULL; attribute = attribute->next) { - if (attribute->invalid) - continue; - - if (attribute->kind == GNU_AK_MODE) { - type = handle_attribute_mode(attribute, type); - } else if (attribute->kind == GNU_AK_ALIGNED) { - int alignment = 32; /* TODO: fill in maximum usefull alignment for target machine */ - if (attribute->has_arguments) - alignment = attribute->u.argument; - - if (entity->kind == ENTITY_TYPEDEF) { - type_t *copy = duplicate_type(type); - copy->base.alignment = attribute->u.argument; - type = identify_new_type(copy); - } else if(entity->kind == ENTITY_VARIABLE) { - entity->variable.alignment = alignment; - } else if(entity->kind == ENTITY_COMPOUND_MEMBER) { - entity->compound_member.alignment = alignment; - } - } - } - - type_modifiers_t type_modifiers = type->base.modifiers; - if (modifiers & DM_TRANSPARENT_UNION) - type_modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION; - - if (type->base.modifiers != type_modifiers) { - type_t *copy = duplicate_type(type); - copy->base.modifiers = type_modifiers; - type = identify_new_type(copy); - } - - if (entity->kind == ENTITY_TYPEDEF) { - entity->typedefe.type = type; - entity->typedefe.modifiers = modifiers; - } else { - entity->declaration.type = type; - entity->declaration.modifiers = modifiers; - } -} - static type_t *construct_declarator_type(construct_type_t *construct_list, type_t *type) { construct_type_t *iter = construct_list; - for (; iter != NULL; iter = iter->next) { + for (; iter != NULL; iter = iter->base.next) { switch (iter->kind) { case CONSTRUCT_INVALID: - internal_errorf(HERE, "invalid type construction found"); + break; case CONSTRUCT_FUNCTION: { - construct_function_type_t *construct_function_type - = (construct_function_type_t*) iter; - - type_t *function_type = construct_function_type->function_type; + construct_function_type_t *function = &iter->function; + type_t *function_type = function->function_type; function_type->function.return_type = type; @@ -4669,16 +4079,18 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, type_ } } - type = function_type; - break; + /* The function type was constructed earlier. Freeing it here will + * destroy other types. */ + type = typehash_insert(function_type); + continue; } case CONSTRUCT_POINTER: { if (is_type_reference(skip_typeref(type))) errorf(HERE, "cannot declare a pointer to reference"); - parsed_pointer_t *parsed_pointer = (parsed_pointer_t*) iter; - type = make_based_pointer_type(type, parsed_pointer->type_qualifiers, parsed_pointer->base_variable); + parsed_pointer_t *pointer = &iter->pointer; + type = make_based_pointer_type(type, pointer->type_qualifiers, pointer->base_variable); continue; } @@ -4693,26 +4105,38 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, type_ if (is_type_reference(skip_typeref(type))) errorf(HERE, "cannot declare an array of references"); - parsed_array_t *parsed_array = (parsed_array_t*) iter; - type_t *array_type = allocate_type_zero(TYPE_ARRAY); + parsed_array_t *array = &iter->array; + type_t *array_type = allocate_type_zero(TYPE_ARRAY); - expression_t *size_expression = parsed_array->size; + expression_t *size_expression = array->size; if (size_expression != NULL) { size_expression = create_implicit_cast(size_expression, type_size_t); } - array_type->base.qualifiers = parsed_array->type_qualifiers; + array_type->base.qualifiers = array->type_qualifiers; array_type->array.element_type = type; - array_type->array.is_static = parsed_array->is_static; - array_type->array.is_variable = parsed_array->is_variable; + array_type->array.is_static = array->is_static; + array_type->array.is_variable = array->is_variable; array_type->array.size_expression = size_expression; if (size_expression != NULL) { if (is_constant_expression(size_expression)) { + long const size + = fold_constant_to_int(size_expression); + array_type->array.size = size; array_type->array.size_constant = true; - array_type->array.size - = fold_constant(size_expression); + /* §6.7.5.2:1 If the expression is a constant expression, it shall + * have a value greater than zero. */ + if (size <= 0) { + if (size < 0 || !GNU_MODE) { + errorf(&size_expression->base.source_position, + "size of array must be greater than zero"); + } else if (warning.other) { + warningf(&size_expression->base.source_position, + "zero length arrays are a GCC extension"); + } + } } else { array_type->array.is_vla = true; } @@ -4725,18 +4149,11 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, type_ } else if (is_type_function(skipped_type)) { errorf(HERE, "array of functions is not allowed"); } - type = array_type; - break; - } + type = identify_new_type(array_type); + continue; } - - /* The function type was constructed earlier. Freeing it here will - * destroy other types. */ - if (iter->kind == CONSTRUCT_FUNCTION) { - type = typehash_insert(type); - } else { - type = identify_new_type(type); } + internal_errorf(HERE, "invalid type construction found"); } return type; @@ -4758,7 +4175,7 @@ static type_t *semantic_parameter(const source_position_t *pos, type = automatic_type_conversion(type); if (specifiers->is_inline && is_type_valid(type)) { - errorf(pos, "parameter '%Y' declared 'inline'", symbol); + errorf(pos, "parameter '%#T' declared 'inline'", type, symbol); } /* §6.9.1:6 The declarations in the declaration list shall contain @@ -4768,7 +4185,7 @@ static type_t *semantic_parameter(const source_position_t *pos, specifiers->storage_class != STORAGE_CLASS_NONE && specifiers->storage_class != STORAGE_CLASS_REGISTER) ) { - errorf(pos, "invalid storage class for parameter '%Y'", symbol); + errorf(pos, "invalid storage class for parameter '%#T'", type, symbol); } /* delay test for incomplete type, because we might have (void) @@ -4782,10 +4199,9 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, { parse_declarator_env_t env; memset(&env, 0, sizeof(env)); - env.modifiers = specifiers->modifiers; + env.may_be_abstract = (flags & DECL_MAY_BE_ABSTRACT) != 0; - construct_type_t *construct_type = - parse_inner_declarator(&env, (flags & DECL_MAY_BE_ABSTRACT) != 0); + construct_type_t *construct_type = parse_inner_declarator(&env); type_t *orig_type = construct_declarator_type(construct_type, specifiers->type); type_t *type = skip_typeref(orig_type); @@ -4794,6 +4210,18 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, obstack_free(&temp_obst, construct_type); } + attribute_t *attributes = parse_attributes(env.attributes); + /* append (shared) specifier attribute behind attributes of this + declarator */ + if (attributes != NULL) { + attribute_t *last = attributes; + while (last->next != NULL) + last = last->next; + last->next = specifiers->attributes; + } else { + attributes = specifiers->attributes; + } + entity_t *entity; if (specifiers->storage_class == STORAGE_CLASS_TYPEDEF) { entity = allocate_entity_zero(ENTITY_TYPEDEF); @@ -4845,11 +4273,14 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, entity->function.parameters = env.parameters; if (env.symbol != NULL) { + /* this needs fixes for C++ */ + bool in_function_scope = current_function != NULL; + if (specifiers->thread_local || ( - specifiers->storage_class != STORAGE_CLASS_EXTERN && - specifiers->storage_class != STORAGE_CLASS_NONE && - specifiers->storage_class != STORAGE_CLASS_STATIC - )) { + specifiers->storage_class != STORAGE_CLASS_EXTERN && + specifiers->storage_class != STORAGE_CLASS_NONE && + (in_function_scope || specifiers->storage_class != STORAGE_CLASS_STATIC) + )) { errorf(&env.source_position, "invalid storage class for function '%Y'", env.symbol); } @@ -4857,9 +4288,6 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, } else { entity = allocate_entity_zero(ENTITY_VARIABLE); - entity->variable.get_property_sym = specifiers->get_property_sym; - entity->variable.put_property_sym = specifiers->put_property_sym; - entity->variable.thread_local = specifiers->thread_local; if (env.symbol != NULL) { @@ -4894,10 +4322,11 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, } else { entity->base.source_position = specifiers->source_position; } - entity->base.namespc = NAMESPACE_NORMAL; - entity->declaration.type = orig_type; - entity->declaration.modifiers = env.modifiers; - entity->declaration.deprecated_string = specifiers->deprecated_string; + entity->base.namespc = NAMESPACE_NORMAL; + entity->declaration.type = orig_type; + entity->declaration.alignment = get_type_alignment(orig_type); + entity->declaration.modifiers = env.modifiers; + entity->declaration.attributes = attributes; storage_class_t storage_class = specifiers->storage_class; entity->declaration.declared_storage_class = storage_class; @@ -4907,19 +4336,27 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, entity->declaration.storage_class = storage_class; } - parse_declaration_attributes(entity); + if (attributes != NULL) { + handle_entity_attributes(attributes, entity); + } return entity; } static type_t *parse_abstract_declarator(type_t *base_type) { - construct_type_t *construct_type = parse_inner_declarator(NULL, 1); + parse_declarator_env_t env; + memset(&env, 0, sizeof(env)); + env.may_be_abstract = true; + env.must_be_abstract = true; + + construct_type_t *construct_type = parse_inner_declarator(&env); type_t *result = construct_declarator_type(construct_type, base_type); if (construct_type != NULL) { obstack_free(&temp_obst, construct_type); } + result = handle_type_attributes(env.attributes, result); return result; } @@ -5025,7 +4462,7 @@ static entity_t *record_entity(entity_t *entity, const bool is_definition) if (symbol == NULL) return entity; - entity_t *previous_entity = get_entity(symbol, namespc); + entity_t *const previous_entity = get_entity(symbol, namespc); /* pushing the same entity twice will break the stack structure */ assert(previous_entity != entity); @@ -5055,160 +4492,166 @@ static entity_t *record_entity(entity_t *entity, const bool is_definition) entity->declaration.type, symbol); } - if (previous_entity != NULL && - previous_entity->base.parent_scope == ¤t_function->parameters && - previous_entity->base.parent_scope->depth + 1 == current_scope->depth) { - assert(previous_entity->kind == ENTITY_PARAMETER); - errorf(pos, - "declaration '%#T' redeclares the parameter '%#T' (declared %P)", - entity->declaration.type, symbol, - previous_entity->declaration.type, symbol, - &previous_entity->base.source_position); - goto finish; - } - - if (previous_entity != NULL && - previous_entity->base.parent_scope == current_scope) { - if (previous_entity->kind != entity->kind) { - if (!is_error_entity(previous_entity) && !is_error_entity(entity)) { - error_redefined_as_different_kind(pos, previous_entity, - entity->kind); - } - goto finish; - } - if (previous_entity->kind == ENTITY_ENUM_VALUE) { - errorf(pos, "redeclaration of enum entry '%Y' (declared %P)", - symbol, &previous_entity->base.source_position); - goto finish; - } - if (previous_entity->kind == ENTITY_TYPEDEF) { - /* TODO: C++ allows this for exactly the same type */ - errorf(pos, "redefinition of typedef '%Y' (declared %P)", - symbol, &previous_entity->base.source_position); + if (previous_entity != NULL) { + if (previous_entity->base.parent_scope == ¤t_function->parameters && + previous_entity->base.parent_scope->depth + 1 == current_scope->depth) { + assert(previous_entity->kind == ENTITY_PARAMETER); + errorf(pos, + "declaration '%#T' redeclares the parameter '%#T' (declared %P)", + entity->declaration.type, symbol, + previous_entity->declaration.type, symbol, + &previous_entity->base.source_position); goto finish; } - /* at this point we should have only VARIABLES or FUNCTIONS */ - assert(is_declaration(previous_entity) && is_declaration(entity)); - - declaration_t *const prev_decl = &previous_entity->declaration; - declaration_t *const decl = &entity->declaration; - - /* can happen for K&R style declarations */ - if (prev_decl->type == NULL && - previous_entity->kind == ENTITY_PARAMETER && - entity->kind == ENTITY_PARAMETER) { - prev_decl->type = decl->type; - prev_decl->storage_class = decl->storage_class; - prev_decl->declared_storage_class = decl->declared_storage_class; - prev_decl->modifiers = decl->modifiers; - prev_decl->deprecated_string = decl->deprecated_string; - return previous_entity; - } - - type_t *const orig_type = decl->type; - assert(orig_type != NULL); - type_t *const type = skip_typeref(orig_type); - type_t *const prev_type = skip_typeref(prev_decl->type); + if (previous_entity->base.parent_scope == current_scope) { + if (previous_entity->kind != entity->kind) { + if (!is_error_entity(previous_entity) && !is_error_entity(entity)) { + error_redefined_as_different_kind(pos, previous_entity, + entity->kind); + } + goto finish; + } + if (previous_entity->kind == ENTITY_ENUM_VALUE) { + errorf(pos, "redeclaration of enum entry '%Y' (declared %P)", + symbol, &previous_entity->base.source_position); + goto finish; + } + if (previous_entity->kind == ENTITY_TYPEDEF) { + /* TODO: C++ allows this for exactly the same type */ + errorf(pos, "redefinition of typedef '%Y' (declared %P)", + symbol, &previous_entity->base.source_position); + goto finish; + } - if (!types_compatible(type, prev_type)) { - errorf(pos, - "declaration '%#T' is incompatible with '%#T' (declared %P)", - orig_type, symbol, prev_decl->type, symbol, - &previous_entity->base.source_position); - } else { - unsigned old_storage_class = prev_decl->storage_class; - if (warning.redundant_decls && - is_definition && - !prev_decl->used && - !(prev_decl->modifiers & DM_USED) && - prev_decl->storage_class == STORAGE_CLASS_STATIC) { - warningf(&previous_entity->base.source_position, - "unnecessary static forward declaration for '%#T'", - prev_decl->type, symbol); + /* at this point we should have only VARIABLES or FUNCTIONS */ + assert(is_declaration(previous_entity) && is_declaration(entity)); + + declaration_t *const prev_decl = &previous_entity->declaration; + declaration_t *const decl = &entity->declaration; + + /* can happen for K&R style declarations */ + if (prev_decl->type == NULL && + previous_entity->kind == ENTITY_PARAMETER && + entity->kind == ENTITY_PARAMETER) { + prev_decl->type = decl->type; + prev_decl->storage_class = decl->storage_class; + prev_decl->declared_storage_class = decl->declared_storage_class; + prev_decl->modifiers = decl->modifiers; + return previous_entity; } - storage_class_t new_storage_class = decl->storage_class; + type_t *const orig_type = decl->type; + assert(orig_type != NULL); + type_t *const type = skip_typeref(orig_type); + type_t *const prev_type = skip_typeref(prev_decl->type); - /* pretend no storage class means extern for function - * declarations (except if the previous declaration is neither - * none nor extern) */ - if (entity->kind == ENTITY_FUNCTION) { - /* the previous declaration could have unspecified parameters or - * be a typedef, so use the new type */ - if (prev_type->function.unspecified_parameters || is_definition) - prev_decl->type = type; + if (!types_compatible(type, prev_type)) { + errorf(pos, + "declaration '%#T' is incompatible with '%#T' (declared %P)", + orig_type, symbol, prev_decl->type, symbol, + &previous_entity->base.source_position); + } else { + unsigned old_storage_class = prev_decl->storage_class; + if (warning.redundant_decls && + is_definition && + !prev_decl->used && + !(prev_decl->modifiers & DM_USED) && + prev_decl->storage_class == STORAGE_CLASS_STATIC) { + warningf(&previous_entity->base.source_position, + "unnecessary static forward declaration for '%#T'", + prev_decl->type, symbol); + } - switch (old_storage_class) { - case STORAGE_CLASS_NONE: - old_storage_class = STORAGE_CLASS_EXTERN; - /* FALLTHROUGH */ - - case STORAGE_CLASS_EXTERN: - if (is_definition) { - if (warning.missing_prototypes && - prev_type->function.unspecified_parameters && - !is_sym_main(symbol)) { - warningf(pos, "no previous prototype for '%#T'", - orig_type, symbol); - } - } else if (new_storage_class == STORAGE_CLASS_NONE) { - new_storage_class = STORAGE_CLASS_EXTERN; - } - break; + storage_class_t new_storage_class = decl->storage_class; + + /* pretend no storage class means extern for function + * declarations (except if the previous declaration is neither + * none nor extern) */ + if (entity->kind == ENTITY_FUNCTION) { + /* the previous declaration could have unspecified parameters or + * be a typedef, so use the new type */ + if (prev_type->function.unspecified_parameters || is_definition) + prev_decl->type = type; + + switch (old_storage_class) { + case STORAGE_CLASS_NONE: + old_storage_class = STORAGE_CLASS_EXTERN; + /* FALLTHROUGH */ + + case STORAGE_CLASS_EXTERN: + if (is_definition) { + if (warning.missing_prototypes && + prev_type->function.unspecified_parameters && + !is_sym_main(symbol)) { + warningf(pos, "no previous prototype for '%#T'", + orig_type, symbol); + } + } else if (new_storage_class == STORAGE_CLASS_NONE) { + new_storage_class = STORAGE_CLASS_EXTERN; + } + break; - default: - break; + default: + break; + } + } else if (is_type_incomplete(prev_type)) { + prev_decl->type = type; } - } else if (is_type_incomplete(prev_type)) { - prev_decl->type = type; - } - if (old_storage_class == STORAGE_CLASS_EXTERN && - new_storage_class == STORAGE_CLASS_EXTERN) { + if (old_storage_class == STORAGE_CLASS_EXTERN && + new_storage_class == STORAGE_CLASS_EXTERN) { warn_redundant_declaration: - if (!is_definition && - warning.redundant_decls && - is_type_valid(prev_type) && - strcmp(previous_entity->base.source_position.input_name, - "") != 0) { - warningf(pos, - "redundant declaration for '%Y' (declared %P)", - symbol, &previous_entity->base.source_position); - } - } else if (current_function == NULL) { - if (old_storage_class != STORAGE_CLASS_STATIC && - new_storage_class == STORAGE_CLASS_STATIC) { - errorf(pos, - "static declaration of '%Y' follows non-static declaration (declared %P)", - symbol, &previous_entity->base.source_position); - } else if (old_storage_class == STORAGE_CLASS_EXTERN) { - prev_decl->storage_class = STORAGE_CLASS_NONE; - prev_decl->declared_storage_class = STORAGE_CLASS_NONE; - } else { - /* ISO/IEC 14882:1998(E) §C.1.2:1 */ - if (c_mode & _CXX) - goto error_redeclaration; - goto warn_redundant_declaration; - } - } else if (is_type_valid(prev_type)) { - if (old_storage_class == new_storage_class) { + if (!is_definition && + warning.redundant_decls && + is_type_valid(prev_type) && + strcmp(previous_entity->base.source_position.input_name, + "") != 0) { + warningf(pos, + "redundant declaration for '%Y' (declared %P)", + symbol, &previous_entity->base.source_position); + } + } else if (current_function == NULL) { + if (old_storage_class != STORAGE_CLASS_STATIC && + new_storage_class == STORAGE_CLASS_STATIC) { + errorf(pos, + "static declaration of '%Y' follows non-static declaration (declared %P)", + symbol, &previous_entity->base.source_position); + } else if (old_storage_class == STORAGE_CLASS_EXTERN) { + prev_decl->storage_class = STORAGE_CLASS_NONE; + prev_decl->declared_storage_class = STORAGE_CLASS_NONE; + } else { + /* ISO/IEC 14882:1998(E) §C.1.2:1 */ + if (c_mode & _CXX) + goto error_redeclaration; + goto warn_redundant_declaration; + } + } else if (is_type_valid(prev_type)) { + if (old_storage_class == new_storage_class) { error_redeclaration: - errorf(pos, "redeclaration of '%Y' (declared %P)", - symbol, &previous_entity->base.source_position); - } else { - errorf(pos, - "redeclaration of '%Y' with different linkage (declared %P)", - symbol, &previous_entity->base.source_position); + errorf(pos, "redeclaration of '%Y' (declared %P)", + symbol, &previous_entity->base.source_position); + } else { + errorf(pos, + "redeclaration of '%Y' with different linkage (declared %P)", + symbol, &previous_entity->base.source_position); + } } } + + prev_decl->modifiers |= decl->modifiers; + if (entity->kind == ENTITY_FUNCTION) { + previous_entity->function.is_inline |= entity->function.is_inline; + } + return previous_entity; } - prev_decl->modifiers |= decl->modifiers; - if (entity->kind == ENTITY_FUNCTION) { - previous_entity->function.is_inline |= entity->function.is_inline; + if (warning.shadow) { + warningf(pos, "%s '%Y' shadows %s (declared %P)", + get_entity_kind_name(entity->kind), symbol, + get_entity_kind_name(previous_entity->kind), + &previous_entity->base.source_position); } - return previous_entity; } if (entity->kind == ENTITY_FUNCTION) { @@ -5308,7 +4751,7 @@ static void parse_init_declarator_rest(entity_t *entity) current_init_decl = NULL; if (entity->kind == ENTITY_VARIABLE) { - /* § 6.7.5:22 array initializers for arrays with unknown size + /* §6.7.5:22 array initializers for arrays with unknown size * determine the array type size */ declaration->type = env.type; entity->variable.initializer = initializer; @@ -5358,7 +4801,8 @@ static void check_variable_type_complete(entity_t *ent) /* §6.7:7 If an identifier for an object is declared with no linkage, the * type for the object shall be complete [...] */ declaration_t *decl = &ent->declaration; - if (decl->storage_class != STORAGE_CLASS_NONE) + if (decl->storage_class == STORAGE_CLASS_EXTERN || + decl->storage_class == STORAGE_CLASS_STATIC) return; type_t *const orig_type = decl->type; @@ -5464,6 +4908,7 @@ static void parse_declaration(parsed_declaration_func finished_declaration, } } +/* §6.5.2.2:6 */ static type_t *get_default_promoted_type(type_t *orig_type) { type_t *result = orig_type; @@ -5471,7 +4916,7 @@ static type_t *get_default_promoted_type(type_t *orig_type) type_t *type = skip_typeref(orig_type); if (is_type_integer(type)) { result = promote_integer(type); - } else if (type == type_float) { + } else if (is_type_atomic(type, ATOMIC_TYPE_FLOAT)) { result = type_double; } @@ -5527,48 +4972,45 @@ decl_list_end: /* update function type */ type_t *new_type = duplicate_type(type); - function_parameter_t *parameters = NULL; - function_parameter_t *last_parameter = NULL; + function_parameter_t *parameters = NULL; + function_parameter_t **anchor = ¶meters; parameter = entity->function.parameters.entities; for (; parameter != NULL; parameter = parameter->base.next) { + if (parameter->kind != ENTITY_PARAMETER) + continue; + type_t *parameter_type = parameter->declaration.type; if (parameter_type == NULL) { if (strict_mode) { errorf(HERE, "no type specified for function parameter '%Y'", parameter->base.symbol); + parameter_type = type_error_type; } else { if (warning.implicit_int) { warningf(HERE, "no type specified for function parameter '%Y', using 'int'", parameter->base.symbol); } - parameter_type = type_int; - parameter->declaration.type = parameter_type; + parameter_type = type_int; } + parameter->declaration.type = parameter_type; } semantic_parameter_incomplete(parameter); - parameter_type = parameter->declaration.type; /* * we need the default promoted types for the function type */ parameter_type = get_default_promoted_type(parameter_type); - function_parameter_t *function_parameter - = obstack_alloc(type_obst, sizeof(function_parameter[0])); - memset(function_parameter, 0, sizeof(function_parameter[0])); + function_parameter_t *const parameter = + allocate_parameter(parameter_type); - function_parameter->type = parameter_type; - if (last_parameter != NULL) { - last_parameter->next = function_parameter; - } else { - parameters = function_parameter; - } - last_parameter = function_parameter; + *anchor = parameter; + anchor = ¶meter->next; } - /* § 6.9.1.7: A K&R style parameter list does NOT act as a function + /* §6.9.1.7: A K&R style parameter list does NOT act as a function * prototype */ new_type->function.parameters = parameters; new_type->function.unspecified_parameters = true; @@ -5703,7 +5145,7 @@ static int determine_truth(expression_t const* const cond) { return !is_constant_expression(cond) ? 0 : - fold_constant(cond) != 0 ? 1 : + fold_constant_to_bool(cond) ? 1 : -1; } @@ -5746,10 +5188,8 @@ static bool expression_returns(expression_t const *const expr) case EXPR_SIZEOF: // TODO handle obscure VLA case case EXPR_ALIGNOF: case EXPR_FUNCNAME: - case EXPR_BUILTIN_SYMBOL: case EXPR_BUILTIN_CONSTANT_P: - case EXPR_BUILTIN_ADDRESS: - case EXPR_BUILTIN_PREFETCH: + case EXPR_BUILTIN_TYPES_COMPATIBLE_P: case EXPR_OFFSETOF: case EXPR_INVALID: return true; @@ -5789,6 +5229,9 @@ static bool expression_returns(expression_t const *const expr) case EXPR_VA_ARG: return expression_returns(expr->va_arge.ap); + case EXPR_VA_COPY: + return expression_returns(expr->va_copye.src); + EXPR_UNARY_CASES_MANDATORY return expression_returns(expr->unary.value); @@ -5915,7 +5358,7 @@ static void check_reachable(statement_t *const stmt) return; if (is_constant_expression(expr)) { - long const val = fold_constant(expr); + long const val = fold_constant_to_int(expr); case_label_statement_t * defaults = NULL; for (case_label_statement_t *i = switchs->first_case; i != NULL; i = i->next) { if (i->expression == NULL) { @@ -6392,7 +5835,7 @@ static void parse_external_declaration(void) ndeclaration->base.symbol); } - /* § 6.7.5.3:14 a function definition with () means no + /* §6.7.5.3:14 a function definition with () means no * parameters (and not unspecified parameters) */ if (type->function.unspecified_parameters && type->function.parameters == NULL && @@ -6498,44 +5941,140 @@ static type_t *make_bitfield_type(type_t *base_type, expression_t *size, base_type); bit_size = 0; } else { - bit_size = skipped_type->base.size * 8; + bit_size = get_type_size(base_type) * 8; + } + + if (is_constant_expression(size)) { + long v = fold_constant_to_int(size); + const symbol_t *user_symbol = symbol == NULL ? sym_anonymous : symbol; + + if (v < 0) { + errorf(source_position, "negative width in bit-field '%Y'", + user_symbol); + } else if (v == 0 && symbol != NULL) { + errorf(source_position, "zero width for bit-field '%Y'", + user_symbol); + } else if (bit_size > 0 && (il_size_t)v > bit_size) { + errorf(source_position, "width of '%Y' exceeds its type", + user_symbol); + } else { + type->bitfield.bit_size = v; + } + } + + return type; +} + +static entity_t *find_compound_entry(compound_t *compound, symbol_t *symbol) +{ + entity_t *iter = compound->members.entities; + for (; iter != NULL; iter = iter->base.next) { + if (iter->kind != ENTITY_COMPOUND_MEMBER) + continue; + + if (iter->base.symbol == symbol) { + return iter; + } else if (iter->base.symbol == NULL) { + /* search in anonymous structs and unions */ + type_t *type = skip_typeref(iter->declaration.type); + if (is_type_compound(type)) { + if (find_compound_entry(type->compound.compound, symbol) + != NULL) + return iter; + } + continue; + } + } + + return NULL; +} + +static void check_deprecated(const source_position_t *source_position, + const entity_t *entity) +{ + if (!warning.deprecated_declarations) + return; + if (!is_declaration(entity)) + return; + if ((entity->declaration.modifiers & DM_DEPRECATED) == 0) + return; + + char const *const prefix = get_entity_kind_name(entity->kind); + const char *deprecated_string + = get_deprecated_string(entity->declaration.attributes); + if (deprecated_string != NULL) { + warningf(source_position, "%s '%Y' is deprecated (declared %P): \"%s\"", + prefix, entity->base.symbol, &entity->base.source_position, + deprecated_string); + } else { + warningf(source_position, "%s '%Y' is deprecated (declared %P)", prefix, + entity->base.symbol, &entity->base.source_position); } +} - if (is_constant_expression(size)) { - long v = fold_constant(size); - if (v < 0) { - errorf(source_position, "negative width in bit-field '%Y'", symbol); - } else if (v == 0) { - errorf(source_position, "zero width for bit-field '%Y'", symbol); - } else if (bit_size > 0 && (il_size_t)v > bit_size) { - errorf(source_position, "width of '%Y' exceeds its type", symbol); - } else { - type->bitfield.bit_size = v; - } +static expression_t *create_select(const source_position_t *pos, + expression_t *addr, + type_qualifiers_t qualifiers, + entity_t *entry) +{ + assert(entry->kind == ENTITY_COMPOUND_MEMBER); + + check_deprecated(pos, entry); + + expression_t *select = allocate_expression_zero(EXPR_SELECT); + select->select.compound = addr; + select->select.compound_entry = entry; + + type_t *entry_type = entry->declaration.type; + type_t *res_type = get_qualified_type(entry_type, qualifiers); + + /* we always do the auto-type conversions; the & and sizeof parser contains + * code to revert this! */ + select->base.type = automatic_type_conversion(res_type); + if (res_type->kind == TYPE_BITFIELD) { + select->base.type = res_type->bitfield.base_type; } - return type; + return select; } -static entity_t *find_compound_entry(compound_t *compound, symbol_t *symbol) +/** + * Find entry with symbol in compound. Search anonymous structs and unions and + * creates implicit select expressions for them. + * Returns the adress for the innermost compound. + */ +static expression_t *find_create_select(const source_position_t *pos, + expression_t *addr, + type_qualifiers_t qualifiers, + compound_t *compound, symbol_t *symbol) { entity_t *iter = compound->members.entities; for (; iter != NULL; iter = iter->base.next) { if (iter->kind != ENTITY_COMPOUND_MEMBER) continue; - if (iter->base.symbol == symbol) { - return iter; - } else if (iter->base.symbol == NULL) { - type_t *type = skip_typeref(iter->declaration.type); - if (is_type_compound(type)) { - entity_t *result - = find_compound_entry(type->compound.compound, symbol); - if (result != NULL) - return result; - } - continue; + symbol_t *iter_symbol = iter->base.symbol; + if (iter_symbol == NULL) { + type_t *type = iter->declaration.type; + if (type->kind != TYPE_COMPOUND_STRUCT + && type->kind != TYPE_COMPOUND_UNION) + continue; + + compound_t *sub_compound = type->compound.compound; + + if (find_compound_entry(sub_compound, symbol) == NULL) + continue; + + expression_t *sub_addr = create_select(pos, addr, qualifiers, iter); + sub_addr->base.source_position = *pos; + sub_addr->select.implicit = true; + return find_create_select(pos, sub_addr, qualifiers, sub_compound, + symbol); + } + + if (iter_symbol == symbol) { + return create_select(pos, addr, qualifiers, iter); } } @@ -6556,15 +6095,29 @@ static void parse_compound_declarators(compound_t *compound, expression_t *size = parse_constant_expression(); type_t *type = make_bitfield_type(base_type, size, - &source_position, sym_anonymous); + &source_position, NULL); + + attribute_t *attributes = parse_attributes(NULL); + if (attributes != NULL) { + attribute_t *last = attributes; + while (last->next != NULL) + last = last->next; + last->next = specifiers->attributes; + } else { + attributes = specifiers->attributes; + } entity = allocate_entity_zero(ENTITY_COMPOUND_MEMBER); entity->base.namespc = NAMESPACE_NORMAL; entity->base.source_position = source_position; entity->declaration.declared_storage_class = STORAGE_CLASS_NONE; entity->declaration.storage_class = STORAGE_CLASS_NONE; - entity->declaration.modifiers = specifiers->modifiers; entity->declaration.type = type; + entity->declaration.attributes = attributes; + + if (attributes != NULL) { + handle_entity_attributes(attributes, entity); + } append_entity(&compound->members, entity); } else { entity = parse_declarator(specifiers, @@ -6594,7 +6147,10 @@ static void parse_compound_declarators(compound_t *compound, type_t *type = entity->declaration.type; type_t *bitfield_type = make_bitfield_type(type, size, &source_position, entity->base.symbol); + + attribute_t *attributes = parse_attributes(NULL); entity->declaration.type = bitfield_type; + handle_entity_attributes(attributes, entity); } else { type_t *orig_type = entity->declaration.type; type_t *type = skip_typeref(orig_type); @@ -6604,11 +6160,9 @@ static void parse_compound_declarators(compound_t *compound, entity->base.symbol, orig_type); } else if (is_type_incomplete(type)) { /* §6.7.2.1:16 flexible array member */ - if (is_type_array(type) && - token.type == ';' && - look_ahead(1)->type == '}') { - compound->has_flexible_member = true; - } else { + if (!is_type_array(type) || + token.type != ';' || + look_ahead(1)->type != '}') { errorf(&entity->base.source_position, "compound member '%Y' has incomplete type '%T'", entity->base.symbol, orig_type); @@ -6866,15 +6420,8 @@ static entity_t *create_implicit_function(symbol_t *symbol, static type_t *make_function_2_type(type_t *return_type, type_t *argument_type1, type_t *argument_type2) { - function_parameter_t *parameter2 - = obstack_alloc(type_obst, sizeof(parameter2[0])); - memset(parameter2, 0, sizeof(parameter2[0])); - parameter2->type = argument_type2; - - function_parameter_t *parameter1 - = obstack_alloc(type_obst, sizeof(parameter1[0])); - memset(parameter1, 0, sizeof(parameter1[0])); - parameter1->type = argument_type1; + function_parameter_t *const parameter2 = allocate_parameter(argument_type2); + function_parameter_t *const parameter1 = allocate_parameter(argument_type1); parameter1->next = parameter2; type_t *type = allocate_type_zero(TYPE_FUNCTION); @@ -6893,10 +6440,7 @@ static type_t *make_function_2_type(type_t *return_type, type_t *argument_type1, */ static type_t *make_function_1_type(type_t *return_type, type_t *argument_type) { - function_parameter_t *parameter - = obstack_alloc(type_obst, sizeof(parameter[0])); - memset(parameter, 0, sizeof(parameter[0])); - parameter->type = argument_type; + function_parameter_t *const parameter = allocate_parameter(argument_type); type_t *type = allocate_type_zero(TYPE_FUNCTION); type->function.return_type = return_type; @@ -6905,6 +6449,19 @@ static type_t *make_function_1_type(type_t *return_type, type_t *argument_type) return identify_new_type(type); } +static type_t *make_function_1_type_variadic(type_t *return_type, type_t *argument_type) +{ + type_t *res = make_function_1_type(return_type, argument_type); + res->function.variadic = 1; + return res; +} + +/** + * Creates a return_type (func)(void) function type if not + * already exists. + * + * @param return_type the return type + */ static type_t *make_function_0_type(type_t *return_type) { type_t *type = allocate_type_zero(TYPE_FUNCTION); @@ -6915,43 +6472,22 @@ static type_t *make_function_0_type(type_t *return_type) } /** - * Creates a function type for some function like builtins. + * Creates a NO_RETURN return_type (func)(void) function type if not + * already exists. * - * @param symbol the symbol describing the builtin - */ -static type_t *get_builtin_symbol_type(symbol_t *symbol) -{ - switch (symbol->ID) { - case T___builtin_alloca: - return make_function_1_type(type_void_ptr, type_size_t); - case T___builtin_huge_val: - return make_function_0_type(type_double); - case T___builtin_inf: - return make_function_0_type(type_double); - case T___builtin_inff: - return make_function_0_type(type_float); - case T___builtin_infl: - return make_function_0_type(type_long_double); - case T___builtin_nan: - return make_function_1_type(type_double, type_char_ptr); - case T___builtin_nanf: - return make_function_1_type(type_float, type_char_ptr); - case T___builtin_nanl: - return make_function_1_type(type_long_double, type_char_ptr); - case T___builtin_va_end: - return make_function_1_type(type_void, type_valist); - case T___builtin_expect: - return make_function_2_type(type_long, type_long, type_long); - case T___builtin_return_address: - case T___builtin_frame_address: - return make_function_1_type(type_void_ptr, type_unsigned_int); - default: - internal_errorf(HERE, "not implemented builtin identifier found"); - } + * @param return_type the return type + */ +static type_t *make_function_0_type_noreturn(type_t *return_type) +{ + type_t *type = allocate_type_zero(TYPE_FUNCTION); + type->function.return_type = return_type; + type->function.parameters = NULL; + type->function.modifiers |= DM_NORETURN; + return identify_new_type(type); } /** - * Performs automatic type cast as described in § 6.3.2.1. + * Performs automatic type cast as described in §6.3.2.1. * * @param orig_type the original type */ @@ -6975,7 +6511,7 @@ static type_t *automatic_type_conversion(type_t *orig_type) /** * reverts the automatic casts of array to pointer types and function - * to function-pointer types as defined § 6.3.2.1 + * to function-pointer types as defined §6.3.2.1 */ type_t *revert_automatic_type_conversion(const expression_t *expression) { @@ -7007,9 +6543,6 @@ type_t *revert_automatic_type_conversion(const expression_t *expression) return type->pointer.points_to; } - case EXPR_BUILTIN_SYMBOL: - return get_builtin_symbol_type(expression->builtin_symbol.symbol); - case EXPR_ARRAY_ACCESS: { const expression_t *array_ref = expression->array_access.array_ref; type_t *type_left = skip_typeref(array_ref->base.type); @@ -7064,11 +6597,6 @@ static expression_t *parse_reference(void) orig_type = entity->declaration.type; } else if (entity->kind == ENTITY_ENUM_VALUE) { orig_type = entity->enum_value.enum_type; - } else if (entity->kind == ENTITY_TYPEDEF) { - errorf(HERE, "encountered typedef name '%Y' while parsing expression", - symbol); - next_token(); - return create_invalid_expression(); } else { panic("expected declaration or enum value in reference"); } @@ -7091,7 +6619,7 @@ static expression_t *parse_reference(void) } if (entity->base.parent_scope != file_scope - && entity->base.parent_scope->depth < current_function->parameters.depth + && (current_function != NULL && entity->base.parent_scope->depth < current_function->parameters.depth) && is_type_valid(orig_type) && !is_type_function(orig_type)) { if (entity->kind == ENTITY_VARIABLE) { /* access of a variable from an outer function */ @@ -7102,24 +6630,7 @@ static expression_t *parse_reference(void) current_function->need_closure = true; } - /* check for deprecated functions */ - if (warning.deprecated_declarations - && is_declaration(entity) - && entity->declaration.modifiers & DM_DEPRECATED) { - declaration_t *declaration = &entity->declaration; - - char const *const prefix = entity->kind == ENTITY_FUNCTION ? - "function" : "variable"; - - if (declaration->deprecated_string != NULL) { - warningf(HERE, "%s '%Y' is deprecated (declared %P): \"%s\"", - prefix, entity->base.symbol, &entity->base.source_position, - declaration->deprecated_string); - } else { - warningf(HERE, "%s '%Y' is deprecated (declared %P)", prefix, - entity->base.symbol, &entity->base.source_position); - } - } + check_deprecated(HERE, entity); if (warning.init_self && entity == current_init_decl && !in_type_prop && entity->kind == ENTITY_VARIABLE) { @@ -7490,7 +7001,7 @@ end_error: } /** - * Parses a _builtin_va_arg() expression. + * Parses a __builtin_va_arg() expression. */ static expression_t *parse_va_arg(void) { @@ -7499,7 +7010,11 @@ static expression_t *parse_va_arg(void) eat(T___builtin_va_arg); expect('(', end_error); - expression->va_arge.ap = parse_assignment_expression(); + call_argument_t ap; + ap.expression = parse_assignment_expression(); + expression->va_arge.ap = ap.expression; + check_call_argument(type_valist, &ap, 1); + expect(',', end_error); expression->base.type = parse_typename(); expect(')', end_error); @@ -7509,37 +7024,29 @@ end_error: return create_invalid_expression(); } -static expression_t *parse_builtin_symbol(void) -{ - expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_SYMBOL); - - symbol_t *symbol = token.v.symbol; - - expression->builtin_symbol.symbol = symbol; - next_token(); - - type_t *type = get_builtin_symbol_type(symbol); - type = automatic_type_conversion(type); - - expression->base.type = type; - return expression; -} - /** - * Parses a __builtin_constant() expression. + * Parses a __builtin_va_copy() expression. */ -static expression_t *parse_builtin_constant(void) +static expression_t *parse_va_copy(void) { - expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_CONSTANT_P); + expression_t *expression = allocate_expression_zero(EXPR_VA_COPY); - eat(T___builtin_constant_p); + eat(T___builtin_va_copy); expect('(', end_error); - add_anchor_token(')'); - expression->builtin_constant.value = parse_assignment_expression(); - rem_anchor_token(')'); + expression_t *dst = parse_assignment_expression(); + assign_error_t error = semantic_assign(type_valist, dst); + report_assign_error(error, type_valist, dst, "call argument 1", + &dst->base.source_position); + expression->va_copye.dst = dst; + + expect(',', end_error); + + call_argument_t src; + src.expression = parse_assignment_expression(); + check_call_argument(type_valist, &src, 2); + expression->va_copye.src = src.expression; expect(')', end_error); - expression->base.type = type_int; return expression; end_error: @@ -7547,28 +7054,20 @@ end_error: } /** - * Parses a __builtin_prefetch() expression. + * Parses a __builtin_constant_p() expression. */ -static expression_t *parse_builtin_prefetch(void) +static expression_t *parse_builtin_constant(void) { - expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_PREFETCH); + expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_CONSTANT_P); - eat(T___builtin_prefetch); + eat(T___builtin_constant_p); expect('(', end_error); add_anchor_token(')'); - expression->builtin_prefetch.adr = parse_assignment_expression(); - if (token.type == ',') { - next_token(); - expression->builtin_prefetch.rw = parse_assignment_expression(); - } - if (token.type == ',') { - next_token(); - expression->builtin_prefetch.locality = parse_assignment_expression(); - } + expression->builtin_constant.value = parse_assignment_expression(); rem_anchor_token(')'); expect(')', end_error); - expression->base.type = type_void; + expression->base.type = type_int; return expression; end_error: @@ -7576,25 +7075,24 @@ end_error: } /** - * Parses a __buildin_return_address of a __builtin_frame_address() expression. - * - * @param tok_type either T___buildin_return_address or T___builtin_frame_address + * Parses a __builtin_types_compatible_p() expression. */ -static expression_t *parse_builtin_address(int tok_type) +static expression_t *parse_builtin_types_compatible(void) { - expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_ADDRESS); + expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_TYPES_COMPATIBLE_P); - expression->builtin_address.kind = tok_type == T___builtin_return_address ? - builtin_return_address : builtin_frame_address; - - eat(tok_type); + eat(T___builtin_types_compatible_p); expect('(', end_error); add_anchor_token(')'); - expression->builtin_address.value = parse_constant_expression(); + add_anchor_token(','); + expression->builtin_types_compatible.left = parse_typename(); + rem_anchor_token(','); + expect(',', end_error); + expression->builtin_types_compatible.right = parse_typename(); rem_anchor_token(')'); expect(')', end_error); - expression->base.type = type_void_ptr; + expression->base.type = type_int; return expression; end_error: @@ -7813,51 +7311,52 @@ end_error: static expression_t *parse_primary_expression(void) { switch (token.type) { - case T_false: return parse_bool_const(false); - case T_true: return parse_bool_const(true); - case T_INTEGER: return parse_int_const(); - case T_CHARACTER_CONSTANT: return parse_character_constant(); - case T_WIDE_CHARACTER_CONSTANT: return parse_wide_character_constant(); - case T_FLOATINGPOINT: return parse_float_const(); + case T_false: return parse_bool_const(false); + case T_true: return parse_bool_const(true); + case T_INTEGER: return parse_int_const(); + case T_CHARACTER_CONSTANT: return parse_character_constant(); + case T_WIDE_CHARACTER_CONSTANT: return parse_wide_character_constant(); + case T_FLOATINGPOINT: return parse_float_const(); case T_STRING_LITERAL: - case T_WIDE_STRING_LITERAL: return parse_string_const(); - case T_IDENTIFIER: return parse_reference(); + case T_WIDE_STRING_LITERAL: return parse_string_const(); case T___FUNCTION__: - case T___func__: return parse_function_keyword(); - case T___PRETTY_FUNCTION__: return parse_pretty_function_keyword(); - case T___FUNCSIG__: return parse_funcsig_keyword(); - case T___FUNCDNAME__: return parse_funcdname_keyword(); - case T___builtin_offsetof: return parse_offsetof(); - case T___builtin_va_start: return parse_va_start(); - case T___builtin_va_arg: return parse_va_arg(); - case T___builtin_expect: - case T___builtin_alloca: - case T___builtin_inf: - case T___builtin_inff: - case T___builtin_infl: - case T___builtin_nan: - case T___builtin_nanf: - case T___builtin_nanl: - case T___builtin_huge_val: - case T___builtin_va_end: return parse_builtin_symbol(); + case T___func__: return parse_function_keyword(); + case T___PRETTY_FUNCTION__: return parse_pretty_function_keyword(); + case T___FUNCSIG__: return parse_funcsig_keyword(); + case T___FUNCDNAME__: return parse_funcdname_keyword(); + case T___builtin_offsetof: return parse_offsetof(); + case T___builtin_va_start: return parse_va_start(); + case T___builtin_va_arg: return parse_va_arg(); + case T___builtin_va_copy: return parse_va_copy(); case T___builtin_isgreater: case T___builtin_isgreaterequal: case T___builtin_isless: case T___builtin_islessequal: case T___builtin_islessgreater: - case T___builtin_isunordered: return parse_compare_builtin(); - case T___builtin_constant_p: return parse_builtin_constant(); - case T___builtin_prefetch: return parse_builtin_prefetch(); - case T___builtin_return_address: return parse_builtin_address(T___builtin_return_address); - case T___builtin_frame_address: return parse_builtin_address(T___builtin_frame_address); - case T__assume: return parse_assume(); + case T___builtin_isunordered: return parse_compare_builtin(); + case T___builtin_constant_p: return parse_builtin_constant(); + case T___builtin_types_compatible_p: return parse_builtin_types_compatible(); + case T__assume: return parse_assume(); case T_ANDAND: if (GNU_MODE) return parse_label_address(); break; - case '(': return parse_parenthesized_expression(); - case T___noop: return parse_noop_expression(); + case '(': return parse_parenthesized_expression(); + case T___noop: return parse_noop_expression(); + + /* Gracefully handle type names while parsing expressions. */ + case T_IDENTIFIER: + if (!is_typedef_symbol(token.v.symbol)) { + return parse_reference(); + } + /* FALLTHROUGH */ + TYPENAME_START { + source_position_t const pos = *HERE; + type_t const *const type = parse_typename(); + errorf(&pos, "encountered type '%T' while parsing expression", type); + return create_invalid_expression(); + } } errorf(HERE, "unexpected token %K, expected an expression", &token); @@ -7992,29 +7491,26 @@ static expression_t *parse_alignof(void) return parse_typeprop(EXPR_ALIGNOF); } -static expression_t *parse_select_expression(expression_t *compound) +static expression_t *parse_select_expression(expression_t *addr) { - expression_t *select = allocate_expression_zero(EXPR_SELECT); - select->select.compound = compound; - assert(token.type == '.' || token.type == T_MINUSGREATER); - bool is_pointer = (token.type == T_MINUSGREATER); + bool select_left_arrow = (token.type == T_MINUSGREATER); next_token(); if (token.type != T_IDENTIFIER) { parse_error_expected("while parsing select", T_IDENTIFIER, NULL); - return select; + return create_invalid_expression(); } symbol_t *symbol = token.v.symbol; next_token(); - type_t *const orig_type = compound->base.type; + type_t *const orig_type = addr->base.type; type_t *const type = skip_typeref(orig_type); type_t *type_left; bool saw_error = false; if (is_type_pointer(type)) { - if (!is_pointer) { + if (!select_left_arrow) { errorf(HERE, "request for member '%Y' in something not a struct or union, but '%T'", symbol, orig_type); @@ -8022,62 +7518,46 @@ static expression_t *parse_select_expression(expression_t *compound) } type_left = skip_typeref(type->pointer.points_to); } else { - if (is_pointer && is_type_valid(type)) { + if (select_left_arrow && is_type_valid(type)) { errorf(HERE, "left hand side of '->' is not a pointer, but '%T'", orig_type); saw_error = true; } type_left = type; } - entity_t *entry; - if (type_left->kind == TYPE_COMPOUND_STRUCT || - type_left->kind == TYPE_COMPOUND_UNION) { - compound_t *compound = type_left->compound.compound; - - if (!compound->complete) { - errorf(HERE, "request for member '%Y' of incomplete type '%T'", - symbol, type_left); - goto create_error_entry; - } + if (type_left->kind != TYPE_COMPOUND_STRUCT && + type_left->kind != TYPE_COMPOUND_UNION) { - entry = find_compound_entry(compound, symbol); - if (entry == NULL) { - errorf(HERE, "'%T' has no member named '%Y'", orig_type, symbol); - goto create_error_entry; - } - } else { if (is_type_valid(type_left) && !saw_error) { errorf(HERE, "request for member '%Y' in something not a struct or union, but '%T'", symbol, type_left); } -create_error_entry: - entry = create_error_entity(symbol, ENTITY_COMPOUND_MEMBER); + return create_invalid_expression(); } - assert(is_declaration(entry)); - select->select.compound_entry = entry; - - type_t *entry_type = entry->declaration.type; - type_t *res_type - = get_qualified_type(entry_type, type_left->base.qualifiers); + compound_t *compound = type_left->compound.compound; + if (!compound->complete) { + errorf(HERE, "request for member '%Y' in incomplete type '%T'", + symbol, type_left); + return create_invalid_expression(); + } - /* we always do the auto-type conversions; the & and sizeof parser contains - * code to revert this! */ - select->base.type = automatic_type_conversion(res_type); + type_qualifiers_t qualifiers = type_left->base.qualifiers; + expression_t *result + = find_create_select(HERE, addr, qualifiers, compound, symbol); - type_t *skipped = skip_typeref(res_type); - if (skipped->kind == TYPE_BITFIELD) { - select->base.type = skipped->bitfield.base_type; + if (result == NULL) { + errorf(HERE, "'%T' has no member named '%Y'", orig_type, symbol); + return create_invalid_expression(); } - return select; + return result; } -static void check_call_argument(const function_parameter_t *parameter, +static void check_call_argument(type_t *expected_type, call_argument_t *argument, unsigned pos) { - type_t *expected_type = parameter->type; type_t *expected_type_skip = skip_typeref(expected_type); assign_error_t error = ASSIGN_ERROR_INCOMPATIBLE; expression_t *arg_expr = argument->expression; @@ -8085,8 +7565,7 @@ static void check_call_argument(const function_parameter_t *parameter, /* handle transparent union gnu extension */ if (is_type_union(expected_type_skip) - && (expected_type_skip->base.modifiers - & TYPE_MODIFIER_TRANSPARENT_UNION)) { + && (get_type_modifiers(expected_type) & DM_TRANSPARENT_UNION)) { compound_t *union_decl = expected_type_skip->compound.compound; type_t *best_type = NULL; entity_t *entry = union_decl->members.entities; @@ -8111,8 +7590,7 @@ static void check_call_argument(const function_parameter_t *parameter, } error = semantic_assign(expected_type, arg_expr); - argument->expression = create_implicit_cast(argument->expression, - expected_type); + argument->expression = create_implicit_cast(arg_expr, expected_type); if (error != ASSIGN_SUCCESS) { /* report exact scope in error messages (like "in argument 3") */ @@ -8133,6 +7611,51 @@ static void check_call_argument(const function_parameter_t *parameter, } } +/** + * Handle the semantic restrictions of builtin calls + */ +static void handle_builtin_argument_restrictions(call_expression_t *call) { + switch (call->function->reference.entity->function.btk) { + case bk_gnu_builtin_return_address: + case bk_gnu_builtin_frame_address: { + /* argument must be constant */ + call_argument_t *argument = call->arguments; + + if (! is_constant_expression(argument->expression)) { + errorf(&call->base.source_position, + "argument of '%Y' must be a constant expression", + call->function->reference.entity->base.symbol); + } + break; + } + case bk_gnu_builtin_prefetch: { + /* second and third argument must be constant if existent */ + call_argument_t *rw = call->arguments->next; + call_argument_t *locality = NULL; + + if (rw != NULL) { + if (! is_constant_expression(rw->expression)) { + errorf(&call->base.source_position, + "second argument of '%Y' must be a constant expression", + call->function->reference.entity->base.symbol); + } + locality = rw->next; + } + if (locality != NULL) { + if (! is_constant_expression(locality->expression)) { + errorf(&call->base.source_position, + "third argument of '%Y' must be a constant expression", + call->function->reference.entity->base.symbol); + } + locality = rw->next; + } + break; + } + default: + break; + } +} + /** * Parse a call expression, ie. expression '( ... )'. * @@ -8158,7 +7681,9 @@ static expression_t *parse_call_expression(expression_t *expression) } if (function_type == NULL && is_type_valid(type)) { - errorf(HERE, "called object '%E' (type '%T') is not a pointer to a function", expression, orig_type); + errorf(HERE, + "called object '%E' (type '%T') is not a pointer to a function", + expression, orig_type); } /* parse arguments */ @@ -8167,18 +7692,13 @@ static expression_t *parse_call_expression(expression_t *expression) add_anchor_token(','); if (token.type != ')') { - call_argument_t *last_argument = NULL; - - while (true) { - call_argument_t *argument = allocate_ast_zero(sizeof(argument[0])); - + call_argument_t **anchor = &call->arguments; + for (;;) { + call_argument_t *argument = allocate_ast_zero(sizeof(*argument)); argument->expression = parse_assignment_expression(); - if (last_argument == NULL) { - call->arguments = argument; - } else { - last_argument->next = argument; - } - last_argument = argument; + + *anchor = argument; + anchor = &argument->next; if (token.type != ',') break; @@ -8192,12 +7712,13 @@ static expression_t *parse_call_expression(expression_t *expression) if (function_type == NULL) return result; + /* check type and count of call arguments */ function_parameter_t *parameter = function_type->parameters; call_argument_t *argument = call->arguments; if (!function_type->unspecified_parameters) { for (unsigned pos = 0; parameter != NULL && argument != NULL; parameter = parameter->next, argument = argument->next) { - check_call_argument(parameter, argument, ++pos); + check_call_argument(parameter->type, argument, ++pos); } if (parameter != NULL) { @@ -8207,7 +7728,7 @@ static expression_t *parse_call_expression(expression_t *expression) } } - /* do default promotion */ + /* do default promotion for other arguments */ for (; argument != NULL; argument = argument->next) { type_t *type = argument->expression->base.type; @@ -8225,6 +7746,13 @@ static expression_t *parse_call_expression(expression_t *expression) "function call has aggregate value"); } + if (call->function->kind == EXPR_REFERENCE) { + reference_expression_t *reference = &call->function->reference; + if (reference->entity->kind == ENTITY_FUNCTION && + reference->entity->function.btk != bk_none) + handle_builtin_argument_restrictions(call); + } + end_error: return result; } @@ -8814,7 +8342,7 @@ static type_t *semantic_arithmetic(type_t *type_left, type_t *type_right) type_left = get_unqualified_type(type_left); type_right = get_unqualified_type(type_right); - /* § 6.3.1.8 Usual arithmetic conversions */ + /* §6.3.1.8 Usual arithmetic conversions */ if (type_left == type_long_double || type_right == type_long_double) { return type_long_double; } else if (type_left == type_double || type_right == type_double) { @@ -8908,7 +8436,7 @@ static void warn_div_by_zero(binary_expression_t const *const expression) /* The type of the right operand can be different for /= */ if (is_type_integer(right->base.type) && is_constant_expression(right) && - fold_constant(right) == 0) { + !fold_constant_to_bool(right)) { warningf(&expression->base.source_position, "division by zero"); } } @@ -8938,7 +8466,7 @@ static void warn_addsub_in_shift(const expression_t *const expr) "suggest parentheses around '%c' inside shift", op); } -static void semantic_shift_op(binary_expression_t *expression) +static bool semantic_shift(binary_expression_t *expression) { expression_t *const left = expression->left; expression_t *const right = expression->right; @@ -8953,19 +8481,47 @@ static void semantic_shift_op(binary_expression_t *expression) errorf(&expression->base.source_position, "operands of shift operation must have integer types"); } - return; + return false; + } + + type_left = promote_integer(type_left); + + if (is_constant_expression(right)) { + long count = fold_constant_to_int(right); + if (count < 0) { + warningf(&right->base.source_position, + "shift count must be non-negative"); + } else if ((unsigned long)count >= + get_atomic_type_size(type_left->atomic.akind) * 8) { + warningf(&right->base.source_position, + "shift count must be less than type width"); + } } + type_right = promote_integer(type_right); + expression->right = create_implicit_cast(right, type_right); + + return true; +} + +static void semantic_shift_op(binary_expression_t *expression) +{ + expression_t *const left = expression->left; + expression_t *const right = expression->right; + + if (!semantic_shift(expression)) + return; + if (warning.parentheses) { warn_addsub_in_shift(left); warn_addsub_in_shift(right); } - type_left = promote_integer(type_left); - type_right = promote_integer(type_right); + type_t *const orig_type_left = left->base.type; + type_t * type_left = skip_typeref(orig_type_left); + type_left = promote_integer(type_left); expression->left = create_implicit_cast(left, type_left); - expression->right = create_implicit_cast(right, type_right); expression->base.type = type_left; } @@ -8978,7 +8534,7 @@ static void semantic_add(binary_expression_t *expression) type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_type_right); - /* § 6.5.6 */ + /* §6.5.6 */ if (is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) { type_t *arithmetic_type = semantic_arithmetic(type_left, type_right); expression->left = create_implicit_cast(left, arithmetic_type); @@ -9009,7 +8565,7 @@ static void semantic_sub(binary_expression_t *expression) type_t *const type_right = skip_typeref(orig_type_right); source_position_t const *const pos = &expression->base.source_position; - /* § 5.6.5 */ + /* §5.6.5 */ if (is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) { type_t *arithmetic_type = semantic_arithmetic(type_left, type_right); expression->left = create_implicit_cast(left, arithmetic_type); @@ -9080,7 +8636,7 @@ static bool maybe_negative(expression_t const *const expr) { return !is_constant_expression(expr) || - fold_constant(expr) < 0; + fold_constant_to_int(expr) < 0; } /** @@ -9293,6 +8849,50 @@ static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression) } } +static void semantic_integer_assign(binary_expression_t *expression) +{ + expression_t *left = expression->left; + expression_t *right = expression->right; + type_t *orig_type_left = left->base.type; + type_t *orig_type_right = right->base.type; + + if (!is_valid_assignment_lhs(left)) + return; + + type_t *type_left = skip_typeref(orig_type_left); + type_t *type_right = skip_typeref(orig_type_right); + + if (!is_type_integer(type_left) || !is_type_integer(type_right)) { + /* TODO: improve error message */ + if (is_type_valid(type_left) && is_type_valid(type_right)) { + errorf(&expression->base.source_position, + "operation needs integer types"); + } + return; + } + + /* combined instructions are tricky. We can't create an implicit cast on + * the left side, because we need the uncasted form for the store. + * The ast2firm pass has to know that left_type must be right_type + * for the arithmetic operation and create a cast by itself */ + type_t *arithmetic_type = semantic_arithmetic(type_left, type_right); + expression->right = create_implicit_cast(right, arithmetic_type); + expression->base.type = type_left; +} + +static void semantic_shift_assign(binary_expression_t *expression) +{ + expression_t *left = expression->left; + + if (!is_valid_assignment_lhs(left)) + return; + + if (!semantic_shift(expression)) + return; + + expression->base.type = skip_typeref(left->base.type); +} + static void warn_logical_and_within_or(const expression_t *const expr) { if (expr->base.kind != EXPR_BINARY_LOGICAL_AND) @@ -9353,64 +8953,65 @@ static void semantic_binexpr_assign(binary_expression_t *expression) static bool expression_has_effect(const expression_t *const expr) { switch (expr->kind) { - case EXPR_UNKNOWN: break; - case EXPR_INVALID: return true; /* do NOT warn */ - case EXPR_REFERENCE: return false; - case EXPR_REFERENCE_ENUM_VALUE: return false; + case EXPR_UNKNOWN: break; + case EXPR_INVALID: return true; /* do NOT warn */ + case EXPR_REFERENCE: return false; + case EXPR_REFERENCE_ENUM_VALUE: return false; /* suppress the warning for microsoft __noop operations */ - case EXPR_CONST: return expr->conste.is_ms_noop; - case EXPR_CHARACTER_CONSTANT: return false; - case EXPR_WIDE_CHARACTER_CONSTANT: return false; - case EXPR_STRING_LITERAL: return false; - case EXPR_WIDE_STRING_LITERAL: return false; - case EXPR_LABEL_ADDRESS: return false; + case EXPR_CONST: return expr->conste.is_ms_noop; + case EXPR_CHARACTER_CONSTANT: return false; + case EXPR_WIDE_CHARACTER_CONSTANT: return false; + case EXPR_STRING_LITERAL: return false; + case EXPR_WIDE_STRING_LITERAL: return false; + case EXPR_LABEL_ADDRESS: return false; case EXPR_CALL: { const call_expression_t *const call = &expr->call; - if (call->function->kind != EXPR_BUILTIN_SYMBOL) + if (call->function->kind != EXPR_REFERENCE) return true; - switch (call->function->builtin_symbol.symbol->ID) { - case T___builtin_va_end: return true; - default: return false; + switch (call->function->reference.entity->function.btk) { + /* FIXME: which builtins have no effect? */ + default: return true; } } /* Generate the warning if either the left or right hand side of a * conditional expression has no effect */ case EXPR_CONDITIONAL: { - const conditional_expression_t *const cond = &expr->conditional; + conditional_expression_t const *const cond = &expr->conditional; + expression_t const *const t = cond->true_expression; return - expression_has_effect(cond->true_expression) && + (t == NULL || expression_has_effect(t)) && expression_has_effect(cond->false_expression); } - case EXPR_SELECT: return false; - case EXPR_ARRAY_ACCESS: return false; - case EXPR_SIZEOF: return false; - case EXPR_CLASSIFY_TYPE: return false; - case EXPR_ALIGNOF: return false; - - case EXPR_FUNCNAME: return false; - case EXPR_BUILTIN_SYMBOL: break; /* handled in EXPR_CALL */ - case EXPR_BUILTIN_CONSTANT_P: return false; - case EXPR_BUILTIN_PREFETCH: return true; - case EXPR_OFFSETOF: return false; - case EXPR_VA_START: return true; - case EXPR_VA_ARG: return true; - case EXPR_STATEMENT: return true; // TODO - case EXPR_COMPOUND_LITERAL: return false; - - case EXPR_UNARY_NEGATE: return false; - case EXPR_UNARY_PLUS: return false; - case EXPR_UNARY_BITWISE_NEGATE: return false; - case EXPR_UNARY_NOT: return false; - case EXPR_UNARY_DEREFERENCE: return false; - case EXPR_UNARY_TAKE_ADDRESS: return false; - case EXPR_UNARY_POSTFIX_INCREMENT: return true; - case EXPR_UNARY_POSTFIX_DECREMENT: return true; - case EXPR_UNARY_PREFIX_INCREMENT: return true; - case EXPR_UNARY_PREFIX_DECREMENT: return true; + case EXPR_SELECT: return false; + case EXPR_ARRAY_ACCESS: return false; + case EXPR_SIZEOF: return false; + case EXPR_CLASSIFY_TYPE: return false; + case EXPR_ALIGNOF: return false; + + case EXPR_FUNCNAME: return false; + case EXPR_BUILTIN_CONSTANT_P: return false; + case EXPR_BUILTIN_TYPES_COMPATIBLE_P: return false; + case EXPR_OFFSETOF: return false; + case EXPR_VA_START: return true; + case EXPR_VA_ARG: return true; + case EXPR_VA_COPY: return true; + case EXPR_STATEMENT: return true; // TODO + case EXPR_COMPOUND_LITERAL: return false; + + case EXPR_UNARY_NEGATE: return false; + case EXPR_UNARY_PLUS: return false; + case EXPR_UNARY_BITWISE_NEGATE: return false; + case EXPR_UNARY_NOT: return false; + case EXPR_UNARY_DEREFERENCE: return false; + case EXPR_UNARY_TAKE_ADDRESS: return false; + case EXPR_UNARY_POSTFIX_INCREMENT: return true; + case EXPR_UNARY_POSTFIX_DECREMENT: return true; + case EXPR_UNARY_PREFIX_INCREMENT: return true; + case EXPR_UNARY_PREFIX_DECREMENT: return true; /* Treat void casts as if they have an effect in order to being able to * suppress the warning */ @@ -9419,39 +9020,39 @@ static bool expression_has_effect(const expression_t *const expr) return is_type_atomic(type, ATOMIC_TYPE_VOID); } - case EXPR_UNARY_CAST_IMPLICIT: return true; - case EXPR_UNARY_ASSUME: return true; - case EXPR_UNARY_DELETE: return true; - case EXPR_UNARY_DELETE_ARRAY: return true; - case EXPR_UNARY_THROW: return true; - - case EXPR_BINARY_ADD: return false; - case EXPR_BINARY_SUB: return false; - case EXPR_BINARY_MUL: return false; - case EXPR_BINARY_DIV: return false; - case EXPR_BINARY_MOD: return false; - case EXPR_BINARY_EQUAL: return false; - case EXPR_BINARY_NOTEQUAL: return false; - case EXPR_BINARY_LESS: return false; - case EXPR_BINARY_LESSEQUAL: return false; - case EXPR_BINARY_GREATER: return false; - case EXPR_BINARY_GREATEREQUAL: return false; - case EXPR_BINARY_BITWISE_AND: return false; - case EXPR_BINARY_BITWISE_OR: return false; - case EXPR_BINARY_BITWISE_XOR: return false; - case EXPR_BINARY_SHIFTLEFT: return false; - case EXPR_BINARY_SHIFTRIGHT: return false; - case EXPR_BINARY_ASSIGN: return true; - case EXPR_BINARY_MUL_ASSIGN: return true; - case EXPR_BINARY_DIV_ASSIGN: return true; - case EXPR_BINARY_MOD_ASSIGN: return true; - case EXPR_BINARY_ADD_ASSIGN: return true; - case EXPR_BINARY_SUB_ASSIGN: return true; - case EXPR_BINARY_SHIFTLEFT_ASSIGN: return true; - case EXPR_BINARY_SHIFTRIGHT_ASSIGN: return true; - case EXPR_BINARY_BITWISE_AND_ASSIGN: return true; - case EXPR_BINARY_BITWISE_XOR_ASSIGN: return true; - case EXPR_BINARY_BITWISE_OR_ASSIGN: return true; + case EXPR_UNARY_CAST_IMPLICIT: return true; + case EXPR_UNARY_ASSUME: return true; + case EXPR_UNARY_DELETE: return true; + case EXPR_UNARY_DELETE_ARRAY: return true; + case EXPR_UNARY_THROW: return true; + + case EXPR_BINARY_ADD: return false; + case EXPR_BINARY_SUB: return false; + case EXPR_BINARY_MUL: return false; + case EXPR_BINARY_DIV: return false; + case EXPR_BINARY_MOD: return false; + case EXPR_BINARY_EQUAL: return false; + case EXPR_BINARY_NOTEQUAL: return false; + case EXPR_BINARY_LESS: return false; + case EXPR_BINARY_LESSEQUAL: return false; + case EXPR_BINARY_GREATER: return false; + case EXPR_BINARY_GREATEREQUAL: return false; + case EXPR_BINARY_BITWISE_AND: return false; + case EXPR_BINARY_BITWISE_OR: return false; + case EXPR_BINARY_BITWISE_XOR: return false; + case EXPR_BINARY_SHIFTLEFT: return false; + case EXPR_BINARY_SHIFTRIGHT: return false; + case EXPR_BINARY_ASSIGN: return true; + case EXPR_BINARY_MUL_ASSIGN: return true; + case EXPR_BINARY_DIV_ASSIGN: return true; + case EXPR_BINARY_MOD_ASSIGN: return true; + case EXPR_BINARY_ADD_ASSIGN: return true; + case EXPR_BINARY_SUB_ASSIGN: return true; + case EXPR_BINARY_SHIFTLEFT_ASSIGN: return true; + case EXPR_BINARY_SHIFTRIGHT_ASSIGN: return true; + case EXPR_BINARY_BITWISE_AND_ASSIGN: return true; + case EXPR_BINARY_BITWISE_XOR_ASSIGN: return true; + case EXPR_BINARY_BITWISE_OR_ASSIGN: return true; /* Only examine the right hand side of && and ||, because the left hand * side already has the effect of controlling the execution of the right @@ -9463,12 +9064,12 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_BINARY_COMMA: return expression_has_effect(expr->binary.right); - case EXPR_BINARY_ISGREATER: return false; - case EXPR_BINARY_ISGREATEREQUAL: return false; - case EXPR_BINARY_ISLESS: return false; - case EXPR_BINARY_ISLESSEQUAL: return false; - case EXPR_BINARY_ISLESSGREATER: return false; - case EXPR_BINARY_ISUNORDERED: return false; + case EXPR_BINARY_ISGREATER: return false; + case EXPR_BINARY_ISGREATEREQUAL: return false; + case EXPR_BINARY_ISLESS: return false; + case EXPR_BINARY_ISLESSEQUAL: return false; + case EXPR_BINARY_ISLESSGREATER: return false; + case EXPR_BINARY_ISUNORDERED: return false; } internal_errorf(HERE, "unexpected expression"); @@ -9528,11 +9129,11 @@ CREATE_BINEXPR_PARSER(T_MINUSEQUAL, EXPR_BINARY_SUB_ASSIGN, PR CREATE_BINEXPR_PARSER(T_ASTERISKEQUAL, EXPR_BINARY_MUL_ASSIGN, PREC_ASSIGNMENT, semantic_arithmetic_assign) CREATE_BINEXPR_PARSER(T_SLASHEQUAL, EXPR_BINARY_DIV_ASSIGN, PREC_ASSIGNMENT, semantic_divmod_assign) CREATE_BINEXPR_PARSER(T_PERCENTEQUAL, EXPR_BINARY_MOD_ASSIGN, PREC_ASSIGNMENT, semantic_divmod_assign) -CREATE_BINEXPR_PARSER(T_LESSLESSEQUAL, EXPR_BINARY_SHIFTLEFT_ASSIGN, PREC_ASSIGNMENT, semantic_arithmetic_assign) -CREATE_BINEXPR_PARSER(T_GREATERGREATEREQUAL, EXPR_BINARY_SHIFTRIGHT_ASSIGN, PREC_ASSIGNMENT, semantic_arithmetic_assign) -CREATE_BINEXPR_PARSER(T_ANDEQUAL, EXPR_BINARY_BITWISE_AND_ASSIGN, PREC_ASSIGNMENT, semantic_arithmetic_assign) -CREATE_BINEXPR_PARSER(T_PIPEEQUAL, EXPR_BINARY_BITWISE_OR_ASSIGN, PREC_ASSIGNMENT, semantic_arithmetic_assign) -CREATE_BINEXPR_PARSER(T_CARETEQUAL, EXPR_BINARY_BITWISE_XOR_ASSIGN, PREC_ASSIGNMENT, semantic_arithmetic_assign) +CREATE_BINEXPR_PARSER(T_LESSLESSEQUAL, EXPR_BINARY_SHIFTLEFT_ASSIGN, PREC_ASSIGNMENT, semantic_shift_assign) +CREATE_BINEXPR_PARSER(T_GREATERGREATEREQUAL, EXPR_BINARY_SHIFTRIGHT_ASSIGN, PREC_ASSIGNMENT, semantic_shift_assign) +CREATE_BINEXPR_PARSER(T_ANDEQUAL, EXPR_BINARY_BITWISE_AND_ASSIGN, PREC_ASSIGNMENT, semantic_integer_assign) +CREATE_BINEXPR_PARSER(T_PIPEEQUAL, EXPR_BINARY_BITWISE_OR_ASSIGN, PREC_ASSIGNMENT, semantic_integer_assign) +CREATE_BINEXPR_PARSER(T_CARETEQUAL, EXPR_BINARY_BITWISE_XOR_ASSIGN, PREC_ASSIGNMENT, semantic_integer_assign) CREATE_BINEXPR_PARSER(',', EXPR_BINARY_COMMA, PREC_ASSIGNMENT, semantic_comma) @@ -9893,7 +9494,7 @@ static statement_t *parse_case_statement(void) } statement->case_label.is_bad = true; } else { - long const val = fold_constant(expression); + long const val = fold_constant_to_int(expression); statement->case_label.first_case = val; statement->case_label.last_case = val; } @@ -9912,7 +9513,7 @@ static statement_t *parse_case_statement(void) } statement->case_label.is_bad = true; } else { - long const val = fold_constant(end_range); + long const val = fold_constant_to_int(end_range); statement->case_label.last_case = val; if (warning.other && val < statement->case_label.first_case) { @@ -10140,7 +9741,7 @@ static void check_enum_cases(const switch_statement_t *statement) for (; entry != NULL && entry->kind == ENTITY_ENUM_VALUE; entry = entry->base.next) { const expression_t *expression = entry->enum_value.value; - long value = expression != NULL ? fold_constant(expression) : last_value + 1; + long value = expression != NULL ? fold_constant_to_int(expression) : last_value + 1; bool found = false; for (const case_label_statement_t *l = statement->first_case; l != NULL; l = l->next) { if (l->expression == NULL) @@ -10306,6 +9907,12 @@ static statement_t *parse_for(void) size_t const top = environment_top(); scope_t *old_scope = scope_push(&statement->fors.scope); + bool old_gcc_extension = in_gcc_extension; + while (token.type == T___extension__) { + next_token(); + in_gcc_extension = true; + } + if (token.type == ';') { next_token(); } else if (is_declaration_specifier(&token, false)) { @@ -10322,6 +9929,7 @@ static statement_t *parse_for(void) rem_anchor_token(';'); expect(';', end_error2); } + in_gcc_extension = old_gcc_extension; if (token.type != ';') { add_anchor_token(';'); @@ -10395,19 +10003,17 @@ static statement_t *parse_goto(void) } statement->gotos.expression = expression; - } else { - if (token.type != T_IDENTIFIER) { - if (GNU_MODE) - parse_error_expected("while parsing goto", T_IDENTIFIER, '*', NULL); - else - parse_error_expected("while parsing goto", T_IDENTIFIER, NULL); - eat_until_anchor(); - goto end_error; - } + } else if (token.type == T_IDENTIFIER) { symbol_t *symbol = token.v.symbol; next_token(); - statement->gotos.label = get_label(symbol); + } else { + if (GNU_MODE) + parse_error_expected("while parsing goto", T_IDENTIFIER, '*', NULL); + else + parse_error_expected("while parsing goto", T_IDENTIFIER, NULL); + eat_until_anchor(); + goto end_error; } /* remember the goto's in a list for later checking */ @@ -10564,10 +10170,10 @@ static statement_t *parse_return(void) /* Only warn in C mode, because GCC does the same */ if (strict_mode) { errorf(pos, - "'return' with expression in function return 'void'"); + "'return' with expression in function returning 'void'"); } else if (warning.other) { warningf(pos, - "'return' with expression in function return 'void'"); + "'return' with expression in function returning 'void'"); } } } else { @@ -11387,6 +10993,10 @@ void start_parsing(void) assert(current_scope == NULL); scope_push(&unit->scope); + + create_gnu_builtins(); + if (c_mode & _MS) + create_microsoft_intrinsics(); } translation_unit_t *finish_parsing(void) @@ -11450,6 +11060,104 @@ void parse(void) incomplete_arrays = NULL; } +/** + * create a builtin function. + */ +static entity_t *create_builtin_function(builtin_kind_t kind, const char *name, type_t *function_type) +{ + symbol_t *symbol = symbol_table_insert(name); + entity_t *entity = allocate_entity_zero(ENTITY_FUNCTION); + entity->declaration.storage_class = STORAGE_CLASS_EXTERN; + entity->declaration.declared_storage_class = STORAGE_CLASS_EXTERN; + entity->declaration.type = function_type; + entity->declaration.implicit = true; + entity->base.symbol = symbol; + entity->base.source_position = builtin_source_position; + + entity->function.btk = kind; + + record_entity(entity, /*is_definition=*/false); + return entity; +} + + +/** + * Create predefined gnu builtins. + */ +static void create_gnu_builtins(void) +{ +#define GNU_BUILTIN(a, b) create_builtin_function(bk_gnu_builtin_##a, "__builtin_" #a, b) + + GNU_BUILTIN(alloca, make_function_1_type(type_void_ptr, type_size_t)); + GNU_BUILTIN(huge_val, make_function_0_type(type_double)); + GNU_BUILTIN(inf, make_function_0_type(type_double)); + GNU_BUILTIN(inff, make_function_0_type(type_float)); + GNU_BUILTIN(infl, make_function_0_type(type_long_double)); + GNU_BUILTIN(nan, make_function_1_type(type_double, type_char_ptr)); + GNU_BUILTIN(nanf, make_function_1_type(type_float, type_char_ptr)); + GNU_BUILTIN(nanl, make_function_1_type(type_long_double, type_char_ptr)); + GNU_BUILTIN(va_end, make_function_1_type(type_void, type_valist)); + GNU_BUILTIN(expect, make_function_2_type(type_long, type_long, type_long)); + GNU_BUILTIN(return_address, make_function_1_type(type_void_ptr, type_unsigned_int)); + GNU_BUILTIN(frame_address, make_function_1_type(type_void_ptr, type_unsigned_int)); + GNU_BUILTIN(ffs, make_function_1_type(type_int, type_unsigned_int)); + GNU_BUILTIN(clz, make_function_1_type(type_int, type_unsigned_int)); + GNU_BUILTIN(ctz, make_function_1_type(type_int, type_unsigned_int)); + GNU_BUILTIN(popcount, make_function_1_type(type_int, type_unsigned_int)); + GNU_BUILTIN(parity, make_function_1_type(type_int, type_unsigned_int)); + GNU_BUILTIN(prefetch, make_function_1_type_variadic(type_float, type_void_ptr)); + GNU_BUILTIN(trap, make_function_0_type_noreturn(type_void)); + +#undef GNU_BUILTIN +} + +/** + * Create predefined MS intrinsics. + */ +static void create_microsoft_intrinsics(void) +{ +#define MS_BUILTIN(a, b) create_builtin_function(bk_ms##a, #a, b) + + /* intrinsics for all architectures */ + MS_BUILTIN(_rotl, make_function_2_type(type_unsigned_int, type_unsigned_int, type_int)); + MS_BUILTIN(_rotr, make_function_2_type(type_unsigned_int, type_unsigned_int, type_int)); + MS_BUILTIN(_rotl64, make_function_2_type(type_unsigned_int64, type_unsigned_int64, type_int)); + MS_BUILTIN(_rotr64, make_function_2_type(type_unsigned_int64, type_unsigned_int64, type_int)); + MS_BUILTIN(_byteswap_ushort, make_function_1_type(type_unsigned_short, type_unsigned_short)); + MS_BUILTIN(_byteswap_ulong, make_function_1_type(type_unsigned_long, type_unsigned_long)); + MS_BUILTIN(_byteswap_uint64, make_function_1_type(type_unsigned_int64, type_unsigned_int64)); + + MS_BUILTIN(__debugbreak, make_function_0_type(type_void)); + MS_BUILTIN(_ReturnAddress, make_function_0_type(type_void_ptr)); + MS_BUILTIN(_AddressOfReturnAddress, make_function_0_type(type_void_ptr)); + MS_BUILTIN(__popcount, make_function_1_type(type_unsigned_int, type_unsigned_int)); + + /* x86/x64 only */ + MS_BUILTIN(_enable, make_function_0_type(type_void)); + MS_BUILTIN(_disable, make_function_0_type(type_void)); + MS_BUILTIN(__inbyte, make_function_1_type(type_unsigned_char, type_unsigned_short)); + MS_BUILTIN(__inword, make_function_1_type(type_unsigned_short, type_unsigned_short)); + MS_BUILTIN(__indword, make_function_1_type(type_unsigned_long, type_unsigned_short)); + MS_BUILTIN(__outbyte, make_function_2_type(type_void, type_unsigned_short, type_unsigned_char)); + MS_BUILTIN(__outword, make_function_2_type(type_void, type_unsigned_short, type_unsigned_short)); + MS_BUILTIN(__outdword, make_function_2_type(type_void, type_unsigned_short, type_unsigned_long)); + MS_BUILTIN(__ud2, make_function_0_type_noreturn(type_void)); + MS_BUILTIN(_BitScanForward, make_function_2_type(type_unsigned_char, type_unsigned_long_ptr, type_unsigned_long)); + MS_BUILTIN(_BitScanReverse, make_function_2_type(type_unsigned_char, type_unsigned_long_ptr, type_unsigned_long)); + MS_BUILTIN(_InterlockedExchange, make_function_2_type(type_long, type_long_ptr, type_long)); + MS_BUILTIN(_InterlockedExchange64, make_function_2_type(type_int64, type_int64_ptr, type_int64)); + + if (machine_size <= 32) { + MS_BUILTIN(__readeflags, make_function_0_type(type_unsigned_int)); + MS_BUILTIN(__writeeflags, make_function_1_type(type_void, type_unsigned_int)); + } else { + MS_BUILTIN(__readeflags, make_function_0_type(type_unsigned_int64)); + MS_BUILTIN(__writeeflags, make_function_1_type(type_void, type_unsigned_int64)); + } + +#undef MS_BUILTIN +} + /** * Initialize the parser. */ @@ -11457,28 +11165,6 @@ void init_parser(void) { sym_anonymous = symbol_table_insert(""); - if (c_mode & _MS) { - /* add predefined symbols for extended-decl-modifier */ - sym_align = symbol_table_insert("align"); - sym_allocate = symbol_table_insert("allocate"); - sym_dllimport = symbol_table_insert("dllimport"); - sym_dllexport = symbol_table_insert("dllexport"); - sym_naked = symbol_table_insert("naked"); - sym_noinline = symbol_table_insert("noinline"); - sym_returns_twice = symbol_table_insert("returns_twice"); - sym_noreturn = symbol_table_insert("noreturn"); - sym_nothrow = symbol_table_insert("nothrow"); - sym_novtable = symbol_table_insert("novtable"); - sym_property = symbol_table_insert("property"); - sym_get = symbol_table_insert("get"); - sym_put = symbol_table_insert("put"); - sym_selectany = symbol_table_insert("selectany"); - sym_thread = symbol_table_insert("thread"); - sym_uuid = symbol_table_insert("uuid"); - sym_deprecated = symbol_table_insert("deprecated"); - sym_restrict = symbol_table_insert("restrict"); - sym_noalias = symbol_table_insert("noalias"); - } memset(token_anchor_set, 0, sizeof(token_anchor_set)); init_expression_parsers();