X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=bca405d8397b042b1144281eef68f9c9e9815ec3;hb=9398959e7dda6fb86547df8a6d5ce6383cfc969f;hp=5b327b69c29fcf3e879412a01f01153c3481dda3;hpb=159700f0095d5bb233bdbf187b06a279dcfdbf08;p=cparser diff --git a/ast2firm.c b/ast2firm.c index 5b327b6..bca405d 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -359,9 +359,10 @@ static long fold_constant(const expression_t *expression); static ir_type *create_atomic_type(const atomic_type_t *type) { + dbg_info *dbgi = get_dbg_info(&type->type.source_position); ir_mode *mode = get_atomic_mode(type); ident *id = get_mode_ident(mode); - ir_type *irtype = new_type_primitive(id, mode); + ir_type *irtype = new_d_type_primitive(id, mode, dbgi); if(type->akind == ATOMIC_TYPE_LONG_DOUBLE || type->akind == ATOMIC_TYPE_DOUBLE) { @@ -378,7 +379,8 @@ static ir_type *create_method_type(const function_type_t *function_type) ident *id = unique_ident("functiontype"); int n_parameters = count_parameters(function_type); int n_results = return_type == type_void ? 0 : 1; - ir_type *irtype = new_type_method(id, n_parameters, n_results); + dbg_info *dbgi = get_dbg_info(&function_type->type.source_position); + ir_type *irtype = new_d_type_method(id, n_parameters, n_results, dbgi); if(return_type != type_void) { ir_type *restype = get_ir_type(return_type); @@ -408,8 +410,9 @@ static ir_type *create_pointer_type(pointer_type_t *type) * again (might be a struct). We therefore first create a void* pointer * and then set the real points_to type */ - ir_type *ir_type = new_type_pointer(unique_ident("pointer"), - ir_type_void, mode_P_data); + dbg_info *dbgi = get_dbg_info(&type->type.source_position); + ir_type *ir_type = new_d_type_pointer(unique_ident("pointer"), + ir_type_void, mode_P_data, dbgi); type->type.firm_type = ir_type; ir_points_to = get_ir_type(points_to); @@ -424,7 +427,11 @@ static ir_type *create_array_type(array_type_t *type) ir_type *ir_element_type = get_ir_type(element_type); ident *id = unique_ident("array"); - ir_type *ir_type = new_type_array(id, 1, ir_element_type); + dbg_info *dbgi = get_dbg_info(&type->type.source_position); + ir_type *ir_type = new_d_type_array(id, 1, ir_element_type, dbgi); + + const int align = get_type_alignment_bytes(ir_element_type); + set_type_alignment_bytes(ir_type, align); if(type->size != NULL) { int n_elements = fold_constant(type->size); @@ -432,16 +439,14 @@ static ir_type *create_array_type(array_type_t *type) set_array_bounds_int(ir_type, 0, 0, n_elements); size_t elemsize = get_type_size_bytes(ir_element_type); - int align = get_type_alignment_bytes(ir_element_type); if(elemsize % align > 0) { elemsize += align - (elemsize % align); } set_type_size_bytes(ir_type, n_elements * elemsize); - set_type_alignment_bytes(ir_type, align); - set_type_state(ir_type, layout_fixed); } else { set_array_lower_bound_int(ir_type, 0, 0); } + set_type_state(ir_type, layout_fixed); return ir_type; } @@ -474,7 +479,8 @@ static ir_type *get_signed_int_type_for_bit_size(ir_type *base_tp, 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); + dbg_info *dbgi = get_dbg_info(&builtin_source_position); + res = new_d_type_primitive(mangle_u(get_type_ident(base_tp), id), mode, dbgi); set_primitive_base_type(res, base_tp); return res; @@ -509,7 +515,8 @@ static ir_type *get_unsigned_int_type_for_bit_size(ir_type *base_tp, 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); + dbg_info *dbgi = get_dbg_info(&builtin_source_position); + res = new_d_type_primitive(mangle_u(get_type_ident(base_tp), id), mode, dbgi); set_primitive_base_type(res, base_tp); return res; @@ -533,28 +540,65 @@ static ir_type *create_bitfield_type(bitfield_type_t *const type) #define INVALID_TYPE ((ir_type_ptr)-1) -static ir_type *create_struct_type(compound_type_t *type) +static ir_type *create_union_type(compound_type_t *type, ir_type *irtype, + size_t *outer_offset, size_t *outer_align); + +static ir_type *create_struct_type(compound_type_t *type, ir_type *irtype, + size_t *outer_offset, size_t *outer_align) { - symbol_t *symbol = type->declaration->symbol; - ident *id; - if(symbol != NULL) { - id = unique_ident(symbol->string); - } else { - id = unique_ident("__anonymous_struct"); + declaration_t *declaration = type->declaration; + if(declaration->v.irtype != NULL) { + return declaration->v.irtype; } - ir_type *irtype = new_type_struct(id); - - type->type.firm_type = irtype; size_t align_all = 1; size_t offset = 0; size_t bit_offset = 0; - declaration_t *entry = type->declaration->scope.declarations; + if(irtype == NULL) { + symbol_t *symbol = declaration->symbol; + ident *id; + if(symbol != NULL) { + id = unique_ident(symbol->string); + } else { + id = unique_ident("__anonymous_struct"); + } + dbg_info *dbgi = get_dbg_info(&type->type.source_position); + + irtype = new_d_type_struct(id, dbgi); + + declaration->v.irtype = irtype; + type->type.firm_type = irtype; + } else { + offset = *outer_offset; + align_all = *outer_align; + } + + declaration_t *entry = declaration->scope.declarations; for( ; entry != NULL; entry = entry->next) { if(entry->namespc != NAMESPACE_NORMAL) continue; - type_t *entry_type = skip_typeref(entry->type); + symbol_t *symbol = entry->symbol; + type_t *entry_type = skip_typeref(entry->type); + dbg_info *dbgi = get_dbg_info(&entry->source_position); + ident *ident; + if(symbol != NULL) { + ident = new_id_from_str(symbol->string); + } else { + if(entry_type->kind == TYPE_COMPOUND_STRUCT) { + create_struct_type(&entry_type->compound, irtype, &offset, + &align_all); + continue; + } else if(entry_type->kind == TYPE_COMPOUND_UNION) { + create_union_type(&entry_type->compound, irtype, &offset, + &align_all); + continue; + } else { + assert(entry_type->kind == TYPE_BITFIELD); + } + ident = unique_ident("anon"); + } + ir_type *base_irtype; if(entry_type->kind == TYPE_BITFIELD) { base_irtype = get_ir_type(entry_type->bitfield.base); @@ -565,16 +609,8 @@ static ir_type *create_struct_type(compound_type_t *type) size_t entry_alignment = get_type_alignment_bytes(base_irtype); size_t misalign = offset % entry_alignment; - 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); - } + ir_type *entry_irtype = get_ir_type(entry_type); + ir_entity *entity = new_d_entity(irtype, ident, entry_irtype, dbgi); size_t base; size_t bits_remainder; @@ -615,60 +651,103 @@ static ir_type *create_struct_type(compound_type_t *type) 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; - } + 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; + assert(entry->v.entity == NULL); + entry->v.entity = entity; } 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); + + if(outer_offset != NULL) { + *outer_offset = offset; + *outer_align = align_all; + } else { + set_type_alignment_bytes(irtype, align_all); + set_type_size_bytes(irtype, offset); + set_type_state(irtype, layout_fixed); + } return irtype; } -static ir_type *create_union_type(compound_type_t *type) +static ir_type *create_union_type(compound_type_t *type, ir_type *irtype, + size_t *outer_offset, size_t *outer_align) { declaration_t *declaration = type->declaration; - symbol_t *symbol = declaration->symbol; - ident *id; - if(symbol != NULL) { - id = unique_ident(symbol->string); + if(declaration->v.irtype != NULL) { + return declaration->v.irtype; + } + + size_t offset = 0; + size_t align_all = 1; + size_t size = 0; + + if(irtype == NULL) { + symbol_t *symbol = declaration->symbol; + ident *id; + if(symbol != NULL) { + id = unique_ident(symbol->string); + } else { + id = unique_ident("__anonymous_union"); + } + dbg_info *dbgi = get_dbg_info(&type->type.source_position); + + irtype = new_d_type_union(id, dbgi); } else { - id = unique_ident("__anonymous_union"); + offset = *outer_offset; + align_all = *outer_align; } - ir_type *irtype = new_type_union(id); type->type.firm_type = irtype; - int align_all = 1; - int size = 0; 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 *entry_ir_type = get_ir_type(entry->type); + type_t *entry_type = skip_typeref(entry->type); + 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); + ident *ident; + if(entry->symbol != NULL) { + ident = new_id_from_str(entry->symbol->string); + } else { + size_t offs = offset; + if(entry_type->kind == TYPE_COMPOUND_STRUCT) { + create_struct_type(&entry_type->compound, irtype, &offs, + &align_all); + continue; + } else if(entry_type->kind == TYPE_COMPOUND_UNION) { + create_union_type(&entry_type->compound, irtype, &offs, + &align_all); + continue; + } else { + panic("anonymous union member must be struct or union"); + } + size_t entry_size = offs - offset; + if(entry_size > size) { + size = entry_size; + } + ident = unique_ident("anon"); + } + + size_t entry_size = get_type_size_bytes(entry_ir_type); + size_t 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(irtype, ident, entry_ir_type, dbgi); - add_union_member(irtype, entity); + //add_union_member(irtype, entity); set_entity_offset(entity, 0); entry->declaration_kind = DECLARATION_KIND_COMPOUND_MEMBER; + assert(entry->v.entity == NULL); entry->v.entity = entity; if(entry_size > size) { @@ -682,9 +761,26 @@ static ir_type *create_union_type(compound_type_t *type) } } - set_type_alignment_bytes(irtype, align_all); - set_type_size_bytes(irtype, size); - set_type_state(irtype, layout_fixed); + if(outer_offset != NULL) { + assert(*outer_offset == offset); + + size_t misalign = offset % align_all; + if (misalign != 0) + size += align_all - misalign; + *outer_offset += size; + + if(align_all > *outer_align) { + if(align_all % *outer_align != 0) { + panic("uneven alignments not supported yet"); + } + *outer_align = align_all; + } + } else { + set_type_alignment_bytes(irtype, align_all); + set_type_size_bytes(irtype, size); + set_type_state(irtype, layout_fixed); + declaration->v.irtype = irtype; + } return irtype; } @@ -750,10 +846,10 @@ static ir_type *get_ir_type(type_t *type) firm_type = create_array_type(&type->array); break; case TYPE_COMPOUND_STRUCT: - firm_type = create_struct_type(&type->compound); + firm_type = create_struct_type(&type->compound, NULL, NULL, NULL); break; case TYPE_COMPOUND_UNION: - firm_type = create_union_type(&type->compound); + firm_type = create_union_type(&type->compound, NULL, NULL, NULL); break; case TYPE_ENUM: firm_type = create_enum_type(&type->enumt); @@ -953,6 +1049,22 @@ static ir_node *const_to_firm(const const_expression_t *cnst) return new_d_Const(dbgi, mode, tv); } +static ir_node *char_const_to_firm(const const_expression_t *cnst) +{ + dbg_info *dbgi = get_dbg_info(&cnst->base.source_position); + ir_mode *mode = get_ir_mode(cnst->base.type); + + long long int v = 0; + for (size_t i = 0; i < cnst->v.chars.size; ++i) { + v = (v << 8) | ((unsigned char)cnst->v.chars.begin[i]); + } + char buf[128]; + size_t len = snprintf(buf, sizeof(buf), "%lld", v); + tarval *tv = new_tarval_from_str(buf, len, mode); + + return new_d_Const(dbgi, mode, tv); +} + static ir_node *create_symconst(dbg_info *dbgi, ir_mode *mode, ir_entity *entity) { @@ -967,11 +1079,11 @@ static ir_node *string_to_firm(const source_position_t *const src_pos, const string_t *const value) { ir_type *const global_type = get_glob_type(); - ir_type *const type = new_type_array(unique_ident("strtype"), 1, - ir_type_const_char); + dbg_info *const dbgi = get_dbg_info(src_pos); + ir_type *const type = new_d_type_array(unique_ident("strtype"), 1, + ir_type_const_char, dbgi); ident *const id = unique_ident(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_variability(entity, variability_constant); @@ -1011,11 +1123,11 @@ static ir_node *wide_string_literal_to_firm( { ir_type *const global_type = get_glob_type(); ir_type *const elem_type = ir_type_wchar_t; - ir_type *const type = new_type_array(unique_ident("strtype"), 1, - elem_type); + dbg_info *const dbgi = get_dbg_info(&literal->base.source_position); + ir_type *const type = new_d_type_array(unique_ident("strtype"), 1, + elem_type, dbgi); ident *const id = unique_ident("Lstr"); - 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); @@ -1045,7 +1157,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; } @@ -1277,8 +1391,9 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) /* we need to construct a new method type matching the call * arguments... */ int n_res = get_method_n_ress(ir_method_type); - new_method_type = new_type_method(unique_ident("calltype"), - n_parameters, n_res); + dbg_info *dbgi = get_dbg_info(&call->base.source_position); + new_method_type = new_d_type_method(unique_ident("calltype"), + n_parameters, n_res, dbgi); set_method_calling_convention(new_method_type, get_method_calling_convention(ir_method_type)); set_method_additional_properties(new_method_type, @@ -1526,12 +1641,13 @@ static bool is_local_variable(expression_t *expression) return declaration->declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE; } -static pn_Cmp get_pnc(const expression_kind_t kind) +static pn_Cmp get_pnc(const expression_kind_t kind, type_t *const type) { switch(kind) { case EXPR_BINARY_EQUAL: return pn_Cmp_Eq; case EXPR_BINARY_ISLESSGREATER: return pn_Cmp_Lg; - case EXPR_BINARY_NOTEQUAL: return pn_Cmp_Ne; + case EXPR_BINARY_NOTEQUAL: + return is_type_float(skip_typeref(type)) ? pn_Cmp_Ne : pn_Cmp_Lg; case EXPR_BINARY_ISLESS: case EXPR_BINARY_LESS: return pn_Cmp_Lt; case EXPR_BINARY_ISLESSEQUAL: @@ -1569,7 +1685,7 @@ static ir_node *handle_assume_compare(dbg_info *dbi, ir_node *res = NULL; pn_Cmp cmp_val; - cmp_val = get_pnc(expression->base.kind); + cmp_val = get_pnc(expression->base.kind, op1->base.type); if (is_local_variable(op1) && is_local_variable(op2)) { var = op1->reference.declaration; @@ -1725,15 +1841,23 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) return create_incdec(expression); case EXPR_UNARY_CAST: { ir_node *value_node = expression_to_firm(value); - ir_mode *mode = get_ir_mode(type); - ir_node *node = create_conv(dbgi, value_node, mode); - node = do_strict_conv(dbgi, node); - return node; + if(is_type_scalar(type)) { + ir_mode *mode = get_ir_mode(type); + ir_node *node = create_conv(dbgi, value_node, mode); + node = do_strict_conv(dbgi, node); + return node; + } else { + return value_node; + } } 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) @@ -2041,7 +2165,7 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression) 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); - long pnc = get_pnc(kind); + long pnc = get_pnc(kind, expression->left->base.type); ir_node *proj = new_d_Proj(dbgi, cmp, mode_b, pnc); return proj; } @@ -2081,6 +2205,7 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression) return create_arithmetic_assign_binop(expression, new_d_Sub); case EXPR_BINARY_MUL_ASSIGN: return create_arithmetic_assign_binop(expression, new_d_Mul); + case EXPR_BINARY_MOD_ASSIGN: case EXPR_BINARY_DIV_ASSIGN: return create_arithmetic_assign_divmod(expression); case EXPR_BINARY_BITWISE_AND_ASSIGN: @@ -2490,6 +2615,8 @@ static ir_node *builtin_prefetch_to_firm( static ir_node *_expression_to_firm(const expression_t *expression) { switch(expression->kind) { + case EXPR_CHAR_CONST: + return char_const_to_firm(&expression->conste); case EXPR_CONST: return const_to_firm(&expression->conste); case EXPR_STRING_LITERAL: @@ -3098,8 +3225,65 @@ static ir_node *compound_statement_to_firm(compound_statement_t *compound) return result; } +static void create_global_variable(declaration_t *declaration) +{ + ir_visibility vis; + ir_type *var_type; + switch ((storage_class_tag_t)declaration->storage_class) { + case STORAGE_CLASS_STATIC: + vis = visibility_local; + goto global_var; + + case STORAGE_CLASS_EXTERN: + vis = visibility_external_allocated; + goto global_var; + + case STORAGE_CLASS_NONE: + vis = visibility_external_visible; + goto global_var; + + case STORAGE_CLASS_THREAD: + vis = visibility_external_visible; + goto tls_var; + + case STORAGE_CLASS_THREAD_EXTERN: + vis = visibility_external_allocated; + goto tls_var; + + case STORAGE_CLASS_THREAD_STATIC: + vis = visibility_local; + goto tls_var; + +tls_var: + var_type = get_tls_type(); + goto create_var; + +global_var: + var_type = get_glob_type(); + goto create_var; + +create_var: + create_declaration_entity(declaration, + DECLARATION_KIND_GLOBAL_VARIABLE, + var_type); + set_entity_visibility(declaration->v.entity, vis); + + return; + + case STORAGE_CLASS_TYPEDEF: + case STORAGE_CLASS_AUTO: + case STORAGE_CLASS_REGISTER: + case STORAGE_CLASS_ENUM_ENTRY: + break; + } + panic("Invalid storage class for global variable"); +} + static void create_local_declaration(declaration_t *declaration) { + if(declaration->symbol == NULL) + return; + type_t *type = skip_typeref(declaration->type); switch ((storage_class_tag_t) declaration->storage_class) { @@ -3109,12 +3293,18 @@ static void create_local_declaration(declaration_t *declaration) case STORAGE_CLASS_ENUM_ENTRY: panic("enum entry declaration in local block found"); case STORAGE_CLASS_EXTERN: - panic("extern declaration in local block found"); + create_global_variable(declaration); + create_initializer(declaration); + return; case STORAGE_CLASS_NONE: case STORAGE_CLASS_AUTO: case STORAGE_CLASS_REGISTER: if(is_type_function(type)) { - panic("nested functions not supported yet"); + if(declaration->init.statement != NULL) { + panic("nested functions not supported yet"); + } else { + get_function_entity(declaration); + } } else { create_local_variable(declaration); } @@ -3437,26 +3627,39 @@ static void case_label_to_firm(const case_label_statement_t *statement) /* let's create a node and hope firm constant folding creates a Const * node... */ ir_node *proj; - set_cur_block(get_nodes_block(current_switch_cond)); - if(statement->expression) { - long pn = fold_constant(statement->expression); - if(pn == MAGIC_DEFAULT_PN_NUMBER) { - /* oops someone detected our cheating... */ - panic("magic default pn used"); + ir_node *old_block = get_nodes_block(current_switch_cond); + ir_node *block = new_immBlock(); + + set_cur_block(old_block); + if(statement->expression != NULL) { + long start_pn = fold_constant(statement->expression); + long end_pn = start_pn; + if (statement->end_range != NULL) { + end_pn = fold_constant(statement->end_range); + } + assert(start_pn <= end_pn); + /* create jumps for all cases in the given range */ + for (long pn = start_pn; pn <= end_pn; ++pn) { + if(pn == MAGIC_DEFAULT_PN_NUMBER) { + /* oops someone detected our cheating... */ + panic("magic default pn used"); + } + proj = new_d_Proj(dbgi, current_switch_cond, mode_X, pn); + add_immBlock_pred(block, proj); } - proj = new_d_Proj(dbgi, current_switch_cond, mode_X, pn); } else { saw_default_label = true; proj = new_d_defaultProj(dbgi, current_switch_cond, MAGIC_DEFAULT_PN_NUMBER); + + add_immBlock_pred(block, proj); } - ir_node *block = new_immBlock(); if (fallthrough != NULL) { add_immBlock_pred(block, fallthrough); } - add_immBlock_pred(block, proj); mature_immBlock(block); + set_cur_block(block); if(statement->statement != NULL) { statement_to_firm(statement->statement); @@ -3520,9 +3723,11 @@ typedef enum modifier_t { ASM_MODIFIER_EARLYCLOBBER = 1 << 3, } modifier_t; -#if 0 static void asm_statement_to_firm(const asm_statement_t *statement) { + (void) statement; + fprintf(stderr, "WARNING asm not implemented yet!\n"); +#if 0 bool needs_memory = false; size_t n_clobbers = 0; @@ -3604,9 +3809,8 @@ static void asm_statement_to_firm(const asm_statement_t *statement) } } - -} #endif +} static void statement_to_firm(statement_t *statement) { @@ -3656,9 +3860,8 @@ static void statement_to_firm(statement_t *statement) goto_to_firm(&statement->gotos); return; case STATEMENT_ASM: - //asm_statement_to_firm(&statement->asms); - //return; - break; + asm_statement_to_firm(&statement->asms); + return; } panic("Statement not implemented\n"); } @@ -3698,6 +3901,14 @@ static int count_decls_in_expression(const expression_t *expression) { } EXPR_UNARY_CASES return count_decls_in_expression(expression->unary.value); + case EXPR_CALL: { + int count = 0; + call_argument_t *argument = expression->call.arguments; + for( ; argument != NULL; argument = argument->next) { + count += count_decls_in_expression(argument->expression); + } + return count; + } default: break; @@ -4002,62 +4213,6 @@ static void create_function(declaration_t *declaration) irg_vrfy(irg); } -static void create_global_variable(declaration_t *declaration) -{ - ir_visibility vis; - ir_type *var_type; - switch ((storage_class_tag_t)declaration->storage_class) { - case STORAGE_CLASS_STATIC: - vis = visibility_local; - goto global_var; - - case STORAGE_CLASS_EXTERN: - vis = visibility_external_allocated; - goto global_var; - - case STORAGE_CLASS_NONE: - vis = visibility_external_visible; - goto global_var; - - case STORAGE_CLASS_THREAD: - vis = visibility_external_visible; - goto tls_var; - - case STORAGE_CLASS_THREAD_EXTERN: - vis = visibility_external_allocated; - goto tls_var; - - case STORAGE_CLASS_THREAD_STATIC: - vis = visibility_local; - goto tls_var; - -tls_var: - var_type = get_tls_type(); - goto create_var; - -global_var: - var_type = get_glob_type(); - goto create_var; - -create_var: - create_declaration_entity(declaration, - DECLARATION_KIND_GLOBAL_VARIABLE, - var_type); - set_entity_visibility(declaration->v.entity, vis); - - current_ir_graph = get_const_code_irg(); - create_initializer(declaration); - return; - - case STORAGE_CLASS_TYPEDEF: - case STORAGE_CLASS_AUTO: - case STORAGE_CLASS_REGISTER: - case STORAGE_CLASS_ENUM_ENTRY: - break; - } - panic("Invalid storage class for global variable"); -} - static void scope_to_firm(scope_t *scope) { /* first pass: create declarations */ @@ -4079,7 +4234,7 @@ static void scope_to_firm(scope_t *scope) } } - /* second pass: create code */ + /* second pass: create code/initializers */ declaration = scope->declarations; for( ; declaration != NULL; declaration = declaration->next) { if(declaration->namespc != NAMESPACE_NORMAL) @@ -4091,10 +4246,14 @@ static void scope_to_firm(scope_t *scope) continue; type_t *type = declaration->type; - if(type->kind != TYPE_FUNCTION) - continue; - - create_function(declaration); + if(type->kind == TYPE_FUNCTION) { + create_function(declaration); + } else { + assert(declaration->declaration_kind + == DECLARATION_KIND_GLOBAL_VARIABLE); + current_ir_graph = get_const_code_irg(); + create_initializer(declaration); + } } }