X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=a81992e159ec6cee2612691bdf6955c81e6c9b35;hb=aa834d2e8cf1f629e00744b5c5a07daa16ffdb13;hp=6c5fcb939b275e026b82d8dd362ff98f424bfce2;hpb=7766fad539af8606bfd1dec3067e8660a7d27d08;p=cparser diff --git a/ast2firm.c b/ast2firm.c index 6c5fcb9..a81992e 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -618,15 +618,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 +634,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) @@ -687,10 +680,6 @@ ir_type *get_ir_type(type_t *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 +711,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; @@ -1072,15 +1062,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); @@ -1121,11 +1112,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 +1533,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) { @@ -1950,7 +1935,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); @@ -3008,7 +2993,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; @@ -3019,8 +3004,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(); @@ -3041,16 +3024,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"); @@ -3061,8 +3040,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); } @@ -3449,79 +3426,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"); } @@ -4511,10 +4457,10 @@ 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; @@ -4559,6 +4505,7 @@ static void return_statement_to_firm(return_statement_t *statement) add_immBlock_pred(end_block, ret); set_unreachable_now(); + return NULL; } static ir_node *expression_statement_to_firm(expression_statement_t *statement) @@ -4582,13 +4529,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; @@ -4713,11 +4654,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) { @@ -4734,9 +4675,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; @@ -4773,6 +4716,8 @@ 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 @@ -4783,7 +4728,7 @@ static void jump_if_reachable(ir_node *const target_block) add_immBlock_pred(target_block, pred); } -static void while_statement_to_firm(while_statement_t *statement) +static ir_node *while_statement_to_firm(while_statement_t *statement) { /* Create the header block */ ir_node *const header_block = new_immBlock(); @@ -4831,6 +4776,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) @@ -4841,7 +4787,7 @@ 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(); @@ -4874,9 +4820,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; @@ -4960,19 +4907,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) @@ -5010,7 +4958,7 @@ 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); @@ -5053,12 +5001,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(); @@ -5074,10 +5023,10 @@ 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); @@ -5086,13 +5035,13 @@ static void label_to_firm(const label_statement_t *statement) 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); @@ -5102,9 +5051,10 @@ static void computed_goto_to_firm(computed_goto_statement_t const *const stateme ijmp_list = ijmp; set_unreachable_now(); + return NULL; } -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; @@ -5344,24 +5294,28 @@ 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 *const stmt) +static ir_node *statement_to_firm(statement_t *const stmt) { #ifndef NDEBUG assert(!stmt->base.transformed); @@ -5369,26 +5323,26 @@ static void statement_to_firm(statement_t *const stmt) #endif switch (stmt->kind) { - case STATEMENT_ASM: asm_statement_to_firm( &stmt->asms); return; - case STATEMENT_CASE_LABEL: case_label_to_firm( &stmt->case_label); return; - case STATEMENT_COMPOUND: compound_statement_to_firm( &stmt->compound); return; - case STATEMENT_COMPUTED_GOTO: computed_goto_to_firm( &stmt->computed_goto); return; - case STATEMENT_DECLARATION: declaration_statement_to_firm(&stmt->declaration); return; - case STATEMENT_DO_WHILE: do_while_statement_to_firm( &stmt->do_while); return; - case STATEMENT_EMPTY: /* nothing */ return; - case STATEMENT_EXPRESSION: expression_statement_to_firm( &stmt->expression); return; - case STATEMENT_FOR: for_statement_to_firm( &stmt->fors); return; - case STATEMENT_IF: if_statement_to_firm( &stmt->ifs); return; - case STATEMENT_LABEL: label_to_firm( &stmt->label); return; - case STATEMENT_LEAVE: leave_statement_to_firm( &stmt->leave); return; - case STATEMENT_MS_TRY: ms_try_statement_to_firm( &stmt->ms_try); return; - case STATEMENT_RETURN: return_statement_to_firm( &stmt->returns); return; - case STATEMENT_SWITCH: switch_statement_to_firm( &stmt->switchs); return; - case STATEMENT_WHILE: while_statement_to_firm( &stmt->whiles); return; - - case STATEMENT_BREAK: create_jump_statement(stmt, get_break_label()); return; - case STATEMENT_CONTINUE: create_jump_statement(stmt, continue_label); return; - case STATEMENT_GOTO: create_jump_statement(stmt, get_label_block(stmt->gotos.label)); return; + 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"); }