X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=721c92dc91d2fe0513d410b5923644f97864ff6a;hb=863f26fe96754bb16052065afb3e777493aad50c;hp=a9e24c459294fb6150de8699cb7693afd12afdc6;hpb=9508fc1b4fb7e7329109855d65292ef1cb3fcbf2;p=cparser diff --git a/ast2firm.c b/ast2firm.c index a9e24c4..721c92d 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -35,6 +35,9 @@ static ir_node *current_switch_cond; static bool saw_default_label; static ir_node **imature_blocks; +static const declaration_t *current_function_decl; +static ir_node *current_function_name; + typedef enum declaration_type_t { DECLARATION_TYPE_UNKNOWN, DECLARATION_TYPE_FUNCTION, @@ -106,7 +109,7 @@ static ident *unique_ident(const char *tag) { char buf[256]; - snprintf(buf, sizeof(buf), "%s.%d", tag, unique_id); + snprintf(buf, sizeof(buf), "%s.%u", tag, unique_id); unique_id++; return new_id_from_str(buf); } @@ -360,7 +363,7 @@ static ir_type *create_struct_type(compound_type_t *type) int offset = 0; declaration_t *entry = type->declaration->context.declarations; for( ; entry != NULL; entry = entry->next) { - if(entry->namespace != NAMESPACE_NORMAL) + if(entry->namespc != NAMESPACE_NORMAL) continue; ident *ident = new_id_from_str(entry->symbol->string); @@ -368,8 +371,9 @@ static ir_type *create_struct_type(compound_type_t *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; - offset += misalign; + int misalign = offset % entry_alignment; + if (misalign != 0) + offset += entry_alignment - misalign; ir_entity *entity = new_entity(ir_type, ident, entry_ir_type); set_entity_offset(entity, offset); @@ -413,7 +417,7 @@ static ir_type *create_union_type(compound_type_t *type) int size = 0; declaration_t *entry = declaration->context.declarations; for( ; entry != NULL; entry = entry->next) { - if(entry->namespace != NAMESPACE_NORMAL) + if(entry->namespc != NAMESPACE_NORMAL) continue; ident *ident = new_id_from_str(entry->symbol->string); @@ -569,29 +573,30 @@ static ir_node *create_symconst(dbg_info *dbgi, ir_entity *entity) return new_d_SymConst(dbgi, sym, symconst_addr_ent); } -static ir_node *string_literal_to_firm(const string_literal_t* literal) +static ir_node *string_to_firm(const source_position_t *const src_pos, + const char *const id_prefix, + const char *const string) { - ir_type *global_type = get_glob_type(); - ir_type *type = new_type_array(unique_ident("strtype"), 1, - ir_type_const_char); + ir_type *const global_type = get_glob_type(); + ir_type *const type = new_type_array(unique_ident("strtype"), 1, + ir_type_const_char); - ident *id = unique_ident("Lstr"); - ir_entity *entity = new_entity(global_type, id, type); + ident *const id = unique_ident(id_prefix); + ir_entity *const entity = new_entity(global_type, id, type); set_entity_ld_ident(entity, id); set_entity_variability(entity, variability_constant); - ir_type *elem_type = ir_type_const_char; - ir_mode *mode = get_type_mode(elem_type); + ir_type *const elem_type = ir_type_const_char; + ir_mode *const mode = get_type_mode(elem_type); - const char *string = literal->value; - size_t slen = strlen(string) + 1; + const size_t slen = strlen(string) + 1; 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); - tarval **tvs = xmalloc(slen * sizeof(tvs[0])); + tarval **const tvs = xmalloc(slen * sizeof(tvs[0])); for(size_t i = 0; i < slen; ++i) { tvs[i] = new_tarval_from_long(string[i], mode); } @@ -599,22 +604,15 @@ static ir_node *string_literal_to_firm(const string_literal_t* literal) set_array_entity_values(entity, tvs, slen); free(tvs); - dbg_info *dbgi = get_dbg_info(&literal->expression.source_position); + dbg_info *const dbgi = get_dbg_info(src_pos); return create_symconst(dbgi, entity); } -static ir_node *load_from_expression_addr(type_t *type, ir_node *addr, - dbg_info *dbgi) +static ir_node *string_literal_to_firm(const string_literal_t* literal) { - ir_mode *mode = get_ir_mode(type); - ir_node *memory = get_store(); - ir_node *load = new_d_Load(dbgi, memory, 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); - set_store(load_mem); - - return load_res; + return string_to_firm(&literal->expression.source_position, "Lstr", + literal->value); } static ir_node *deref_address(type_t *const type, ir_node *const addr, @@ -626,8 +624,15 @@ static ir_node *deref_address(type_t *const type, ir_node *const addr, case TYPE_COMPOUND_UNION: return addr; - default: - return load_from_expression_addr(type, addr, dbgi); + default: { + ir_mode *const mode = get_ir_mode(type); + ir_node *const memory = get_store(); + ir_node *const load = new_d_Load(dbgi, memory, addr, mode); + ir_node *const load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M); + ir_node *const load_res = new_d_Proj(dbgi, load, mode, pn_Load_res); + set_store(load_mem); + return load_res; + } } } @@ -707,8 +712,15 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) expression_t *function = call->function; ir_node *callee = expression_to_firm(function); - assert(function->datatype->type == TYPE_FUNCTION); - function_type_t *function_type = (function_type_t*) function->datatype; + function_type_t *function_type; + if (function->datatype->type == TYPE_POINTER) { + pointer_type_t *const ptr_type = (pointer_type_t*)function->datatype; + assert(ptr_type->points_to->type == TYPE_FUNCTION); + function_type = (function_type_t*)ptr_type->points_to; + } else { + assert(function->datatype->type == TYPE_FUNCTION); + function_type = (function_type_t*)function->datatype; + } int n_parameters = 0; call_argument_t *argument = call->arguments; @@ -805,7 +817,7 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) { ir_mode *value_mode = get_irn_mode(value); - if(value_mode == dest_mode) + if (value_mode == dest_mode || is_Bad(value)) return value; if(dest_mode == mode_b) { @@ -970,8 +982,8 @@ static ir_node *create_arithmetic_binop(const binary_expression_t *expression, ir_node *left = expression_to_firm(expression->left); ir_node *right = expression_to_firm(expression->right); type_t *type = expression->right->datatype; - /* be careful with the modes, because in asithmetic assign nodes only - * the right operand has the mode of the arithmetic alread */ + /* 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); left = create_conv(dbgi, left, mode); ir_node *res = func(dbgi, left, right, mode); @@ -979,16 +991,44 @@ static ir_node *create_arithmetic_binop(const binary_expression_t *expression, return res; } +static ir_node *pointer_arithmetic(ir_node *const pointer, + ir_node * integer, + type_t *const type, + dbg_info *const dbgi, + const create_arithmetic_func func) +{ + pointer_type_t *const pointer_type = (pointer_type_t*)type; + type_t *const points_to = pointer_type->points_to; + const unsigned elem_size = get_type_size(points_to); + + assert(elem_size >= 1); + if (elem_size > 1) { + integer = create_conv(dbgi, integer, mode_Is); + ir_node *const cnst = new_Const_long(mode_Is, (long)elem_size); + ir_node *const mul = new_d_Mul(dbgi, integer, cnst, mode_Is); + integer = mul; + } + + ir_mode *const mode = get_ir_mode(type); + return func(dbgi, pointer, integer, mode); +} + static ir_node *create_arithmetic_assign_binop( const binary_expression_t *expression, create_arithmetic_func func) { - dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); - ir_node *value = create_arithmetic_binop(expression, func); - type_t *type = expression->expression.datatype; - ir_mode *mode = get_ir_mode(type); + dbg_info *const dbgi = get_dbg_info(&expression->expression.source_position); + type_t *const type = expression->expression.datatype; + ir_node *value; - assert(type->type != TYPE_POINTER); + if (type->type == TYPE_POINTER) { + ir_node *const pointer = expression_to_firm(expression->left); + ir_node * integer = expression_to_firm(expression->right); + value = pointer_arithmetic(pointer, integer, type, dbgi, func); + } else { + value = create_arithmetic_binop(expression, func); + } + ir_mode *const mode = get_ir_mode(type); value = create_conv(dbgi, value, mode); set_value_for_expression(expression->left, value); @@ -1001,7 +1041,6 @@ static ir_node *create_add(const binary_expression_t *expression) ir_node *left = expression_to_firm(expression->left); ir_node *right = expression_to_firm(expression->right); type_t *type = expression->expression.datatype; - ir_mode *mode = get_ir_mode(type); expression_t *expr_left = expression->left; expression_t *expr_right = expression->right; @@ -1009,76 +1048,37 @@ static ir_node *create_add(const binary_expression_t *expression) type_t *type_right = skip_typeref(expr_right->datatype); if(is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) { + ir_mode *const mode = get_ir_mode(type); return new_d_Add(dbgi, left, right, mode); } - ir_node *pointer; - ir_node *integer; - pointer_type_t *pointer_type; - if(type_left->type == TYPE_POINTER) { - pointer = left; - integer = right; - pointer_type = (pointer_type_t*) type_left; + if (type_left->type == TYPE_POINTER || type_left->type == TYPE_ARRAY) { + return pointer_arithmetic(left, right, type, dbgi, new_d_Add); } else { - assert(type_right->type == TYPE_POINTER); - pointer = right; - integer = left; - pointer_type = (pointer_type_t*) type_right; + assert(type_right->type == TYPE_POINTER || type_right->type == TYPE_ARRAY); + return pointer_arithmetic(right, left, type, dbgi, new_d_Add); } - - type_t *points_to = pointer_type->points_to; - unsigned elem_size = get_type_size(points_to); - - assert(elem_size >= 1); - if(elem_size > 1) { - integer = create_conv(dbgi, integer, mode_Is); - ir_node *cnst = new_Const_long(mode_Is, (int) elem_size); - ir_node *mul = new_d_Mul(dbgi, integer, cnst, mode_Is); - integer = mul; - } - - ir_node *res = new_d_Add(dbgi, pointer, integer, mode); - - return res; } static ir_node *create_sub(const binary_expression_t *expression) { - dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); - ir_node *left = expression_to_firm(expression->left); - ir_node *right = expression_to_firm(expression->right); - type_t *type = expression->expression.datatype; - ir_mode *mode = get_ir_mode(type); - - expression_t *expr_left = expression->left; - expression_t *expr_right = expression->right; - type_t *type_left = skip_typeref(expr_left->datatype); - type_t *type_right = skip_typeref(expr_right->datatype); - - if((is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) - || (type_left->type == TYPE_POINTER - && type_right->type == TYPE_POINTER)) { + dbg_info *const dbgi = get_dbg_info(&expression->expression.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->datatype); + type_t *const type_right = skip_typeref(expr_right->datatype); + + if ((is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) || + (type_left->type == TYPE_POINTER && type_right->type == TYPE_POINTER)) { + ir_mode *const mode = get_ir_mode(type); return new_d_Sub(dbgi, left, right, mode); } - assert(type_right->type == TYPE_POINTER); - ir_node *pointer = left; - ir_node *integer = right; - pointer_type_t *pointer_type = (pointer_type_t*) type_right; - - type_t *points_to = pointer_type->points_to; - unsigned elem_size = get_type_size(points_to); - - assert(elem_size >= 1); - if(elem_size > 1) { - ir_node *cnst = new_Const_long(mode_Iu, elem_size); - ir_node *mul = new_d_Mul(dbgi, integer, cnst, mode_Iu); - integer = mul; - } - - ir_node *res = new_d_Sub(dbgi, pointer, integer, mode); - - return res; + assert(type_left->type == TYPE_POINTER); + return pointer_arithmetic(left, right, type_left, dbgi, new_d_Sub); } static ir_node *create_shift(const binary_expression_t *expression) @@ -1262,7 +1262,7 @@ static ir_node *array_access_to_firm( { dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); ir_node *addr = array_access_addr(expression); - type_t *type = expression->expression.datatype; + type_t *type = skip_typeref(expression->expression.datatype); return deref_address(type, addr, dbgi); } @@ -1311,6 +1311,9 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression) add_immBlock_pred(common_block, false_jmp); mature_immBlock(common_block); + /* TODO improve static semantics, so either both or no values are NULL */ + if (true_val == NULL || false_val == NULL) return NULL; + ir_node *in[2] = { true_val, false_val }; ir_mode *mode = get_irn_mode(true_val); assert(get_irn_mode(false_val) == mode); @@ -1340,10 +1343,126 @@ static ir_node *select_to_firm(const select_expression_t *expression) { dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); ir_node *addr = select_addr(expression); - type_t *type = expression->expression.datatype; + type_t *type = skip_typeref(expression->expression.datatype); return deref_address(type, addr, dbgi); } +/* Values returned by __builtin_classify_type. */ +typedef enum gcc_type_class +{ + no_type_class = -1, + void_type_class, + integer_type_class, + char_type_class, + enumeral_type_class, + boolean_type_class, + pointer_type_class, + reference_type_class, + offset_type_class, + real_type_class, + complex_type_class, + function_type_class, + method_type_class, + record_type_class, + union_type_class, + array_type_class, + string_type_class, + set_type_class, + file_type_class, + lang_type_class +} 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->datatype; + + gcc_type_class tc; + switch (type->type) + { + case TYPE_ATOMIC: { + const atomic_type_t *const atomic_type = (const atomic_type_t*)type; + switch (atomic_type->atype) { + // should not be reached + case ATOMIC_TYPE_INVALID: + tc = no_type_class; + break; + + // gcc cannot do that + case ATOMIC_TYPE_VOID: + tc = void_type_class; + break; + + case ATOMIC_TYPE_CHAR: // gcc handles this as integer + case ATOMIC_TYPE_SCHAR: // gcc handles this as integer + case ATOMIC_TYPE_UCHAR: // gcc handles this as integer + case ATOMIC_TYPE_SHORT: + case ATOMIC_TYPE_USHORT: + case ATOMIC_TYPE_INT: + case ATOMIC_TYPE_UINT: + case ATOMIC_TYPE_LONG: + case ATOMIC_TYPE_ULONG: + case ATOMIC_TYPE_LONGLONG: + case ATOMIC_TYPE_ULONGLONG: + case ATOMIC_TYPE_BOOL: // gcc handles this as integer + tc = integer_type_class; + break; + + case ATOMIC_TYPE_FLOAT: + case ATOMIC_TYPE_DOUBLE: + case ATOMIC_TYPE_LONG_DOUBLE: + tc = real_type_class; + break; + +#ifdef PROVIDE_COMPLEX + case ATOMIC_TYPE_FLOAT_COMPLEX: + case ATOMIC_TYPE_DOUBLE_COMPLEX: + case ATOMIC_TYPE_LONG_DOUBLE_COMPLEX: + tc = complex_type_class; + break; + case ATOMIC_TYPE_FLOAT_IMAGINARY: + case ATOMIC_TYPE_DOUBLE_IMAGINARY: + case ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY: + tc = complex_type_class; + break; +#endif + + default: + panic("Unimplemented case in classify_type_to_firm()."); + } + break; + } + + case TYPE_ARRAY: // gcc handles this as pointer + case TYPE_FUNCTION: // gcc handles this as pointer + case TYPE_POINTER: tc = pointer_type_class; break; + case TYPE_COMPOUND_STRUCT: tc = record_type_class; break; + case TYPE_COMPOUND_UNION: tc = union_type_class; break; + + // gcc handles this as integer + case TYPE_ENUM: tc = integer_type_class; break; + + default: + panic("Unimplemented case in classify_type_to_firm()."); + } + + dbg_info *const dbgi = get_dbg_info(&expr->expression.source_position); + ir_mode *const mode = mode_Is; + tarval *const tv = new_tarval_from_long(tc, mode); + return new_d_Const(dbgi, mode, tv); +} + +static ir_node *function_name_to_firm(const string_literal_t *const expr) +{ + if (current_function_name == NULL) { + const source_position_t *const src_pos = + &expr->expression.source_position; + const char *const name = current_function_decl->symbol->string; + current_function_name = string_to_firm(src_pos, "__func__", name); + } + + return current_function_name; +} + static ir_node *dereference_addr(const unary_expression_t *const expression) { assert(expression->type == UNEXPR_DEREFERENCE); @@ -1399,9 +1518,12 @@ static ir_node *_expression_to_firm(const expression_t *expression) return conditional_to_firm((const conditional_expression_t*)expression); case EXPR_SELECT: return select_to_firm((const select_expression_t*) expression); + case EXPR_CLASSIFY_TYPE: + return classify_type_to_firm((const classify_type_expression_t*)expression); case EXPR_FUNCTION: - case EXPR_OFFSETOF: case EXPR_PRETTY_FUNCTION: + return function_name_to_firm((const string_literal_t*)expression); + case EXPR_OFFSETOF: case EXPR_VA_ARG: case EXPR_STATEMENT: case EXPR_BUILTIN_SYMBOL: @@ -1546,12 +1668,16 @@ static void if_statement_to_firm(if_statement_t *statement) ir_node *fallthrough_block = new_immBlock(); /* the true (blocks) */ - ir_node *true_block = new_immBlock(); - - statement_to_firm(statement->true_statement); - if(get_cur_block() != NULL) { - ir_node *jmp = new_Jmp(); - add_immBlock_pred(fallthrough_block, jmp); + ir_node *true_block; + if (statement->true_statement != NULL) { + true_block = new_immBlock(); + statement_to_firm(statement->true_statement); + if(get_cur_block() != NULL) { + ir_node *jmp = new_Jmp(); + add_immBlock_pred(fallthrough_block, jmp); + } + } else { + true_block = fallthrough_block; } /* the false (blocks) */ @@ -1601,23 +1727,27 @@ static void while_statement_to_firm(while_statement_t *statement) ir_node *false_block = new_immBlock(); /* the loop body */ - ir_node *body_block = new_immBlock(); - - ir_node *old_continue_label = continue_label; - ir_node *old_break_label = break_label; - continue_label = header_block; - break_label = false_block; + ir_node *body_block; + if (statement->body != NULL) { + ir_node *old_continue_label = continue_label; + ir_node *old_break_label = break_label; + continue_label = header_block; + break_label = false_block; - statement_to_firm(statement->body); + body_block = new_immBlock(); + statement_to_firm(statement->body); - assert(continue_label == header_block); - assert(break_label == false_block); - continue_label = old_continue_label; - break_label = old_break_label; + assert(continue_label == header_block); + assert(break_label == false_block); + continue_label = old_continue_label; + break_label = old_break_label; - if(get_cur_block() != NULL) { - ir_node *jmp = new_Jmp(); - add_immBlock_pred(header_block, jmp); + if(get_cur_block() != NULL) { + ir_node *jmp = new_Jmp(); + add_immBlock_pred(header_block, jmp); + } + } else { + body_block = header_block; } /* create the condition */ @@ -1650,23 +1780,25 @@ static void do_while_statement_to_firm(do_while_statement_t *statement) add_immBlock_pred(body_block, jmp); } - ir_node *old_continue_label = continue_label; - ir_node *old_break_label = break_label; - continue_label = header_block; - break_label = false_block; + if (statement->body != NULL) { + ir_node *old_continue_label = continue_label; + ir_node *old_break_label = break_label; + continue_label = header_block; + break_label = false_block; - statement_to_firm(statement->body); + statement_to_firm(statement->body); - assert(continue_label == header_block); - assert(break_label == false_block); - continue_label = old_continue_label; - break_label = old_break_label; + assert(continue_label == header_block); + assert(break_label == false_block); + continue_label = old_continue_label; + break_label = old_break_label; - if(get_cur_block() == NULL) { - mature_immBlock(header_block); - mature_immBlock(body_block); - mature_immBlock(false_block); - return; + if (get_cur_block() == NULL) { + mature_immBlock(header_block); + mature_immBlock(body_block); + mature_immBlock(false_block); + return; + } } ir_node *body_jmp = new_Jmp(); @@ -1712,23 +1844,27 @@ static void for_statement_to_firm(for_statement_t *statement) ir_node *const false_block = new_immBlock(); /* the loop body */ - ir_node *const body_block = new_immBlock(); - - ir_node *const old_continue_label = continue_label; - ir_node *const old_break_label = break_label; - continue_label = step_block; - break_label = false_block; - - statement_to_firm(statement->body); - - assert(continue_label == step_block); - assert(break_label == false_block); - continue_label = old_continue_label; - break_label = old_break_label; - - if (get_cur_block() != NULL) { - ir_node *const jmp = new_Jmp(); - add_immBlock_pred(step_block, jmp); + ir_node * body_block; + if (statement->body != NULL) { + ir_node *const old_continue_label = continue_label; + ir_node *const old_break_label = break_label; + continue_label = step_block; + break_label = false_block; + + body_block = new_immBlock(); + statement_to_firm(statement->body); + + assert(continue_label == step_block); + assert(break_label == false_block); + continue_label = old_continue_label; + break_label = old_break_label; + + if (get_cur_block() != NULL) { + ir_node *const jmp = new_Jmp(); + add_immBlock_pred(step_block, jmp); + } + } else { + body_block = step_block; } /* create the condition */ @@ -1766,6 +1902,141 @@ static void create_declaration_entity(declaration_t *declaration, /* TODO: visibility? */ } +typedef struct compound_graph_path_entry_t compound_graph_path_entry_t; + +enum compound_graph_entry_type_t { + COMPOUND_GRAPH_ENTRY_ARRAY, + COMPOUND_GRAPH_ENTRY_COMPOUND +}; + +struct compound_graph_path_entry_t { + int type; + union { + ir_entity *entity; + int array_index; + } v; + compound_graph_path_entry_t *prev; +}; + +static void create_initializer_list(initializer_list_t *initializer, + type_t *type, ir_entity *entity, + compound_graph_path_entry_t *entry, + int len); + +static void create_initializer_value(initializer_value_t *initializer, + ir_entity *entity, + compound_graph_path_entry_t *entry, + int len) +{ + ir_node *node = expression_to_firm(initializer->value); + + ir_type *type = get_entity_type(entity); + compound_graph_path *path = new_compound_graph_path(type, len); + + int i = len - 1; + for( ; entry != NULL; entry = entry->prev, --i) { + assert(i >= 0); + if(entry->type == COMPOUND_GRAPH_ENTRY_COMPOUND) { + set_compound_graph_path_node(path, i, entry->v.entity); + } else { + assert(entry->type == COMPOUND_GRAPH_ENTRY_ARRAY); + set_compound_graph_path_array_index(path, i, entry->v.array_index); + } + } + assert(i == -1); + + add_compound_ent_value_w_path(entity, node, path); +} + +static void create_initializer_compound(initializer_list_t *initializer, + compound_type_t *type, + ir_entity *entity, + compound_graph_path_entry_t *last_entry, + int len) +{ + declaration_t *compound_declaration = type->declaration; + + declaration_t *compound_entry = compound_declaration->context.declarations; + + compound_graph_path_entry_t entry; + entry.type = COMPOUND_GRAPH_ENTRY_COMPOUND; + entry.prev = last_entry; + ++len; + + size_t i = 0; + for( ; compound_entry != NULL; compound_entry = compound_entry->next) { + if(compound_entry->symbol == NULL) + continue; + if(compound_entry->namespc != NAMESPACE_NORMAL) + continue; + + if(i >= initializer->len) + break; + + entry.v.entity = compound_entry->v.entity; + + initializer_t *sub_initializer = initializer->initializers[i]; + + assert(compound_entry != NULL); + assert(compound_entry->declaration_type + == DECLARATION_TYPE_COMPOUND_MEMBER); + + if(sub_initializer->type == INITIALIZER_VALUE) { + create_initializer_value((initializer_value_t*) sub_initializer, + entity, &entry, len); + } else { + assert(sub_initializer->type == INITIALIZER_LIST); + create_initializer_list((initializer_list_t*) sub_initializer, + compound_entry->type, entity, &entry, len); + } + + ++i; + } +} + +static void create_initializer_array(initializer_list_t *initializer, + array_type_t *type, ir_entity *entity, + compound_graph_path_entry_t *last_entry, + int len) +{ + type_t *element_type = type->element_type; + + compound_graph_path_entry_t entry; + entry.type = COMPOUND_GRAPH_ENTRY_ARRAY; + entry.prev = last_entry; + ++len; + + for(size_t i = 0; i < initializer->len; ++i) { + entry.v.array_index = i; + + initializer_t *sub_initializer = initializer->initializers[i]; + + if(sub_initializer->type == INITIALIZER_VALUE) { + create_initializer_value((initializer_value_t*) sub_initializer, + entity, &entry, len); + } else { + assert(sub_initializer->type == INITIALIZER_LIST); + create_initializer_list((initializer_list_t*) sub_initializer, + element_type, entity, &entry, len); + } + } +} + +static void create_initializer_list(initializer_list_t *initializer, + type_t *type, ir_entity *entity, + compound_graph_path_entry_t *entry, int len) +{ + if(type->type == TYPE_ARRAY) { + create_initializer_array(initializer, (array_type_t*) type, + entity, entry, len); + } else { + assert(type->type == TYPE_COMPOUND_STRUCT + || type->type == TYPE_COMPOUND_UNION); + create_initializer_compound(initializer, (compound_type_t*) type, + entity, entry, len); + } +} + static void create_initializer(declaration_t *declaration) { initializer_t *initializer = declaration->init.initializer; @@ -1773,21 +2044,30 @@ static void create_initializer(declaration_t *declaration) return; if(initializer->type == INITIALIZER_VALUE) { - assert(initializer->designator == NULL); - assert(initializer->next == NULL); - ir_node *init_node = expression_to_firm(initializer->v.value); + initializer_value_t *initializer_value + = (initializer_value_t*) initializer; + ir_node *value = expression_to_firm(initializer_value->value); if(declaration->declaration_type == DECLARATION_TYPE_LOCAL_VARIABLE) { - set_value(declaration->v.value_number, init_node); + set_value(declaration->v.value_number, value); } else { ir_entity *entity = declaration->v.entity; set_entity_variability(entity, variability_initialized); - set_atomic_ent_value(entity, init_node); + set_atomic_ent_value(entity, value); } } else { assert(initializer->type == INITIALIZER_LIST); - panic("list initializer not supported yet"); + initializer_list_t *list = (initializer_list_t*) initializer; + + declaration_type_t declaration_type = declaration->declaration_type; + assert(declaration_type == DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY + || declaration_type == DECLARATION_TYPE_GLOBAL_VARIABLE); + + ir_entity *entity = declaration->v.entity; + set_entity_variability(entity, variability_initialized); + + create_initializer_list(list, declaration->type, entity, NULL, 0); } } @@ -1954,7 +2234,7 @@ static void case_label_to_firm(const case_label_statement_t *statement) static ir_node *get_label_block(declaration_t *label) { - assert(label->namespace == NAMESPACE_LABEL); + assert(label->namespc == NAMESPACE_LABEL); if(label->declaration_type == DECLARATION_TYPE_LABEL_BLOCK) { return label->v.block; @@ -2051,11 +2331,112 @@ static void statement_to_firm(statement_t *statement) panic("Statement not implemented\n"); } +static int count_local_declarations(const declaration_t * decl, + const declaration_t *const end) +{ + int count = 0; + for (; decl != end; decl = decl->next) { + const type_t *type = skip_typeref(decl->type); + switch (type->type) { + case TYPE_ATOMIC: + case TYPE_ENUM: + case TYPE_POINTER: + if (!decl->address_taken) ++count; + break; + + default: break; + } + } + return count; +} + +static int count_decls_in_stmts(const statement_t *stmt) +{ + int count = 0; + for (; stmt != NULL; stmt = stmt->next) { + switch (stmt->type) { + case STATEMENT_DECLARATION: { + const declaration_statement_t *const decl_stmt = + (const declaration_statement_t*)stmt; + count += count_local_declarations(decl_stmt->declarations_begin, + decl_stmt->declarations_end->next); + break; + } + + case STATEMENT_COMPOUND: { + const compound_statement_t *const comp = + (const compound_statement_t*)stmt; + count += count_decls_in_stmts(comp->statements); + break; + } + + case STATEMENT_IF: { + const if_statement_t *const if_stmt = (const if_statement_t*)stmt; + count += count_decls_in_stmts(if_stmt->true_statement); + count += count_decls_in_stmts(if_stmt->false_statement); + break; + } + + case STATEMENT_SWITCH: { + const switch_statement_t *const switch_stmt = + (const switch_statement_t*)stmt; + count += count_decls_in_stmts(switch_stmt->body); + break; + } + + case STATEMENT_LABEL: { + const label_statement_t *const label_stmt = + (const label_statement_t*)stmt; + count += count_decls_in_stmts(label_stmt->label_statement); + break; + } + + case STATEMENT_WHILE: { + const while_statement_t *const while_stmt = + (const while_statement_t*)stmt; + count += count_decls_in_stmts(while_stmt->body); + break; + } + + case STATEMENT_DO_WHILE: { + const do_while_statement_t *const do_while_stmt = + (const do_while_statement_t*)stmt; + count += count_decls_in_stmts(do_while_stmt->body); + break; + } + + case STATEMENT_FOR: { + const for_statement_t *const for_stmt = + (const for_statement_t*)stmt; + /* TODO initialisation */ + count += count_decls_in_stmts(for_stmt->body); + break; + } + + case STATEMENT_BREAK: + case STATEMENT_CASE_LABEL: + case STATEMENT_CONTINUE: + case STATEMENT_EXPRESSION: + case STATEMENT_GOTO: + case STATEMENT_INVALID: + case STATEMENT_RETURN: + break; + } + } + return count; +} + static int get_function_n_local_vars(declaration_t *declaration) { - (void) declaration; - /* TODO */ - return 30; + int count = 0; + + /* count parameters */ + count += count_local_declarations(declaration->context.declarations, NULL); + + /* count local variables declared in body */ + count += count_decls_in_stmts(declaration->init.statement); + + return count; } static void initialize_function_parameters(declaration_t *declaration) @@ -2100,6 +2481,9 @@ static void create_function(declaration_t *declaration) if(declaration->init.statement == NULL) return; + current_function_decl = declaration; + current_function_name = NULL; + assert(imature_blocks == NULL); imature_blocks = NEW_ARR_F(ir_node*, 0); @@ -2162,7 +2546,9 @@ static void create_function(declaration_t *declaration) int misalign = 0; if(align > 0) { misalign = offset % align; - offset += misalign; + if(misalign > 0) { + offset += align - misalign; + } } set_entity_offset(entity, offset); @@ -2197,7 +2583,7 @@ static void context_to_firm(context_t *context) { declaration_t *declaration = context->declarations; for( ; declaration != NULL; declaration = declaration->next) { - if(declaration->namespace != NAMESPACE_NORMAL) + if(declaration->namespc != NAMESPACE_NORMAL) continue; if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY || declaration->storage_class == STORAGE_CLASS_TYPEDEF) @@ -2216,9 +2602,6 @@ static void context_to_firm(context_t *context) void translation_unit_to_firm(translation_unit_t *unit) { - /* remove me later TODO FIXME */ - (void) get_type_size; - /* just to be sure */ continue_label = NULL; break_label = NULL;