X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=5fc82cab30b00139df7f33dbbfd9790e2e2ef1ed;hb=9de06381987e3b71a9efea26cb9b596fd433191c;hp=1c9c0c44fb67b220fcf1814bcea97c787d545211;hpb=508cc42e42c39c77ed2ec0664a09f4911b0603d1;p=cparser diff --git a/ast2firm.c b/ast2firm.c index 1c9c0c4..5fc82ca 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -16,18 +16,20 @@ #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_void; static ir_type *ir_type_int; -static ir_type *ir_type_void_ptr; static type_t *type_const_char; static type_t *type_void; static type_t *type_int; +static symbol_t *symbol_alloca; + static int next_value_number_function; static ir_node *continue_label; static ir_node *break_label; @@ -35,6 +37,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 +48,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); @@ -90,10 +96,10 @@ void init_ast2firm(void) ir_type_const_char = get_ir_type(type_const_char); ir_type_void = get_ir_type(type_int); /* we don't have a real void type in firm */ - ir_type_void_ptr = new_type_pointer(new_id_from_str("void_ptr"), - ir_type_void, mode_P_data); - type_void->firm_type = ir_type_void; + type_void->base.firm_type = ir_type_void; + + symbol_alloca = symbol_table_insert("__builtin_alloca"); } void exit_ast2firm(void) @@ -204,13 +210,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 +226,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: @@ -447,39 +453,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: @@ -490,7 +529,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; } @@ -538,25 +577,29 @@ static ir_entity* get_function_entity(declaration_t *declaration) return entity; } - - -static ir_node *expression_to_firm(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 +613,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,29 +644,51 @@ 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 *deref_address(type_t *const type, ir_node *const addr, +static ir_node *string_literal_to_firm( + const string_literal_expression_t* literal) +{ + return string_to_firm(&literal->expression.source_position, "Lstr", + literal->value); +} + +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; - - default: { - ir_mode *const mode = get_ir_mode(type); - ir_node *const memory = get_store(); - ir_node *const load = new_d_Load(dbgi, memory, addr, mode); - ir_node *const load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M); - ir_node *const load_res = new_d_Proj(dbgi, load, mode, pn_Load_res); - set_store(load_mem); - return load_res; + 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 *get_global_var_address(dbg_info *const dbgi, + const declaration_t *const decl) +{ + assert(decl->declaration_type == DECLARATION_TYPE_GLOBAL_VARIABLE); + + ir_entity *const entity = decl->v.entity; + switch ((storage_class_tag_t)decl->storage_class) { + case STORAGE_CLASS_THREAD: + case STORAGE_CLASS_THREAD_EXTERN: + case STORAGE_CLASS_THREAD_STATIC: { + ir_node *const no_mem = new_NoMem(); + ir_node *const tls = get_irg_tls(current_ir_graph); + return new_d_simpleSel(dbgi, no_mem, tls, entity); } + + default: + return create_symconst(dbgi, entity); } } @@ -634,7 +700,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); @@ -643,15 +719,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: @@ -676,9 +754,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; @@ -687,6 +764,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"); @@ -695,22 +776,50 @@ static ir_node *reference_addr(const reference_expression_t *ref) panic("reference to declaration with unknown type found"); } -static ir_node *call_expression_to_firm(const call_expression_t *call) +static ir_node *process_builtin_call(const call_expression_t *call) { - assert(get_cur_block() != NULL); + dbg_info *dbgi = get_dbg_info(&call->expression.source_position); + + assert(call->function->type == EXPR_BUILTIN_SYMBOL); + builtin_symbol_expression_t *builtin + = (builtin_symbol_expression_t*) call->function; + symbol_t *symbol = builtin->symbol; - expression_t *function = call->function; - ir_node *callee = expression_to_firm(function); + if(symbol == symbol_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); - function_type_t *function_type; - if (function->datatype->type == TYPE_POINTER) { - pointer_type_t *const ptr_type = (pointer_type_t*)function->datatype; - assert(ptr_type->points_to->type == TYPE_FUNCTION); - function_type = (function_type_t*)ptr_type->points_to; + 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; } else { - assert(function->datatype->type == TYPE_FUNCTION); - function_type = (function_type_t*)function->datatype; + 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; + if(function->type == EXPR_BUILTIN_SYMBOL) { + return process_builtin_call(call); } + ir_node *callee = expression_to_firm(function); + + type_t *type = function->base.datatype; + assert(type->type == TYPE_POINTER); + pointer_type_t *const ptr_type = &type->pointer; + assert(ptr_type->points_to->type == TYPE_FUNCTION); + function_type_t *function_type = &ptr_type->points_to->function; int n_parameters = 0; call_argument_t *argument = call->arguments; @@ -746,7 +855,7 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) 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); } @@ -764,10 +873,16 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) ir_node *mem = new_d_Proj(dbgi, node, mode_M, pn_Call_M_regular); set_store(mem); - type_t *result_type = function_type->result_type; + type_t *result_type = skip_typeref(function_type->result_type); ir_node *result = NULL; - if(result_type != type_void) { - ir_mode *mode = get_ir_mode(result_type); + + if(!is_type_atomic(result_type, ATOMIC_TYPE_VOID)) { + ir_mode *mode; + if(is_type_scalar(result_type)) { + mode = get_ir_mode(result_type); + } else { + mode = mode_P_data; + } ir_node *resproj = new_d_Proj(dbgi, node, mode_T, pn_Call_T_result); result = new_d_Proj(dbgi, resproj, mode, 0); } @@ -775,6 +890,9 @@ 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, @@ -794,13 +912,21 @@ 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); + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + 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) @@ -831,7 +957,7 @@ static ir_node *create_incdec(const unary_expression_t *expression) ir_node *offset; if(type->type == TYPE_POINTER) { - pointer_type_t *pointer_type = (pointer_type_t*) 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 { @@ -839,7 +965,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); @@ -863,15 +988,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; + type_t *type = skip_typeref(expression->expression.datatype); if(expression->type == UNEXPR_TAKE_ADDRESS) return expression_to_addr(expression->value); @@ -897,8 +1021,10 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) } return value_node; } - case UNEXPR_DEREFERENCE: - return deref_address(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: @@ -971,7 +1097,7 @@ 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; + 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); @@ -1034,8 +1160,8 @@ static ir_node *create_add(const binary_expression_t *expression) 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); @@ -1058,13 +1184,23 @@ static ir_node *create_sub(const binary_expression_t *expression) ir_node *const left = expression_to_firm(expr_left); ir_node *const right = expression_to_firm(expr_right); type_t *const type = expression->expression.datatype; - type_t *const type_left = skip_typeref(expr_left->datatype); - type_t *const type_right = skip_typeref(expr_right->datatype); + 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)) || - (type_left->type == TYPE_POINTER && type_right->type == TYPE_POINTER)) { + 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 (type_left->type == TYPE_POINTER + && type_right->type == TYPE_POINTER) { + 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_left->type == TYPE_POINTER); @@ -1085,12 +1221,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); @@ -1113,8 +1251,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; @@ -1159,6 +1300,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) { @@ -1181,6 +1335,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: @@ -1222,9 +1377,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"); } @@ -1232,13 +1386,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); @@ -1250,17 +1407,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 = skip_typeref(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); } @@ -1301,6 +1462,9 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression) add_immBlock_pred(common_block, false_jmp); mature_immBlock(common_block); + /* TODO improve static semantics, so either both or no values are NULL */ + if (true_val == NULL || false_val == NULL) return NULL; + ir_node *in[2] = { true_val, false_val }; ir_mode *mode = get_irn_mode(true_val); assert(get_irn_mode(false_val) == mode); @@ -1328,10 +1492,14 @@ 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 = skip_typeref(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. */ @@ -1361,13 +1529,13 @@ typedef enum gcc_type_class static ir_node *classify_type_to_firm(const classify_type_expression_t *const expr) { - const type_t *const type = expr->type_expression->datatype; + 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 = (const atomic_type_t*)type; + const atomic_type_t *const atomic_type = &type->atomic; switch (atomic_type->atype) { // should not be reached case ATOMIC_TYPE_INVALID: @@ -1406,9 +1574,6 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex case ATOMIC_TYPE_LONG_DOUBLE_COMPLEX: tc = complex_type_class; break; -#endif - -#ifdef PROVIDE_IMAGINARY case ATOMIC_TYPE_FLOAT_IMAGINARY: case ATOMIC_TYPE_DOUBLE_IMAGINARY: case ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY: @@ -1441,6 +1606,27 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex 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) { assert(expression->type == UNEXPR_DEREFERENCE); @@ -1451,14 +1637,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); } @@ -1474,35 +1661,34 @@ 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_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((const classify_type_expression_t*)expression); + 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"); @@ -1518,7 +1704,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); } @@ -1584,7 +1770,7 @@ static void create_condition_evaluation(const expression_t *expression, break; } - dbg_info *dbgi = get_dbg_info(&expression->source_position); + 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); @@ -1596,46 +1782,89 @@ static void create_condition_evaluation(const expression_t *expression, set_cur_block(NULL); } -static void statement_to_firm(statement_t *statement); static void return_statement_to_firm(return_statement_t *statement) { if(get_cur_block() == NULL) return; - dbg_info *dbgi = get_dbg_info(&statement->statement.source_position); - ir_node *ret; + 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 *retval = expression_to_firm(statement->return_value); - ir_node *in[1]; + if(is_compound_type(res_type)) { + ir_entity *entity = get_method_value_res_ent(func_irtype, 0); - in[0] = retval; - ret = new_d_Return(dbgi, get_store(), 1, in); + ir_node *frame = get_irg_frame(current_ir_graph); + ir_node *nomem = new_NoMem(); + ir_node *source_addr = expression_to_addr(statement->return_value); + ir_node *dest_addr = new_simpleSel(nomem, frame, entity); + + ir_node *store = get_store(); + ir_node *copyb = new_d_CopyB(dbgi, store, dest_addr, source_addr, + res_type); + + ir_node *copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M_regular); + set_store(copyb_mem); + + in[0] = dest_addr; + in_len = 1; + } else { + in_len = 1; + if(statement->return_value != NULL) { + in[0] = expression_to_firm(statement->return_value); + } else { + ir_mode *mode = get_type_mode(res_type); + in[0] = new_Unknown(mode); + } + } } 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) @@ -1720,7 +1949,7 @@ static void while_statement_to_firm(while_statement_t *statement) break_label = old_break_label; if(get_cur_block() != NULL) { - ir_node *jmp = new_Jmp(); + jmp = new_Jmp(); add_immBlock_pred(header_block, jmp); } } else { @@ -1837,7 +2066,7 @@ static void for_statement_to_firm(for_statement_t *statement) break_label = old_break_label; if (get_cur_block() != NULL) { - ir_node *const jmp = new_Jmp(); + jmp = new_Jmp(); add_immBlock_pred(step_block, jmp); } } else { @@ -1851,7 +2080,7 @@ static void for_statement_to_firm(for_statement_t *statement) false_block); } else { keep_alive(header_block); - ir_node *jmp = new_Jmp(); + jmp = new_Jmp(); add_immBlock_pred(body_block, jmp); } @@ -1873,7 +2102,7 @@ static void create_declaration_entity(declaration_t *declaration, ir_entity *entity = new_entity(parent_type, id, irtype); set_entity_ld_ident(entity, id); - declaration->declaration_type = declaration_type; + declaration->declaration_type = (unsigned char) declaration_type; declaration->v.entity = entity; set_entity_variability(entity, variability_uninitialized); /* TODO: visibility? */ @@ -1895,19 +2124,12 @@ struct compound_graph_path_entry_t { compound_graph_path_entry_t *prev; }; -static void create_initializer_list(initializer_list_t *initializer, - type_t *type, ir_entity *entity, - compound_graph_path_entry_t *entry, - int len); +static void create_initializer_object(initializer_t *initializer, type_t *type, + ir_entity *entity, compound_graph_path_entry_t *entry, int len); -static void create_initializer_value(initializer_value_t *initializer, - ir_entity *entity, - compound_graph_path_entry_t *entry, - int len) +static compound_graph_path *create_compound_path(ir_type *type, + compound_graph_path_entry_t *entry, int len) { - ir_node *node = expression_to_firm(initializer->value); - - ir_type *type = get_entity_type(entity); compound_graph_path *path = new_compound_graph_path(type, len); int i = len - 1; @@ -1922,6 +2144,17 @@ static void create_initializer_value(initializer_value_t *initializer, } 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); } @@ -1936,8 +2169,8 @@ static void create_initializer_compound(initializer_list_t *initializer, declaration_t *compound_entry = compound_declaration->context.declarations; compound_graph_path_entry_t entry; - entry.type = COMPOUND_GRAPH_ENTRY_COMPOUND; - entry.prev = last_entry; + entry.type = COMPOUND_GRAPH_ENTRY_COMPOUND; + entry.prev = last_entry; ++len; size_t i = 0; @@ -1959,30 +2192,156 @@ static void create_initializer_compound(initializer_list_t *initializer, == DECLARATION_TYPE_COMPOUND_MEMBER); if(sub_initializer->type == INITIALIZER_VALUE) { - create_initializer_value((initializer_value_t*) sub_initializer, + create_initializer_value(&sub_initializer->value, entity, &entry, len); } else { - assert(sub_initializer->type == INITIALIZER_LIST); - create_initializer_list((initializer_list_t*) sub_initializer, - compound_entry->type, entity, &entry, len); + type_t *entry_type = skip_typeref(compound_entry->type); + create_initializer_object(sub_initializer, entry_type, entity, + &entry, len); } ++i; } } -static void create_initializer_list(initializer_list_t *initializer, - type_t *type, ir_entity *entity, - compound_graph_path_entry_t *entry, int len) +static void create_initializer_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(type->type == TYPE_ARRAY) { - /* TODO */ + 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(type->type == TYPE_COMPOUND_STRUCT || type->type == TYPE_COMPOUND_UNION); - create_initializer_compound(initializer, (compound_type_t*) type, - entity, entry, len); + 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) @@ -1991,31 +2350,37 @@ static void create_initializer(declaration_t *declaration) 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) { - initializer_value_t *initializer_value - = (initializer_value_t*) initializer; + initializer_value_t *initializer_value = &initializer->value; + ir_node *value = expression_to_firm(initializer_value->value); - if(declaration->declaration_type == DECLARATION_TYPE_LOCAL_VARIABLE) { + 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, value); } } else { - assert(initializer->type == INITIALIZER_LIST); - initializer_list_t *list = (initializer_list_t*) initializer; - - declaration_type_t declaration_type = declaration->declaration_type; assert(declaration_type == DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY || declaration_type == DECLARATION_TYPE_GLOBAL_VARIABLE); ir_entity *entity = declaration->v.entity; set_entity_variability(entity, variability_initialized); - create_initializer_list(list, declaration->type, entity, NULL, 0); + type_t *type = skip_typeref(declaration->type); + create_initializer_object(initializer, type, entity, NULL, 0); } } @@ -2046,6 +2411,31 @@ 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; @@ -2053,11 +2443,12 @@ static void declaration_statement_to_firm(declaration_statement_t *statement) for( ; declaration != end; declaration = declaration->next) { type_t *type = declaration->type; - switch(declaration->storage_class) { + switch ((storage_class_tag_t)declaration->storage_class) { case STORAGE_CLASS_TYPEDEF: continue; case STORAGE_CLASS_STATIC: - 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: @@ -2071,6 +2462,10 @@ static void declaration_statement_to_firm(declaration_statement_t *statement) create_local_variable(declaration); } continue; + case STORAGE_CLASS_THREAD: + case STORAGE_CLASS_THREAD_EXTERN: + case STORAGE_CLASS_THREAD_STATIC: + break; } panic("invalid storage class found"); } @@ -2082,7 +2477,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); @@ -2178,6 +2573,8 @@ 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) @@ -2289,7 +2686,8 @@ static int count_local_declarations(const declaration_t * decl, case TYPE_ATOMIC: case TYPE_ENUM: case TYPE_POINTER: - if (!decl->address_taken) ++count; + if (!decl->address_taken) + ++count; break; default: break; @@ -2301,7 +2699,7 @@ static int count_local_declarations(const declaration_t * decl, static int count_decls_in_stmts(const statement_t *stmt) { int count = 0; - for (; stmt != NULL; stmt = stmt->next) { + for (; stmt != NULL; stmt = stmt->base.next) { switch (stmt->type) { case STATEMENT_DECLARATION: { const declaration_statement_t *const decl_stmt = @@ -2384,20 +2782,25 @@ static int get_function_n_local_vars(declaration_t *declaration) /* 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 @@ -2406,13 +2809,19 @@ static void initialize_function_parameters(declaration_t *declaration) } 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; @@ -2424,16 +2833,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; @@ -2446,8 +2858,8 @@ 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; + const function_type_t* const func_type = &declaration->type->function; + ir_node *ret; if (func_type->result_type == type_void) { ret = new_Return(get_store(), 0, NULL); @@ -2508,24 +2920,62 @@ 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->namespc != NAMESPACE_NORMAL) @@ -2538,11 +2988,29 @@ static void context_to_firm(context_t *context) type_t *type = declaration->type; if(type->type == TYPE_FUNCTION) { - create_function(declaration); + 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)