X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=c85a8a10241d7fd3921f97397a628488001c098b;hb=47b73b80e0b34b1e716253384d0a7c56f2a5e268;hp=0e9950aa0ea6d6f26d5ec2094875f22343caf25f;hpb=b892fe35993bac602948920d326522068b7d1bfe;p=cparser diff --git a/ast2firm.c b/ast2firm.c index 0e9950a..c85a8a1 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -63,7 +63,6 @@ fp_model_t firm_fp_model = fp_model_precise; static const backend_params *be_params; static ir_type *ir_type_char; -static ir_type *ir_type_const_char; static ir_type *ir_type_wchar_t; /* architecture specific floating point arithmetic mode (if any) */ @@ -191,12 +190,10 @@ static ir_mode *init_atomic_ir_mode(atomic_type_kind_t kind) unsigned size = get_atomic_type_size(kind); if ((flags & ATOMIC_TYPE_FLAG_FLOAT) && !(flags & ATOMIC_TYPE_FLAG_COMPLEX)) { - if (size == 4) { - return get_modeF(); - } else if (size == 8) { - return get_modeD(); - } else { - panic("unexpected kind"); + switch (size) { + case 4: return get_modeF(); + case 8: return get_modeD(); + default: panic("unexpected kind"); } } else if (flags & ATOMIC_TYPE_FLAG_INTEGER) { char name[64]; @@ -506,12 +503,11 @@ static ir_type *create_bitfield_type(const entity_t *entity) { assert(entity->kind == ENTITY_COMPOUND_MEMBER); type_t *base = skip_typeref(entity->declaration.type); - assert(base->kind == TYPE_ATOMIC || base->kind == TYPE_ENUM); + assert(is_type_integer(base)); ir_type *irbase = get_ir_type(base); unsigned bit_size = entity->compound_member.bit_size; - assert(!is_type_float(base)); if (is_type_signed(base)) { return get_signed_int_type_for_bit_size(irbase, bit_size, base); } else { @@ -577,8 +573,7 @@ static ir_type *create_compound_type(compound_type_t *const type, bool const inc /* anonymous bitfield member, skip */ if (entry->compound_member.bitfield) continue; - assert(entry_type->kind == TYPE_COMPOUND_STRUCT - || entry_type->kind == TYPE_COMPOUND_UNION); + assert(is_type_compound(entry_type)); ident = id_unique("anon.%u"); } else { ident = new_id_from_str(symbol->string); @@ -641,7 +636,6 @@ static ir_type *create_enum_type(enum_type_t *const type) static ir_type *get_ir_type_incomplete(type_t *type) { - assert(type != NULL); type = skip_typeref(type); if (type->base.firm_type != NULL) { @@ -657,8 +651,6 @@ static ir_type *get_ir_type_incomplete(type_t *type) ir_type *get_ir_type(type_t *type) { - assert(type != NULL); - type = skip_typeref(type); if (type->base.firm_type != NULL) { @@ -858,7 +850,7 @@ static bool declaration_is_definition(const entity_t *entity) { switch (entity->kind) { case ENTITY_VARIABLE: - return entity->variable.initializer != NULL; + return entity->declaration.storage_class != STORAGE_CLASS_EXTERN; case ENTITY_FUNCTION: return entity->function.statement != NULL; case ENTITY_PARAMETER: @@ -1102,47 +1094,6 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) return new_d_Conv(dbgi, value, dest_mode); } -/** - * Creates a SymConst node representing a wide string literal. - * - * @param literal the wide string literal - */ -static ir_node *wide_string_literal_to_firm( - const string_literal_expression_t *literal) -{ - ir_type *const global_type = get_glob_type(); - ir_type *const elem_type = ir_type_wchar_t; - dbg_info *const dbgi = get_dbg_info(&literal->base.source_position); - ir_type *const type = new_type_array(1, elem_type); - - ident *const id = id_unique("str.%u"); - ir_entity *const entity = new_d_entity(global_type, id, type, dbgi); - set_entity_ld_ident(entity, id); - set_entity_visibility(entity, ir_visibility_private); - add_entity_linkage(entity, IR_LINKAGE_CONSTANT); - - ir_mode *const mode = get_type_mode(elem_type); - const size_t slen = wstrlen(&literal->value); - - set_array_lower_bound_int(type, 0, 0); - set_array_upper_bound_int(type, 0, slen); - set_type_size_bytes(type, slen * get_mode_size_bytes(mode)); - set_type_state(type, layout_fixed); - - ir_initializer_t *initializer = create_initializer_compound(slen); - const char *p = literal->value.begin; - for (size_t i = 0; i < slen; ++i) { - assert(p < literal->value.begin + literal->value.size); - utf32 v = read_utf8_char(&p); - ir_tarval *tv = new_tarval_from_long(v, mode); - ir_initializer_t *val = create_initializer_tarval(tv); - set_initializer_compound_value(initializer, i, val); - } - set_entity_initializer(entity, initializer); - - return create_symconst(dbgi, entity); -} - /** * Creates a SymConst node representing a string constant. * @@ -1150,37 +1101,55 @@ static ir_node *wide_string_literal_to_firm( * @param id_prefix a prefix for the name of the generated string constant * @param value the value of the string constant */ -static ir_node *string_to_firm(const source_position_t *const src_pos, - const char *const id_prefix, - const string_t *const value) -{ - ir_type *const global_type = get_glob_type(); - dbg_info *const dbgi = get_dbg_info(src_pos); - ir_type *const type = new_type_array(1, ir_type_const_char); - - ident *const id = id_unique(id_prefix); - ir_entity *const entity = new_d_entity(global_type, id, type, dbgi); - set_entity_ld_ident(entity, id); - set_entity_visibility(entity, ir_visibility_private); - add_entity_linkage(entity, IR_LINKAGE_CONSTANT); +static ir_node *string_to_firm(source_position_t const *const src_pos, char const *const id_prefix, string_encoding_t const enc, string_t const *const value) +{ + size_t const slen = get_string_len(enc, value) + 1; + ir_initializer_t *const initializer = create_initializer_compound(slen); + ir_type * elem_type; + switch (enc) { + case STRING_ENCODING_CHAR: { + elem_type = ir_type_char; + + ir_mode *const mode = get_type_mode(elem_type); + char const *p = value->begin; + for (size_t i = 0; i < slen; ++i) { + ir_tarval *tv = new_tarval_from_long(*p++, mode); + ir_initializer_t *val = create_initializer_tarval(tv); + set_initializer_compound_value(initializer, i, val); + } + goto finish; + } - ir_type *const elem_type = ir_type_const_char; - ir_mode *const mode = get_type_mode(elem_type); + case STRING_ENCODING_WIDE: { + elem_type = ir_type_wchar_t; - const char* const string = value->begin; - const size_t slen = value->size; + ir_mode *const mode = get_type_mode(elem_type); + char const *p = value->begin; + for (size_t i = 0; i < slen; ++i) { + assert(p <= value->begin + value->size); + utf32 v = read_utf8_char(&p); + ir_tarval *tv = new_tarval_from_long(v, mode); + ir_initializer_t *val = create_initializer_tarval(tv); + set_initializer_compound_value(initializer, i, val); + } + goto finish; + } + } + panic("invalid string encoding"); - set_array_lower_bound_int(type, 0, 0); - set_array_upper_bound_int(type, 0, slen); - set_type_size_bytes(type, slen); - set_type_state(type, layout_fixed); +finish:; + ir_type *const type = new_type_array(1, elem_type); + set_array_bounds_int(type, 0, 0, slen); + set_type_size_bytes( type, slen * get_type_size_bytes(elem_type)); + set_type_state( type, layout_fixed); - ir_initializer_t *initializer = create_initializer_compound(slen); - for (size_t i = 0; i < slen; ++i) { - ir_tarval *tv = new_tarval_from_long(string[i], mode); - ir_initializer_t *val = create_initializer_tarval(tv); - set_initializer_compound_value(initializer, i, val); - } + ir_type *const global_type = get_glob_type(); + ident *const id = id_unique(id_prefix); + dbg_info *const dbgi = get_dbg_info(src_pos); + ir_entity *const entity = new_d_entity(global_type, id, type, dbgi); + set_entity_ld_ident( entity, id); + set_entity_visibility( entity, ir_visibility_private); + add_entity_linkage( entity, IR_LINKAGE_CONSTANT); set_entity_initializer(entity, initializer); return create_symconst(dbgi, entity); @@ -1274,7 +1243,48 @@ static ir_node *literal_to_firm(const literal_expression_t *literal) ir_tarval *tv; switch (literal->base.kind) { - case EXPR_LITERAL_WIDE_CHARACTER: { + case EXPR_LITERAL_INTEGER: + assert(literal->target_value != NULL); + tv = literal->target_value; + break; + + case EXPR_LITERAL_FLOATINGPOINT: + tv = new_tarval_from_str(string, size, mode); + break; + + case EXPR_LITERAL_BOOLEAN: + if (string[0] == 't') { + tv = get_mode_one(mode); + } else { + assert(string[0] == 'f'); + case EXPR_LITERAL_MS_NOOP: + tv = get_mode_null(mode); + } + break; + + default: + panic("Invalid literal kind found"); + } + + dbg_info *dbgi = get_dbg_info(&literal->base.source_position); + ir_node *res = new_d_Const(dbgi, tv); + ir_mode *mode_arith = get_ir_mode_arithmetic(type); + return create_conv(dbgi, res, mode_arith); +} + +/** + * Creates a Const node representing a character constant. + */ +static ir_node *char_literal_to_firm(string_literal_expression_t const *literal) +{ + type_t *type = skip_typeref(literal->base.type); + ir_mode *mode = get_ir_mode_storage(type); + const char *string = literal->value.begin; + size_t size = literal->value.size; + ir_tarval *tv; + + switch (literal->encoding) { + case STRING_ENCODING_WIDE: { utf32 v = read_utf8_char(&string); char buf[128]; size_t len = snprintf(buf, sizeof(buf), UTF32_PRINTF_FORMAT, v); @@ -1283,7 +1293,7 @@ static ir_node *literal_to_firm(const literal_expression_t *literal) break; } - case EXPR_LITERAL_CHARACTER: { + case STRING_ENCODING_CHAR: { long long int v; bool char_is_signed = get_atomic_type_flags(ATOMIC_TYPE_CHAR) & ATOMIC_TYPE_FLAG_SIGNED; @@ -1302,26 +1312,6 @@ static ir_node *literal_to_firm(const literal_expression_t *literal) break; } - case EXPR_LITERAL_INTEGER: - assert(literal->target_value != NULL); - tv = literal->target_value; - break; - - case EXPR_LITERAL_FLOATINGPOINT: - case EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL: - tv = new_tarval_from_str(string, size, mode); - break; - - case EXPR_LITERAL_BOOLEAN: - if (string[0] == 't') { - tv = get_mode_one(mode); - } else { - assert(string[0] == 'f'); - case EXPR_LITERAL_MS_NOOP: - tv = get_mode_null(mode); - } - break; - default: panic("Invalid literal kind found"); } @@ -1516,15 +1506,11 @@ static ir_node *enum_constant_to_firm(reference_expression_t const *const ref) return new_Const(entity->enum_value.tv); } -static ir_node *reference_expression_to_firm(const reference_expression_t *ref) +static ir_node *reference_addr(const reference_expression_t *ref) { dbg_info *dbgi = get_dbg_info(&ref->base.source_position); entity_t *entity = ref->entity; assert(is_declaration(entity)); - type_t *type = skip_typeref(entity->declaration.type); - - /* make sure the type is constructed */ - (void) get_ir_type(type); if (entity->kind == ENTITY_FUNCTION && entity->function.btk != BUILTIN_NONE) { @@ -1533,8 +1519,7 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref) * builtins which don't have entities */ if (irentity == NULL) { source_position_t const *const pos = &ref->base.source_position; - symbol_t const *const sym = ref->entity->base.symbol; - warningf(WARN_OTHER, pos, "taking address of builtin '%Y'", sym); + warningf(WARN_OTHER, pos, "taking address of builtin '%N'", ref->entity); /* simply create a NULL pointer */ ir_mode *mode = get_ir_mode_arithmetic(type_void_ptr); @@ -1544,68 +1529,6 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref) } } - switch ((declaration_kind_t) entity->declaration.kind) { - case DECLARATION_KIND_UNKNOWN: - break; - - case DECLARATION_KIND_LOCAL_VARIABLE: { - ir_mode *const mode = get_ir_mode_storage(type); - ir_node *const value = get_value(entity->variable.v.value_number, mode); - return create_conv(NULL, value, get_ir_mode_arithmetic(type)); - } - case DECLARATION_KIND_PARAMETER: { - ir_mode *const mode = get_ir_mode_storage(type); - ir_node *const value = get_value(entity->parameter.v.value_number,mode); - return create_conv(NULL, value, get_ir_mode_arithmetic(type)); - } - case DECLARATION_KIND_FUNCTION: { - return create_symconst(dbgi, entity->function.irentity); - } - case DECLARATION_KIND_INNER_FUNCTION: { - ir_mode *const mode = get_ir_mode_storage(type); - if (!entity->function.goto_to_outer && !entity->function.need_closure) { - /* inner function not using the closure */ - return create_symconst(dbgi, entity->function.irentity); - } else { - /* need trampoline here */ - return create_trampoline(dbgi, mode, entity->function.irentity); - } - } - case DECLARATION_KIND_GLOBAL_VARIABLE: { - const variable_t *variable = &entity->variable; - ir_node *const addr = create_symconst(dbgi, variable->v.entity); - return deref_address(dbgi, variable->base.type, addr); - } - - case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: { - ir_entity *irentity = entity->variable.v.entity; - ir_node *frame = get_local_frame(irentity); - ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, irentity); - return deref_address(dbgi, entity->declaration.type, sel); - } - case DECLARATION_KIND_PARAMETER_ENTITY: { - ir_entity *irentity = entity->parameter.v.entity; - ir_node *frame = get_local_frame(irentity); - ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, irentity); - return deref_address(dbgi, entity->declaration.type, sel); - } - - case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY: - return entity->variable.v.vla_base; - - case DECLARATION_KIND_COMPOUND_MEMBER: - panic("not implemented reference type"); - } - - panic("reference to declaration with unknown type found"); -} - -static ir_node *reference_addr(const reference_expression_t *ref) -{ - dbg_info *dbgi = get_dbg_info(&ref->base.source_position); - entity_t *entity = ref->entity; - assert(is_declaration(entity)); - switch((declaration_kind_t) entity->declaration.kind) { case DECLARATION_KIND_UNKNOWN: break; @@ -1618,18 +1541,12 @@ static ir_node *reference_addr(const reference_expression_t *ref) ir_node *const addr = create_symconst(dbgi, entity->variable.v.entity); return addr; } - case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: { - ir_entity *irentity = entity->variable.v.entity; - ir_node *frame = get_local_frame(irentity); - ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, irentity); - return sel; - } + case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: case DECLARATION_KIND_PARAMETER_ENTITY: { - ir_entity *irentity = entity->parameter.v.entity; + ir_entity *irentity = entity->variable.v.entity; ir_node *frame = get_local_frame(irentity); ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, irentity); - return sel; } @@ -1659,6 +1576,28 @@ static ir_node *reference_addr(const reference_expression_t *ref) panic("reference to declaration with unknown type found"); } +static ir_node *reference_expression_to_firm(const reference_expression_t *ref) +{ + dbg_info *const dbgi = get_dbg_info(&ref->base.source_position); + entity_t *const entity = ref->entity; + assert(is_declaration(entity)); + + switch ((declaration_kind_t)entity->declaration.kind) { + case DECLARATION_KIND_LOCAL_VARIABLE: + case DECLARATION_KIND_PARAMETER: { + type_t *const type = skip_typeref(entity->declaration.type); + ir_mode *const mode = get_ir_mode_storage(type); + ir_node *const value = get_value(entity->variable.v.value_number, mode); + return create_conv(dbgi, value, get_ir_mode_arithmetic(type)); + } + + default: { + ir_node *const addr = reference_addr(ref); + return deref_address(dbgi, entity->declaration.type, addr); + } + } +} + /** * Transform calls to builtin functions. */ @@ -2088,12 +2027,10 @@ static ir_node *set_value_for_expression_addr(const expression_t *expression, entity_t *entity = ref->entity; assert(is_declaration(entity)); assert(entity->declaration.kind != DECLARATION_KIND_UNKNOWN); - if (entity->declaration.kind == DECLARATION_KIND_LOCAL_VARIABLE) { + if (entity->declaration.kind == DECLARATION_KIND_LOCAL_VARIABLE || + entity->declaration.kind == DECLARATION_KIND_PARAMETER) { set_value(entity->variable.v.value_number, value); return value; - } else if (entity->declaration.kind == DECLARATION_KIND_PARAMETER) { - set_value(entity->parameter.v.value_number, value); - return value; } } @@ -2139,20 +2076,14 @@ static ir_node *get_value_from_lvalue(const expression_t *expression, || entity->kind == ENTITY_PARAMETER); assert(entity->declaration.kind != DECLARATION_KIND_UNKNOWN); int value_number; - if (entity->declaration.kind == DECLARATION_KIND_LOCAL_VARIABLE) { + if (entity->declaration.kind == DECLARATION_KIND_LOCAL_VARIABLE || + entity->declaration.kind == DECLARATION_KIND_PARAMETER) { value_number = entity->variable.v.value_number; assert(addr == NULL); type_t *type = skip_typeref(expression->base.type); ir_mode *mode = get_ir_mode_storage(type); ir_node *res = get_value(value_number, mode); return create_conv(NULL, res, get_ir_mode_arithmetic(type)); - } else if (entity->declaration.kind == DECLARATION_KIND_PARAMETER) { - value_number = entity->parameter.v.value_number; - assert(addr == NULL); - type_t *type = skip_typeref(expression->base.type); - ir_mode *mode = get_ir_mode_storage(type); - ir_node *res = get_value(value_number, mode); - return create_conv(NULL, res, get_ir_mode_arithmetic(type)); } } @@ -2250,7 +2181,7 @@ static ir_relation get_relation(const expression_kind_t kind) default: break; } - panic("trying to get pn_Cmp from non-comparison binexpr type"); + panic("trying to get ir_relation from non-comparison binexpr type"); } /** @@ -2587,7 +2518,6 @@ normal_node: case EXPR_BINARY_MOD: case EXPR_BINARY_MOD_ASSIGN: { ir_node *pin = new_Pin(new_NoMem()); - assert(!mode_is_float(mode)); ir_node *op = new_d_Mod(dbgi, pin, left, right, mode, op_pin_state_floats); ir_node *res = new_d_Proj(dbgi, op, mode, pn_Mod_res); @@ -2728,7 +2658,7 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression) case EXPR_BINARY_SHIFTRIGHT_ASSIGN: return create_assign_binop(expression); default: - panic("TODO binexpr type"); + panic("invalid binexpr type"); } } @@ -2773,12 +2703,7 @@ static long get_offsetof_offset(const offsetof_expression_t *expression) compound_t *compound = type->compound.compound; entity_t *iter = compound->members.entities; - for ( ; iter != NULL; iter = iter->base.next) { - if (iter->base.symbol == symbol) { - break; - } - } - assert(iter != NULL); + for (; iter->base.symbol != symbol; iter = iter->base.next) {} assert(iter->kind == ENTITY_COMPOUND_MEMBER); assert(iter->declaration.kind == DECLARATION_KIND_COMPOUND_MEMBER); @@ -3217,8 +3142,8 @@ static ir_node *function_name_to_firm( if (current_function_name == NULL) { const source_position_t *const src_pos = &expr->base.source_position; const char *name = current_function_entity->base.symbol->string; - const string_t string = { name, strlen(name) + 1 }; - current_function_name = string_to_firm(src_pos, "__func__.%u", &string); + const string_t string = { name, strlen(name) }; + current_function_name = string_to_firm(src_pos, "__func__.%u", STRING_ENCODING_CHAR, &string); } return current_function_name; case FUNCNAME_FUNCSIG: @@ -3226,8 +3151,8 @@ static ir_node *function_name_to_firm( const source_position_t *const src_pos = &expr->base.source_position; ir_entity *ent = get_irg_entity(current_ir_graph); const char *const name = get_entity_ld_name(ent); - const string_t string = { name, strlen(name) + 1 }; - current_funcsig = string_to_firm(src_pos, "__FUNCSIG__.%u", &string); + const string_t string = { name, strlen(name) }; + current_funcsig = string_to_firm(src_pos, "__FUNCSIG__.%u", STRING_ENCODING_CHAR, &string); } return current_funcsig; } @@ -3406,6 +3331,7 @@ static ir_node *_expression_to_firm(expression_t const *const expr) case EXPR_FUNCNAME: return function_name_to_firm( &expr->funcname); case EXPR_LABEL_ADDRESS: return label_address_to_firm( &expr->label_address); case EXPR_LITERAL_CASES: return literal_to_firm( &expr->literal); + case EXPR_LITERAL_CHARACTER: return char_literal_to_firm( &expr->string_literal); case EXPR_OFFSETOF: return offsetof_to_firm( &expr->offsetofe); case EXPR_REFERENCE: return reference_expression_to_firm( &expr->reference); case EXPR_ENUM_CONSTANT: return enum_constant_to_firm( &expr->reference); @@ -3416,9 +3342,8 @@ static ir_node *_expression_to_firm(expression_t const *const expr) case EXPR_VA_ARG: return va_arg_expression_to_firm( &expr->va_arge); case EXPR_VA_COPY: return va_copy_expression_to_firm( &expr->va_copye); case EXPR_VA_START: return va_start_expression_to_firm( &expr->va_starte); - case EXPR_WIDE_STRING_LITERAL: return wide_string_literal_to_firm( &expr->string_literal); - case EXPR_STRING_LITERAL: return string_to_firm(&expr->base.source_position, "str.%u", &expr->literal.value); + case EXPR_STRING_LITERAL: return string_to_firm(&expr->base.source_position, "str.%u", expr->string_literal.encoding, &expr->string_literal.value); case EXPR_ERROR: break; } @@ -3745,13 +3670,8 @@ static void walk_designator(type_path_t *path, const designator_t *designator) compound_t *compound = type->compound.compound; entity_t *iter = compound->members.entities; - for ( ; iter != NULL; iter = iter->base.next, ++index) { - if (iter->base.symbol == symbol) { - assert(iter->kind == ENTITY_COMPOUND_MEMBER); - break; - } - } - assert(iter != NULL); + for (; iter->base.symbol != symbol; iter = iter->base.next, ++index) {} + assert(iter->kind == ENTITY_COMPOUND_MEMBER); /* revert previous initialisations of other union elements */ if (type->kind == TYPE_COMPOUND_UNION) { @@ -3780,17 +3700,10 @@ static void walk_designator(type_path_t *path, const designator_t *designator) orig_type = iter->declaration.type; } else { expression_t *array_index = designator->array_index; - assert(designator->array_index != NULL); assert(is_type_array(type)); long index = fold_constant_to_int(array_index); - assert(index >= 0); -#ifndef NDEBUG - if (type->array.size_constant) { - long array_size = type->array.size; - assert(index < array_size); - } -#endif + assert(0 <= index && (!type->array.size_constant || (size_t)index < type->array.size)); top->type = orig_type; top->index = (size_t) index; @@ -3910,8 +3823,7 @@ static ir_initializer_t *create_ir_initializer_list( break; descend_into_subtype(&path); } - } else if (sub_initializer->kind == INITIALIZER_STRING - || sub_initializer->kind == INITIALIZER_WIDE_STRING) { + } else if (sub_initializer->kind == INITIALIZER_STRING) { /* we might have to descend into types until we're at a scalar * type */ while (true) { @@ -3944,58 +3856,38 @@ static ir_initializer_t *create_ir_initializer_list( return result; } -static ir_initializer_t *create_ir_initializer_string( - const initializer_string_t *initializer, type_t *type) +static ir_initializer_t *create_ir_initializer_string(initializer_string_t const *const initializer, type_t *type) { type = skip_typeref(type); - size_t string_len = initializer->string.size; - assert(type->kind == TYPE_ARRAY); - assert(type->array.size_constant); - size_t len = type->array.size; - ir_initializer_t *irinitializer = create_initializer_compound(len); - - const char *string = initializer->string.begin; - ir_mode *mode = get_ir_mode_storage(type->array.element_type); - - for (size_t i = 0; i < len; ++i) { - char c = 0; - if (i < string_len) - c = string[i]; - - ir_tarval *tv = new_tarval_from_long(c, mode); - ir_initializer_t *char_initializer = create_initializer_tarval(tv); - - set_initializer_compound_value(irinitializer, i, char_initializer); - } - - return irinitializer; -} - -static ir_initializer_t *create_ir_initializer_wide_string( - const initializer_wide_string_t *initializer, type_t *type) -{ assert(type->kind == TYPE_ARRAY); assert(type->array.size_constant); - size_t len = type->array.size; - size_t string_len = wstrlen(&initializer->string); - ir_initializer_t *irinitializer = create_initializer_compound(len); - - const char *p = initializer->string.begin; - ir_mode *mode = get_type_mode(ir_type_wchar_t); - - for (size_t i = 0; i < len; ++i) { - utf32 c = 0; - if (i < string_len) { - c = read_utf8_char(&p); + size_t const str_len = initializer->string.size; + size_t const arr_len = type->array.size; + ir_initializer_t *const irinit = create_initializer_compound(arr_len); + ir_mode *const mode = get_ir_mode_storage(type->array.element_type); + char const * p = initializer->string.begin; + switch (initializer->encoding) { + case STRING_ENCODING_CHAR: + for (size_t i = 0; i != arr_len; ++i) { + char const c = i < str_len ? *p++ : 0; + ir_tarval *const tv = new_tarval_from_long(c, mode); + ir_initializer_t *const tvinit = create_initializer_tarval(tv); + set_initializer_compound_value(irinit, i, tvinit); } - ir_tarval *tv = new_tarval_from_long(c, mode); - ir_initializer_t *char_initializer = create_initializer_tarval(tv); + break; - set_initializer_compound_value(irinitializer, i, char_initializer); + case STRING_ENCODING_WIDE: + for (size_t i = 0; i != arr_len; ++i) { + utf32 const c = i < str_len ? read_utf8_char(&p) : 0; + ir_tarval *const tv = new_tarval_from_long(c, mode); + ir_initializer_t *const tvinit = create_initializer_tarval(tv); + set_initializer_compound_value(irinit, i, tvinit); + } + break; } - return irinitializer; + return irinit; } static ir_initializer_t *create_ir_initializer( @@ -4005,10 +3897,6 @@ static ir_initializer_t *create_ir_initializer( case INITIALIZER_STRING: return create_ir_initializer_string(&initializer->string, type); - case INITIALIZER_WIDE_STRING: - return create_ir_initializer_wide_string(&initializer->wide_string, - type); - case INITIALIZER_LIST: return create_ir_initializer_list(&initializer->list, type); @@ -5311,20 +5199,9 @@ static int count_local_variables(const entity_t *entity, int count = 0; entity_t const *const end = last != NULL ? last->base.next : NULL; for (; entity != end; entity = entity->base.next) { - type_t *type; - bool address_taken; - - if (entity->kind == ENTITY_VARIABLE) { - type = skip_typeref(entity->declaration.type); - address_taken = entity->variable.address_taken; - } else if (entity->kind == ENTITY_PARAMETER) { - type = skip_typeref(entity->declaration.type); - address_taken = entity->parameter.address_taken; - } else { - continue; - } - - if (!address_taken && is_type_scalar(type)) + if ((entity->kind == ENTITY_VARIABLE || entity->kind == ENTITY_PARAMETER) && + !entity->variable.address_taken && + is_type_scalar(skip_typeref(entity->declaration.type))) ++count; } return count; @@ -5400,20 +5277,16 @@ static void initialize_function_parameters(entity_t *entity) assert(parameter->declaration.kind == DECLARATION_KIND_UNKNOWN); type_t *type = skip_typeref(parameter->declaration.type); - bool needs_entity = parameter->parameter.address_taken; assert(!is_type_array(type)); - if (is_type_compound(type)) { - needs_entity = true; - } + bool const needs_entity = parameter->variable.address_taken || is_type_compound(type); ir_type *param_irtype = get_method_param_type(function_irtype, n); if (needs_entity) { ir_type *frame_type = get_irg_frame_type(irg); ir_entity *param = new_parameter_entity(frame_type, n, param_irtype); - parameter->declaration.kind - = DECLARATION_KIND_PARAMETER_ENTITY; - parameter->parameter.v.entity = param; + parameter->declaration.kind = DECLARATION_KIND_PARAMETER_ENTITY; + parameter->variable.v.entity = param; continue; } @@ -5425,13 +5298,13 @@ static void initialize_function_parameters(entity_t *entity) value = create_conv(NULL, value, mode); value = do_strict_conv(NULL, value); - parameter->declaration.kind = DECLARATION_KIND_PARAMETER; - parameter->parameter.v.value_number = next_value_number_function; + parameter->declaration.kind = DECLARATION_KIND_PARAMETER; + parameter->variable.v.value_number = next_value_number_function; set_irg_loc_description(current_ir_graph, next_value_number_function, parameter); ++next_value_number_function; - set_value(parameter->parameter.v.value_number, value); + set_value(parameter->variable.v.value_number, value); } } @@ -5707,9 +5580,8 @@ static void init_ir_types(void) return; ir_types_initialized = 1; - ir_type_char = get_ir_type(type_char); - ir_type_const_char = get_ir_type(type_const_char); - ir_type_wchar_t = get_ir_type(type_wchar_t); + ir_type_char = get_ir_type(type_char); + ir_type_wchar_t = get_ir_type(type_wchar_t); be_params = be_get_backend_param(); mode_float_arithmetic = be_params->mode_float_arithmetic; @@ -5729,13 +5601,8 @@ static void global_asm_to_firm(statement_t *s) assert(s->kind == STATEMENT_ASM); char const *const text = s->asms.asm_text.begin; - size_t size = s->asms.asm_text.size; - - /* skip the last \0 */ - if (text[size - 1] == '\0') - --size; - - ident *const id = new_id_from_chars(text, size); + size_t const size = s->asms.asm_text.size; + ident *const id = new_id_from_chars(text, size); add_irp_asm(id); } }