X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=63bd35030f847acf3f3b1144a8abef6ef5a1b0f2;hb=00fad4c6c28b600fd17a6c3e8320dd6227c28e30;hp=25545b8cf3cf6792ebeee4e96c84e9085dc0535f;hpb=06d5bbfbbf6b0e26dfedcff620f762757c3bf9bb;p=cparser diff --git a/ast2firm.c b/ast2firm.c index 25545b8..63bd350 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -17,6 +17,7 @@ #include "type_t.h" #include "ast_t.h" #include "parser.h" +#include "diagnostic.h" #include "lang_features.h" #include "driver/firm_opt.h" #include "driver/firm_cmdline.h" @@ -60,15 +61,10 @@ static int count_decls_in_stmts(const statement_t *stmt); ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos) { - (void) pos; -#if 0 - const declaration_t *declaration = & value_numbers[pos]->declaration; + const declaration_t *declaration = get_irg_loc_description(irg, pos); - print_warning_prefix(declaration->source_position); - fprintf(stderr, "variable '%s' might be used uninitialized\n", - declaration->symbol->string); -#endif - fprintf(stderr, "Some variable might be used uninitialized\n"); + warningf(declaration->source_position, "variable '%#T' might be used uninitialized", + declaration->type, declaration->symbol); return new_r_Unknown(irg, mode); } @@ -245,8 +241,8 @@ static void init_atomic_modes(void) { static ir_mode *get_atomic_mode(const atomic_type_t* atomic_type) { ir_mode *res = NULL; - if ((unsigned)atomic_type->atype < (unsigned)ATOMIC_TYPE_LAST) - res = _atomic_modes[(unsigned)atomic_type->atype]; + if ((unsigned)atomic_type->akind < (unsigned)ATOMIC_TYPE_LAST) + res = _atomic_modes[(unsigned)atomic_type->akind]; if (res == NULL) panic("Encountered unknown atomic type"); return res; @@ -256,7 +252,7 @@ static unsigned get_type_size(type_t *type); static unsigned get_atomic_type_size(const atomic_type_t *type) { - switch(type->atype) { + switch(type->akind) { case ATOMIC_TYPE_CHAR: case ATOMIC_TYPE_SCHAR: case ATOMIC_TYPE_UCHAR: @@ -316,6 +312,8 @@ static unsigned get_type_size(type_t *type) type = skip_typeref(type); switch(type->kind) { + case TYPE_ERROR: + panic("error type occured"); case TYPE_ATOMIC: return get_atomic_type_size(&type->atomic); case TYPE_ENUM: @@ -332,6 +330,8 @@ static unsigned get_type_size(type_t *type) return get_array_type_size(&type->array); case TYPE_BUILTIN: return get_type_size(type->builtin.real_type); + case TYPE_BITFIELD: + panic("type size of bitfield request"); case TYPE_TYPEDEF: case TYPE_TYPEOF: case TYPE_INVALID: @@ -363,7 +363,8 @@ static ir_type *create_atomic_type(const atomic_type_t *type) ident *id = get_mode_ident(mode); ir_type *irtype = new_type_primitive(id, mode); - if(type->atype == ATOMIC_TYPE_LONG_DOUBLE) { + if(type->akind == ATOMIC_TYPE_LONG_DOUBLE + || type->akind == ATOMIC_TYPE_DOUBLE) { set_type_alignment_bytes(irtype, 4); } @@ -445,6 +446,91 @@ static ir_type *create_array_type(array_type_t *type) return ir_type; } +/** + * Return the signed integer type of size bits. + * + * @param size the size + */ +static ir_type *get_signed_int_type_for_bit_size(ir_type *base_tp, + unsigned size) +{ + static ir_mode *s_modes[64 + 1] = {NULL, }; + ir_type *res; + ir_mode *mode; + + if (size <= 0 || size > 64) + return NULL; + + mode = s_modes[size]; + if (mode == NULL) { + char name[32]; + + snprintf(name, sizeof(name), "bf_I%u", size); + mode = new_ir_mode(name, irms_int_number, size, 1, irma_twos_complement, + size <= 32 ? 32 : size ); + s_modes[size] = mode; + } + + char name[32]; + snprintf(name, sizeof(name), "I%u", size); + ident *id = new_id_from_str(name); + res = new_type_primitive(mangle_u(get_type_ident(base_tp), id), mode); + set_primitive_base_type(res, base_tp); + + return res; +} + +/** + * Return the unsigned integer type of size bits. + * + * @param size the size + */ +static ir_type *get_unsigned_int_type_for_bit_size(ir_type *base_tp, + unsigned size) +{ + static ir_mode *u_modes[64 + 1] = {NULL, }; + ir_type *res; + ir_mode *mode; + + if (size <= 0 || size > 64) + return NULL; + + mode = u_modes[size]; + if (mode == NULL) { + char name[32]; + + snprintf(name, sizeof(name), "bf_U%u", size); + mode = new_ir_mode(name, irms_int_number, size, 0, irma_twos_complement, + size <= 32 ? 32 : size ); + u_modes[size] = mode; + } + + char name[32]; + + snprintf(name, sizeof(name), "U%u", size); + ident *id = new_id_from_str(name); + res = new_type_primitive(mangle_u(get_type_ident(base_tp), id), mode); + set_primitive_base_type(res, base_tp); + + return res; +} + +static ir_type *create_bitfield_type(bitfield_type_t *const type) +{ + type_t *base = skip_typeref(type->base); + assert(base->kind == TYPE_ATOMIC); + ir_type *irbase = get_ir_type(base); + + unsigned size = fold_constant(type->size); + + assert(!is_type_float(base)); + if(is_type_signed(base)) { + return get_signed_int_type_for_bit_size(irbase, size); + } else { + return get_unsigned_int_type_for_bit_size(irbase, size); + } +} + #define INVALID_TYPE ((ir_type_ptr)-1) static ir_type *create_struct_type(compound_type_t *type) @@ -456,49 +542,98 @@ static ir_type *create_struct_type(compound_type_t *type) } else { id = unique_ident("__anonymous_struct"); } - ir_type *ir_type = new_type_struct(id); + ir_type *irtype = new_type_struct(id); - type->type.firm_type = ir_type; + type->type.firm_type = irtype; - int align_all = 1; - int offset = 0; - declaration_t *entry = type->declaration->context.declarations; + size_t align_all = 1; + size_t offset = 0; + size_t bit_offset = 0; + declaration_t *entry = type->declaration->scope.declarations; for( ; entry != NULL; entry = entry->next) { if(entry->namespc != NAMESPACE_NORMAL) continue; - ident *ident = new_id_from_str(entry->symbol->string); - ir_type_ptr entry_ir_type = get_ir_type(entry->type); + type_t *entry_type = skip_typeref(entry->type); + ir_type *base_irtype; + if(entry_type->kind == TYPE_BITFIELD) { + base_irtype = get_ir_type(entry_type->bitfield.base); + } else { + base_irtype = get_ir_type(entry_type); + } - int entry_size = get_type_size_bytes(entry_ir_type); - int entry_alignment = get_type_alignment_bytes(entry_ir_type); - int misalign = offset % entry_alignment; - if (misalign != 0) - offset += entry_alignment - misalign; + size_t entry_alignment = get_type_alignment_bytes(base_irtype); + size_t misalign = offset % entry_alignment; - dbg_info *const dbgi = get_dbg_info(&entry->source_position); - ir_entity *const entity = new_d_entity(ir_type, ident, entry_ir_type, dbgi); - set_entity_offset(entity, offset); - add_struct_member(ir_type, entity); - entry->declaration_kind = DECLARATION_KIND_COMPOUND_MEMBER; - entry->v.entity = entity; + dbg_info *dbgi = get_dbg_info(&entry->source_position); + ir_entity *entity = NULL; + if(entry->symbol != NULL) { + ident *ident = new_id_from_str(entry->symbol->string); + ir_type *entry_irtype = get_ir_type(entry_type); + entity = new_d_entity(irtype, ident, entry_irtype, dbgi); + } else { + /* only bitfields are allowed to be anonymous */ + assert(entry_type->kind == TYPE_BITFIELD); + } + + size_t base; + size_t bits_remainder; + if(entry_type->kind == TYPE_BITFIELD) { + size_t size_bits = fold_constant(entry_type->bitfield.size); + size_t rest_size_bits = (entry_alignment - misalign)*8 - bit_offset; + + if(size_bits > rest_size_bits) { + /* start a new bucket */ + offset += entry_alignment - misalign; + bit_offset = 0; + + base = offset; + bits_remainder = 0; + } else { + /* put into current bucket */ + base = offset - misalign; + bits_remainder = misalign * 8 + bit_offset; + } + + offset += size_bits / 8; + bit_offset = bit_offset + (size_bits % 8); + } else { + size_t entry_size = get_type_size_bytes(base_irtype); + if(misalign > 0 || bit_offset > 0) + offset += entry_alignment - misalign; + + base = offset; + bits_remainder = 0; + offset += entry_size; + bit_offset = 0; + } - offset += entry_size; if(entry_alignment > align_all) { if(entry_alignment % align_all != 0) { - panic("Uneven alignments not supported yet"); + panic("uneven alignments not supported yet"); } align_all = entry_alignment; } + + if(entity != NULL) { + set_entity_offset(entity, base); + set_entity_offset_bits_remainder(entity, + (unsigned char) bits_remainder); + add_struct_member(irtype, entity); + entry->declaration_kind = DECLARATION_KIND_COMPOUND_MEMBER; + entry->v.entity = entity; + } } - int misalign = offset % align_all; - offset += misalign; - set_type_alignment_bytes(ir_type, align_all); - set_type_size_bytes(ir_type, offset); - set_type_state(ir_type, layout_fixed); + size_t misalign = offset % align_all; + if(misalign > 0 || bit_offset > 0) { + offset += align_all - misalign; + } + set_type_alignment_bytes(irtype, align_all); + set_type_size_bytes(irtype, offset); + set_type_state(irtype, layout_fixed); - return ir_type; + return irtype; } static ir_type *create_union_type(compound_type_t *type) @@ -511,26 +646,27 @@ static ir_type *create_union_type(compound_type_t *type) } else { id = unique_ident("__anonymous_union"); } - ir_type *ir_type = new_type_union(id); + ir_type *irtype = new_type_union(id); - type->type.firm_type = ir_type; + type->type.firm_type = irtype; int align_all = 1; int size = 0; - declaration_t *entry = declaration->context.declarations; + declaration_t *entry = declaration->scope.declarations; for( ; entry != NULL; entry = entry->next) { if(entry->namespc != NAMESPACE_NORMAL) continue; - ident *ident = new_id_from_str(entry->symbol->string); - ir_type_ptr entry_ir_type = get_ir_type(entry->type); + ident *ident = new_id_from_str(entry->symbol->string); + ir_type *entry_ir_type = get_ir_type(entry->type); int entry_size = get_type_size_bytes(entry_ir_type); int entry_alignment = get_type_alignment_bytes(entry_ir_type); dbg_info *const dbgi = get_dbg_info(&entry->source_position); - ir_entity *const entity = new_d_entity(ir_type, ident, entry_ir_type, dbgi); - add_union_member(ir_type, entity); + ir_entity *const entity = new_d_entity(irtype, ident, entry_ir_type, + dbgi); + add_union_member(irtype, entity); set_entity_offset(entity, 0); entry->declaration_kind = DECLARATION_KIND_COMPOUND_MEMBER; entry->v.entity = entity; @@ -546,11 +682,11 @@ static ir_type *create_union_type(compound_type_t *type) } } - set_type_alignment_bytes(ir_type, align_all); - set_type_size_bytes(ir_type, size); - set_type_state(ir_type, layout_fixed); + set_type_alignment_bytes(irtype, align_all); + set_type_size_bytes(irtype, size); + set_type_state(irtype, layout_fixed); - return ir_type; + return irtype; } static ir_node *expression_to_firm(const expression_t *expression); @@ -599,6 +735,8 @@ static ir_type *get_ir_type(type_t *type) ir_type *firm_type = NULL; switch(type->kind) { + case TYPE_ERROR: + panic("error type occured"); case TYPE_ATOMIC: firm_type = create_atomic_type(&type->atomic); break; @@ -623,6 +761,10 @@ static ir_type *get_ir_type(type_t *type) case TYPE_BUILTIN: firm_type = get_ir_type(type->builtin.real_type); break; + case TYPE_BITFIELD: + firm_type = create_bitfield_type(&type->bitfield); + break; + case TYPE_TYPEOF: case TYPE_TYPEDEF: case TYPE_INVALID: @@ -758,10 +900,9 @@ static ir_entity* get_function_entity(declaration_t *declaration) /* We should check for file scope here, but as long as we compile C only this is not needed. */ - int n_params = get_method_n_params(ir_type_method); - int n_res = get_method_n_ress(ir_type_method); - ir_ident_ptr id = get_entity_ident(entity); - int i; + int n_params = get_method_n_params(ir_type_method); + int n_res = get_method_n_ress(ir_type_method); + int i; if (n_params == 0 && n_res == 0 && id == predef_idents[rts_abort]) { /* found abort(), store for later */ @@ -791,8 +932,8 @@ static ir_entity* get_function_entity(declaration_t *declaration) static ir_node *const_to_firm(const const_expression_t *cnst) { - dbg_info *dbgi = get_dbg_info(&cnst->expression.source_position); - ir_mode *mode = get_ir_mode(cnst->expression.datatype); + dbg_info *dbgi = get_dbg_info(&cnst->base.source_position); + ir_mode *mode = get_ir_mode(cnst->base.type); char buf[128]; tarval *tv; @@ -812,7 +953,8 @@ static ir_node *const_to_firm(const const_expression_t *cnst) return new_d_Const(dbgi, mode, tv); } -static ir_node *create_symconst(dbg_info *dbgi, ir_mode *mode, ir_entity *entity) +static ir_node *create_symconst(dbg_info *dbgi, ir_mode *mode, + ir_entity *entity) { assert(entity != NULL); union symconst_symbol sym; @@ -822,7 +964,7 @@ static ir_node *create_symconst(dbg_info *dbgi, ir_mode *mode, ir_entity *entity static ir_node *string_to_firm(const source_position_t *const src_pos, const char *const id_prefix, - const char *const string) + const string_t *const value) { ir_type *const global_type = get_glob_type(); ir_type *const type = new_type_array(unique_ident("strtype"), 1, @@ -838,7 +980,8 @@ static ir_node *string_to_firm(const source_position_t *const src_pos, ir_type *const elem_type = ir_type_const_char; ir_mode *const mode = get_type_mode(elem_type); - const size_t slen = strlen(string) + 1; + const char* const string = value->begin; + const size_t slen = value->size; set_array_lower_bound_int(type, 0, 0); set_array_upper_bound_int(type, 0, slen); @@ -859,8 +1002,8 @@ static ir_node *string_to_firm(const source_position_t *const src_pos, static ir_node *string_literal_to_firm( const string_literal_expression_t* literal) { - return string_to_firm(&literal->expression.source_position, "Lstr", - literal->value); + return string_to_firm(&literal->base.source_position, "Lstr", + &literal->value); } static ir_node *wide_string_literal_to_firm( @@ -872,7 +1015,7 @@ static ir_node *wide_string_literal_to_firm( elem_type); ident *const id = unique_ident("Lstr"); - dbg_info *const dbgi = get_dbg_info(&literal->expression.source_position); + dbg_info *const dbgi = get_dbg_info(&literal->base.source_position); ir_entity *const entity = new_d_entity(global_type, id, type, dbgi); set_entity_ld_ident(entity, id); set_entity_variability(entity, variability_constant); @@ -902,7 +1045,9 @@ static ir_node *wide_string_literal_to_firm( static ir_node *deref_address(ir_type *const irtype, ir_node *const addr, dbg_info *const dbgi) { - if(is_compound_type(irtype) || is_Array_type(irtype)) { + if (is_compound_type(irtype) || + is_Method_type(irtype) || + is_Array_type(irtype)) { return addr; } @@ -955,9 +1100,23 @@ static ir_node *get_global_var_address(dbg_info *const dbgi, } } +/* Returns the correct base address depending on whether it is a parameter or a + * normal local variable */ +static ir_node *get_local_frame(ir_entity *const ent) +{ + ir_graph *const irg = current_ir_graph; + const ir_type *const owner = get_entity_owner(ent); + if (owner == get_irg_frame_type(irg)) { + return get_irg_frame(irg); + } else { + assert(owner == get_method_value_param_type(get_entity_type(get_irg_entity(irg)))); + return get_irg_value_param_base(irg); + } +} + static ir_node *reference_expression_to_firm(const reference_expression_t *ref) { - dbg_info *dbgi = get_dbg_info(&ref->expression.source_position); + dbg_info *dbgi = get_dbg_info(&ref->base.source_position); declaration_t *declaration = ref->declaration; type_t *type = skip_typeref(declaration->type); @@ -990,7 +1149,7 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref) case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: { ir_entity *entity = declaration->v.entity; - ir_node *frame = get_irg_frame(current_ir_graph); + ir_node *frame = get_local_frame(entity); ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, entity); ir_type *irtype = get_entity_type(entity); return deref_address(irtype, sel, dbgi); @@ -1006,7 +1165,7 @@ 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->expression.source_position); + dbg_info *dbgi = get_dbg_info(&ref->base.source_position); declaration_t *declaration = ref->declaration; switch((declaration_kind_t) declaration->declaration_kind) { @@ -1015,7 +1174,7 @@ static ir_node *reference_addr(const reference_expression_t *ref) case DECLARATION_KIND_LOCAL_VARIABLE: panic("local variable without entity has no address"); case DECLARATION_KIND_FUNCTION: { - type_t *const type = skip_typeref(ref->expression.datatype); + type_t *const type = skip_typeref(ref->base.type); ir_mode *const mode = get_ir_mode(type); return create_symconst(dbgi, mode, declaration->v.entity); } @@ -1025,7 +1184,7 @@ static ir_node *reference_addr(const reference_expression_t *ref) } case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: { ir_entity *entity = declaration->v.entity; - ir_node *frame = get_irg_frame(current_ir_graph); + ir_node *frame = get_local_frame(entity); ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, entity); return sel; @@ -1044,12 +1203,12 @@ static ir_node *reference_addr(const reference_expression_t *ref) static ir_node *process_builtin_call(const call_expression_t *call) { - dbg_info *dbgi = get_dbg_info(&call->expression.source_position); + dbg_info *dbgi = get_dbg_info(&call->base.source_position); assert(call->function->kind == EXPR_BUILTIN_SYMBOL); builtin_symbol_expression_t *builtin = &call->function->builtin_symbol; - type_t *type = skip_typeref(builtin->expression.datatype); + type_t *type = skip_typeref(builtin->base.type); assert(is_type_pointer(type)); type_t *function_type = skip_typeref(type->pointer.points_to); @@ -1099,7 +1258,7 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) } ir_node *callee = expression_to_firm(function); - type_t *type = skip_typeref(function->base.datatype); + type_t *type = skip_typeref(function->base.type); assert(is_type_pointer(type)); pointer_type_t *pointer_type = &type->pointer; type_t *points_to = skip_typeref(pointer_type->points_to); @@ -1112,7 +1271,7 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) ++n_parameters; } - dbg_info *dbgi = get_dbg_info(&call->expression.source_position); + dbg_info *dbgi = get_dbg_info(&call->base.source_position); ir_type *ir_method_type = get_ir_type((type_t*) function_type); ir_type *new_method_type = NULL; @@ -1144,7 +1303,7 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) in[n] = arg_node; if(new_method_type != NULL) { - ir_type *irtype = get_ir_type(expression->base.datatype); + ir_type *irtype = get_ir_type(expression->base.type); set_method_param_type(new_method_type, n, irtype); } @@ -1191,7 +1350,7 @@ static void assign_value(dbg_info *dbgi, ir_node *addr, type_t *type, { value = do_strict_conv(dbgi, value); - ir_node *memory = get_store(); + ir_node *memory = get_store(); if(is_type_scalar(type)) { ir_node *store = new_d_Store(dbgi, memory, addr, value); @@ -1205,6 +1364,71 @@ static void assign_value(dbg_info *dbgi, ir_node *addr, type_t *type, } } +static tarval *create_bitfield_mask(ir_mode *mode, int offset, int size) +{ + tarval *all_one = get_mode_all_one(mode); + int mode_size = get_mode_size_bits(mode); + + assert(offset >= 0 && size >= 0); + assert(offset + size <= mode_size); + if(size == mode_size) { + return all_one; + } + + long shiftr = get_mode_size_bits(mode) - size; + long shiftl = offset; + tarval *tv_shiftr = new_tarval_from_long(shiftr, mode_uint); + tarval *tv_shiftl = new_tarval_from_long(shiftl, mode_uint); + tarval *mask0 = tarval_shr(all_one, tv_shiftr); + tarval *mask1 = tarval_shl(mask0, tv_shiftl); + + return mask1; +} + +static void bitfield_store_to_firm(const unary_expression_t *expression, + ir_node *value) +{ + expression_t *select = expression->value; + assert(select->kind == EXPR_SELECT); + type_t *type = select->base.type; + assert(type->kind == TYPE_BITFIELD); + ir_mode *mode = get_ir_mode(type->bitfield.base); + ir_node *addr = expression_to_addr(select); + + assert(get_irn_mode(value) == mode); + + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + + /* kill upper bits of value and shift to right position */ + ir_entity *entity = select->select.compound_entry->v.entity; + int bitoffset = get_entity_offset_bits_remainder(entity); + ir_type *entity_type = get_entity_type(entity); + int bitsize = get_mode_size_bits(get_type_mode(entity_type)); + + tarval *mask = create_bitfield_mask(mode, 0, bitsize); + ir_node *mask_node = new_d_Const(dbgi, mode, mask); + ir_node *value_masked = new_d_And(dbgi, value, mask_node, mode); + tarval *shiftl = new_tarval_from_long(bitoffset, mode_uint); + ir_node *shiftcount = new_d_Const(dbgi, mode_uint, shiftl); + ir_node *value_maskshift = new_d_Shl(dbgi, value_masked, shiftcount, mode); + + /* load current value */ + ir_node *mem = get_store(); + ir_node *load = new_d_Load(dbgi, mem, addr, mode); + ir_node *load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M); + ir_node *load_res = new_d_Proj(dbgi, load, mode, pn_Load_res); + tarval *shift_mask = create_bitfield_mask(mode, bitoffset, bitsize); + tarval *inv_mask = tarval_not(shift_mask); + ir_node *inv_mask_node = new_d_Const(dbgi, mode, inv_mask); + ir_node *load_res_masked = new_d_And(dbgi, load_res, inv_mask_node, mode); + + /* construct new value and store */ + ir_node *new_val = new_d_Or(dbgi, load_res_masked, value_maskshift, mode); + ir_node *store = new_d_Store(dbgi, load_mem, addr, new_val); + ir_node *store_mem = new_d_Proj(dbgi, store, mode_M, pn_Store_M); + set_store(store_mem); +} + static void set_value_for_expression(const expression_t *expression, ir_node *value) { @@ -1222,8 +1446,13 @@ static void set_value_for_expression(const expression_t *expression, } } + if(expression->kind == EXPR_UNARY_BITFIELD_EXTRACT) { + bitfield_store_to_firm(&expression->unary, value); + return; + } + ir_node *addr = expression_to_addr(expression); - type_t *type = skip_typeref(expression->base.datatype); + type_t *type = skip_typeref(expression->base.type); assign_value(dbgi, addr, type, value); } @@ -1246,8 +1475,8 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) static ir_node *create_incdec(const unary_expression_t *expression) { - dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); - type_t *type = skip_typeref(expression->expression.datatype); + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + type_t *type = skip_typeref(expression->base.type); ir_mode *mode = get_ir_mode(type); expression_t *value = expression->value; @@ -1263,7 +1492,7 @@ static ir_node *create_incdec(const unary_expression_t *expression) offset = new_Const(mode, get_mode_one(mode)); } - switch(expression->expression.kind) { + switch(expression->base.kind) { case EXPR_UNARY_POSTFIX_INCREMENT: { ir_node *new_value = new_d_Add(dbgi, value_node, offset, mode); set_value_for_expression(value, new_value); @@ -1333,7 +1562,8 @@ static pn_Cmp get_pnc(const expression_kind_t kind) * - const rel val * - var rel var */ -static ir_node *handle_assume_compare(dbg_info *dbi, const binary_expression_t *expression) +static ir_node *handle_assume_compare(dbg_info *dbi, + const binary_expression_t *expression) { expression_t *op1 = expression->left; expression_t *op2 = expression->right; @@ -1341,7 +1571,7 @@ static ir_node *handle_assume_compare(dbg_info *dbi, const binary_expression_t * ir_node *res = NULL; pn_Cmp cmp_val; - cmp_val = get_pnc(expression->expression.kind); + cmp_val = get_pnc(expression->base.kind); if (is_local_variable(op1) && is_local_variable(op2)) { var = op1->reference.declaration; @@ -1403,17 +1633,61 @@ static ir_node *handle_assume(dbg_info *dbi, const expression_t *expression) { } } +static ir_node *bitfield_extract_to_firm(const unary_expression_t *expression) +{ + expression_t *select = expression->value; + assert(select->kind == EXPR_SELECT); + + type_t *type = select->base.type; + assert(type->kind == TYPE_BITFIELD); + ir_mode *mode = get_ir_mode(type->bitfield.base); + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + ir_node *addr = expression_to_addr(select); + ir_node *mem = get_store(); + ir_node *load = new_d_Load(dbgi, mem, addr, mode); + ir_node *load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M); + ir_node *load_res = new_d_Proj(dbgi, load, mode, pn_Load_res); + + load_res = create_conv(dbgi, load_res, mode_int); + + set_store(load_mem); + + /* kill upper bits */ + ir_entity *entity = select->select.compound_entry->v.entity; + int bitoffset = get_entity_offset_bits_remainder(entity); + ir_type *entity_type = get_entity_type(entity); + int bitsize = get_mode_size_bits(get_type_mode(entity_type)); + long shift_bitsl = machine_size - bitoffset - bitsize; + assert(shift_bitsl >= 0); + tarval *tvl = new_tarval_from_long(shift_bitsl, mode_uint); + ir_node *countl = new_d_Const(dbgi, mode_uint, tvl); + ir_node *shiftl = new_d_Shl(dbgi, load_res, countl, mode_int); + + long shift_bitsr = bitoffset + shift_bitsl; + assert(shift_bitsr <= (long) machine_size); + tarval *tvr = new_tarval_from_long(shift_bitsr, mode_uint); + ir_node *countr = new_d_Const(dbgi, mode_uint, tvr); + ir_node *shiftr; + if(mode_is_signed(mode)) { + shiftr = new_d_Shrs(dbgi, shiftl, countr, mode_int); + } else { + shiftr = new_d_Shr(dbgi, shiftl, countr, mode_int); + } + + return create_conv(dbgi, shiftr, mode); +} + static ir_node *unary_expression_to_firm(const unary_expression_t *expression) { - dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); - type_t *type = skip_typeref(expression->expression.datatype); + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + type_t *type = skip_typeref(expression->base.type); - if(expression->expression.kind == EXPR_UNARY_TAKE_ADDRESS) + if(expression->base.kind == EXPR_UNARY_TAKE_ADDRESS) return expression_to_addr(expression->value); const expression_t *value = expression->value; - switch(expression->expression.kind) { + switch(expression->base.kind) { case EXPR_UNARY_NEGATE: { ir_node *value_node = expression_to_firm(value); ir_mode *mode = get_ir_mode(type); @@ -1440,7 +1714,7 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) } case EXPR_UNARY_DEREFERENCE: { ir_node *value_node = expression_to_firm(value); - type_t *value_type = skip_typeref(value->base.datatype); + type_t *value_type = skip_typeref(value->base.type); ir_type *irtype = get_ir_type(value_type); assert(is_Pointer_type(irtype)); ir_type *points_to = get_pointer_points_to_type(irtype); @@ -1460,14 +1734,20 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) } case EXPR_UNARY_CAST_IMPLICIT: { ir_node *value_node = expression_to_firm(value); - ir_mode *mode = get_ir_mode(type); - return create_conv(dbgi, value_node, mode); + if(is_type_scalar(type)) { + ir_mode *mode = get_ir_mode(type); + return create_conv(dbgi, value_node, mode); + } else { + return value_node; + } } case EXPR_UNARY_ASSUME: if(firm_opt.confirm) return handle_assume(dbgi, value); else return NULL; + case EXPR_UNARY_BITFIELD_EXTRACT: + return bitfield_extract_to_firm(expression); default: break; @@ -1477,13 +1757,13 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) static ir_node *create_lazy_op(const binary_expression_t *expression) { - dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); - type_t *type = expression->expression.datatype; + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + type_t *type = expression->base.type; ir_mode *mode = get_ir_mode(type); if(is_constant_expression(expression->left)) { long val = fold_constant(expression->left); - expression_kind_t ekind = expression->expression.kind; + expression_kind_t ekind = expression->base.kind; if((ekind == EXPR_BINARY_LOGICAL_AND && val != 0) || (ekind == EXPR_BINARY_LOGICAL_OR && val == 0)) { return expression_to_firm(expression->right); @@ -1527,10 +1807,10 @@ typedef ir_node * (*create_arithmetic_func)(dbg_info *dbgi, ir_node *left, static ir_node *create_arithmetic_binop(const binary_expression_t *expression, create_arithmetic_func func) { - dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); ir_node *left = expression_to_firm(expression->left); ir_node *right = expression_to_firm(expression->right); - type_t *type = expression->right->base.datatype; + type_t *type = expression->right->base.type; /* be careful with the modes, because in arithmetic assign nodes only * the right operand has the mode of the arithmetic already */ ir_mode *mode = get_ir_mode(type); @@ -1565,8 +1845,8 @@ static ir_node *pointer_arithmetic(ir_node *const pointer, static ir_node *create_arithmetic_assign_binop( const binary_expression_t *expression, create_arithmetic_func func) { - dbg_info *const dbgi = get_dbg_info(&expression->expression.source_position); - type_t *const type = skip_typeref(expression->expression.datatype); + dbg_info *const dbgi = get_dbg_info(&expression->base.source_position); + type_t *const type = skip_typeref(expression->base.type); ir_node *value; if (is_type_pointer(type)) { @@ -1586,15 +1866,15 @@ static ir_node *create_arithmetic_assign_binop( static ir_node *create_add(const binary_expression_t *expression) { - dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); ir_node *left = expression_to_firm(expression->left); ir_node *right = expression_to_firm(expression->right); - type_t *type = expression->expression.datatype; + type_t *type = expression->base.type; expression_t *expr_left = expression->left; expression_t *expr_right = expression->right; - type_t *type_left = skip_typeref(expr_left->base.datatype); - type_t *type_right = skip_typeref(expr_right->base.datatype); + type_t *type_left = skip_typeref(expr_left->base.type); + type_t *type_right = skip_typeref(expr_right->base.type); if(is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) { ir_mode *const mode = get_ir_mode(type); @@ -1611,14 +1891,14 @@ static ir_node *create_add(const binary_expression_t *expression) static ir_node *create_sub(const binary_expression_t *expression) { - dbg_info *const dbgi = get_dbg_info(&expression->expression.source_position); + dbg_info *const dbgi = get_dbg_info(&expression->base.source_position); expression_t *const expr_left = expression->left; expression_t *const expr_right = expression->right; ir_node *const left = expression_to_firm(expr_left); ir_node *const right = expression_to_firm(expr_right); - type_t *const type = expression->expression.datatype; - type_t *const type_left = skip_typeref(expr_left->base.datatype); - type_t *const type_right = skip_typeref(expr_right->base.datatype); + type_t *const type = expression->base.type; + type_t *const type_left = skip_typeref(expr_left->base.type); + type_t *const type_right = skip_typeref(expr_right->base.type); if (is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) { ir_mode *const mode = get_ir_mode(type); @@ -1641,10 +1921,10 @@ static ir_node *create_sub(const binary_expression_t *expression) static ir_node *create_shift(const binary_expression_t *expression) { - dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); ir_node *left = expression_to_firm(expression->left); ir_node *right = expression_to_firm(expression->right); - type_t *type = expression->expression.datatype; + type_t *type = expression->base.type; ir_mode *mode = get_ir_mode(type); /* firm always wants the shift count to be unsigned */ @@ -1652,7 +1932,7 @@ static ir_node *create_shift(const binary_expression_t *expression) ir_node *res; - switch(expression->expression.kind) { + switch(expression->base.kind) { case EXPR_BINARY_SHIFTLEFT_ASSIGN: case EXPR_BINARY_SHIFTLEFT: res = new_d_Shl(dbgi, left, right, mode); @@ -1660,7 +1940,7 @@ static ir_node *create_shift(const binary_expression_t *expression) case EXPR_BINARY_SHIFTRIGHT_ASSIGN: case EXPR_BINARY_SHIFTRIGHT: { expression_t *expr_left = expression->left; - type_t *type_left = skip_typeref(expr_left->base.datatype); + type_t *type_left = skip_typeref(expr_left->base.type); if(is_type_signed(type_left)) { res = new_d_Shrs(dbgi, left, right, mode); @@ -1679,19 +1959,19 @@ static ir_node *create_shift(const binary_expression_t *expression) static ir_node *create_divmod(const binary_expression_t *expression) { - dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); ir_node *left = expression_to_firm(expression->left); ir_node *right = expression_to_firm(expression->right); ir_node *pin = new_Pin(new_NoMem()); /* be careful with the modes, because in arithmetic assign nodes only * the right operand has the mode of the arithmetic already */ - type_t *type = expression->right->base.datatype; + type_t *type = expression->right->base.type; ir_mode *mode = get_ir_mode(type); left = create_conv(dbgi, left, mode); ir_node *op; ir_node *res; - switch (expression->expression.kind) { + switch (expression->base.kind) { case EXPR_BINARY_DIV: case EXPR_BINARY_DIV_ASSIGN: if(mode_is_float(mode)) { @@ -1720,8 +2000,8 @@ static ir_node *create_arithmetic_assign_divmod( const binary_expression_t *expression) { ir_node * value = create_divmod(expression); - dbg_info *const dbgi = get_dbg_info(&expression->expression.source_position); - type_t *const type = expression->expression.datatype; + dbg_info *const dbgi = get_dbg_info(&expression->base.source_position); + type_t *const type = expression->base.type; ir_mode *const mode = get_ir_mode(type); assert(type->kind != TYPE_POINTER); @@ -1736,8 +2016,8 @@ static ir_node *create_arithmetic_assign_shift( const binary_expression_t *expression) { ir_node * value = create_shift(expression); - dbg_info *const dbgi = get_dbg_info(&expression->expression.source_position); - type_t *const type = expression->expression.datatype; + dbg_info *const dbgi = get_dbg_info(&expression->base.source_position); + type_t *const type = expression->base.type; ir_mode *const mode = get_ir_mode(type); value = create_conv(dbgi, value, mode); @@ -1748,7 +2028,7 @@ static ir_node *create_arithmetic_assign_shift( static ir_node *binary_expression_to_firm(const binary_expression_t *expression) { - expression_kind_t kind = expression->expression.kind; + expression_kind_t kind = expression->base.kind; switch(kind) { case EXPR_BINARY_EQUAL: @@ -1763,7 +2043,7 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression) case EXPR_BINARY_ISLESSEQUAL: case EXPR_BINARY_ISLESSGREATER: case EXPR_BINARY_ISUNORDERED: { - dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); ir_node *left = expression_to_firm(expression->left); ir_node *right = expression_to_firm(expression->right); ir_node *cmp = new_d_Cmp(dbgi, left, right); @@ -1827,12 +2107,12 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression) static ir_node *array_access_addr(const array_access_expression_t *expression) { - dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); ir_node *base_addr = expression_to_firm(expression->array_ref); ir_node *offset = expression_to_firm(expression->index); offset = create_conv(dbgi, offset, mode_uint); - type_t *ref_type = skip_typeref(expression->array_ref->base.datatype); + type_t *ref_type = skip_typeref(expression->array_ref->base.type); assert(is_type_pointer(ref_type)); pointer_type_t *pointer_type = &ref_type->pointer; @@ -1848,7 +2128,7 @@ static ir_node *array_access_addr(const array_access_expression_t *expression) static ir_node *array_access_to_firm( const array_access_expression_t *expression) { - dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); ir_node *addr = array_access_addr(expression); type_t *type = revert_automatic_type_conversion( (const expression_t*) expression); @@ -1858,24 +2138,42 @@ static ir_node *array_access_to_firm( return deref_address(irtype, addr, dbgi); } -static ir_node *sizeof_to_firm(const sizeof_expression_t *expression) +/** + * Transform a sizeof expression into Firm code. + */ +static ir_node *sizeof_to_firm(const typeprop_expression_t *expression) { type_t *type = expression->type; if(type == NULL) { - type = expression->size_expression->base.datatype; + type = expression->tp_expression->base.type; assert(type != NULL); } - ir_mode *const mode = get_ir_mode(expression->expression.datatype); + ir_mode *const mode = get_ir_mode(expression->base.type); symconst_symbol sym; sym.type_p = get_ir_type(type); return new_SymConst(mode, sym, symconst_type_size); } -static ir_node *alignof_to_firm(const alignof_expression_t *expression) +/** + * Transform an alignof expression into Firm code. + */ +static ir_node *alignof_to_firm(const typeprop_expression_t *expression) { - type_t *const type = expression->type; - ir_mode *const mode = get_ir_mode(expression->expression.datatype); + type_t *type = expression->type; + if(type == NULL) { + /* beware: if expression is a variable reference, return the + alignment of the variable. */ + const expression_t *tp_expression = expression->tp_expression; + const declaration_t *declaration = expr_is_variable(tp_expression); + if (declaration != NULL) { + /* TODO: get the alignment of this variable. */ + } + type = tp_expression->base.type; + assert(type != NULL); + } + + ir_mode *const mode = get_ir_mode(expression->base.type); symconst_symbol sym; sym.type_p = get_ir_type(type); return new_SymConst(mode, sym, symconst_type_align); @@ -1907,7 +2205,7 @@ static long fold_constant(const expression_t *expression) static ir_node *conditional_to_firm(const conditional_expression_t *expression) { - dbg_info *const dbgi = get_dbg_info(&expression->expression.source_position); + dbg_info *const dbgi = get_dbg_info(&expression->base.source_position); /* first try to fold a constant condition */ if(is_constant_expression(expression->condition)) { @@ -1959,7 +2257,7 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression) static ir_node *select_addr(const select_expression_t *expression) { - dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); ir_node *compound_addr = expression_to_firm(expression->compound); @@ -1976,7 +2274,7 @@ static ir_node *select_addr(const select_expression_t *expression) static ir_node *select_to_firm(const select_expression_t *expression) { - dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); ir_node *addr = select_addr(expression); type_t *type = revert_automatic_type_conversion( (const expression_t*) expression); @@ -2013,14 +2311,14 @@ typedef enum gcc_type_class static ir_node *classify_type_to_firm(const classify_type_expression_t *const expr) { - const type_t *const type = expr->type_expression->base.datatype; + const type_t *const type = expr->type_expression->base.type; gcc_type_class tc; switch (type->kind) { case TYPE_ATOMIC: { const atomic_type_t *const atomic_type = &type->atomic; - switch (atomic_type->atype) { + switch (atomic_type->akind) { /* should not be reached */ case ATOMIC_TYPE_INVALID: tc = no_type_class; @@ -2084,7 +2382,7 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex panic("Unimplemented case in classify_type_to_firm()."); } - dbg_info *const dbgi = get_dbg_info(&expr->expression.source_position); + dbg_info *const dbgi = get_dbg_info(&expr->base.source_position); ir_mode *const mode = mode_int; tarval *const tv = new_tarval_from_long(tc, mode); return new_d_Const(dbgi, mode, tv); @@ -2094,10 +2392,10 @@ static ir_node *function_name_to_firm( const string_literal_expression_t *const expr) { if (current_function_name == NULL) { - const source_position_t *const src_pos = - &expr->expression.source_position; + const source_position_t *const src_pos = &expr->base.source_position; const char *const name = current_function_decl->symbol->string; - current_function_name = string_to_firm(src_pos, "__func__", name); + const string_t string = { name, strlen(name) + 1 }; + current_function_name = string_to_firm(src_pos, "__func__", &string); } return current_function_name; @@ -2118,8 +2416,7 @@ static ir_node *va_start_expression_to_firm( int const n = get_method_n_params(method_type) - 1; ir_entity *const parm_ent = get_method_value_param_ent(method_type, n); ir_node *const arg_base = get_irg_value_param_base(current_ir_graph); - dbg_info *const dbgi = - get_dbg_info(&expr->expression.source_position); + dbg_info *const dbgi = get_dbg_info(&expr->base.source_position); ir_node *const no_mem = new_NoMem(); ir_node *const arg_sel = new_d_simpleSel(dbgi, no_mem, arg_base, parm_ent); @@ -2134,12 +2431,12 @@ static ir_node *va_start_expression_to_firm( static ir_node *va_arg_expression_to_firm(const va_arg_expression_t *const expr) { - ir_type *const irtype = get_ir_type(expr->expression.datatype); + ir_type *const irtype = get_ir_type(expr->base.type); ir_node *const ap = expression_to_firm(expr->ap); - dbg_info *const dbgi = get_dbg_info(&expr->expression.source_position); + dbg_info *const dbgi = get_dbg_info(&expr->base.source_position); ir_node *const res = deref_address(irtype, ap, dbgi); - size_t const parm_size = get_type_size(expr->expression.datatype); + size_t const parm_size = get_type_size(expr->base.type); ir_node *const cnst = new_Const_long(mode_uint, parm_size); ir_node *const add = new_d_Add(dbgi, ap, cnst, mode_P_data); set_value_for_expression(expr->ap, add); @@ -2149,7 +2446,7 @@ static ir_node *va_arg_expression_to_firm(const va_arg_expression_t *const expr) static ir_node *dereference_addr(const unary_expression_t *const expression) { - assert(expression->expression.kind == EXPR_UNARY_DEREFERENCE); + assert(expression->base.kind == EXPR_UNARY_DEREFERENCE); return expression_to_firm(expression->value); } @@ -2173,9 +2470,10 @@ static ir_node *expression_to_addr(const expression_t *expression) panic("trying to get address of non-lvalue"); } -static ir_node *builtin_constant_to_firm(const builtin_constant_expression_t *expression) +static ir_node *builtin_constant_to_firm( + const builtin_constant_expression_t *expression) { - ir_mode *mode = get_ir_mode(expression->expression.datatype); + ir_mode *mode = get_ir_mode(expression->base.type); long v; if (is_constant_expression(expression->value)) { @@ -2186,6 +2484,15 @@ static ir_node *builtin_constant_to_firm(const builtin_constant_expression_t *ex return new_Const_long(mode, v); } +static ir_node *builtin_prefetch_to_firm( + const builtin_prefetch_expression_t *expression) +{ + ir_node *adr = expression_to_firm(expression->adr); + /* no Firm support for prefetch yet */ + (void) adr; + return NULL; +} + static ir_node *_expression_to_firm(const expression_t *expression) { switch(expression->kind) { @@ -2206,9 +2513,9 @@ static ir_node *_expression_to_firm(const expression_t *expression) case EXPR_ARRAY_ACCESS: return array_access_to_firm(&expression->array_access); case EXPR_SIZEOF: - return sizeof_to_firm(&expression->sizeofe); + return sizeof_to_firm(&expression->typeprop); case EXPR_ALIGNOF: - return alignof_to_firm(&expression->alignofe); + return alignof_to_firm(&expression->typeprop); case EXPR_CONDITIONAL: return conditional_to_firm(&expression->conditional); case EXPR_SELECT: @@ -2229,6 +2536,8 @@ static ir_node *_expression_to_firm(const expression_t *expression) panic("unimplemented expression found"); case EXPR_BUILTIN_CONSTANT_P: return builtin_constant_to_firm(&expression->builtin_constant); + case EXPR_BUILTIN_PREFETCH: + return builtin_prefetch_to_firm(&expression->builtin_prefetch); case EXPR_UNKNOWN: case EXPR_INVALID: @@ -2242,7 +2551,7 @@ static ir_node *expression_to_firm(const expression_t *expression) ir_node *res = _expression_to_firm(expression); if(res != NULL && get_irn_mode(res) == mode_b) { - ir_mode *mode = get_ir_mode(expression->base.datatype); + ir_mode *mode = get_ir_mode(expression->base.type); res = create_conv(NULL, res, mode); } @@ -2409,7 +2718,7 @@ static void create_initializer_compound(initializer_list_t *initializer, { declaration_t *compound_declaration = type->declaration; - declaration_t *compound_entry = compound_declaration->context.declarations; + declaration_t *compound_entry = compound_declaration->scope.declarations; compound_graph_path_entry_t entry; entry.type = COMPOUND_GRAPH_ENTRY_COMPOUND; @@ -2499,19 +2808,18 @@ static void create_initializer_string(initializer_string_t *initializer, entry.prev = last_entry; ++len; - ir_type *irtype = get_entity_type(entity); - size_t arr_len = get_array_type_size(type); - const char *p = initializer->string; - size_t i = 0; - for(i = 0; i < arr_len; ++i, ++p) { + ir_type *const irtype = get_entity_type(entity); + size_t arr_len = get_array_type_size(type); + const char *const p = initializer->string.begin; + if (initializer->string.size < arr_len) { + arr_len = initializer->string.size; + } + for (size_t i = 0; i < arr_len; ++i) { entry.v.array_index = i; - ir_node *node = new_Const_long(mode_Bs, *p); + ir_node *node = new_Const_long(mode_Bs, p[i]); compound_graph_path *path = create_compound_path(irtype, &entry, len); add_compound_ent_value_w_path(entity, node, path); - - if(*p == '\0') - break; } } @@ -2666,6 +2974,9 @@ static void create_initializer(declaration_t *declaration) } } +/** + * Creates a Firm local variable from a declaration. + */ static void create_local_variable(declaration_t *declaration) { assert(declaration->declaration_kind == DECLARATION_KIND_UNKNOWN); @@ -2685,6 +2996,7 @@ static void create_local_variable(declaration_t *declaration) } else { declaration->declaration_kind = DECLARATION_KIND_LOCAL_VARIABLE; declaration->v.value_number = next_value_number_function; + set_irg_loc_description(current_ir_graph, next_value_number_function, declaration); ++next_value_number_function; } @@ -2725,17 +3037,17 @@ static void return_statement_to_firm(return_statement_t *statement) if(get_cur_block() == NULL) return; - ir_type *func_irtype = get_ir_type(current_function_decl->type); + dbg_info *dbgi = get_dbg_info(&statement->base.source_position); + ir_type *func_irtype = get_ir_type(current_function_decl->type); - dbg_info *dbgi = get_dbg_info(&statement->statement.source_position); ir_node *in[1]; int in_len; if(get_method_n_ress(func_irtype) > 0) { ir_type *res_type = get_method_res_type(func_irtype, 0); - if(statement->return_value != NULL) { - ir_node *node = expression_to_firm(statement->return_value); + if(statement->value != NULL) { + ir_node *node = expression_to_firm(statement->value); node = do_strict_conv(dbgi, node); in[0] = node; } else { @@ -2750,8 +3062,8 @@ static void return_statement_to_firm(return_statement_t *statement) in_len = 1; } else { /* build return_value for its side effects */ - if(statement->return_value != NULL) { - expression_to_firm(statement->return_value); + if(statement->value != NULL) { + expression_to_firm(statement->value); } in_len = 0; } @@ -2778,7 +3090,7 @@ static ir_node *compound_statement_to_firm(compound_statement_t *compound) ir_node *result = NULL; statement_t *statement = compound->statements; for( ; statement != NULL; statement = statement->base.next) { - //context2firm(&statement->context); + //context2firm(&statement->scope); if(statement->base.next == NULL && statement->kind == STATEMENT_EXPRESSION) { @@ -2827,7 +3139,9 @@ static void declaration_statement_to_firm(declaration_statement_t *statement) declaration_t *declaration = statement->declarations_begin; declaration_t *end = statement->declarations_end->next; for( ; declaration != end; declaration = declaration->next) { - create_local_variable(declaration); + if(declaration->namespc != NAMESPACE_NORMAL) + continue; + create_local_declaration(declaration); } } @@ -2995,7 +3309,7 @@ static void for_statement_to_firm(for_statement_t *statement) } /* create declarations */ - declaration_t *declaration = statement->context.declarations; + declaration_t *declaration = statement->scope.declarations; for( ; declaration != NULL; declaration = declaration->next) { create_local_declaration(declaration); } @@ -3080,7 +3394,7 @@ static void create_jump_statement(const statement_t *statement, static void switch_statement_to_firm(const switch_statement_t *statement) { - dbg_info *dbgi = get_dbg_info(&statement->statement.source_position); + dbg_info *dbgi = get_dbg_info(&statement->base.source_position); ir_node *expression = expression_to_firm(statement->expression); ir_node *cond = new_d_Cond(dbgi, expression); @@ -3094,7 +3408,9 @@ static void switch_statement_to_firm(const switch_statement_t *statement) current_switch_cond = cond; break_label = break_block; - statement_to_firm(statement->body); + if (statement->body != NULL) { + statement_to_firm(statement->body); + } if(get_cur_block() != NULL) { ir_node *jmp = new_Jmp(); @@ -3120,7 +3436,7 @@ static void switch_statement_to_firm(const switch_statement_t *statement) static void case_label_to_firm(const case_label_statement_t *statement) { - dbg_info *dbgi = get_dbg_info(&statement->statement.source_position); + dbg_info *dbgi = get_dbg_info(&statement->base.source_position); ir_node *const fallthrough = (get_cur_block() == NULL ? NULL : new_Jmp()); @@ -3148,8 +3464,8 @@ static void case_label_to_firm(const case_label_statement_t *statement) add_immBlock_pred(block, proj); mature_immBlock(block); - if(statement->label_statement != NULL) { - statement_to_firm(statement->label_statement); + if(statement->statement != NULL) { + statement_to_firm(statement->statement); } } @@ -3186,8 +3502,8 @@ static void label_to_firm(const label_statement_t *statement) set_cur_block(block); keep_alive(block); - if(statement->label_statement != NULL) { - statement_to_firm(statement->label_statement); + if(statement->statement != NULL) { + statement_to_firm(statement->statement); } } @@ -3360,17 +3676,11 @@ static int count_local_declarations(const declaration_t * decl, { int count = 0; for (; decl != end; decl = decl->next) { + if(decl->namespc != NAMESPACE_NORMAL) + continue; const type_t *type = skip_typeref(decl->type); - switch (type->kind) { - case TYPE_ATOMIC: - case TYPE_ENUM: - case TYPE_POINTER: - if (!decl->address_taken) - ++count; - break; - - default: break; - } + if (!decl->address_taken && is_type_scalar(type)) + ++count; const initializer_t *initializer = decl->init.initializer; /* FIXME: should walk initializer hierarchies... */ if(initializer != NULL && initializer->kind == INITIALIZER_VALUE) { @@ -3387,9 +3697,11 @@ static int count_decls_in_expression(const expression_t *expression) { switch(expression->base.kind) { case EXPR_STATEMENT: return count_decls_in_stmts(expression->statement.statement); - EXPR_BINARY_CASES - return count_decls_in_expression(expression->binary.left) - + count_decls_in_expression(expression->binary.right); + EXPR_BINARY_CASES { + int count_left = count_decls_in_expression(expression->binary.left); + int count_right = count_decls_in_expression(expression->binary.right); + return count_left + count_right; + } EXPR_UNARY_CASES return count_decls_in_expression(expression->unary.value); @@ -3440,7 +3752,9 @@ static int count_decls_in_stmts(const statement_t *stmt) case STATEMENT_LABEL: { const label_statement_t *const label_stmt = &stmt->label; - count += count_decls_in_stmts(label_stmt->label_statement); + if(label_stmt->statement != NULL) { + count += count_decls_in_stmts(label_stmt->statement); + } break; } @@ -3460,7 +3774,7 @@ static int count_decls_in_stmts(const statement_t *stmt) case STATEMENT_FOR: { const for_statement_t *const for_stmt = &stmt->fors; - count += count_local_declarations(for_stmt->context.declarations, NULL); + count += count_local_declarations(for_stmt->scope.declarations, NULL); count += count_decls_in_expression(for_stmt->initialisation); count += count_decls_in_expression(for_stmt->condition); count += count_decls_in_expression(for_stmt->step); @@ -3471,7 +3785,9 @@ static int count_decls_in_stmts(const statement_t *stmt) case STATEMENT_CASE_LABEL: { const case_label_statement_t *label = &stmt->case_label; count += count_decls_in_expression(label->expression); - count += count_decls_in_stmts(label->label_statement); + if(label->statement != NULL) { + count += count_decls_in_stmts(label->statement); + } break; } @@ -3492,7 +3808,7 @@ static int count_decls_in_stmts(const statement_t *stmt) case STATEMENT_RETURN: { const return_statement_t *ret_stmt = &stmt->returns; - count += count_decls_in_expression(ret_stmt->return_value); + count += count_decls_in_expression(ret_stmt->value); break; } } @@ -3505,7 +3821,7 @@ static int get_function_n_local_vars(declaration_t *declaration) int count = 0; /* count parameters */ - count += count_local_declarations(declaration->context.declarations, NULL); + count += count_local_declarations(declaration->scope.declarations, NULL); /* count local variables declared in body */ count += count_decls_in_stmts(declaration->init.statement); @@ -3521,7 +3837,7 @@ static void initialize_function_parameters(declaration_t *declaration) ir_type *function_irtype = get_ir_type(declaration->type); int n = 0; - declaration_t *parameter = declaration->context.declarations; + declaration_t *parameter = declaration->scope.declarations; for( ; parameter != NULL; parameter = parameter->next, ++n) { assert(parameter->declaration_kind == DECLARATION_KIND_UNKNOWN); type_t *type = skip_typeref(parameter->type); @@ -3549,6 +3865,7 @@ static void initialize_function_parameters(declaration_t *declaration) parameter->declaration_kind = DECLARATION_KIND_LOCAL_VARIABLE; parameter->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->v.value_number, proj); @@ -3610,7 +3927,7 @@ static void create_function(declaration_t *declaration) /* set inline flags */ if (declaration->is_inline) set_irg_inline_property(irg, irg_inline_recomended); - handle_decl_modifier_irg(irg, declaration->decl_modifiers); + handle_decl_modifier_irg(irg, declaration->modifiers); next_value_number_function = 0; initialize_function_parameters(declaration); @@ -3729,7 +4046,8 @@ global_var: goto create_var; create_var: - create_declaration_entity(declaration, DECLARATION_KIND_GLOBAL_VARIABLE, + create_declaration_entity(declaration, + DECLARATION_KIND_GLOBAL_VARIABLE, var_type); set_entity_visibility(declaration->v.entity, vis); @@ -3746,10 +4064,10 @@ create_var: panic("Invalid storage class for global variable"); } -static void context_to_firm(context_t *context) +static void scope_to_firm(scope_t *scope) { /* first pass: create declarations */ - declaration_t *declaration = context->declarations; + declaration_t *declaration = scope->declarations; for( ; declaration != NULL; declaration = declaration->next) { if(declaration->namespc != NAMESPACE_NORMAL) continue; @@ -3768,7 +4086,7 @@ static void context_to_firm(context_t *context) } /* second pass: create code */ - declaration = context->declarations; + declaration = scope->declarations; for( ; declaration != NULL; declaration = declaration->next) { if(declaration->namespc != NAMESPACE_NORMAL) continue; @@ -3821,5 +4139,5 @@ void translation_unit_to_firm(translation_unit_t *unit) break_label = NULL; current_switch_cond = NULL; - context_to_firm(&unit->context); + scope_to_firm(&unit->scope); }