X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=b75ddc1cd19c23dd5868635fd5ce43b0e3c61831;hb=946ecca09f62b2e57a19e7f7fbfcfedd857ded37;hp=b6e22044ca34e81422344d941e276009ef01e6c2;hpb=7ef1a1bb85402943131db02b4f11092c5fbe9c0b;p=cparser diff --git a/ast2firm.c b/ast2firm.c index b6e2204..b75ddc1 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -23,13 +23,13 @@ static ir_type *ir_type_const_char; static ir_type *ir_type_void; static ir_type *ir_type_int; -static ir_type *ir_type_void_ptr; static type_t *type_const_char; static type_t *type_void; static type_t *type_int; -static symbol_t *symbol_alloca; +static symbol_t *symbol_builtin_alloca; +static symbol_t *symbol_builtin_nanf; static int next_value_number_function; static ir_node *continue_label; @@ -97,12 +97,11 @@ void init_ast2firm(void) ir_type_const_char = get_ir_type(type_const_char); ir_type_void = get_ir_type(type_int); /* we don't have a real void type in firm */ - ir_type_void_ptr = new_type_pointer(new_id_from_str("void_ptr"), - ir_type_void, mode_P_data); type_void->base.firm_type = ir_type_void; - symbol_alloca = symbol_table_insert("__builtin_alloca"); + symbol_builtin_alloca = symbol_table_insert("__builtin_alloca"); + symbol_builtin_nanf = symbol_table_insert("__builtin_nanf"); } void exit_ast2firm(void) @@ -245,7 +244,6 @@ static unsigned get_type_size(type_t *type) case TYPE_BUILTIN: case TYPE_TYPEDEF: case TYPE_TYPEOF: - case TYPE_COUNT: case TYPE_INVALID: break; } @@ -527,7 +525,6 @@ static ir_type *get_ir_type(type_t *type) case TYPE_BUILTIN: case TYPE_TYPEOF: case TYPE_TYPEDEF: - case TYPE_COUNT: case TYPE_INVALID: break; } @@ -601,7 +598,8 @@ static ir_node *const_to_firm(const const_expression_t *cnst) if(mode_is_signed(mode)) { len = snprintf(buf, sizeof(buf), "%lld", cnst->v.int_value); } else { - len = snprintf(buf, sizeof(buf), "%llu", cnst->v.int_value); + len = snprintf(buf, sizeof(buf), "%llu", + (unsigned long long) cnst->v.int_value); } tv = new_tarval_from_str(buf, len, mode); } @@ -676,6 +674,46 @@ static ir_node *deref_address(ir_type *const irtype, ir_node *const addr, return load_res; } +static ir_node *do_strict_conv(dbg_info *dbgi, ir_node *node) +{ + ir_mode *mode = get_irn_mode(node); + + if(!(get_irg_fp_model(current_ir_graph) & fp_explicit_rounding)) + return node; + if(!mode_is_float(mode)) + return node; + + /* check if there is already a Conv */ + if (get_irn_op(node) == op_Conv) { + /* convert it into a strict Conv */ + set_Conv_strict(node, 1); + return node; + } + + /* otherwise create a new one */ + return new_d_strictConv(dbgi, node, mode); +} + +static ir_node *get_global_var_address(dbg_info *const dbgi, + const declaration_t *const decl) +{ + assert(decl->declaration_type == DECLARATION_TYPE_GLOBAL_VARIABLE); + + ir_entity *const entity = decl->v.entity; + switch ((storage_class_tag_t)decl->storage_class) { + case STORAGE_CLASS_THREAD: + case STORAGE_CLASS_THREAD_EXTERN: + case STORAGE_CLASS_THREAD_STATIC: { + ir_node *const no_mem = new_NoMem(); + ir_node *const tls = get_irg_tls(current_ir_graph); + return new_d_simpleSel(dbgi, no_mem, tls, entity); + } + + default: + return create_symconst(dbgi, entity); + } +} + static ir_node *reference_expression_to_firm(const reference_expression_t *ref) { dbg_info *dbgi = get_dbg_info(&ref->expression.source_position); @@ -703,11 +741,11 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref) return create_symconst(dbgi, declaration->v.entity); } case DECLARATION_TYPE_GLOBAL_VARIABLE: { - ir_entity *entity = declaration->v.entity; - ir_node *symconst = create_symconst(dbgi, entity); - ir_type *irtype = get_entity_type(entity); - return deref_address(irtype, symconst, dbgi); + ir_node *const addr = get_global_var_address(dbgi, declaration); + ir_type *const irtype = get_entity_type(declaration->v.entity); + return deref_address(irtype, addr, dbgi); } + case DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY: { ir_entity *entity = declaration->v.entity; ir_node *frame = get_irg_frame(current_ir_graph); @@ -738,9 +776,8 @@ static ir_node *reference_addr(const reference_expression_t *ref) return create_symconst(dbgi, declaration->v.entity); } case DECLARATION_TYPE_GLOBAL_VARIABLE: { - ir_entity *entity = declaration->v.entity; - ir_node *symconst = create_symconst(dbgi, entity); - return symconst; + ir_node *const addr = get_global_var_address(dbgi, declaration); + return addr; } case DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY: { ir_entity *entity = declaration->v.entity; @@ -770,7 +807,7 @@ static ir_node *process_builtin_call(const call_expression_t *call) = (builtin_symbol_expression_t*) call->function; symbol_t *symbol = builtin->symbol; - if(symbol == symbol_alloca) { + if(symbol == symbol_builtin_alloca) { if(call->arguments == NULL || call->arguments->next != NULL) { panic("invalid number of parameters on __builtin_alloca"); } @@ -784,6 +821,12 @@ static ir_node *process_builtin_call(const call_expression_t *call) set_store(proj_m); ir_node *res = new_Proj(alloca, mode_P_data, pn_Alloc_res); + return res; + } else if(symbol == symbol_builtin_nanf) { + /* Ignore string for now... */ + ir_mode *mode = mode_D; + tarval *tv = get_mode_NAN(mode); + ir_node *res = new_d_Const(dbgi, mode, tv); return res; } else { panic("Unsupported builtin found\n"); @@ -794,11 +837,11 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) { assert(get_cur_block() != NULL); - expression_t *function = call->function; + expression_t *function = call->function; if(function->type == EXPR_BUILTIN_SYMBOL) { return process_builtin_call(call); } - ir_node *callee = expression_to_firm(function); + ir_node *callee = expression_to_firm(function); type_t *type = function->base.datatype; assert(type->type == TYPE_POINTER); @@ -812,6 +855,8 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) ++n_parameters; } + dbg_info *dbgi = get_dbg_info(&call->expression.source_position); + ir_type *ir_method_type = get_ir_type((type_t*) function_type); ir_type *new_method_type = NULL; if(function_type->variadic || function_type->unspecified_parameters) { @@ -838,6 +883,8 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) expression_t *expression = argument->expression; ir_node *arg_node = expression_to_firm(expression); + arg_node = do_strict_conv(dbgi, arg_node); + in[n] = arg_node; if(new_method_type != NULL) { ir_type *irtype = get_ir_type(expression->base.datatype); @@ -851,17 +898,22 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) if(new_method_type != NULL) ir_method_type = new_method_type; - dbg_info *dbgi = get_dbg_info(&call->expression.source_position); ir_node *store = get_store(); ir_node *node = new_d_Call(dbgi, store, callee, n_parameters, in, ir_method_type); ir_node *mem = new_d_Proj(dbgi, node, mode_M, pn_Call_M_regular); set_store(mem); - type_t *result_type = function_type->result_type; + type_t *result_type = skip_typeref(function_type->result_type); ir_node *result = NULL; - if(result_type != type_void) { - ir_mode *mode = get_ir_mode(result_type); + + if(!is_type_atomic(result_type, ATOMIC_TYPE_VOID)) { + ir_mode *mode; + if(is_type_scalar(result_type)) { + mode = get_ir_mode(result_type); + } else { + mode = mode_P_data; + } ir_node *resproj = new_d_Proj(dbgi, node, mode_T, pn_Call_T_result); result = new_d_Proj(dbgi, resproj, mode, 0); } @@ -880,6 +932,9 @@ static void create_condition_evaluation(const expression_t *expression, static void set_value_for_expression(const expression_t *expression, ir_node *value) { + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + value = do_strict_conv(dbgi, value); + if(expression->type == EXPR_REFERENCE) { reference_expression_t *ref = (reference_expression_t*) expression; @@ -891,13 +946,20 @@ static void set_value_for_expression(const expression_t *expression, } } - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); - ir_node *addr = expression_to_addr(expression); - assert(get_irn_mode(value) == get_ir_mode(expression->base.datatype)); - ir_node *memory = get_store(); - ir_node *store = new_d_Store(dbgi, memory, addr, value); - ir_node *store_mem = new_d_Proj(dbgi, store, mode_M, pn_Store_M); - set_store(store_mem); + ir_node *addr = expression_to_addr(expression); + ir_node *memory = get_store(); + + type_t *type = skip_typeref(expression->base.datatype); + if(is_type_scalar(type)) { + ir_node *store = new_d_Store(dbgi, memory, addr, value); + ir_node *store_mem = new_d_Proj(dbgi, store, mode_M, pn_Store_M); + set_store(store_mem); + } else { + ir_type *irtype = get_ir_type(type); + ir_node *copyb = new_d_CopyB(dbgi, memory, addr, value, irtype); + ir_node *copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M_regular); + set_store(copyb_mem); + } } static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) @@ -1001,7 +1063,12 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) case UNEXPR_PREFIX_INCREMENT: case UNEXPR_PREFIX_DECREMENT: return create_incdec(expression); - case UNEXPR_CAST: + case UNEXPR_CAST: { + ir_node *node = create_conv(dbgi, value_node, get_ir_mode(type)); + node = do_strict_conv(dbgi, node); + return node; + } + case UNEXPR_CAST_IMPLICIT: return create_conv(dbgi, value_node, get_ir_mode(type)); case UNEXPR_TAKE_ADDRESS: @@ -1306,6 +1373,7 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression) case BINEXPR_ASSIGN: { ir_node *right = expression_to_firm(expression->right); set_value_for_expression(expression->left, right); + return right; } case BINEXPR_ADD: @@ -1607,14 +1675,15 @@ static ir_node *expression_to_addr(const expression_t *expression) { switch(expression->type) { case EXPR_REFERENCE: - return reference_addr((const reference_expression_t*) expression); + return reference_addr(&expression->reference); case EXPR_ARRAY_ACCESS: - return array_access_addr((const array_access_expression_t*) expression); + return array_access_addr(&expression->array_access); case EXPR_SELECT: - return select_addr((const select_expression_t*) expression); + return select_addr(&expression->select); + case EXPR_CALL: + return call_expression_to_firm(&expression->call); case EXPR_UNARY: { - const unary_expression_t *const unary_expr = - (const unary_expression_t*)expression; + const unary_expression_t *const unary_expr = &expression->unary; if (unary_expr->type == UNEXPR_DEREFERENCE) { return dereference_addr(unary_expr); } @@ -1632,7 +1701,7 @@ static ir_node *_expression_to_firm(const expression_t *expression) case EXPR_CONST: return const_to_firm(&expression->conste); case EXPR_STRING_LITERAL: - return string_literal_to_firm(&expression->string_literal); + return string_literal_to_firm(&expression->string); case EXPR_REFERENCE: return reference_expression_to_firm(&expression->reference); case EXPR_CALL: @@ -1653,7 +1722,7 @@ static ir_node *_expression_to_firm(const expression_t *expression) return classify_type_to_firm(&expression->classify_type); case EXPR_FUNCTION: case EXPR_PRETTY_FUNCTION: - return function_name_to_firm(&expression->string_literal); + return function_name_to_firm(&expression->string); case EXPR_STATEMENT: return statement_expression_to_firm(&expression->statement); case EXPR_OFFSETOF: @@ -1751,36 +1820,42 @@ static void create_condition_evaluation(const expression_t *expression, set_cur_block(NULL); } - 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); - ir_node *value = NULL; - if(statement->return_value != NULL) { - value = expression_to_firm(statement->return_value); - } + 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) { - if(value == NULL) { - ir_type *res_type = get_method_res_type(func_irtype, 0); - ir_mode *mode = get_type_mode(res_type); - value = new_Unknown(mode); - } + ir_type *res_type = get_method_res_type(func_irtype, 0); - in[0] = value; + if(statement->return_value != NULL) { + ir_node *node = expression_to_firm(statement->return_value); + node = do_strict_conv(dbgi, node); + in[0] = node; + } else { + ir_mode *mode; + if(is_compound_type(res_type)) { + mode = mode_P_data; + } else { + mode = get_type_mode(res_type); + } + in[0] = new_Unknown(mode); + } in_len = 1; } else { + /* build return_value for its side effects */ + if(statement->return_value != NULL) { + expression_to_firm(statement->return_value); + } in_len = 0; } - dbg_info *dbgi = get_dbg_info(&statement->statement.source_position); ir_node *store = get_store(); ir_node *ret = new_d_Return(dbgi, store, in_len, in); @@ -1899,7 +1974,7 @@ static void while_statement_to_firm(while_statement_t *statement) break_label = old_break_label; if(get_cur_block() != NULL) { - ir_node *jmp = new_Jmp(); + jmp = new_Jmp(); add_immBlock_pred(header_block, jmp); } } else { @@ -2016,7 +2091,7 @@ static void for_statement_to_firm(for_statement_t *statement) break_label = old_break_label; if (get_cur_block() != NULL) { - ir_node *const jmp = new_Jmp(); + jmp = new_Jmp(); add_immBlock_pred(step_block, jmp); } } else { @@ -2030,7 +2105,7 @@ static void for_statement_to_firm(for_statement_t *statement) false_block); } else { keep_alive(header_block); - ir_node *jmp = new_Jmp(); + jmp = new_Jmp(); add_immBlock_pred(body_block, jmp); } @@ -2052,7 +2127,7 @@ static void create_declaration_entity(declaration_t *declaration, ir_entity *entity = new_entity(parent_type, id, irtype); set_entity_ld_ident(entity, id); - declaration->declaration_type = declaration_type; + declaration->declaration_type = (unsigned char) declaration_type; declaration->v.entity = entity; set_entity_variability(entity, variability_uninitialized); /* TODO: visibility? */ @@ -2145,9 +2220,9 @@ static void create_initializer_compound(initializer_list_t *initializer, create_initializer_value(&sub_initializer->value, entity, &entry, len); } else { - type_t *type = skip_typeref(compound_entry->type); - create_initializer_object(sub_initializer, type, entity, &entry, - len); + type_t *entry_type = skip_typeref(compound_entry->type); + create_initializer_object(sub_initializer, entry_type, entity, + &entry, len); } ++i; @@ -2183,7 +2258,7 @@ static void create_initializer_array(initializer_list_t *initializer, } #if 0 - /* TODO: initializer rest... */ + /* TODO: initialize rest... */ if(type->size_expression != NULL) { size_t array_len = fold_constant(type->size_expression); for( ; i < array_len; ++i) { @@ -2300,7 +2375,8 @@ static void create_initializer(declaration_t *declaration) if(initializer == NULL) return; - declaration_type_t declaration_type = (declaration_type_t)declaration->declaration_type; + declaration_type_t declaration_type + = (declaration_type_t) declaration->declaration_type; if(declaration_type == DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY) { create_initializer_local_variable_entity(declaration); return; @@ -2322,7 +2398,6 @@ static void create_initializer(declaration_t *declaration) set_atomic_ent_value(entity, value); } } else { - declaration_type_t declaration_type = (declaration_type_t)declaration->declaration_type; assert(declaration_type == DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY || declaration_type == DECLARATION_TYPE_GLOBAL_VARIABLE); @@ -2393,7 +2468,7 @@ static void declaration_statement_to_firm(declaration_statement_t *statement) for( ; declaration != end; declaration = declaration->next) { type_t *type = declaration->type; - switch(declaration->storage_class) { + switch ((storage_class_tag_t)declaration->storage_class) { case STORAGE_CLASS_TYPEDEF: continue; case STORAGE_CLASS_STATIC: @@ -2412,6 +2487,10 @@ static void declaration_statement_to_firm(declaration_statement_t *statement) create_local_variable(declaration); } continue; + case STORAGE_CLASS_THREAD: + case STORAGE_CLASS_THREAD_EXTERN: + case STORAGE_CLASS_THREAD_STATIC: + break; } panic("invalid storage class found"); } @@ -2574,26 +2653,28 @@ static void goto_to_firm(const goto_statement_t *statement) static void statement_to_firm(statement_t *statement) { switch(statement->type) { + case STATEMENT_INVALID: + panic("invalid statement found"); case STATEMENT_COMPOUND: - compound_statement_to_firm((compound_statement_t*) statement); + compound_statement_to_firm(&statement->compound); return; case STATEMENT_RETURN: - return_statement_to_firm((return_statement_t*) statement); + return_statement_to_firm(&statement->returns); return; case STATEMENT_EXPRESSION: - expression_statement_to_firm((expression_statement_t*) statement); + expression_statement_to_firm(&statement->expression); return; case STATEMENT_IF: - if_statement_to_firm((if_statement_t*) statement); + if_statement_to_firm(&statement->ifs); return; case STATEMENT_WHILE: - while_statement_to_firm((while_statement_t*) statement); + while_statement_to_firm(&statement->whiles); return; case STATEMENT_DO_WHILE: - do_while_statement_to_firm((do_while_statement_t*) statement); + do_while_statement_to_firm(&statement->do_while); return; case STATEMENT_DECLARATION: - declaration_statement_to_firm((declaration_statement_t*) statement); + declaration_statement_to_firm(&statement->declaration); return; case STATEMENT_BREAK: create_jump_statement(statement, break_label); @@ -2602,21 +2683,21 @@ static void statement_to_firm(statement_t *statement) create_jump_statement(statement, continue_label); return; case STATEMENT_SWITCH: - switch_statement_to_firm((switch_statement_t*) statement); + switch_statement_to_firm(&statement->switchs); return; case STATEMENT_CASE_LABEL: - case_label_to_firm((case_label_statement_t*) statement); + case_label_to_firm(&statement->case_label); return; case STATEMENT_FOR: - for_statement_to_firm((for_statement_t*) statement); + for_statement_to_firm(&statement->fors); return; case STATEMENT_LABEL: - label_to_firm((label_statement_t*) statement); + label_to_firm(&statement->label); return; case STATEMENT_GOTO: - goto_to_firm((goto_statement_t*) statement); + goto_to_firm(&statement->gotos); return; - default: + case STATEMENT_ASM: break; } panic("Statement not implemented\n"); @@ -2705,6 +2786,7 @@ static int count_decls_in_stmts(const statement_t *stmt) break; } + case STATEMENT_ASM: case STATEMENT_BREAK: case STATEMENT_CASE_LABEL: case STATEMENT_CONTINUE: @@ -2779,7 +2861,7 @@ static void initialize_function_parameters(declaration_t *declaration) static void create_function(declaration_t *declaration) { - ir_entity *entity = get_function_entity(declaration); + ir_entity *function_entity = get_function_entity(declaration); if(declaration->init.statement == NULL) return; @@ -2791,7 +2873,7 @@ static void create_function(declaration_t *declaration) imature_blocks = NEW_ARR_F(ir_node*, 0); int n_local_vars = get_function_n_local_vars(declaration); - ir_graph *irg = new_ir_graph(entity, n_local_vars); + ir_graph *irg = new_ir_graph(function_entity, n_local_vars); ir_node *first_block = get_cur_block(); next_value_number_function = 0; @@ -2805,13 +2887,20 @@ static void create_function(declaration_t *declaration) if(get_cur_block() != NULL) { assert(declaration->type->type == TYPE_FUNCTION); const function_type_t* const func_type = &declaration->type->function; + const type_t *result_type = skip_typeref(func_type->result_type); ir_node *ret; - if (func_type->result_type == type_void) { + if (is_type_atomic(result_type, ATOMIC_TYPE_VOID)) { ret = new_Return(get_store(), 0, NULL); } else { - ir_mode *const mode = get_ir_mode(func_type->result_type); - ir_node * in[1]; + ir_mode *mode; + if(is_type_scalar(result_type)) { + mode = get_ir_mode(func_type->result_type); + } else { + mode = mode_P_data; + } + + ir_node *in[1]; // §5.1.2.2.3 main implicitly returns 0 if (strcmp(declaration->symbol->string, "main") == 0) { in[0] = new_Const(mode, get_mode_null(mode)); @@ -2866,20 +2955,57 @@ static void create_function(declaration_t *declaration) static void create_global_variable(declaration_t *declaration) { - ir_type *global_type = get_glob_type(); - create_declaration_entity(declaration, DECLARATION_TYPE_GLOBAL_VARIABLE, - global_type); + 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; - ir_entity *entity = declaration->v.entity; - if(declaration->storage_class == STORAGE_CLASS_STATIC) { - set_entity_visibility(entity, visibility_local); - } else if(declaration->storage_class == STORAGE_CLASS_EXTERN) { - set_entity_visibility(entity, visibility_external_allocated); - } else { - set_entity_visibility(entity, visibility_external_visible); + 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_TYPE_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; } - current_ir_graph = get_const_code_irg(); - create_initializer(declaration); + panic("Invalid storage class for global variable"); } static void context_to_firm(context_t *context)