X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=75b674c7824142952b4dde66fe71dbac02c67e6e;hb=23ebb996cbe0f5d2c74184d1cfb783cb2a529a13;hp=875f1d9fbffa15dc549f35d6da7b85ba8e3f2163;hpb=c1766187fc2226da5e59558aa7d0510b61ea4cf3;p=cparser diff --git a/ast2firm.c b/ast2firm.c index 875f1d9..75b674c 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -64,8 +65,6 @@ static const backend_params *be_params; static ir_type *ir_type_char; static ir_type *ir_type_const_char; static ir_type *ir_type_wchar_t; -static ir_type *ir_type_void; -static ir_type *ir_type_int; /* architecture specific floating point arithmetic mode (if any) */ static ir_mode *mode_float_arithmetic; @@ -130,14 +129,14 @@ static ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos) return new_r_Unknown(irg, mode); } -static const char *dbg_retrieve(const dbg_info *dbg, unsigned *line) +static src_loc_t dbg_retrieve(const dbg_info *dbg) { - const source_position_t *pos = (const source_position_t*) dbg; - if (pos == NULL) - return NULL; - if (line != NULL) - *line = pos->lineno; - return pos->input_name; + source_position_t const *const pos = (source_position_t const*)dbg; + if (pos) { + return (src_loc_t){ pos->input_name, pos->lineno, pos->colno }; + } else { + return (src_loc_t){ NULL, 0, 0 }; + } } static dbg_info *get_dbg_info(const source_position_t *pos) @@ -316,11 +315,11 @@ static ir_type *create_method_type(const function_type_t *function_type, bool fo int n_parameters = count_parameters(function_type) + (for_closure ? 1 : 0); - int n_results = return_type == type_void ? 0 : 1; + int n_results = is_type_void(return_type) ? 0 : 1; type_dbg_info *dbgi = get_type_dbg_info_((const type_t*) function_type); ir_type *irtype = new_d_type_method(n_parameters, n_results, dbgi); - if (return_type != type_void) { + if (!is_type_void(return_type)) { ir_type *restype = get_ir_type(return_type); set_method_res_type(irtype, 0, restype); } @@ -521,8 +520,6 @@ static ir_type *create_bitfield_type(const entity_t *entity) } } -#define INVALID_TYPE ((ir_type*)-1) - enum { COMPOUND_IS_STRUCT = false, COMPOUND_IS_UNION = true @@ -618,15 +615,14 @@ static ir_type *create_compound_type(compound_type_t *type, return irtype; } +static ir_tarval *fold_constant_to_tarval(expression_t const *); + static void determine_enum_values(enum_type_t *const type) { ir_mode *const mode = atomic_modes[type->base.akind]; ir_tarval *const one = get_mode_one(mode); ir_tarval * tv_next = get_mode_null(mode); - bool constant_folding_old = constant_folding; - constant_folding = true; - enum_t *enume = type->enume; entity_t *entry = enume->base.next; for (; entry != NULL; entry = entry->base.next) { @@ -635,18 +631,12 @@ static void determine_enum_values(enum_type_t *const type) expression_t *const init = entry->enum_value.value; if (init != NULL) { - ir_node *const cnst = expression_to_firm(init); - if (!is_Const(cnst)) { - panic("couldn't fold constant"); - } - tv_next = get_Const_tarval(cnst); + tv_next = fold_constant_to_tarval(init); } assert(entry->enum_value.tv == NULL || entry->enum_value.tv == tv_next); entry->enum_value.tv = tv_next; tv_next = tarval_add(tv_next, one); } - - constant_folding = constant_folding_old; } static ir_type *create_enum_type(enum_type_t *const type) @@ -660,7 +650,6 @@ static ir_type *get_ir_type_incomplete(type_t *type) type = skip_typeref(type); if (type->base.firm_type != NULL) { - assert(type->base.firm_type != INVALID_TYPE); return type->base.firm_type; } @@ -681,16 +670,11 @@ ir_type *get_ir_type(type_t *type) type = skip_typeref(type); if (type->base.firm_type != NULL) { - assert(type->base.firm_type != INVALID_TYPE); return type->base.firm_type; } ir_type *firm_type = NULL; switch (type->kind) { - case TYPE_ERROR: - /* Happens while constant folding, when there was an error */ - return create_atomic_type(ATOMIC_TYPE_VOID, NULL); - case TYPE_ATOMIC: firm_type = create_atomic_type(type->atomic.akind, type); break; @@ -722,6 +706,7 @@ ir_type *get_ir_type(type_t *type) firm_type = create_enum_type(&type->enumt); break; + case TYPE_ERROR: case TYPE_TYPEOF: case TYPE_TYPEDEF: break; @@ -735,14 +720,15 @@ ir_type *get_ir_type(type_t *type) static ir_mode *get_ir_mode_storage(type_t *type) { - ir_type *irtype = get_ir_type(type); + type = skip_typeref(type); - /* firm doesn't report a mode for arrays somehow... */ - if (is_Array_type(irtype)) { + /* Firm doesn't report a mode for arrays and structs/unions. */ + if (!is_type_scalar(type)) { return mode_P_data; } - ir_mode *mode = get_type_mode(irtype); + ir_type *const irtype = get_ir_type(type); + ir_mode *const mode = get_type_mode(irtype); assert(mode != NULL); return mode; } @@ -1037,7 +1023,7 @@ static ir_entity *get_function_entity(entity_t *entity, ir_type *owner_type) continue; type_t *return_type = skip_typeref(function_type->return_type); - int n_res = return_type != type_void ? 1 : 0; + int n_res = is_type_void(return_type) ? 0 : 1; if (n_res != rts_data[i].n_res) continue; @@ -1072,15 +1058,16 @@ static ir_node *create_symconst(dbg_info *dbgi, ir_entity *entity) return new_d_SymConst(dbgi, mode_P, sym, symconst_addr_ent); } +static ir_node *create_Const_from_bool(ir_mode *const mode, bool const v) +{ + return new_Const((v ? get_mode_one : get_mode_null)(mode)); +} + static ir_node *create_conv_from_b(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) { if (is_Const(value)) { - if (is_Const_null(value)) { - return new_Const(get_mode_null(dest_mode)); - } else { - return new_Const(get_mode_one(dest_mode)); - } + return create_Const_from_bool(dest_mode, !is_Const_null(value)); } ir_node *cond = new_d_Cond(dbgi, value); @@ -1112,7 +1099,7 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) if (dest_mode == mode_b) { ir_node *zero = new_Const(get_mode_null(value_mode)); - ir_node *cmp = new_d_Cmp(dbgi, value, zero, ir_relation_less_greater); + ir_node *cmp = new_d_Cmp(dbgi, value, zero, ir_relation_unordered_less_greater); return cmp; } else if (value_mode == mode_b) { return create_conv_from_b(dbgi, value, dest_mode); @@ -1121,11 +1108,6 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) return new_d_Conv(dbgi, value, dest_mode); } -static ir_node *create_Const_from_bool(ir_mode *const mode, bool const v) -{ - return new_Const((v ? get_mode_one : get_mode_null)(mode)); -} - /** * Creates a SymConst node representing a wide string literal. * @@ -1547,8 +1529,7 @@ static void keep_all_memory(ir_node *block) set_cur_block(old); } -static ir_node *reference_expression_enum_value_to_firm( - const reference_expression_t *ref) +static ir_node *enum_constant_to_firm(reference_expression_t const *const ref) { entity_t *entity = ref->entity; if (entity->enum_value.tv == NULL) { @@ -1881,9 +1862,9 @@ static ir_node *call_expression_to_firm(const call_expression_t *const call) type_t *arg_type = skip_typeref(expression->base.type); if (!is_type_compound(arg_type)) { - ir_mode *mode = get_ir_mode_storage(expression->base.type); - arg_node = create_conv(dbgi, arg_node, mode); - arg_node = do_strict_conv(dbgi, arg_node); + ir_mode *const mode = get_ir_mode_storage(arg_type); + arg_node = create_conv(dbgi, arg_node, mode); + arg_node = do_strict_conv(dbgi, arg_node); } in[n] = arg_node; @@ -1909,7 +1890,7 @@ static ir_node *call_expression_to_firm(const call_expression_t *const call) set_store(mem); } - if (!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { + if (!is_type_void(return_type)) { assert(is_type_scalar(return_type)); ir_mode *mode = get_ir_mode_storage(return_type); result = new_Proj(node, mode, pn_Builtin_max+1); @@ -1923,18 +1904,12 @@ static ir_node *call_expression_to_firm(const call_expression_t *const call) set_store(mem); } - if (!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { - ir_node *resproj = new_Proj(node, mode_T, pn_Call_T_result); - - if (is_type_scalar(return_type)) { - ir_mode *mode = get_ir_mode_storage(return_type); - result = new_Proj(resproj, mode, 0); - ir_mode *mode_arith = get_ir_mode_arithmetic(return_type); - result = create_conv(NULL, result, mode_arith); - } else { - ir_mode *mode = mode_P_data; - result = new_Proj(resproj, mode, 0); - } + if (!is_type_void(return_type)) { + ir_node *const resproj = new_Proj(node, mode_T, pn_Call_T_result); + ir_mode *const mode = get_ir_mode_storage(return_type); + result = new_Proj(resproj, mode, 0); + ir_mode *const mode_arith = get_ir_mode_arithmetic(return_type); + result = create_conv(NULL, result, mode_arith); } } @@ -1950,7 +1925,7 @@ static ir_node *call_expression_to_firm(const call_expression_t *const call) return result; } -static void statement_to_firm(statement_t *statement); +static ir_node *statement_to_firm(statement_t *statement); static ir_node *compound_statement_to_firm(compound_statement_t *compound); static ir_node *expression_to_addr(const expression_t *expression); @@ -2389,7 +2364,7 @@ static ir_node *create_cast(dbg_info *dbgi, ir_node *value_node, type_t *from_type, type_t *type) { type = skip_typeref(type); - if (type == type_void) { + if (is_type_void(type)) { /* make sure firm type is constructed */ (void) get_ir_type(type); return NULL; @@ -2410,7 +2385,7 @@ static ir_node *create_cast(dbg_info *dbgi, ir_node *value_node, if (from_var != NULL) { ir_node *const addr = create_symconst(dbgi, from_var->v.entity); ir_node *const base = deref_address(dbgi, from_var->base.type, addr); - value_node = new_d_Add(dbgi, value_node, base, get_ir_mode_storage(from_type)); + value_node = new_d_Add(dbgi, value_node, base, mode); } if (to_var != NULL) { ir_node *const addr = create_symconst(dbgi, to_var->v.entity); @@ -2439,12 +2414,12 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) dbg_info *dbgi = get_dbg_info(&expression->base.source_position); type_t *type = skip_typeref(expression->base.type); - if (expression->base.kind == EXPR_UNARY_TAKE_ADDRESS) - return expression_to_addr(expression->value); - const expression_t *value = expression->value; switch(expression->base.kind) { + case EXPR_UNARY_TAKE_ADDRESS: + return expression_to_addr(value); + case EXPR_UNARY_NEGATE: { ir_node *value_node = expression_to_firm(value); ir_mode *mode = get_ir_mode_arithmetic(type); @@ -2893,8 +2868,7 @@ static ir_entity *create_initializer_entity(dbg_info *dbgi, return entity; } -static ir_node *compound_literal_to_firm( - const compound_literal_expression_t *expression) +static ir_node *compound_literal_addr(compound_literal_expression_t const *const expression) { dbg_info *dbgi = get_dbg_info(&expression->base.source_position); type_t *type = expression->type; @@ -2922,6 +2896,14 @@ static ir_node *compound_literal_to_firm( } } +static ir_node *compound_literal_to_firm(compound_literal_expression_t const* const expr) +{ + dbg_info *const dbgi = get_dbg_info(&expr->base.source_position); + type_t *const type = expr->type; + ir_node *const addr = compound_literal_addr(expr); + return deref_address(dbgi, type, addr); +} + /** * Transform a sizeof expression into Firm code. */ @@ -2933,11 +2915,6 @@ static ir_node *sizeof_to_firm(const typeprop_expression_t *expression) && expression->tp_expression != NULL) { expression_to_firm(expression->tp_expression); } - /* strange gnu extensions: sizeof(function) == 1 */ - if (is_type_function(type)) { - ir_mode *mode = get_ir_mode_storage(type_size_t); - return new_Const(get_mode_one(mode)); - } return get_type_size_node(type); } @@ -3001,7 +2978,7 @@ static void init_ir_types(void); static ir_tarval *fold_constant_to_tarval(const expression_t *expression) { - assert(is_type_valid(skip_typeref(expression->base.type))); + assert(is_constant_expression(expression) == EXPR_CLASS_CONSTANT); bool constant_folding_old = constant_folding; constant_folding = true; @@ -3012,8 +2989,6 @@ static ir_tarval *fold_constant_to_tarval(const expression_t *expression) init_ir_types(); - assert(is_constant_expression(expression) == EXPR_CLASS_CONSTANT); - ir_graph *old_current_ir_graph = current_ir_graph; current_ir_graph = get_const_code_irg(); @@ -3034,16 +3009,12 @@ static ir_tarval *fold_constant_to_tarval(const expression_t *expression) /* this function is only used in parser.c, but it relies on libfirm functionality */ bool constant_is_negative(const expression_t *expression) { - assert(is_constant_expression(expression) == EXPR_CLASS_CONSTANT); ir_tarval *tv = fold_constant_to_tarval(expression); return tarval_is_negative(tv); } long fold_constant_to_int(const expression_t *expression) { - if (expression->kind == EXPR_ERROR) - return 0; - ir_tarval *tv = fold_constant_to_tarval(expression); if (!tarval_is_long(tv)) { panic("result of constant folding is not integer"); @@ -3054,8 +3025,6 @@ long fold_constant_to_int(const expression_t *expression) bool fold_constant_to_bool(const expression_t *expression) { - if (expression->kind == EXPR_ERROR) - return false; ir_tarval *tv = fold_constant_to_tarval(expression); return !tarval_is_null(tv); } @@ -3111,12 +3080,7 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression) ir_node *const in[2] = { true_val, false_val }; type_t *const type = skip_typeref(expression->base.type); - ir_mode *mode; - if (is_type_compound(type)) { - mode = mode_P; - } else { - mode = get_ir_mode_arithmetic(type); - } + ir_mode *const mode = get_ir_mode_arithmetic(type); ir_node *const val = new_d_Phi(dbgi, lengthof(in), in, mode); return val; @@ -3376,7 +3340,7 @@ static ir_node *expression_to_addr(const expression_t *expression) case EXPR_CALL: return call_expression_to_firm(&expression->call); case EXPR_COMPOUND_LITERAL: - return compound_literal_to_firm(&expression->compound_literal); + return compound_literal_addr(&expression->compound_literal); case EXPR_REFERENCE: return reference_addr(&expression->reference); case EXPR_SELECT: @@ -3442,79 +3406,48 @@ static ir_node *label_address_to_firm(const label_address_expression_t *label) return new_d_SymConst(dbgi, mode_P_code, value, symconst_addr_ent); } -static ir_node *error_to_firm(const expression_t *expression) -{ - ir_mode *mode = get_ir_mode_arithmetic(expression->base.type); - return new_Bad(mode); -} - /** * creates firm nodes for an expression. The difference between this function * and expression_to_firm is, that this version might produce mode_b nodes * instead of mode_Is. */ -static ir_node *_expression_to_firm(const expression_t *expression) +static ir_node *_expression_to_firm(expression_t const *const expr) { #ifndef NDEBUG if (!constant_folding) { - assert(!expression->base.transformed); - ((expression_t*) expression)->base.transformed = true; + assert(!expr->base.transformed); + ((expression_t*)expr)->base.transformed = true; } #endif - switch (expression->kind) { - case EXPR_LITERAL_CASES: - return literal_to_firm(&expression->literal); - case EXPR_STRING_LITERAL: - return string_to_firm(&expression->base.source_position, "str.%u", - &expression->literal.value); - case EXPR_WIDE_STRING_LITERAL: - return wide_string_literal_to_firm(&expression->string_literal); - case EXPR_REFERENCE: - return reference_expression_to_firm(&expression->reference); - case EXPR_REFERENCE_ENUM_VALUE: - return reference_expression_enum_value_to_firm(&expression->reference); - case EXPR_CALL: - return call_expression_to_firm(&expression->call); - case EXPR_UNARY_CASES: - return unary_expression_to_firm(&expression->unary); - case EXPR_BINARY_CASES: - return binary_expression_to_firm(&expression->binary); - case EXPR_ARRAY_ACCESS: - return array_access_to_firm(&expression->array_access); - case EXPR_SIZEOF: - return sizeof_to_firm(&expression->typeprop); - case EXPR_ALIGNOF: - return alignof_to_firm(&expression->typeprop); - case EXPR_CONDITIONAL: - return conditional_to_firm(&expression->conditional); - case EXPR_SELECT: - return select_to_firm(&expression->select); - case EXPR_CLASSIFY_TYPE: - return classify_type_to_firm(&expression->classify_type); - case EXPR_FUNCNAME: - return function_name_to_firm(&expression->funcname); - case EXPR_STATEMENT: - return statement_expression_to_firm(&expression->statement); - case EXPR_VA_START: - return va_start_expression_to_firm(&expression->va_starte); - case EXPR_VA_ARG: - return va_arg_expression_to_firm(&expression->va_arge); - case EXPR_VA_COPY: - return va_copy_expression_to_firm(&expression->va_copye); - case EXPR_BUILTIN_CONSTANT_P: - return builtin_constant_to_firm(&expression->builtin_constant); - case EXPR_BUILTIN_TYPES_COMPATIBLE_P: - return builtin_types_compatible_to_firm(&expression->builtin_types_compatible); - case EXPR_OFFSETOF: - return offsetof_to_firm(&expression->offsetofe); - case EXPR_COMPOUND_LITERAL: - return compound_literal_to_firm(&expression->compound_literal); - case EXPR_LABEL_ADDRESS: - return label_address_to_firm(&expression->label_address); - - case EXPR_ERROR: - return error_to_firm(expression); + switch (expr->kind) { + case EXPR_ALIGNOF: return alignof_to_firm( &expr->typeprop); + case EXPR_ARRAY_ACCESS: return array_access_to_firm( &expr->array_access); + case EXPR_BINARY_CASES: return binary_expression_to_firm( &expr->binary); + case EXPR_BUILTIN_CONSTANT_P: return builtin_constant_to_firm( &expr->builtin_constant); + case EXPR_BUILTIN_TYPES_COMPATIBLE_P: return builtin_types_compatible_to_firm(&expr->builtin_types_compatible); + case EXPR_CALL: return call_expression_to_firm( &expr->call); + case EXPR_CLASSIFY_TYPE: return classify_type_to_firm( &expr->classify_type); + case EXPR_COMPOUND_LITERAL: return compound_literal_to_firm( &expr->compound_literal); + case EXPR_CONDITIONAL: return conditional_to_firm( &expr->conditional); + case EXPR_FUNCNAME: return function_name_to_firm( &expr->funcname); + case EXPR_LABEL_ADDRESS: return label_address_to_firm( &expr->label_address); + case EXPR_LITERAL_CASES: return literal_to_firm( &expr->literal); + case EXPR_OFFSETOF: return offsetof_to_firm( &expr->offsetofe); + case EXPR_REFERENCE: return reference_expression_to_firm( &expr->reference); + case EXPR_ENUM_CONSTANT: return enum_constant_to_firm( &expr->reference); + case EXPR_SELECT: return select_to_firm( &expr->select); + case EXPR_SIZEOF: return sizeof_to_firm( &expr->typeprop); + case EXPR_STATEMENT: return statement_expression_to_firm( &expr->statement); + case EXPR_UNARY_CASES: return unary_expression_to_firm( &expr->unary); + case EXPR_VA_ARG: return va_arg_expression_to_firm( &expr->va_arge); + case EXPR_VA_COPY: return va_copy_expression_to_firm( &expr->va_copye); + case EXPR_VA_START: return va_start_expression_to_firm( &expr->va_starte); + case EXPR_WIDE_STRING_LITERAL: return wide_string_literal_to_firm( &expr->string_literal); + + case EXPR_STRING_LITERAL: return string_to_firm(&expr->base.source_position, "str.%u", &expr->literal.value); + + case EXPR_ERROR: break; } panic("invalid expression found"); } @@ -4343,13 +4276,10 @@ static void create_variable_initializer(entity_t *entity) type_qualifiers_t tq = get_type_qualifier(type, true); if (initializer->kind == INITIALIZER_VALUE) { - initializer_value_t *initializer_value = &initializer->value; - dbg_info *dbgi = get_dbg_info(&entity->base.source_position); - expression_t *value = initializer_value->value; - type_t *init_type = value->base.type; - type_t *skipped = skip_typeref(init_type); + expression_t * value = initializer->value.value; + type_t *const init_type = skip_typeref(value->base.type); - if (!is_type_scalar(skipped)) { + if (!is_type_scalar(init_type)) { /* skip convs */ while (value->kind == EXPR_UNARY_CAST) value = value->unary.value; @@ -4360,9 +4290,9 @@ static void create_variable_initializer(entity_t *entity) goto have_initializer; } - ir_node *node = expression_to_firm(initializer_value->value); - - ir_mode *mode = get_ir_mode_storage(init_type); + ir_node * node = expression_to_firm(value); + dbg_info *const dbgi = get_dbg_info(&entity->base.source_position); + ir_mode *const mode = get_ir_mode_storage(init_type); node = create_conv(dbgi, node, mode); node = do_strict_conv(dbgi, node); @@ -4504,54 +4434,38 @@ static void create_local_static_variable(entity_t *entity) -static void return_statement_to_firm(return_statement_t *statement) +static ir_node *return_statement_to_firm(return_statement_t *statement) { if (!currently_reachable()) - return; + return NULL; - dbg_info *dbgi = get_dbg_info(&statement->base.source_position); - type_t *type = current_function_entity->declaration.type; - ir_type *func_irtype = get_ir_type(type); - - 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->value != NULL) { - ir_node *node = expression_to_firm(statement->value); - if (!is_compound_type(res_type)) { - type_t *ret_value_type = statement->value->base.type; - ir_mode *mode = get_ir_mode_storage(ret_value_type); - node = create_conv(dbgi, node, mode); - node = do_strict_conv(dbgi, node); - } - in[0] = node; + dbg_info *const dbgi = get_dbg_info(&statement->base.source_position); + type_t *const type = skip_typeref(current_function_entity->declaration.type->function.return_type); + ir_node * res = statement->value ? expression_to_firm(statement->value) : NULL; + + int in_len; + if (!is_type_void(type)) { + ir_mode *const mode = get_ir_mode_storage(type); + if (res) { + res = create_conv(dbgi, res, mode); + res = do_strict_conv(dbgi, res); } 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); + res = new_Unknown(mode); } in_len = 1; } else { - /* build return_value for its side effects */ - if (statement->value != NULL) { - expression_to_firm(statement->value); - } in_len = 0; } - ir_node *store = get_store(); - ir_node *ret = new_d_Return(dbgi, store, in_len, in); + ir_node *const in[1] = { res }; + ir_node *const store = get_store(); + ir_node *const ret = new_d_Return(dbgi, store, in_len, in); ir_node *end_block = get_irg_end_block(current_ir_graph); add_immBlock_pred(end_block, ret); set_unreachable_now(); + return NULL; } static ir_node *expression_statement_to_firm(expression_statement_t *statement) @@ -4575,13 +4489,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) { - if (statement->base.next == NULL - && statement->kind == STATEMENT_EXPRESSION) { - result = expression_statement_to_firm( - &statement->expression); - break; - } - statement_to_firm(statement); + result = statement_to_firm(statement); } return result; @@ -4706,11 +4614,11 @@ static void initialize_local_declaration(entity_t *entity) panic("invalid declaration kind"); } -static void declaration_statement_to_firm(declaration_statement_t *statement) +static ir_node *declaration_statement_to_firm(declaration_statement_t *statement) { entity_t *entity = statement->declarations_begin; if (entity == NULL) - return; + return NULL; entity_t *const last = statement->declarations_end; for ( ;; entity = entity->base.next) { @@ -4727,9 +4635,11 @@ static void declaration_statement_to_firm(declaration_statement_t *statement) if (entity == last) break; } + + return NULL; } -static void if_statement_to_firm(if_statement_t *statement) +static ir_node *if_statement_to_firm(if_statement_t *statement) { /* Create the condition. */ ir_node *true_block = NULL; @@ -4766,21 +4676,37 @@ static void if_statement_to_firm(if_statement_t *statement) } set_cur_block(fallthrough_block); } + + return NULL; } -/* Create a jump node which jumps into target_block, if the current block is - * reachable. */ -static void jump_if_reachable(ir_node *const target_block) +/** + * Add an unconditional jump to the target block. If the source block is not + * reachable, then a Bad predecessor is created to prevent Phi-less unreachable + * loops. This is necessary if the jump potentially enters a loop. + */ +static void jump_to(ir_node *const target_block) { ir_node *const pred = currently_reachable() ? new_Jmp() : new_Bad(mode_X); add_immBlock_pred(target_block, pred); } -static void while_statement_to_firm(while_statement_t *statement) +/** + * Add an unconditional jump to the target block, if the current block is + * reachable and do nothing otherwise. This is only valid if the jump does not + * enter a loop (a back edge is ok). + */ +static void jump_if_reachable(ir_node *const target_block) +{ + if (currently_reachable()) + add_immBlock_pred(target_block, new_Jmp()); +} + +static ir_node *while_statement_to_firm(while_statement_t *statement) { /* Create the header block */ ir_node *const header_block = new_immBlock(); - jump_if_reachable(header_block); + jump_to(header_block); /* Create the condition. */ ir_node * body_block; @@ -4824,6 +4750,7 @@ static void while_statement_to_firm(while_statement_t *statement) assert(continue_label == header_block); continue_label = old_continue_label; break_label = old_break_label; + return NULL; } static ir_node *get_break_label(void) @@ -4834,14 +4761,14 @@ static ir_node *get_break_label(void) return break_label; } -static void do_while_statement_to_firm(do_while_statement_t *statement) +static ir_node *do_while_statement_to_firm(do_while_statement_t *statement) { /* create the header block */ ir_node *header_block = new_immBlock(); /* the loop body */ ir_node *body_block = new_immBlock(); - jump_if_reachable(body_block); + jump_to(body_block); ir_node *old_continue_label = continue_label; ir_node *old_break_label = break_label; @@ -4867,9 +4794,10 @@ static void do_while_statement_to_firm(do_while_statement_t *statement) mature_immBlock(false_block); set_cur_block(false_block); + return NULL; } -static void for_statement_to_firm(for_statement_t *statement) +static ir_node *for_statement_to_firm(for_statement_t *statement) { /* create declarations */ entity_t *entity = statement->scope.entities; @@ -4896,7 +4824,7 @@ static void for_statement_to_firm(for_statement_t *statement) /* Create the header block */ ir_node *const header_block = new_immBlock(); - jump_if_reachable(header_block); + jump_to(header_block); /* Create the condition. */ ir_node *body_block; @@ -4953,19 +4881,20 @@ static void for_statement_to_firm(for_statement_t *statement) assert(continue_label == step_block); continue_label = old_continue_label; break_label = old_break_label; + return NULL; } -static void create_jump_statement(const statement_t *statement, - ir_node *target_block) +static ir_node *create_jump_statement(const statement_t *statement, ir_node *target_block) { if (!currently_reachable()) - return; + return NULL; dbg_info *dbgi = get_dbg_info(&statement->base.source_position); ir_node *jump = new_d_Jmp(dbgi); add_immBlock_pred(target_block, jump); set_unreachable_now(); + return NULL; } static ir_switch_table *create_switch_table(const switch_statement_t *statement) @@ -5003,9 +4932,8 @@ static ir_switch_table *create_switch_table(const switch_statement_t *statement) return res; } -static void switch_statement_to_firm(switch_statement_t *statement) +static ir_node *switch_statement_to_firm(switch_statement_t *statement) { - ir_node *first_block = NULL; dbg_info *dbgi = get_dbg_info(&statement->base.source_position); ir_node *switch_node = NULL; @@ -5015,7 +4943,6 @@ static void switch_statement_to_firm(switch_statement_t *statement) unsigned n_outs = (unsigned)ir_switch_table_get_n_entries(table) + 1; switch_node = new_d_Switch(dbgi, expression, n_outs, table); - first_block = get_cur_block(); } set_unreachable_now(); @@ -5029,10 +4956,11 @@ static void switch_statement_to_firm(switch_statement_t *statement) statement_to_firm(statement->body); - jump_if_reachable(get_break_label()); + if (currently_reachable()) { + add_immBlock_pred(get_break_label(), new_Jmp()); + } - if (!saw_default_label && first_block != NULL) { - set_cur_block(first_block); + if (!saw_default_label && switch_node) { ir_node *proj = new_d_Proj(dbgi, switch_node, mode_X, pn_Switch_default); add_immBlock_pred(get_break_label(), proj); } @@ -5046,12 +4974,13 @@ static void switch_statement_to_firm(switch_statement_t *statement) current_switch = old_switch; break_label = old_break_label; saw_default_label = old_saw_default_label; + return NULL; } -static void case_label_to_firm(const case_label_statement_t *statement) +static ir_node *case_label_to_firm(const case_label_statement_t *statement) { if (statement->is_empty_range) - return; + return NULL; if (current_switch != NULL) { ir_node *block = new_immBlock(); @@ -5067,25 +4996,25 @@ static void case_label_to_firm(const case_label_statement_t *statement) set_cur_block(block); } - statement_to_firm(statement->statement); + return statement_to_firm(statement->statement); } -static void label_to_firm(const label_statement_t *statement) +static ir_node *label_to_firm(const label_statement_t *statement) { ir_node *block = get_label_block(statement->label); - jump_if_reachable(block); + jump_to(block); set_cur_block(block); keep_alive(block); keep_all_memory(block); - statement_to_firm(statement->statement); + return statement_to_firm(statement->statement); } -static void computed_goto_to_firm(computed_goto_statement_t const *const statement) +static ir_node *computed_goto_to_firm(computed_goto_statement_t const *const statement) { if (!currently_reachable()) - return; + return NULL; ir_node *const irn = expression_to_firm(statement->expression); dbg_info *const dbgi = get_dbg_info(&statement->base.source_position); @@ -5095,21 +5024,10 @@ static void computed_goto_to_firm(computed_goto_statement_t const *const stateme ijmp_list = ijmp; set_unreachable_now(); + return NULL; } -static void goto_to_firm(const goto_statement_t *statement) -{ - if (!currently_reachable()) - return; - - ir_node *block = get_label_block(statement->label); - ir_node *jmp = new_Jmp(); - add_immBlock_pred(block, jmp); - - set_unreachable_now(); -} - -static void asm_statement_to_firm(const asm_statement_t *statement) +static ir_node *asm_statement_to_firm(const asm_statement_t *statement) { bool needs_memory = false; @@ -5349,90 +5267,57 @@ static void asm_statement_to_firm(const asm_statement_t *statement) set_value_for_expression_addr(out_expr, proj, addr); } + + return NULL; } -static void ms_try_statement_to_firm(ms_try_statement_t *statement) +static ir_node *ms_try_statement_to_firm(ms_try_statement_t *statement) { statement_to_firm(statement->try_statement); source_position_t const *const pos = &statement->base.source_position; warningf(WARN_OTHER, pos, "structured exception handling ignored"); + return NULL; } -static void leave_statement_to_firm(leave_statement_t *statement) +static ir_node *leave_statement_to_firm(leave_statement_t *statement) { errorf(&statement->base.source_position, "__leave not supported yet"); + return NULL; } /** * Transform a statement. */ -static void statement_to_firm(statement_t *statement) +static ir_node *statement_to_firm(statement_t *const stmt) { #ifndef NDEBUG - assert(!statement->base.transformed); - statement->base.transformed = true; + assert(!stmt->base.transformed); + stmt->base.transformed = true; #endif - switch (statement->kind) { - case STATEMENT_ERROR: - panic("error statement found"); - case STATEMENT_EMPTY: - /* nothing */ - return; - case STATEMENT_COMPOUND: - compound_statement_to_firm(&statement->compound); - return; - case STATEMENT_RETURN: - return_statement_to_firm(&statement->returns); - return; - case STATEMENT_EXPRESSION: - expression_statement_to_firm(&statement->expression); - return; - case STATEMENT_IF: - if_statement_to_firm(&statement->ifs); - return; - case STATEMENT_WHILE: - while_statement_to_firm(&statement->whiles); - return; - case STATEMENT_DO_WHILE: - do_while_statement_to_firm(&statement->do_while); - return; - case STATEMENT_DECLARATION: - declaration_statement_to_firm(&statement->declaration); - return; - case STATEMENT_BREAK: - create_jump_statement(statement, get_break_label()); - return; - case STATEMENT_CONTINUE: - create_jump_statement(statement, continue_label); - return; - case STATEMENT_SWITCH: - switch_statement_to_firm(&statement->switchs); - return; - case STATEMENT_CASE_LABEL: - case_label_to_firm(&statement->case_label); - return; - case STATEMENT_FOR: - for_statement_to_firm(&statement->fors); - return; - case STATEMENT_LABEL: - label_to_firm(&statement->label); - return; - case STATEMENT_COMPUTED_GOTO: - computed_goto_to_firm(&statement->computed_goto); - return; - case STATEMENT_GOTO: - goto_to_firm(&statement->gotos); - return; - case STATEMENT_ASM: - asm_statement_to_firm(&statement->asms); - return; - case STATEMENT_MS_TRY: - ms_try_statement_to_firm(&statement->ms_try); - return; - case STATEMENT_LEAVE: - leave_statement_to_firm(&statement->leave); - return; + switch (stmt->kind) { + case STATEMENT_ASM: return asm_statement_to_firm( &stmt->asms); + case STATEMENT_CASE_LABEL: return case_label_to_firm( &stmt->case_label); + case STATEMENT_COMPOUND: return compound_statement_to_firm( &stmt->compound); + case STATEMENT_COMPUTED_GOTO: return computed_goto_to_firm( &stmt->computed_goto); + case STATEMENT_DECLARATION: return declaration_statement_to_firm(&stmt->declaration); + case STATEMENT_DO_WHILE: return do_while_statement_to_firm( &stmt->do_while); + case STATEMENT_EMPTY: return NULL; /* nothing */ + case STATEMENT_EXPRESSION: return expression_statement_to_firm( &stmt->expression); + case STATEMENT_FOR: return for_statement_to_firm( &stmt->fors); + case STATEMENT_IF: return if_statement_to_firm( &stmt->ifs); + case STATEMENT_LABEL: return label_to_firm( &stmt->label); + case STATEMENT_LEAVE: return leave_statement_to_firm( &stmt->leave); + case STATEMENT_MS_TRY: return ms_try_statement_to_firm( &stmt->ms_try); + case STATEMENT_RETURN: return return_statement_to_firm( &stmt->returns); + case STATEMENT_SWITCH: return switch_statement_to_firm( &stmt->switchs); + case STATEMENT_WHILE: return while_statement_to_firm( &stmt->whiles); + + case STATEMENT_BREAK: return create_jump_statement(stmt, get_break_label()); + case STATEMENT_CONTINUE: return create_jump_statement(stmt, continue_label); + case STATEMENT_GOTO: return create_jump_statement(stmt, get_label_block(stmt->gotos.label)); + + case STATEMENT_ERROR: panic("error statement found"); } panic("statement not implemented"); } @@ -5692,20 +5577,13 @@ static void create_function(entity_t *entity) if (currently_reachable()) { type_t *type = skip_typeref(entity->declaration.type); assert(is_type_function(type)); - const function_type_t *func_type = &type->function; - const type_t *return_type - = skip_typeref(func_type->return_type); + type_t *const return_type = skip_typeref(type->function.return_type); ir_node *ret; - if (is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { + if (is_type_void(return_type)) { ret = new_Return(get_store(), 0, NULL); } else { - ir_mode *mode; - if (is_type_scalar(return_type)) { - mode = get_ir_mode_storage(func_type->return_type); - } else { - mode = mode_P_data; - } + ir_mode *const mode = get_ir_mode_storage(return_type); ir_node *in[1]; /* §5.1.2.2.3 main implicitly returns 0 */ @@ -5846,11 +5724,9 @@ static void init_ir_types(void) return; ir_types_initialized = 1; - ir_type_int = get_ir_type(type_int); ir_type_char = get_ir_type(type_char); ir_type_const_char = get_ir_type(type_const_char); ir_type_wchar_t = get_ir_type(type_wchar_t); - ir_type_void = get_ir_type(type_void); be_params = be_get_backend_param(); mode_float_arithmetic = be_params->mode_float_arithmetic; @@ -5881,8 +5757,27 @@ static void global_asm_to_firm(statement_t *s) } } +static const char *get_cwd(void) +{ + static char buf[1024]; + if (buf[0] == '\0') + getcwd(buf, sizeof(buf)); + return buf; +} + void translation_unit_to_firm(translation_unit_t *unit) { + if (c_mode & _CXX) { + be_dwarf_set_source_language(DW_LANG_C_plus_plus); + } else if (c_mode & _C99) { + be_dwarf_set_source_language(DW_LANG_C99); + } else if (c_mode & _C89) { + be_dwarf_set_source_language(DW_LANG_C89); + } else { + be_dwarf_set_source_language(DW_LANG_C); + } + be_dwarf_set_compilation_directory(get_cwd()); + /* initialize firm arithmetic */ tarval_set_integer_overflow_mode(TV_OVERFLOW_WRAP); ir_set_uninitialized_local_variable_func(uninitialized_local_var);