X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=0065ea235d30fa20ba53b70d80573affa929a98c;hb=a223a2177b4add7bc2f341675ec1932943553245;hp=5912543808170e1408764072c0fdf2f18a82aa99;hpb=a2ece61ac4936c82a30f6399f6e7f5cf407620b5;p=cparser diff --git a/ast2firm.c b/ast2firm.c index 5912543..0065ea2 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -16,13 +16,14 @@ #include "token_t.h" #include "type_t.h" #include "ast_t.h" +#include "parser.h" #define MAGIC_DEFAULT_PN_NUMBER (long) -314159265 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; -static ir_type *ir_type_void_ptr; static type_t *type_const_char; static type_t *type_void; @@ -35,6 +36,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, @@ -43,6 +47,7 @@ typedef enum declaration_type_t { DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY, DECLARATION_TYPE_COMPOUND_MEMBER, DECLARATION_TYPE_LABEL_BLOCK, + DECLARATION_TYPE_ENUM_ENTRY } declaration_type_t; static ir_type *get_ir_type(type_t *type); @@ -82,18 +87,6 @@ const char *retrieve_dbg(const dbg_info *dbg, unsigned *line) void init_ast2firm(void) { - type_const_char = make_atomic_type(ATOMIC_TYPE_CHAR, TYPE_QUALIFIER_CONST); - type_void = make_atomic_type(ATOMIC_TYPE_VOID, TYPE_QUALIFIER_NONE); - type_int = make_atomic_type(ATOMIC_TYPE_INT, TYPE_QUALIFIER_NONE); - - ir_type_int = get_ir_type(type_int); - 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->firm_type = ir_type_void; } void exit_ast2firm(void) @@ -106,7 +99,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); } @@ -204,13 +197,13 @@ static unsigned get_atomic_type_size(const atomic_type_t *type) static unsigned get_compound_type_size(compound_type_t *type) { - ir_type *irtype = get_ir_type(&type->type); + ir_type *irtype = get_ir_type((type_t*) type); return get_type_size_bytes(irtype); } static unsigned get_array_type_size(array_type_t *type) { - ir_type *irtype = get_ir_type(&type->type); + ir_type *irtype = get_ir_type((type_t*) type); return get_type_size_bytes(irtype); } @@ -220,19 +213,19 @@ static unsigned get_type_size(type_t *type) switch(type->type) { case TYPE_ATOMIC: - return get_atomic_type_size((const atomic_type_t*) type); + return get_atomic_type_size(&type->atomic); case TYPE_ENUM: return get_mode_size_bytes(mode_Is); case TYPE_COMPOUND_UNION: case TYPE_COMPOUND_STRUCT: - return get_compound_type_size((compound_type_t*) type); + return get_compound_type_size(&type->compound); case TYPE_FUNCTION: /* just a pointer to the function */ return get_mode_size_bytes(mode_P_code); case TYPE_POINTER: return get_mode_size_bytes(mode_P_data); case TYPE_ARRAY: - return get_array_type_size((array_type_t*) type); + return get_array_type_size(&type->array); case TYPE_BUILTIN: case TYPE_TYPEDEF: case TYPE_TYPEOF: @@ -270,15 +263,15 @@ static ir_type *create_atomic_type(const atomic_type_t *type) static ir_type *create_method_type(const function_type_t *function_type) { - type_t *result_type = function_type->result_type; + type_t *return_type = function_type->return_type; ident *id = unique_ident("functiontype"); int n_parameters = count_parameters(function_type); - int n_results = result_type == type_void ? 0 : 1; + int n_results = return_type == type_void ? 0 : 1; ir_type *irtype = new_type_method(id, n_parameters, n_results); - if(result_type != type_void) { - ir_type *restype = get_ir_type(result_type); + if(return_type != type_void) { + ir_type *restype = get_ir_type(return_type); set_method_res_type(irtype, 0, restype); } @@ -360,7 +353,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 +361,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 +407,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); @@ -446,39 +440,72 @@ static ir_type *create_union_type(compound_type_t *type) return ir_type; } +static ir_node *expression_to_firm(const expression_t *expression); +static inline ir_mode *get_ir_mode(type_t *type); + +static ir_type *create_enum_type(enum_type_t *const type) +{ + type->type.firm_type = ir_type_int; + + ir_mode *const mode = get_ir_mode((type_t*) type); + tarval *const one = get_mode_one(mode); + tarval * tv_next = get_tarval_null(mode); + + declaration_t *declaration = type->declaration->next; + for (; declaration != NULL; declaration = declaration->next) { + if (declaration->storage_class != STORAGE_CLASS_ENUM_ENTRY) + break; + + declaration->declaration_type = DECLARATION_TYPE_ENUM_ENTRY; + + expression_t *const init = declaration->init.enum_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); + } + declaration->v.enum_val = tv_next; + tv_next = tarval_add(tv_next, one); + } + + return ir_type_int; +} + static ir_type *get_ir_type(type_t *type) { assert(type != NULL); type = skip_typeref(type); - if(type->firm_type != NULL) { - assert(type->firm_type != INVALID_TYPE); - return type->firm_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->type) { case TYPE_ATOMIC: - firm_type = create_atomic_type((atomic_type_t*) type); + firm_type = create_atomic_type(&type->atomic); break; case TYPE_FUNCTION: - firm_type = create_method_type((function_type_t*) type); + firm_type = create_method_type(&type->function); break; case TYPE_POINTER: - firm_type = create_pointer_type((pointer_type_t*) type); + firm_type = create_pointer_type(&type->pointer); break; case TYPE_ARRAY: - firm_type = create_array_type((array_type_t*) type); + firm_type = create_array_type(&type->array); break; case TYPE_COMPOUND_STRUCT: - firm_type = create_struct_type((compound_type_t*) type); + firm_type = create_struct_type(&type->compound); break; case TYPE_COMPOUND_UNION: - firm_type = create_union_type((compound_type_t*) type); + firm_type = create_union_type(&type->compound); break; case TYPE_ENUM: - firm_type = ir_type_int; + firm_type = create_enum_type(&type->enumt); break; case TYPE_BUILTIN: case TYPE_TYPEOF: @@ -489,7 +516,7 @@ static ir_type *get_ir_type(type_t *type) if(firm_type == NULL) panic("unknown type found"); - type->firm_type = firm_type; + type->base.firm_type = firm_type; return firm_type; } @@ -537,26 +564,29 @@ static ir_entity* get_function_entity(declaration_t *declaration) return entity; } - - -static ir_node *expression_to_firm(const expression_t *expression); -static ir_node *expression_to_modeb(const expression_t *expression); - static dbg_info *get_dbg_info(const source_position_t *pos) { return (dbg_info*) pos; } -static ir_node *const_to_firm(const const_t *cnst) +static ir_node *const_to_firm(const const_expression_t *cnst) { dbg_info *dbgi = get_dbg_info(&cnst->expression.source_position); ir_mode *mode = get_ir_mode(cnst->expression.datatype); - tarval *tv; + char buf[128]; + tarval *tv; + size_t len; if(mode_is_float(mode)) { tv = new_tarval_from_double(cnst->v.float_value, mode); } else { - tv = new_tarval_from_long(cnst->v.int_value, mode); + if(mode_is_signed(mode)) { + len = snprintf(buf, sizeof(buf), "%lld", cnst->v.int_value); + } else { + len = snprintf(buf, sizeof(buf), "%llu", + (unsigned long long) cnst->v.int_value); + } + tv = new_tarval_from_str(buf, len, mode); } return new_d_Const(dbgi, mode, tv); @@ -570,29 +600,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); } @@ -600,35 +631,107 @@ 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_expression_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 string_to_firm(&literal->expression.source_position, "Lstr", + literal->value); +} - return load_res; +static ir_node *wide_string_literal_to_firm( + const wide_string_literal_expression_t* const literal) +{ + ir_type *const global_type = get_glob_type(); + ir_type *const elem_type = ir_type_wchar_t; + ir_type *const type = new_type_array(unique_ident("strtype"), 1, + elem_type); + + ident *const id = unique_ident("Lstr"); + ir_entity *const entity = new_entity(global_type, id, type); + set_entity_ld_ident(entity, id); + set_entity_variability(entity, variability_constant); + + ir_mode *const mode = get_type_mode(elem_type); + + const wchar_rep_t *const string = literal->value.begin; + const size_t slen = literal->value.size; + + 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 **const tvs = xmalloc(slen * sizeof(tvs[0])); + for(size_t i = 0; i < slen; ++i) { + tvs[i] = new_tarval_from_long(string[i], mode); + } + + set_array_entity_values(entity, tvs, slen); + free(tvs); + + dbg_info *const dbgi = get_dbg_info(&literal->expression.source_position); + + return create_symconst(dbgi, entity); } -static ir_node *deref_address(type_t *const type, ir_node *const addr, +static ir_node *deref_address(ir_type *const irtype, ir_node *const addr, dbg_info *const dbgi) { - switch (type->type) { - case TYPE_ARRAY: - case TYPE_COMPOUND_STRUCT: - case TYPE_COMPOUND_UNION: - return addr; + if(is_compound_type(irtype) || is_Array_type(irtype)) { + return addr; + } + + ir_mode *const mode = get_type_mode(irtype); + 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; +} + +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 load_from_expression_addr(type, addr, dbgi); + return create_symconst(dbgi, entity); } } @@ -640,7 +743,17 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref) switch((declaration_type_t) declaration->declaration_type) { case DECLARATION_TYPE_UNKNOWN: - break; + if (declaration->storage_class != STORAGE_CLASS_ENUM_ENTRY) { + break; + } + get_ir_type(type); + /* FALLTHROUGH */ + + case DECLARATION_TYPE_ENUM_ENTRY: { + ir_mode *const mode = get_ir_mode(type); + return new_Const(mode, declaration->v.enum_val); + } + case DECLARATION_TYPE_LOCAL_VARIABLE: { ir_mode *mode = get_ir_mode(type); return get_value(declaration->v.value_number, mode); @@ -649,15 +762,17 @@ 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); - return deref_address(type, 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); ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, entity); - return deref_address(type, sel, dbgi); + ir_type *irtype = get_entity_type(entity); + return deref_address(irtype, sel, dbgi); } case DECLARATION_TYPE_COMPOUND_MEMBER: @@ -682,9 +797,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; @@ -693,6 +807,10 @@ static ir_node *reference_addr(const reference_expression_t *ref) return sel; } + + case DECLARATION_TYPE_ENUM_ENTRY: + panic("trying to reference enum entry"); + case DECLARATION_TYPE_COMPOUND_MEMBER: case DECLARATION_TYPE_LABEL_BLOCK: panic("not implemented reference type"); @@ -701,15 +819,67 @@ static ir_node *reference_addr(const reference_expression_t *ref) panic("reference to declaration with unknown type found"); } +static ir_node *process_builtin_call(const call_expression_t *call) +{ + dbg_info *dbgi = get_dbg_info(&call->expression.source_position); + + assert(call->function->type == EXPR_BUILTIN_SYMBOL); + builtin_symbol_expression_t *builtin = &call->function->builtin_symbol; + + type_t *type = skip_typeref(builtin->expression.datatype); + assert(is_type_pointer(type)); + + type_t *function_type = skip_typeref(type->pointer.points_to); + symbol_t *symbol = builtin->symbol; + + switch(symbol->ID) { + case T___builtin_alloca: { + if(call->arguments == NULL || call->arguments->next != NULL) { + panic("invalid number of parameters on __builtin_alloca"); + } + expression_t *argument = call->arguments->expression; + ir_node *size = expression_to_firm(argument); + + ir_node *store = get_store(); + ir_node *alloca = new_d_Alloc(dbgi, store, size, firm_unknown_type, + stack_alloc); + ir_node *proj_m = new_Proj(alloca, mode_M, pn_Alloc_M); + set_store(proj_m); + ir_node *res = new_Proj(alloca, mode_P_data, pn_Alloc_res); + + return res; + } + case T___builtin_nan: + case T___builtin_nanf: + case T___builtin_nand: { + /* Ignore string for now... */ + assert(is_type_function(function_type)); + ir_mode *mode = get_ir_mode(function_type->function.return_type); + tarval *tv = get_mode_NAN(mode); + ir_node *res = new_d_Const(dbgi, mode, tv); + return res; + } + default: + panic("Unsupported builtin found\n"); + } +} + static ir_node *call_expression_to_firm(const call_expression_t *call) { assert(get_cur_block() != NULL); - expression_t *function = call->function; - ir_node *callee = expression_to_firm(function); + expression_t *function = call->function; + if(function->type == EXPR_BUILTIN_SYMBOL) { + return process_builtin_call(call); + } + ir_node *callee = expression_to_firm(function); - assert(function->datatype->type == TYPE_FUNCTION); - function_type_t *function_type = (function_type_t*) function->datatype; + type_t *type = skip_typeref(function->base.datatype); + assert(is_type_pointer(type)); + pointer_type_t *pointer_type = &type->pointer; + type_t *points_to = skip_typeref(pointer_type->points_to); + assert(is_type_function(points_to)); + function_type_t *function_type = &points_to->function; int n_parameters = 0; call_argument_t *argument = call->arguments; @@ -717,6 +887,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) { @@ -743,9 +915,11 @@ 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->datatype); + ir_type *irtype = get_ir_type(expression->base.datatype); set_method_param_type(new_method_type, n, irtype); } @@ -756,17 +930,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 *return_type = skip_typeref(function_type->return_type); ir_node *result = NULL; - if(result_type != type_void) { - ir_mode *mode = get_ir_mode(result_type); + + if(!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { + ir_mode *mode; + if(is_type_scalar(return_type)) { + mode = get_ir_mode(return_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); } @@ -774,11 +953,20 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) return result; } +static void 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); +static void create_condition_evaluation(const expression_t *expression, + ir_node *true_block, + ir_node *false_block); 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; @@ -790,20 +978,27 @@ static void set_value_for_expression(const expression_t *expression, } } - dbg_info *dbgi = get_dbg_info(&expression->source_position); - ir_node *addr = expression_to_addr(expression); - assert(get_irn_mode(value) == get_ir_mode(expression->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) { 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) { @@ -819,15 +1014,15 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) static ir_node *create_incdec(const unary_expression_t *expression) { dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); - type_t *type = expression->expression.datatype; + type_t *type = skip_typeref(expression->expression.datatype); ir_mode *mode = get_ir_mode(type); expression_t *value = expression->value; ir_node *value_node = expression_to_firm(value); ir_node *offset; - if(type->type == TYPE_POINTER) { - pointer_type_t *pointer_type = (pointer_type_t*) type; + if(is_type_pointer(type)) { + pointer_type_t *pointer_type = &type->pointer; unsigned elem_size = get_type_size(pointer_type->points_to); offset = new_Const_long(mode_Is, elem_size); } else { @@ -835,7 +1030,6 @@ static ir_node *create_incdec(const unary_expression_t *expression) offset = new_Const(mode, get_mode_one(mode)); } - ir_node *new_value; switch(expression->type) { case UNEXPR_POSTFIX_INCREMENT: { ir_node *new_value = new_d_Add(dbgi, value_node, offset, mode); @@ -859,16 +1053,14 @@ static ir_node *create_incdec(const unary_expression_t *expression) } default: panic("no incdec expr in create_incdec"); + return NULL; } - - return new_value; } static ir_node *unary_expression_to_firm(const unary_expression_t *expression) { dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); - type_t *type = expression->expression.datatype; - ir_mode *mode = get_ir_mode(type); + type_t *type = skip_typeref(expression->expression.datatype); if(expression->type == UNEXPR_TAKE_ADDRESS) return expression_to_addr(expression->value); @@ -878,29 +1070,38 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) switch(expression->type) { case UNEXPR_NEGATE: - return new_d_Minus(dbgi, value_node, mode); + return new_d_Minus(dbgi, value_node, get_ir_mode(type)); case UNEXPR_PLUS: return value_node; case UNEXPR_BITWISE_NEGATE: - return new_d_Not(dbgi, value_node, mode); - case UNEXPR_NOT: + return new_d_Not(dbgi, value_node, get_ir_mode(type)); + case UNEXPR_NOT: { if(get_irn_mode(value_node) != mode_b) { value_node = create_conv(dbgi, value_node, mode_b); } value_node = new_d_Not(dbgi, value_node, mode_b); + ir_mode *const mode = get_ir_mode(type); if(mode != mode_b) { value_node = create_conv(dbgi, value_node, mode); } return value_node; - case UNEXPR_DEREFERENCE: - return load_from_expression_addr(type, value_node, dbgi); + } + case UNEXPR_DEREFERENCE: { + ir_type *irtype = get_ir_type(type); + return deref_address(irtype, value_node, dbgi); + } case UNEXPR_POSTFIX_INCREMENT: case UNEXPR_POSTFIX_DECREMENT: case UNEXPR_PREFIX_INCREMENT: case UNEXPR_PREFIX_DECREMENT: return create_incdec(expression); - case UNEXPR_CAST: - return create_conv(dbgi, value_node, mode); + 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: case UNEXPR_INVALID: @@ -927,48 +1128,32 @@ static long get_pnc(binary_expression_type_t type) static ir_node *create_lazy_op(const binary_expression_t *expression) { dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); + type_t *type = expression->expression.datatype; + ir_mode *mode = get_ir_mode(type); - bool is_or = (expression->type == BINEXPR_LOGICAL_OR); - assert(is_or || expression->type == BINEXPR_LOGICAL_AND); - - ir_node *val1 = expression_to_modeb(expression->left); - ir_node *cond = new_d_Cond(dbgi, val1); - ir_node *true_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true); - ir_node *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false); - - ir_node *fallthrough_block = new_immBlock(); - - /* the true case */ - ir_node *calc_val2_block = new_immBlock(); - if(is_or) { - add_immBlock_pred(calc_val2_block, false_proj); - } else { - add_immBlock_pred(calc_val2_block, true_proj); - } + ir_node *cur_block = get_cur_block(); - mature_immBlock(calc_val2_block); + ir_node *one_block = new_immBlock(); + ir_node *one = new_Const(mode, get_mode_one(mode)); + ir_node *jmp_one = new_d_Jmp(dbgi); - ir_node *val2 = expression_to_modeb(expression->right); - if(get_cur_block() != NULL) { - ir_node *jmp = new_d_Jmp(dbgi); - add_immBlock_pred(fallthrough_block, jmp); - } + ir_node *zero_block = new_immBlock(); + ir_node *zero = new_Const(mode, get_mode_null(mode)); + ir_node *jmp_zero = new_d_Jmp(dbgi); - /* fallthrough */ - ir_node *constb; - if(is_or) { - constb = new_d_Const(dbgi, mode_b, get_tarval_b_true()); - add_immBlock_pred(fallthrough_block, true_proj); - } else { - constb = new_d_Const(dbgi, mode_b, get_tarval_b_false()); - add_immBlock_pred(fallthrough_block, false_proj); - } - mature_immBlock(fallthrough_block); + set_cur_block(cur_block); + create_condition_evaluation((const expression_t*) expression, + one_block, zero_block); + mature_immBlock(one_block); + mature_immBlock(zero_block); - set_cur_block(fallthrough_block); + ir_node *common_block = new_immBlock(); + add_immBlock_pred(common_block, jmp_one); + add_immBlock_pred(common_block, jmp_zero); + mature_immBlock(common_block); - ir_node *in[2] = { val2, constb }; - ir_node *val = new_d_Phi(dbgi, 2, in, mode_b); + ir_node *in[2] = { one, zero }; + ir_node *val = new_d_Phi(dbgi, 2, in, mode); return val; } @@ -982,9 +1167,9 @@ static ir_node *create_arithmetic_binop(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->right->datatype; - /* be careful with the modes, because in asithmetic assign nodes only - * the right operand has the mode of the arithmetic alread */ + type_t *type = expression->right->base.datatype; + /* 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); @@ -992,16 +1177,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 = skip_typeref(expression->expression.datatype); + ir_node *value; - assert(type->type != TYPE_POINTER); + if (is_type_pointer(type)) { + 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); @@ -1014,84 +1227,53 @@ 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; - type_t *type_left = skip_typeref(expr_left->datatype); - type_t *type_right = skip_typeref(expr_right->datatype); + type_t *type_left = skip_typeref(expr_left->base.datatype); + type_t *type_right = skip_typeref(expr_right->base.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 (is_type_pointer(type_left)) { + 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; - } - - 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; + assert(is_type_pointer(type_right)); + return pointer_arithmetic(right, left, type, dbgi, new_d_Add); } - - 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->base.datatype); + type_t *const type_right = skip_typeref(expr_right->base.datatype); + + if (is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) { + ir_mode *const mode = get_ir_mode(type); return new_d_Sub(dbgi, left, right, mode); + } else if (is_type_pointer(type_left) && is_type_pointer(type_right)) { + const pointer_type_t *const ptr_type = &type_left->pointer; + const unsigned elem_size = get_type_size(ptr_type->points_to); + ir_mode *const mode = get_ir_mode(type); + ir_node *const sub = new_d_Sub(dbgi, left, right, mode); + ir_node *const cnst = new_Const_long(mode_Is, (long)elem_size); + ir_node *const no_mem = new_NoMem(); + ir_node *const div = new_d_Div(dbgi, no_mem, sub, cnst, mode, + op_pin_state_floats); + return new_d_Proj(dbgi, div, mode, pn_Div_res); } - 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(is_type_pointer(type_left)); + return pointer_arithmetic(left, right, type_left, dbgi, new_d_Sub); } static ir_node *create_shift(const binary_expression_t *expression) @@ -1108,12 +1290,14 @@ static ir_node *create_shift(const binary_expression_t *expression) ir_node *res; switch(expression->type) { + case BINEXPR_SHIFTLEFT_ASSIGN: case BINEXPR_SHIFTLEFT: res = new_d_Shl(dbgi, left, right, mode); break; + case BINEXPR_SHIFTRIGHT_ASSIGN: case BINEXPR_SHIFTRIGHT: { expression_t *expr_left = expression->left; - type_t *type_left = skip_typeref(expr_left->datatype); + type_t *type_left = skip_typeref(expr_left->base.datatype); if(is_type_signed(type_left)) { res = new_d_Shrs(dbgi, left, right, mode); @@ -1136,8 +1320,11 @@ static ir_node *create_divmod(const binary_expression_t *expression) ir_node *left = expression_to_firm(expression->left); ir_node *right = expression_to_firm(expression->right); ir_node *pin = new_Pin(new_NoMem()); - type_t *type = expression->expression.datatype; + /* be careful with the modes, because in arithmetic assign nodes only + * the right operand has the mode of the arithmetic already */ + type_t *type = expression->right->base.datatype; ir_mode *mode = get_ir_mode(type); + left = create_conv(dbgi, left, mode); ir_node *op; ir_node *res; @@ -1182,6 +1369,19 @@ static ir_node *create_arithmetic_assign_divmod( return value; } +static ir_node *create_arithmetic_assign_shift( + const binary_expression_t *expression) +{ + ir_node * value = create_shift(expression); + dbg_info *const dbgi = get_dbg_info(&expression->expression.source_position); + type_t *const type = expression->expression.datatype; + ir_mode *const mode = get_ir_mode(type); + + value = create_conv(dbgi, value, mode); + set_value_for_expression(expression->left, value); + + return value; +} static ir_node *binary_expression_to_firm(const binary_expression_t *expression) { @@ -1204,6 +1404,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: @@ -1245,9 +1446,8 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression) case BINEXPR_BITWISE_XOR_ASSIGN: return create_arithmetic_assign_binop(expression, new_d_Eor); case BINEXPR_SHIFTLEFT_ASSIGN: - return create_arithmetic_assign_binop(expression, new_d_Shl); case BINEXPR_SHIFTRIGHT_ASSIGN: - return create_arithmetic_assign_binop(expression, new_d_Shr); + return create_arithmetic_assign_shift(expression); default: panic("TODO binexpr type"); } @@ -1255,13 +1455,16 @@ static ir_node *binary_expression_to_firm(const binary_expression_t *expression) static ir_node *array_access_addr(const array_access_expression_t *expression) { - dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); + dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); + ir_node *base_addr = expression_to_firm(expression->array_ref); + ir_node *offset = expression_to_firm(expression->index); + offset = create_conv(dbgi, offset, mode_Iu); - ir_node *base_addr = expression_to_firm(expression->array_ref); - ir_node *offset = expression_to_firm(expression->index); - offset = create_conv(dbgi, offset, mode_Iu); + type_t *ref_type = skip_typeref(expression->array_ref->base.datatype); + assert(is_type_pointer(ref_type)); + pointer_type_t *pointer_type = (pointer_type_t*) ref_type; - unsigned elem_size = get_type_size(expression->expression.datatype); + unsigned elem_size = get_type_size(pointer_type->points_to); ir_node *elem_size_const = new_Const_long(mode_Iu, elem_size); ir_node *real_offset = new_d_Mul(dbgi, offset, elem_size_const, mode_Iu); @@ -1273,17 +1476,21 @@ static ir_node *array_access_addr(const array_access_expression_t *expression) static ir_node *array_access_to_firm( const array_access_expression_t *expression) { - dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); - ir_node *addr = array_access_addr(expression); - type_t *type = expression->expression.datatype; - return deref_address(type, addr, dbgi); + dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); + ir_node *addr = array_access_addr(expression); + type_t *type = revert_automatic_type_conversion( + (const expression_t*) expression); + type = skip_typeref(type); + ir_type *irtype = get_ir_type(type); + + return deref_address(irtype, addr, dbgi); } static ir_node *sizeof_to_firm(const sizeof_expression_t *expression) { type_t *type = expression->type; if(type == NULL) { - type = expression->size_expression->datatype; + type = expression->size_expression->base.datatype; assert(type != NULL); } @@ -1298,33 +1505,36 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression) { dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); - ir_node *condition = expression_to_modeb(expression->condition); - ir_node *cond = new_d_Cond(dbgi, condition); - ir_node *true_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true); - ir_node *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false); + ir_node *cur_block = get_cur_block(); /* create the true block */ - ir_node *true_block = new_immBlock(); - add_immBlock_pred(true_block, true_proj); - mature_immBlock(true_block); + ir_node *true_block = new_immBlock(); ir_node *true_val = expression_to_firm(expression->true_expression); ir_node *true_jmp = new_Jmp(); /* create the false block */ ir_node *false_block = new_immBlock(); - add_immBlock_pred(false_block, false_proj); - mature_immBlock(false_block); ir_node *false_val = expression_to_firm(expression->false_expression); ir_node *false_jmp = new_Jmp(); + /* create the condition evaluation */ + set_cur_block(cur_block); + create_condition_evaluation(expression->condition, true_block, false_block); + mature_immBlock(true_block); + mature_immBlock(false_block); + /* create the common block */ ir_node *common_block = new_immBlock(); add_immBlock_pred(common_block, true_jmp); 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); @@ -1352,10 +1562,139 @@ static ir_node *select_addr(const select_expression_t *expression) 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; - return deref_address(type, addr, dbgi); + dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); + ir_node *addr = select_addr(expression); + type_t *type = revert_automatic_type_conversion( + (const expression_t*) expression); + type = skip_typeref(type); + ir_type *irtype = get_ir_type(type); + + return deref_address(irtype, 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->base.datatype; + + gcc_type_class tc; + switch (type->type) + { + case TYPE_ATOMIC: { + const atomic_type_t *const atomic_type = &type->atomic; + 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_expression_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 *statement_expression_to_firm(const statement_expression_t *expr) +{ + statement_t *statement = expr->statement; + + assert(statement->type == STATEMENT_COMPOUND); + return compound_statement_to_firm((compound_statement_t*) statement); } static ir_node *dereference_addr(const unary_expression_t *const expression) @@ -1368,14 +1707,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); } @@ -1391,33 +1731,36 @@ static ir_node *_expression_to_firm(const expression_t *expression) { switch(expression->type) { case EXPR_CONST: - return const_to_firm((const const_t*) expression); + return const_to_firm(&expression->conste); case EXPR_STRING_LITERAL: - return string_literal_to_firm((const string_literal_t*) expression); + return string_literal_to_firm(&expression->string); + case EXPR_WIDE_STRING_LITERAL: + return wide_string_literal_to_firm(&expression->wide_string); case EXPR_REFERENCE: - return reference_expression_to_firm( - (const reference_expression_t*) expression); + return reference_expression_to_firm(&expression->reference); case EXPR_CALL: - return call_expression_to_firm((const call_expression_t*) expression); + return call_expression_to_firm(&expression->call); case EXPR_UNARY: - return unary_expression_to_firm((const unary_expression_t*) expression); + return unary_expression_to_firm(&expression->unary); case EXPR_BINARY: - return binary_expression_to_firm( - (const binary_expression_t*) expression); + return binary_expression_to_firm(&expression->binary); case EXPR_ARRAY_ACCESS: - return array_access_to_firm( - (const array_access_expression_t*) expression); + return array_access_to_firm(&expression->array_access); case EXPR_SIZEOF: - return sizeof_to_firm((const sizeof_expression_t*) expression); + return sizeof_to_firm(&expression->sizeofe); case EXPR_CONDITIONAL: - return conditional_to_firm((const conditional_expression_t*)expression); + return conditional_to_firm(&expression->conditional); case EXPR_SELECT: - return select_to_firm((const select_expression_t*) expression); + return select_to_firm(&expression->select); + case EXPR_CLASSIFY_TYPE: + return classify_type_to_firm(&expression->classify_type); case EXPR_FUNCTION: - case EXPR_OFFSETOF: case EXPR_PRETTY_FUNCTION: - case EXPR_VA_ARG: + return function_name_to_firm(&expression->string); case EXPR_STATEMENT: + return statement_expression_to_firm(&expression->statement); + case EXPR_OFFSETOF: + case EXPR_VA_ARG: case EXPR_BUILTIN_SYMBOL: panic("unimplemented expression found"); @@ -1433,7 +1776,7 @@ static ir_node *expression_to_firm(const expression_t *expression) ir_node *res = _expression_to_firm(expression); if(res != NULL && get_irn_mode(res) == mode_b) { - ir_mode *mode = get_ir_mode(expression->datatype); + ir_mode *mode = get_ir_mode(expression->base.datatype); res = create_conv(NULL, res, mode); } @@ -1448,76 +1791,164 @@ static ir_node *expression_to_modeb(const expression_t *expression) return res; } -static void statement_to_firm(statement_t *statement); - -static void return_statement_to_firm(return_statement_t *statement) +/** + * create a short-circuit expression evaluation that tries to construct + * efficient control flow structures for &&, || and ! expressions + */ +static void create_condition_evaluation(const expression_t *expression, + ir_node *true_block, + ir_node *false_block) { - if(get_cur_block() == NULL) - return; + switch(expression->type) { + case EXPR_UNARY: { + unary_expression_t *unary_expression = (unary_expression_t*) expression; + if(unary_expression->type == UNEXPR_NOT) { + create_condition_evaluation(unary_expression->value, false_block, + true_block); + return; + } + break; + } + case EXPR_BINARY: { + binary_expression_t *binary_expression + = (binary_expression_t*) expression; + if(binary_expression->type == BINEXPR_LOGICAL_AND) { + ir_node *cur_block = get_cur_block(); + ir_node *extra_block = new_immBlock(); + set_cur_block(cur_block); + create_condition_evaluation(binary_expression->left, extra_block, + false_block); + mature_immBlock(extra_block); + set_cur_block(extra_block); + create_condition_evaluation(binary_expression->right, true_block, + false_block); + return; + } + if(binary_expression->type == BINEXPR_LOGICAL_OR) { + ir_node *cur_block = get_cur_block(); + ir_node *extra_block = new_immBlock(); + set_cur_block(cur_block); + create_condition_evaluation(binary_expression->left, true_block, + extra_block); + mature_immBlock(extra_block); + set_cur_block(extra_block); + create_condition_evaluation(binary_expression->right, true_block, + false_block); + return; + } + break; + } + default: + break; + } - dbg_info *dbgi = get_dbg_info(&statement->statement.source_position); - ir_node *ret; + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + ir_node *condition = expression_to_modeb(expression); + ir_node *cond = new_d_Cond(dbgi, condition); + ir_node *true_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true); + ir_node *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false); - if(statement->return_value != NULL) { - ir_node *retval = expression_to_firm(statement->return_value); - ir_node *in[1]; + add_immBlock_pred(true_block, true_proj); + add_immBlock_pred(false_block, false_proj); - in[0] = retval; - ret = new_d_Return(dbgi, get_store(), 1, in); + 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); + + 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) { + ir_type *res_type = get_method_res_type(func_irtype, 0); + + 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 { - ret = new_d_Return(dbgi, get_store(), 0, NULL); + /* build return_value for its side effects */ + if(statement->return_value != NULL) { + expression_to_firm(statement->return_value); + } + in_len = 0; } + + ir_node *store = get_store(); + ir_node *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_cur_block(NULL); } -static void compound_statement_to_firm(compound_statement_t *compound) +static ir_node *expression_statement_to_firm(expression_statement_t *statement) { + if(get_cur_block() == NULL) + return NULL; + + return expression_to_firm(statement->expression); +} + +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->next) { + for( ; statement != NULL; statement = statement->base.next) { //context2firm(&statement->context); + + if(statement->base.next == NULL + && statement->type == STATEMENT_EXPRESSION) { + result = expression_statement_to_firm( + (expression_statement_t*) statement); + break; + } statement_to_firm(statement); } -} - -static void expression_statement_to_firm(expression_statement_t *statement) -{ - if(get_cur_block() == NULL) - return; - expression_to_firm(statement->expression); + return result; } static void if_statement_to_firm(if_statement_t *statement) { - dbg_info *dbgi = get_dbg_info(&statement->statement.source_position); - ir_node *condition = expression_to_modeb(statement->condition); - - /* make sure we have a mode_b condition */ - ir_node *cond = new_d_Cond(dbgi, condition); - ir_node *true_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true); - ir_node *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false); + ir_node *cur_block = get_cur_block(); ir_node *fallthrough_block = new_immBlock(); /* the true (blocks) */ - ir_node *true_block = new_immBlock(); - add_immBlock_pred(true_block, true_proj); - mature_immBlock(true_block); - - 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) */ + ir_node *false_block; if(statement->false_statement != NULL) { - ir_node *false_block = new_immBlock(); - add_immBlock_pred(false_block, false_proj); - mature_immBlock(false_block); + false_block = new_immBlock(); statement_to_firm(statement->false_statement); if(get_cur_block() != NULL) { @@ -1525,7 +1956,19 @@ static void if_statement_to_firm(if_statement_t *statement) add_immBlock_pred(fallthrough_block, jmp); } } else { - add_immBlock_pred(fallthrough_block, false_proj); + false_block = fallthrough_block; + } + + /* create the condition */ + if(cur_block != NULL) { + set_cur_block(cur_block); + create_condition_evaluation(statement->condition, true_block, + false_block); + } + + mature_immBlock(true_block); + if(false_block != fallthrough_block) { + mature_immBlock(false_block); } mature_immBlock(fallthrough_block); @@ -1534,8 +1977,6 @@ static void if_statement_to_firm(if_statement_t *statement) static void while_statement_to_firm(while_statement_t *statement) { - dbg_info *dbgi = get_dbg_info(&statement->statement.source_position); - ir_node *jmp = NULL; if(get_cur_block() != NULL) { jmp = new_Jmp(); @@ -1547,48 +1988,46 @@ static void while_statement_to_firm(while_statement_t *statement) add_immBlock_pred(header_block, jmp); } - /* create the condition */ - ir_node *condition = expression_to_modeb(statement->condition); - ir_node *cond = new_d_Cond(dbgi, condition); - ir_node *true_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true); - ir_node *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false); - /* the false block */ ir_node *false_block = new_immBlock(); - add_immBlock_pred(false_block, false_proj); /* the loop body */ - ir_node *body_block = new_immBlock(); - add_immBlock_pred(body_block, true_proj); - mature_immBlock(body_block); - - 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) { + jmp = new_Jmp(); + add_immBlock_pred(header_block, jmp); + } + } else { + body_block = header_block; } - mature_immBlock(header_block); + /* create the condition */ + set_cur_block(header_block); + + create_condition_evaluation(statement->condition, body_block, false_block); + mature_immBlock(body_block); mature_immBlock(false_block); + mature_immBlock(header_block); set_cur_block(false_block); } static void do_while_statement_to_firm(do_while_statement_t *statement) { - dbg_info *dbgi = get_dbg_info(&statement->statement.source_position); - ir_node *jmp = NULL; if(get_cur_block() != NULL) { jmp = new_Jmp(); @@ -1606,23 +2045,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(); @@ -1631,24 +2072,17 @@ static void do_while_statement_to_firm(do_while_statement_t *statement) /* create the condition */ set_cur_block(header_block); - ir_node *condition = expression_to_modeb(statement->condition); - ir_node *cond = new_d_Cond(dbgi, condition); - ir_node *true_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true); - ir_node *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false); - add_immBlock_pred(body_block, true_proj); + create_condition_evaluation(statement->condition, body_block, false_block); mature_immBlock(body_block); - - add_immBlock_pred(false_block, false_proj); mature_immBlock(false_block); + mature_immBlock(header_block); set_cur_block(false_block); } static void for_statement_to_firm(for_statement_t *statement) { - dbg_info *const dbgi = get_dbg_info(&statement->statement.source_position); - ir_node *jmp = NULL; if (get_cur_block() != NULL) { if(statement->initialisation != NULL) { @@ -1662,7 +2096,7 @@ static void for_statement_to_firm(for_statement_t *statement) if (statement->step != NULL) { expression_to_firm(statement->step); } - ir_node *const step_jmp = new_Jmp(); + ir_node *const step_jmp = new_Jmp(); /* create the header block */ ir_node *const header_block = new_immBlock(); @@ -1671,48 +2105,46 @@ static void for_statement_to_firm(for_statement_t *statement) } add_immBlock_pred(header_block, step_jmp); - /* create the condition */ - ir_node *true_proj; - ir_node *false_proj; - if (statement->condition != NULL) { - ir_node *const condition = expression_to_modeb(statement->condition); - ir_node *const cond = new_d_Cond(dbgi, condition); - true_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true); - false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false); - } else { - keep_alive(header_block); - true_proj = new_Jmp(); - false_proj = NULL; - } - /* the false block */ ir_node *const false_block = new_immBlock(); - if (false_proj != NULL) { - add_immBlock_pred(false_block, false_proj); - } /* the loop body */ - ir_node *const body_block = new_immBlock(); - add_immBlock_pred(body_block, true_proj); - mature_immBlock(body_block); - - 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; + 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) { + jmp = new_Jmp(); + add_immBlock_pred(step_block, jmp); + } + } else { + body_block = step_block; + } - if (get_cur_block() != NULL) { - ir_node *const jmp = new_Jmp(); - add_immBlock_pred(step_block, jmp); + /* create the condition */ + set_cur_block(header_block); + if (statement->condition != NULL) { + create_condition_evaluation(statement->condition, body_block, + false_block); + } else { + keep_alive(header_block); + jmp = new_Jmp(); + add_immBlock_pred(body_block, jmp); } + mature_immBlock(body_block); + mature_immBlock(false_block); mature_immBlock(step_block); mature_immBlock(header_block); mature_immBlock(false_block); @@ -1729,34 +2161,284 @@ 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? */ } +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_object(initializer_t *initializer, type_t *type, + ir_entity *entity, compound_graph_path_entry_t *entry, int len); + +static compound_graph_path *create_compound_path(ir_type *type, + compound_graph_path_entry_t *entry, int len) +{ + 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); + + return path; +} + +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 = create_compound_path(type, entry, len); + 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(&sub_initializer->value, + entity, &entry, len); + } else { + type_t *entry_type = skip_typeref(compound_entry->type); + create_initializer_object(sub_initializer, 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; + element_type = skip_typeref(element_type); + + compound_graph_path_entry_t entry; + entry.type = COMPOUND_GRAPH_ENTRY_ARRAY; + entry.prev = last_entry; + ++len; + + size_t i; + for(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(&sub_initializer->value, + entity, &entry, len); + } else { + create_initializer_object(sub_initializer, element_type, entity, + &entry, len); + } + } + +#if 0 + /* TODO: initialize rest... */ + if(type->size_expression != NULL) { + size_t array_len = fold_constant(type->size_expression); + for( ; i < array_len; ++i) { + + } + } +#endif +} + +static void create_initializer_string(initializer_string_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; + element_type = skip_typeref(element_type); + + compound_graph_path_entry_t entry; + entry.type = COMPOUND_GRAPH_ENTRY_ARRAY; + entry.prev = last_entry; + ++len; + + ir_type *irtype = get_entity_type(entity); + size_t arr_len = get_array_type_size(type); + const char *p = initializer->string; + size_t i = 0; + for(i = 0; i < arr_len; ++i, ++p) { + entry.v.array_index = i; + + ir_node *node = new_Const_long(mode_Bs, *p); + compound_graph_path *path = create_compound_path(irtype, &entry, len); + add_compound_ent_value_w_path(entity, node, path); + + if(*p == '\0') + break; + } +} + +static void create_initializer_object(initializer_t *initializer, type_t *type, + ir_entity *entity, compound_graph_path_entry_t *entry, int len) +{ + if(is_type_array(type)) { + array_type_t *array_type = &type->array; + + if(initializer->type == INITIALIZER_STRING) { + initializer_string_t *string = &initializer->string; + create_initializer_string(string, array_type, entity, entry, len); + } else { + assert(initializer->type == INITIALIZER_LIST); + initializer_list_t *list = &initializer->list; + create_initializer_array(list, array_type, entity, entry, len); + } + } else { + assert(initializer->type == INITIALIZER_LIST); + initializer_list_t *list = &initializer->list; + + assert(is_type_compound(type)); + compound_type_t *compound_type = &type->compound; + create_initializer_compound(list, compound_type, entity, entry, len); + } +} + +static void create_initializer_local_variable_entity(declaration_t *declaration) +{ + initializer_t *initializer = declaration->init.initializer; + dbg_info *dbgi = get_dbg_info(&declaration->source_position); + ir_entity *entity = declaration->v.entity; + ir_node *memory = get_store(); + ir_node *nomem = new_NoMem(); + ir_node *frame = get_irg_frame(current_ir_graph); + ir_node *addr = new_d_simpleSel(dbgi, nomem, frame, entity); + + if(is_atomic_entity(entity)) { + assert(initializer->type == INITIALIZER_VALUE); + initializer_value_t *initializer_value = &initializer->value; + + ir_node *value = expression_to_firm(initializer_value->value); + 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); + return; + } + + /* create a "template" entity which is copied to the entity on the stack */ + ident *id = unique_ident("initializer"); + ir_type *irtype = get_ir_type(declaration->type); + ir_type *global_type = get_glob_type(); + ir_entity *init_entity = new_entity(global_type, id, irtype); + set_entity_ld_ident(init_entity, id); + + set_entity_variability(init_entity, variability_initialized); + set_entity_visibility(init_entity, visibility_local); + + ir_graph *old_current_ir_graph = current_ir_graph; + current_ir_graph = get_const_code_irg(); + + type_t *type = skip_typeref(declaration->type); + create_initializer_object(initializer, type, init_entity, NULL, 0); + + assert(current_ir_graph == get_const_code_irg()); + current_ir_graph = old_current_ir_graph; + + ir_node *src_addr = create_symconst(dbgi, init_entity); + ir_node *copyb = new_d_CopyB(dbgi, memory, addr, src_addr, irtype); + + ir_node *copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M_regular); + set_store(copyb_mem); +} + static void create_initializer(declaration_t *declaration) { initializer_t *initializer = declaration->init.initializer; if(initializer == NULL) return; + 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; + } + 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; - if(declaration->declaration_type == DECLARATION_TYPE_LOCAL_VARIABLE) { - set_value(declaration->v.value_number, init_node); + ir_node *value = expression_to_firm(initializer_value->value); + + if(declaration_type == DECLARATION_TYPE_LOCAL_VARIABLE) { + set_value(declaration->v.value_number, value); } else { + assert(declaration_type == DECLARATION_TYPE_GLOBAL_VARIABLE); + 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"); + 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); + + type_t *type = skip_typeref(declaration->type); + create_initializer_object(initializer, type, entity, NULL, 0); } } @@ -1767,9 +2449,7 @@ static void create_local_variable(declaration_t *declaration) bool needs_entity = declaration->address_taken; type_t *type = skip_typeref(declaration->type); - if(type->type == TYPE_ARRAY - || type->type == TYPE_COMPOUND_STRUCT - || type->type == TYPE_COMPOUND_UNION) { + if(is_type_array(type) || is_type_compound(type)) { needs_entity = true; } @@ -1787,18 +2467,44 @@ static void create_local_variable(declaration_t *declaration) create_initializer(declaration); } +static void create_local_static_variable(declaration_t *declaration) +{ + assert(declaration->declaration_type == DECLARATION_TYPE_UNKNOWN); + + type_t *type = skip_typeref(declaration->type); + ir_type *global_type = get_glob_type(); + ident *id = unique_ident(declaration->symbol->string); + ir_type *irtype = get_ir_type(type); + ir_entity *entity = new_entity(global_type, id, irtype); + set_entity_ld_ident(entity, id); + + declaration->declaration_type = DECLARATION_TYPE_GLOBAL_VARIABLE; + declaration->v.entity = entity; + set_entity_variability(entity, variability_uninitialized); + set_entity_visibility(entity, visibility_local); + + ir_graph *old_current_ir_graph = current_ir_graph; + current_ir_graph = get_const_code_irg(); + + create_initializer(declaration); + + assert(current_ir_graph == get_const_code_irg()); + current_ir_graph = old_current_ir_graph; +} + static void declaration_statement_to_firm(declaration_statement_t *statement) { declaration_t *declaration = statement->declarations_begin; declaration_t *end = statement->declarations_end->next; for( ; declaration != end; declaration = declaration->next) { - type_t *type = declaration->type; + type_t *type = skip_typeref(declaration->type); - switch(declaration->storage_class) { + switch ((storage_class_tag_t) declaration->storage_class) { case STORAGE_CLASS_TYPEDEF: continue; case STORAGE_CLASS_STATIC: - panic("static local vars not implemented yet"); + create_local_static_variable(declaration); + continue; case STORAGE_CLASS_ENUM_ENTRY: panic("enum entry declaration in local block found"); case STORAGE_CLASS_EXTERN: @@ -1806,12 +2512,16 @@ static void declaration_statement_to_firm(declaration_statement_t *statement) case STORAGE_CLASS_NONE: case STORAGE_CLASS_AUTO: case STORAGE_CLASS_REGISTER: - if(type->type == TYPE_FUNCTION) { + if(is_type_function(type)) { panic("nested functions not supported yet"); } else { 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"); } @@ -1823,7 +2533,7 @@ static void create_jump_statement(const statement_t *statement, if(get_cur_block() == NULL) return; - dbg_info *dbgi = get_dbg_info(&statement->source_position); + dbg_info *dbgi = get_dbg_info(&statement->base.source_position); ir_node *jump = new_d_Jmp(dbgi); add_immBlock_pred(target_block, jump); @@ -1919,11 +2629,13 @@ static void case_label_to_firm(const case_label_statement_t *statement) } add_immBlock_pred(block, proj); mature_immBlock(block); + + statement_to_firm(statement->label_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; @@ -1972,26 +2684,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); @@ -2000,59 +2714,173 @@ 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"); } +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->base.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_ASM: + 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); + + /* TODO FIXME: Matze: I'm lazy don't want to scan all expressions + * for expression statements... */ + count += 10; + + return count; } static void initialize_function_parameters(declaration_t *declaration) { - ir_graph *irg = current_ir_graph; - ir_node *args = get_irg_args(irg); - ir_node *start_block = get_irg_start_block(irg); + ir_graph *irg = current_ir_graph; + ir_node *args = get_irg_args(irg); + ir_node *start_block = get_irg_start_block(irg); + ir_type *function_irtype = get_ir_type(declaration->type); int n = 0; declaration_t *parameter = declaration->context.declarations; - for( ; parameter != NULL; parameter = parameter->next) { + for( ; parameter != NULL; parameter = parameter->next, ++n) { assert(parameter->declaration_type == DECLARATION_TYPE_UNKNOWN); - type_t *type = parameter->type; + type_t *type = skip_typeref(parameter->type); bool needs_entity = parameter->address_taken; - if(type->type == TYPE_COMPOUND_STRUCT - || type->type == TYPE_COMPOUND_UNION) { + assert(!is_type_array(type)); + if(is_type_compound(type)) { needs_entity = true; } if(needs_entity) { - panic("entities for function parameters not implemented yet"); + ir_entity *entity = get_method_value_param_ent(function_irtype, n); + ident *id = new_id_from_str(parameter->symbol->string); + set_entity_ident(entity, id); + + parameter->declaration_type + = DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY; + parameter->v.entity = entity; + continue; } ir_mode *mode = get_ir_mode(parameter->type); long pn = n; ir_node *proj = new_r_Proj(irg, start_block, args, mode, pn); - ++n; parameter->declaration_type = DECLARATION_TYPE_LOCAL_VARIABLE; parameter->v.value_number = next_value_number_function; @@ -2064,16 +2892,19 @@ 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; + current_function_decl = declaration; + current_function_name = NULL; + assert(imature_blocks == NULL); 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; @@ -2085,15 +2916,24 @@ static void create_function(declaration_t *declaration) /* do we have a return statement yet? */ if(get_cur_block() != NULL) { - assert(declaration->type->type == TYPE_FUNCTION); - const function_type_t* const func_type - = (const function_type_t*) declaration->type; + type_t *type = skip_typeref(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); + ir_node *ret; - if (func_type->result_type == type_void) { + if (is_type_atomic(return_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(return_type)) { + mode = get_ir_mode(func_type->return_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)); @@ -2131,7 +2971,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); @@ -2146,27 +2988,65 @@ 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) { + /* first pass: create declarations */ 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) @@ -2174,19 +3054,46 @@ static void context_to_firm(context_t *context) if(declaration->symbol == NULL) continue; - type_t *type = declaration->type; - if(type->type == TYPE_FUNCTION) { - create_function(declaration); + type_t *type = skip_typeref(declaration->type); + if(is_type_function(type)) { + get_function_entity(declaration); } else { create_global_variable(declaration); } } + + /* second pass: create code */ + declaration = context->declarations; + for( ; declaration != NULL; declaration = declaration->next) { + if(declaration->namespc != NAMESPACE_NORMAL) + continue; + if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY + || declaration->storage_class == STORAGE_CLASS_TYPEDEF) + continue; + if(declaration->symbol == NULL) + continue; + + type_t *type = declaration->type; + if(type->type != TYPE_FUNCTION) + continue; + + create_function(declaration); + } } void translation_unit_to_firm(translation_unit_t *unit) { - /* remove me later TODO FIXME */ - (void) get_type_size; + type_const_char = make_atomic_type(ATOMIC_TYPE_CHAR, TYPE_QUALIFIER_CONST); + type_void = make_atomic_type(ATOMIC_TYPE_VOID, TYPE_QUALIFIER_NONE); + type_int = make_atomic_type(ATOMIC_TYPE_INT, TYPE_QUALIFIER_NONE); + + ir_type_int = get_ir_type(type_int); + 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_int); /* we don't have a real void + type in firm */ + + type_void->base.firm_type = ir_type_void; /* just to be sure */ continue_label = NULL;