X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=46f2f19aad6cf2912fa3a1ef463ed0139b337433;hb=78cc65b14fc5c53a16368fe5975c70c83e969b19;hp=b75ddc1cd19c23dd5868635fd5ce43b0e3c61831;hpb=946ecca09f62b2e57a19e7f7fbfcfedd857ded37;p=cparser diff --git a/ast2firm.c b/ast2firm.c index b75ddc1..46f2f19 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -17,10 +17,15 @@ #include "type_t.h" #include "ast_t.h" #include "parser.h" +#include "diagnostic.h" +#include "lang_features.h" +#include "driver/firm_opt.h" +#include "driver/firm_cmdline.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; @@ -28,9 +33,6 @@ static type_t *type_const_char; static type_t *type_void; static type_t *type_int; -static symbol_t *symbol_builtin_alloca; -static symbol_t *symbol_builtin_nanf; - static int next_value_number_function; static ir_node *continue_label; static ir_node *break_label; @@ -41,30 +43,28 @@ 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, - DECLARATION_TYPE_GLOBAL_VARIABLE, - DECLARATION_TYPE_LOCAL_VARIABLE, - DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY, - DECLARATION_TYPE_COMPOUND_MEMBER, - DECLARATION_TYPE_LABEL_BLOCK, - DECLARATION_TYPE_ENUM_ENTRY -} declaration_type_t; +static struct obstack asm_obst; + +typedef enum declaration_kind_t { + DECLARATION_KIND_UNKNOWN, + DECLARATION_KIND_FUNCTION, + DECLARATION_KIND_GLOBAL_VARIABLE, + DECLARATION_KIND_LOCAL_VARIABLE, + DECLARATION_KIND_LOCAL_VARIABLE_ENTITY, + DECLARATION_KIND_COMPOUND_MEMBER, + DECLARATION_KIND_LABEL_BLOCK, + DECLARATION_KIND_ENUM_ENTRY +} declaration_kind_t; static ir_type *get_ir_type(type_t *type); +static int count_decls_in_stmts(const statement_t *stmt); ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos) { - (void) pos; -#if 0 - const declaration_t *declaration = & value_numbers[pos]->declaration; + const declaration_t *declaration = get_irg_loc_description(irg, pos); - print_warning_prefix(declaration->source_position); - fprintf(stderr, "variable '%s' might be used uninitialized\n", - declaration->symbol->string); -#endif - fprintf(stderr, "Some variable might be used uninitialized\n"); + warningf(declaration->source_position, "variable '%#T' might be used uninitialized", + declaration->type, declaration->symbol); return new_r_Unknown(irg, mode); } @@ -77,7 +77,7 @@ unsigned dbg_snprint(char *buf, unsigned len, const dbg_info *dbg) pos->linenr); } -const char *retrieve_dbg(const dbg_info *dbg, unsigned *line) +const char *dbg_retrieve(const dbg_info *dbg, unsigned *line) { const source_position_t *pos = (const source_position_t*) dbg; if(pos == NULL) @@ -87,25 +87,9 @@ const char *retrieve_dbg(const dbg_info *dbg, unsigned *line) return pos->input_name; } -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 */ - - type_void->base.firm_type = ir_type_void; - - symbol_builtin_alloca = symbol_table_insert("__builtin_alloca"); - symbol_builtin_nanf = symbol_table_insert("__builtin_nanf"); -} - -void exit_ast2firm(void) +static dbg_info *get_dbg_info(const source_position_t *pos) { + return (dbg_info*) pos; } static unsigned unique_id = 0; @@ -119,63 +103,156 @@ static ident *unique_ident(const char *tag) return new_id_from_str(buf); } -static ir_mode *get_atomic_mode(const atomic_type_t* atomic_type) +/** + * Return the signed integer mode of size bytes. + * + * @param size the size + */ +static ir_mode *get_smode(unsigned size) { - switch(atomic_type->atype) { - case ATOMIC_TYPE_SCHAR: - case ATOMIC_TYPE_CHAR: - return mode_Bs; - case ATOMIC_TYPE_UCHAR: - return mode_Bu; - case ATOMIC_TYPE_SHORT: - return mode_Hs; - case ATOMIC_TYPE_USHORT: - return mode_Hu; - case ATOMIC_TYPE_LONG: - case ATOMIC_TYPE_INT: - return mode_Is; - case ATOMIC_TYPE_ULONG: - case ATOMIC_TYPE_UINT: - return mode_Iu; - case ATOMIC_TYPE_LONGLONG: - return mode_Ls; - case ATOMIC_TYPE_ULONGLONG: - return mode_Lu; - case ATOMIC_TYPE_FLOAT: - return mode_F; - case ATOMIC_TYPE_DOUBLE: - return mode_D; - case ATOMIC_TYPE_LONG_DOUBLE: - return mode_E; - case ATOMIC_TYPE_BOOL: - return mode_b; + static ir_mode *s_modes[16 + 1] = {0, }; + ir_mode *res; + + if (size <= 0 || size > 16) + return NULL; + + res = s_modes[size]; + if (res == NULL) { + unsigned bits; + char name[32]; + + bits = size * 8; + snprintf(name, sizeof(name), "i%u", bits); + res = new_ir_mode(name, irms_int_number, bits, 1, irma_twos_complement, + bits <= machine_size ? machine_size : bits ); + + s_modes[size] = res; + } + return res; +} + +/** + * Return the unsigned integer mode of size bytes. + * + * @param size the size + */ +static ir_mode *get_umode(unsigned size) +{ + static ir_mode *u_modes[16 + 1] = {0, }; + ir_mode *res; + + if (size <= 0 || size > 16) + return NULL; + + res = u_modes[size]; + if (res == NULL) { + unsigned bits; + char name[32]; + + bits = size * 8; + snprintf(name, sizeof(name), "u%u", bits); + res = new_ir_mode(name, irms_int_number, bits, 0, irma_twos_complement, + bits <= machine_size ? machine_size : bits ); + + u_modes[size] = res; + } + return res; +} + +/** + * Return the pointer mode of size bytes. + * + * @param size the size + */ +static ir_mode *get_ptrmode(unsigned size, char *name) +{ + static ir_mode *p_modes[16 + 1] = {0, }; + ir_mode *res; + + if (size <= 0 || size > 16) + return NULL; + + res = p_modes[size]; + if (res == NULL) { + unsigned bits; + char buf[32]; + + bits = size * 8; + if (name == NULL) { + snprintf(buf, sizeof(buf), "p%u", bits); + name = buf; + } + res = new_ir_mode(name, irms_reference, bits, 0, irma_twos_complement, + bits <= machine_size ? machine_size : bits); + + p_modes[size] = res; + + set_reference_mode_signed_eq(res, get_smode(size)); + set_reference_mode_unsigned_eq(res, get_umode(size)); + } + return res; +} + +static ir_mode *_atomic_modes[ATOMIC_TYPE_LAST]; + +static ir_mode *mode_int, *mode_uint; + +/** + * Initialises the atomic modes depending on the machine size. + */ +static void init_atomic_modes(void) { + unsigned int_size = machine_size < 32 ? 2 : 4; + unsigned long_size = machine_size < 64 ? 4 : 8; + unsigned llong_size = machine_size < 32 ? 4 : 8; + + /* firm has no real void... */ + _atomic_modes[ATOMIC_TYPE_VOID] = mode_T; + _atomic_modes[ATOMIC_TYPE_CHAR] = char_is_signed ? get_smode(1) : get_umode(1); + _atomic_modes[ATOMIC_TYPE_SCHAR] = get_smode(1); + _atomic_modes[ATOMIC_TYPE_UCHAR] = get_umode(1); + _atomic_modes[ATOMIC_TYPE_SHORT] = get_smode(2); + _atomic_modes[ATOMIC_TYPE_USHORT] = get_umode(2); + _atomic_modes[ATOMIC_TYPE_INT] = get_smode(int_size); + _atomic_modes[ATOMIC_TYPE_UINT] = get_umode(int_size); + _atomic_modes[ATOMIC_TYPE_LONG] = get_smode(long_size); + _atomic_modes[ATOMIC_TYPE_ULONG] = get_umode(long_size); + _atomic_modes[ATOMIC_TYPE_LONGLONG] = get_smode(llong_size); + _atomic_modes[ATOMIC_TYPE_ULONGLONG] = get_umode(llong_size); + _atomic_modes[ATOMIC_TYPE_FLOAT] = mode_F; + _atomic_modes[ATOMIC_TYPE_DOUBLE] = mode_D; + _atomic_modes[ATOMIC_TYPE_LONG_DOUBLE] = mode_E; + _atomic_modes[ATOMIC_TYPE_BOOL] = get_umode(int_size); + #ifdef PROVIDE_COMPLEX - case ATOMIC_TYPE_FLOAT_COMPLEX: - case ATOMIC_TYPE_DOUBLE_COMPLEX: - case ATOMIC_TYPE_LONG_DOUBLE_COMPLEX: - panic("complex lowering not implemented yet"); - break; - case ATOMIC_TYPE_FLOAT_IMAGINARY: - case ATOMIC_TYPE_DOUBLE_IMAGINARY: - case ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY: - panic("imaginary lowering not implemented yet"); - break; + _atomic_modes[ATOMIC_TYPE_BOOL] = _atomic_modes[ATOMIC_TYPE_INT]; + _atomic_modes[ATOMIC_TYPE_FLOAT_IMAGINARY] = _atomic_modes[ATOMIC_TYPE_FLOAT]; + _atomic_modes[ATOMIC_TYPE_DOUBLE_IMAGINARY] = _atomic_modes[ATOMIC_TYPE_DOUBLE]; + _atomic_modes[ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY] = _atomic_modes[ATOMIC_TYPE_LONG_DOUBLE]; #endif - case ATOMIC_TYPE_VOID: - /* firm has no real void... */ - return mode_Is; - case ATOMIC_TYPE_INVALID: - break; - } - panic("Encountered unknown atomic type"); + + /* Hmm, pointers should be machine size */ + set_modeP_data(get_ptrmode(machine_size >> 3, NULL)); + set_modeP_code(get_ptrmode(machine_size >> 3, NULL)); + + mode_int = _atomic_modes[ATOMIC_TYPE_INT]; + mode_uint = _atomic_modes[ATOMIC_TYPE_UINT]; } +static ir_mode *get_atomic_mode(const atomic_type_t* atomic_type) +{ + ir_mode *res = NULL; + if ((unsigned)atomic_type->akind < (unsigned)ATOMIC_TYPE_LAST) + res = _atomic_modes[(unsigned)atomic_type->akind]; + if (res == NULL) + panic("Encountered unknown atomic type"); + return res; +} static unsigned get_type_size(type_t *type); static unsigned get_atomic_type_size(const atomic_type_t *type) { - switch(type->atype) { + switch(type->akind) { case ATOMIC_TYPE_CHAR: case ATOMIC_TYPE_SCHAR: case ATOMIC_TYPE_UCHAR: @@ -188,13 +265,19 @@ static unsigned get_atomic_type_size(const atomic_type_t *type) case ATOMIC_TYPE_BOOL: case ATOMIC_TYPE_INT: case ATOMIC_TYPE_UINT: + return machine_size >> 3; + case ATOMIC_TYPE_LONG: case ATOMIC_TYPE_ULONG: - case ATOMIC_TYPE_FLOAT: - return 4; + return machine_size > 16 ? machine_size >> 3 : 4; case ATOMIC_TYPE_LONGLONG: case ATOMIC_TYPE_ULONGLONG: + return machine_size > 16 ? 8 : 4; + + case ATOMIC_TYPE_FLOAT: + return 4; + case ATOMIC_TYPE_DOUBLE: return 8; @@ -205,6 +288,7 @@ static unsigned get_atomic_type_size(const atomic_type_t *type) return 1; case ATOMIC_TYPE_INVALID: + case ATOMIC_TYPE_LAST: break; } panic("Trying to determine size of invalid atomic type"); @@ -222,15 +306,18 @@ static unsigned get_array_type_size(array_type_t *type) return get_type_size_bytes(irtype); } + static unsigned get_type_size(type_t *type) { type = skip_typeref(type); - switch(type->type) { + switch(type->kind) { + case TYPE_ERROR: + panic("error type occured"); case TYPE_ATOMIC: return get_atomic_type_size(&type->atomic); case TYPE_ENUM: - return get_mode_size_bytes(mode_Is); + return get_mode_size_bytes(mode_int); case TYPE_COMPOUND_UNION: case TYPE_COMPOUND_STRUCT: return get_compound_type_size(&type->compound); @@ -242,6 +329,9 @@ static unsigned get_type_size(type_t *type) case TYPE_ARRAY: return get_array_type_size(&type->array); case TYPE_BUILTIN: + return get_type_size(type->builtin.real_type); + case TYPE_BITFIELD: + panic("type size of bitfield request"); case TYPE_TYPEDEF: case TYPE_TYPEOF: case TYPE_INVALID: @@ -273,20 +363,25 @@ static ir_type *create_atomic_type(const atomic_type_t *type) ident *id = get_mode_ident(mode); ir_type *irtype = new_type_primitive(id, mode); + if(type->akind == ATOMIC_TYPE_LONG_DOUBLE + || type->akind == ATOMIC_TYPE_DOUBLE) { + set_type_alignment_bytes(irtype, 4); + } + return irtype; } 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); } @@ -344,11 +439,98 @@ static ir_type *create_array_type(array_type_t *type) set_type_size_bytes(ir_type, n_elements * elemsize); set_type_alignment_bytes(ir_type, align); set_type_state(ir_type, layout_fixed); + } else { + set_array_lower_bound_int(ir_type, 0, 0); } return ir_type; } +/** + * Return the signed integer type of size bits. + * + * @param size the size + */ +static ir_type *get_signed_int_type_for_bit_size(ir_type *base_tp, + unsigned size) +{ + static ir_mode *s_modes[64 + 1] = {NULL, }; + ir_type *res; + ir_mode *mode; + + if (size <= 0 || size > 64) + return NULL; + + mode = s_modes[size]; + if (mode == NULL) { + char name[32]; + + snprintf(name, sizeof(name), "bf_I%u", size); + mode = new_ir_mode(name, irms_int_number, size, 1, irma_twos_complement, + size <= 32 ? 32 : size ); + s_modes[size] = mode; + } + + char name[32]; + snprintf(name, sizeof(name), "I%u", size); + ident *id = new_id_from_str(name); + res = new_type_primitive(mangle_u(get_type_ident(base_tp), id), mode); + set_primitive_base_type(res, base_tp); + + return res; +} + +/** + * Return the unsigned integer type of size bits. + * + * @param size the size + */ +static ir_type *get_unsigned_int_type_for_bit_size(ir_type *base_tp, + unsigned size) +{ + static ir_mode *u_modes[64 + 1] = {NULL, }; + ir_type *res; + ir_mode *mode; + + if (size <= 0 || size > 64) + return NULL; + + mode = u_modes[size]; + if (mode == NULL) { + char name[32]; + + snprintf(name, sizeof(name), "bf_U%u", size); + mode = new_ir_mode(name, irms_int_number, size, 0, irma_twos_complement, + size <= 32 ? 32 : size ); + u_modes[size] = mode; + } + + char name[32]; + + snprintf(name, sizeof(name), "U%u", size); + ident *id = new_id_from_str(name); + res = new_type_primitive(mangle_u(get_type_ident(base_tp), id), mode); + set_primitive_base_type(res, base_tp); + + return res; +} + +static ir_type *create_bitfield_type(bitfield_type_t *const type) +{ + type_t *base = skip_typeref(type->base); + assert(base->kind == TYPE_ATOMIC); + ir_type *irbase = get_ir_type(base); + + unsigned size = fold_constant(type->size); + + assert(!is_type_floating(base)); + if(is_type_signed(base)) { + return get_signed_int_type_for_bit_size(irbase, size); + } else { + return get_unsigned_int_type_for_bit_size(irbase, size); + } +} + #define INVALID_TYPE ((ir_type_ptr)-1) static ir_type *create_struct_type(compound_type_t *type) @@ -360,48 +542,98 @@ static ir_type *create_struct_type(compound_type_t *type) } else { id = unique_ident("__anonymous_struct"); } - ir_type *ir_type = new_type_struct(id); + ir_type *irtype = new_type_struct(id); - type->type.firm_type = ir_type; + type->type.firm_type = irtype; - int align_all = 1; - int offset = 0; - declaration_t *entry = type->declaration->context.declarations; + size_t align_all = 1; + size_t offset = 0; + size_t bit_offset = 0; + declaration_t *entry = type->declaration->scope.declarations; for( ; entry != NULL; entry = entry->next) { if(entry->namespc != NAMESPACE_NORMAL) continue; - ident *ident = new_id_from_str(entry->symbol->string); - ir_type_ptr entry_ir_type = get_ir_type(entry->type); + type_t *entry_type = skip_typeref(entry->type); + ir_type *base_irtype; + if(entry_type->kind == TYPE_BITFIELD) { + base_irtype = get_ir_type(entry_type->bitfield.base); + } else { + base_irtype = get_ir_type(entry_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; - if (misalign != 0) - offset += entry_alignment - misalign; + size_t entry_alignment = get_type_alignment_bytes(base_irtype); + size_t misalign = offset % entry_alignment; - ir_entity *entity = new_entity(ir_type, ident, entry_ir_type); - set_entity_offset(entity, offset); - add_struct_member(ir_type, entity); - entry->declaration_type = DECLARATION_TYPE_COMPOUND_MEMBER; - entry->v.entity = entity; + dbg_info *dbgi = get_dbg_info(&entry->source_position); + ir_entity *entity = NULL; + if(entry->symbol != NULL) { + ident *ident = new_id_from_str(entry->symbol->string); + ir_type *entry_irtype = get_ir_type(entry_type); + entity = new_d_entity(irtype, ident, entry_irtype, dbgi); + } else { + /* only bitfields are allowed to be anonymous */ + assert(entry_type->kind == TYPE_BITFIELD); + } + + size_t base; + size_t bits_remainder; + if(entry_type->kind == TYPE_BITFIELD) { + size_t size_bits = fold_constant(entry_type->bitfield.size); + size_t rest_size_bits = (entry_alignment - misalign)*8 - bit_offset; + + if(size_bits > rest_size_bits) { + /* start a new bucket */ + offset += entry_alignment - misalign; + bit_offset = 0; + + base = offset; + bits_remainder = 0; + } else { + /* put into current bucket */ + base = offset - misalign; + bits_remainder = misalign * 8 + bit_offset; + } + + offset += size_bits / 8; + bit_offset = bit_offset + (size_bits % 8); + } else { + size_t entry_size = get_type_size_bytes(base_irtype); + if(misalign > 0 || bit_offset > 0) + offset += entry_alignment - misalign; + + base = offset; + bits_remainder = 0; + offset += entry_size; + bit_offset = 0; + } - offset += entry_size; if(entry_alignment > align_all) { if(entry_alignment % align_all != 0) { - panic("Uneven alignments not supported yet"); + panic("uneven alignments not supported yet"); } align_all = entry_alignment; } + + if(entity != NULL) { + set_entity_offset(entity, base); + set_entity_offset_bits_remainder(entity, + (unsigned char) bits_remainder); + add_struct_member(irtype, entity); + entry->declaration_kind = DECLARATION_KIND_COMPOUND_MEMBER; + entry->v.entity = entity; + } } - int misalign = offset % align_all; - offset += misalign; - set_type_alignment_bytes(ir_type, align_all); - set_type_size_bytes(ir_type, offset); - set_type_state(ir_type, layout_fixed); + size_t misalign = offset % align_all; + if(misalign > 0 || bit_offset > 0) { + offset += align_all - misalign; + } + set_type_alignment_bytes(irtype, align_all); + set_type_size_bytes(irtype, offset); + set_type_state(irtype, layout_fixed); - return ir_type; + return irtype; } static ir_type *create_union_type(compound_type_t *type) @@ -414,27 +646,29 @@ static ir_type *create_union_type(compound_type_t *type) } else { id = unique_ident("__anonymous_union"); } - ir_type *ir_type = new_type_union(id); + ir_type *irtype = new_type_union(id); - type->type.firm_type = ir_type; + type->type.firm_type = irtype; int align_all = 1; int size = 0; - declaration_t *entry = declaration->context.declarations; + declaration_t *entry = declaration->scope.declarations; for( ; entry != NULL; entry = entry->next) { if(entry->namespc != NAMESPACE_NORMAL) continue; - ident *ident = new_id_from_str(entry->symbol->string); - ir_type_ptr entry_ir_type = get_ir_type(entry->type); + ident *ident = new_id_from_str(entry->symbol->string); + ir_type *entry_ir_type = get_ir_type(entry->type); int entry_size = get_type_size_bytes(entry_ir_type); int entry_alignment = get_type_alignment_bytes(entry_ir_type); - ir_entity *entity = new_entity(ir_type, ident, entry_ir_type); - add_union_member(ir_type, entity); + dbg_info *const dbgi = get_dbg_info(&entry->source_position); + ir_entity *const entity = new_d_entity(irtype, ident, entry_ir_type, + dbgi); + add_union_member(irtype, entity); set_entity_offset(entity, 0); - entry->declaration_type = DECLARATION_TYPE_COMPOUND_MEMBER; + entry->declaration_kind = DECLARATION_KIND_COMPOUND_MEMBER; entry->v.entity = entity; if(entry_size > size) { @@ -448,11 +682,11 @@ static ir_type *create_union_type(compound_type_t *type) } } - set_type_alignment_bytes(ir_type, align_all); - set_type_size_bytes(ir_type, size); - set_type_state(ir_type, layout_fixed); + set_type_alignment_bytes(irtype, align_all); + set_type_size_bytes(irtype, size); + set_type_state(irtype, layout_fixed); - return ir_type; + return irtype; } static ir_node *expression_to_firm(const expression_t *expression); @@ -471,7 +705,7 @@ static ir_type *create_enum_type(enum_type_t *const type) if (declaration->storage_class != STORAGE_CLASS_ENUM_ENTRY) break; - declaration->declaration_type = DECLARATION_TYPE_ENUM_ENTRY; + declaration->declaration_kind = DECLARATION_KIND_ENUM_ENTRY; expression_t *const init = declaration->init.enum_value; if (init != NULL) { @@ -500,7 +734,9 @@ static ir_type *get_ir_type(type_t *type) } ir_type *firm_type = NULL; - switch(type->type) { + switch(type->kind) { + case TYPE_ERROR: + panic("error type occured"); case TYPE_ATOMIC: firm_type = create_atomic_type(&type->atomic); break; @@ -523,6 +759,12 @@ static ir_type *get_ir_type(type_t *type) firm_type = create_enum_type(&type->enumt); break; case TYPE_BUILTIN: + firm_type = get_ir_type(type->builtin.real_type); + break; + case TYPE_BITFIELD: + firm_type = create_bitfield_type(&type->bitfield); + break; + case TYPE_TYPEOF: case TYPE_TYPEDEF: case TYPE_INVALID: @@ -541,7 +783,7 @@ static inline ir_mode *get_ir_mode(type_t *type) /* firm doesn't report a mode for arrays somehow... */ if(is_Array_type(irtype)) { - return mode_P; + return mode_P_data; } ir_mode *mode = get_type_mode(irtype); @@ -549,11 +791,94 @@ static inline ir_mode *get_ir_mode(type_t *type) return mode; } +static ident *predef_idents[rts_max]; + +/** Names of the runtime functions. */ +static const struct { + int id; /**< the rts id */ + int n_res; /**< number of return values */ + const char *name; /**< the name of the rts function */ + int n_params; /**< number of parameters */ + unsigned flags; /**< language flags */ +} rts_data[] = { + { rts_debugbreak, 0, "__debugbreak", 0, _MS }, + { rts_abort, 0, "abort", 0, _C89 }, + { rts_abs, 1, "abs", 1, _C89 }, + { rts_labs, 1, "labs", 1, _C89 }, + { rts_llabs, 1, "llabs", 1, _C99 }, + { rts_imaxabs, 1, "imaxabs", 1, _C99 }, + + { rts_fabs, 1, "fabs", 1, _C89 }, + { rts_sqrt, 1, "sqrt", 1, _C89 }, + { rts_cbrt, 1, "cbrt", 1, _C99 }, + { rts_exp, 1, "exp", 1, _C89 }, + { rts_exp2, 1, "exp2", 1, _C89 }, + { rts_exp10, 1, "exp10", 1, _GNUC }, + { rts_log, 1, "log", 1, _C89 }, + { rts_log2, 1, "log2", 1, _C89 }, + { rts_log10, 1, "log10", 1, _C89 }, + { rts_pow, 1, "pow", 2, _C89 }, + { rts_sin, 1, "sin", 1, _C89 }, + { rts_cos, 1, "cos", 1, _C89 }, + { rts_tan, 1, "tan", 1, _C89 }, + { rts_asin, 1, "asin", 1, _C89 }, + { rts_acos, 1, "acos", 1, _C89 }, + { rts_atan, 1, "atan", 1, _C89 }, + { rts_sinh, 1, "sinh", 1, _C89 }, + { rts_cosh, 1, "cosh", 1, _C89 }, + { rts_tanh, 1, "tanh", 1, _C89 }, + + { rts_fabsf, 1, "fabsf", 1, _C99 }, + { rts_sqrtf, 1, "sqrtf", 1, _C99 }, + { rts_cbrtf, 1, "cbrtf", 1, _C99 }, + { rts_expf, 1, "expf", 1, _C99 }, + { rts_exp2f, 1, "exp2f", 1, _C99 }, + { rts_exp10f, 1, "exp10f", 1, _GNUC }, + { rts_logf, 1, "logf", 1, _C99 }, + { rts_log2f, 1, "log2f", 1, _C99 }, + { rts_log10f, 1, "log10f", 1, _C99 }, + { rts_powf, 1, "powf", 2, _C99 }, + { rts_sinf, 1, "sinf", 1, _C99 }, + { rts_cosf, 1, "cosf", 1, _C99 }, + { rts_tanf, 1, "tanf", 1, _C99 }, + { rts_asinf, 1, "asinf", 1, _C99 }, + { rts_acosf, 1, "acosf", 1, _C99 }, + { rts_atanf, 1, "atanf", 1, _C99 }, + { rts_sinhf, 1, "sinhf", 1, _C99 }, + { rts_coshf, 1, "coshf", 1, _C99 }, + { rts_tanhf, 1, "tanhf", 1, _C99 }, + + { rts_fabsl, 1, "fabsl", 1, _C99 }, + { rts_sqrtl, 1, "sqrtl", 1, _C99 }, + { rts_cbrtl, 1, "cbrtl", 1, _C99 }, + { rts_expl, 1, "expl", 1, _C99 }, + { rts_exp2l, 1, "exp2l", 1, _C99 }, + { rts_exp10l, 1, "exp10l", 1, _GNUC }, + { rts_logl, 1, "logl", 1, _C99 }, + { rts_log2l, 1, "log2l", 1, _C99 }, + { rts_log10l, 1, "log10l", 1, _C99 }, + { rts_powl, 1, "powl", 2, _C99 }, + { rts_sinl, 1, "sinl", 1, _C99 }, + { rts_cosl, 1, "cosl", 1, _C99 }, + { rts_tanl, 1, "tanl", 1, _C99 }, + { rts_asinl, 1, "asinl", 1, _C99 }, + { rts_acosl, 1, "acosl", 1, _C99 }, + { rts_atanl, 1, "atanl", 1, _C99 }, + { rts_sinhl, 1, "sinhl", 1, _C99 }, + { rts_coshl, 1, "coshl", 1, _C99 }, + { rts_tanhl, 1, "tanhl", 1, _C99 }, + + { rts_memcpy, 1, "memcpy", 3, _C89 }, /* HMM, man say its C99 */ + { rts_memset, 1, "memset", 3, _C89 }, /* HMM, man say its C99 */ + { rts_strcmp, 1, "strcmp", 2, _C89 }, + { rts_strncmp, 1, "strncmp", 3, _C89 } +}; + static ir_entity* get_function_entity(declaration_t *declaration) { - if(declaration->declaration_type == DECLARATION_TYPE_FUNCTION) + if(declaration->declaration_kind == DECLARATION_KIND_FUNCTION) return declaration->v.entity; - assert(declaration->declaration_type == DECLARATION_TYPE_UNKNOWN); + assert(declaration->declaration_kind == DECLARATION_KIND_UNKNOWN); symbol_t *symbol = declaration->symbol; ident *id = new_id_from_str(symbol->string); @@ -562,7 +887,8 @@ static ir_entity* get_function_entity(declaration_t *declaration) ir_type *ir_type_method = get_ir_type(declaration->type); assert(is_Method_type(ir_type_method)); - ir_entity *entity = new_entity(global_type, id, ir_type_method); + dbg_info *const dbgi = get_dbg_info(&declaration->source_position); + ir_entity *const entity = new_d_entity(global_type, id, ir_type_method, dbgi); set_entity_ld_ident(entity, id); if(declaration->storage_class == STORAGE_CLASS_STATIC || declaration->is_inline) { @@ -571,19 +897,39 @@ static ir_entity* get_function_entity(declaration_t *declaration) set_entity_visibility(entity, visibility_external_visible); } else { set_entity_visibility(entity, visibility_external_allocated); + + /* We should check for file scope here, but as long as we compile C only + this is not needed. */ + int n_params = get_method_n_params(ir_type_method); + int n_res = get_method_n_ress(ir_type_method); + int i; + + if (n_params == 0 && n_res == 0 && id == predef_idents[rts_abort]) { + /* found abort(), store for later */ + //abort_ent = ent; + //abort_tp = ftype; + } else { + if (! firm_opt.freestanding) { + /* check for a known runtime function */ + for (i = 0; i < rts_max; ++i) { + /* ignore those rts functions not necessary needed for current mode */ + if ((c_mode & rts_data[i].flags) == 0) + continue; + if (n_params == rts_data[i].n_params && n_res == rts_data[i].n_res && + id == predef_idents[rts_data[i].id]) + rts_entities[rts_data[i].id] = entity; + } + } + } } + set_entity_allocation(entity, allocation_static); - declaration->declaration_type = DECLARATION_TYPE_FUNCTION; + declaration->declaration_kind = DECLARATION_KIND_FUNCTION; declaration->v.entity = entity; return entity; } -static dbg_info *get_dbg_info(const source_position_t *pos) -{ - return (dbg_info*) pos; -} - static ir_node *const_to_firm(const const_expression_t *cnst) { dbg_info *dbgi = get_dbg_info(&cnst->expression.source_position); @@ -607,31 +953,35 @@ static ir_node *const_to_firm(const const_expression_t *cnst) return new_d_Const(dbgi, mode, tv); } -static ir_node *create_symconst(dbg_info *dbgi, ir_entity *entity) +static ir_node *create_symconst(dbg_info *dbgi, ir_mode *mode, + ir_entity *entity) { assert(entity != NULL); union symconst_symbol sym; sym.entity_p = entity; - return new_d_SymConst(dbgi, sym, symconst_addr_ent); + return new_d_SymConst(dbgi, mode, sym, symconst_addr_ent); } static ir_node *string_to_firm(const source_position_t *const src_pos, const char *const id_prefix, - const char *const string) + const string_t *const value) { ir_type *const global_type = get_glob_type(); ir_type *const type = new_type_array(unique_ident("strtype"), 1, ir_type_const_char); ident *const id = unique_ident(id_prefix); - ir_entity *const entity = new_entity(global_type, id, type); + dbg_info *const dbgi = get_dbg_info(src_pos); + ir_entity *const entity = new_d_entity(global_type, id, type, dbgi); set_entity_ld_ident(entity, id); set_entity_variability(entity, variability_constant); + set_entity_allocation(entity, allocation_static); ir_type *const elem_type = ir_type_const_char; ir_mode *const mode = get_type_mode(elem_type); - const size_t slen = strlen(string) + 1; + const char* const string = value->begin; + const size_t slen = value->size; set_array_lower_bound_int(type, 0, 0); set_array_upper_bound_int(type, 0, slen); @@ -646,16 +996,50 @@ static ir_node *string_to_firm(const source_position_t *const src_pos, set_array_entity_values(entity, tvs, slen); free(tvs); - dbg_info *const dbgi = get_dbg_info(src_pos); - - return create_symconst(dbgi, entity); + return create_symconst(dbgi, mode_P_data, entity); } static ir_node *string_literal_to_firm( const string_literal_expression_t* literal) { return string_to_firm(&literal->expression.source_position, "Lstr", - literal->value); + &literal->value); +} + +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"); + dbg_info *const dbgi = get_dbg_info(&literal->expression.source_position); + ir_entity *const entity = new_d_entity(global_type, id, type, dbgi); + set_entity_ld_ident(entity, id); + set_entity_variability(entity, variability_constant); + set_entity_allocation(entity, allocation_static); + + 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); + + return create_symconst(dbgi, mode_P_data, entity); } static ir_node *deref_address(ir_type *const irtype, ir_node *const addr, @@ -697,7 +1081,7 @@ static ir_node *do_strict_conv(dbg_info *dbgi, ir_node *node) static ir_node *get_global_var_address(dbg_info *const dbgi, const declaration_t *const decl) { - assert(decl->declaration_type == DECLARATION_TYPE_GLOBAL_VARIABLE); + assert(decl->declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE); ir_entity *const entity = decl->v.entity; switch ((storage_class_tag_t)decl->storage_class) { @@ -710,7 +1094,21 @@ static ir_node *get_global_var_address(dbg_info *const dbgi, } default: - return create_symconst(dbgi, entity); + return create_symconst(dbgi, mode_P_data, entity); + } +} + +/* Returns the correct base address depending on whether it is a parameter or a + * normal local variable */ +static ir_node *get_local_frame(ir_entity *const ent) +{ + ir_graph *const irg = current_ir_graph; + const ir_type *const owner = get_entity_owner(ent); + if (owner == get_irg_frame_type(irg)) { + return get_irg_frame(irg); + } else { + assert(owner == get_method_value_param_type(get_entity_type(get_irg_entity(irg)))); + return get_irg_value_param_base(irg); } } @@ -720,42 +1118,43 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref) declaration_t *declaration = ref->declaration; type_t *type = skip_typeref(declaration->type); - switch((declaration_type_t) declaration->declaration_type) { - case DECLARATION_TYPE_UNKNOWN: + switch((declaration_kind_t) declaration->declaration_kind) { + case DECLARATION_KIND_UNKNOWN: if (declaration->storage_class != STORAGE_CLASS_ENUM_ENTRY) { break; } get_ir_type(type); /* FALLTHROUGH */ - case DECLARATION_TYPE_ENUM_ENTRY: { + case DECLARATION_KIND_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); + case DECLARATION_KIND_LOCAL_VARIABLE: { + ir_mode *const mode = get_ir_mode(type); return get_value(declaration->v.value_number, mode); } - case DECLARATION_TYPE_FUNCTION: { - return create_symconst(dbgi, declaration->v.entity); + case DECLARATION_KIND_FUNCTION: { + ir_mode *const mode = get_ir_mode(type); + return create_symconst(dbgi, mode, declaration->v.entity); } - case DECLARATION_TYPE_GLOBAL_VARIABLE: { + case DECLARATION_KIND_GLOBAL_VARIABLE: { 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: { + case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: { ir_entity *entity = declaration->v.entity; - ir_node *frame = get_irg_frame(current_ir_graph); + ir_node *frame = get_local_frame(entity); ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, entity); ir_type *irtype = get_entity_type(entity); return deref_address(irtype, sel, dbgi); } - case DECLARATION_TYPE_COMPOUND_MEMBER: - case DECLARATION_TYPE_LABEL_BLOCK: + case DECLARATION_KIND_COMPOUND_MEMBER: + case DECLARATION_KIND_LABEL_BLOCK: panic("not implemented reference type"); } @@ -767,31 +1166,33 @@ static ir_node *reference_addr(const reference_expression_t *ref) dbg_info *dbgi = get_dbg_info(&ref->expression.source_position); declaration_t *declaration = ref->declaration; - switch((declaration_type_t) declaration->declaration_type) { - case DECLARATION_TYPE_UNKNOWN: + switch((declaration_kind_t) declaration->declaration_kind) { + case DECLARATION_KIND_UNKNOWN: break; - case DECLARATION_TYPE_LOCAL_VARIABLE: + case DECLARATION_KIND_LOCAL_VARIABLE: panic("local variable without entity has no address"); - case DECLARATION_TYPE_FUNCTION: { - return create_symconst(dbgi, declaration->v.entity); + case DECLARATION_KIND_FUNCTION: { + type_t *const type = skip_typeref(ref->expression.datatype); + ir_mode *const mode = get_ir_mode(type); + return create_symconst(dbgi, mode, declaration->v.entity); } - case DECLARATION_TYPE_GLOBAL_VARIABLE: { + case DECLARATION_KIND_GLOBAL_VARIABLE: { ir_node *const addr = get_global_var_address(dbgi, declaration); return addr; } - case DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY: { + case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: { ir_entity *entity = declaration->v.entity; - ir_node *frame = get_irg_frame(current_ir_graph); + ir_node *frame = get_local_frame(entity); ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, entity); return sel; } - case DECLARATION_TYPE_ENUM_ENTRY: + case DECLARATION_KIND_ENUM_ENTRY: panic("trying to reference enum entry"); - case DECLARATION_TYPE_COMPOUND_MEMBER: - case DECLARATION_TYPE_LABEL_BLOCK: + case DECLARATION_KIND_COMPOUND_MEMBER: + case DECLARATION_KIND_LABEL_BLOCK: panic("not implemented reference type"); } @@ -802,12 +1203,17 @@ 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 - = (builtin_symbol_expression_t*) call->function; - symbol_t *symbol = builtin->symbol; + assert(call->function->kind == EXPR_BUILTIN_SYMBOL); + builtin_symbol_expression_t *builtin = &call->function->builtin_symbol; - if(symbol == symbol_builtin_alloca) { + 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"); } @@ -822,13 +1228,20 @@ static ir_node *process_builtin_call(const call_expression_t *call) ir_node *res = new_Proj(alloca, mode_P_data, pn_Alloc_res); return res; - } else if(symbol == symbol_builtin_nanf) { + } + case T___builtin_nan: + case T___builtin_nanf: + case T___builtin_nand: { /* Ignore string for now... */ - ir_mode *mode = mode_D; + 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; - } else { + } + case T___builtin_va_end: + return NULL; + default: panic("Unsupported builtin found\n"); } } @@ -838,16 +1251,17 @@ 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) { + if(function->kind == 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; + 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; @@ -904,13 +1318,13 @@ 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 = skip_typeref(function_type->result_type); + type_t *return_type = skip_typeref(function_type->return_type); ir_node *result = NULL; - if(!is_type_atomic(result_type, ATOMIC_TYPE_VOID)) { + if(!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { ir_mode *mode; - if(is_type_scalar(result_type)) { - mode = get_ir_mode(result_type); + if(is_type_scalar(return_type)) { + mode = get_ir_mode(return_type); } else { mode = mode_P_data; } @@ -929,27 +1343,13 @@ 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) +static void assign_value(dbg_info *dbgi, ir_node *addr, type_t *type, + 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; + value = do_strict_conv(dbgi, value); - declaration_t *declaration = ref->declaration; - assert(declaration->declaration_type != DECLARATION_TYPE_UNKNOWN); - if(declaration->declaration_type == DECLARATION_TYPE_LOCAL_VARIABLE) { - set_value(declaration->v.value_number, value); - return; - } - } - - ir_node *addr = expression_to_addr(expression); - ir_node *memory = get_store(); + 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); @@ -962,59 +1362,151 @@ static void set_value_for_expression(const expression_t *expression, } } -static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) +static tarval *create_bitfield_mask(ir_mode *mode, int offset, int size) { - ir_mode *value_mode = get_irn_mode(value); + tarval *all_one = get_mode_all_one(mode); + int mode_size = get_mode_size_bits(mode); - if (value_mode == dest_mode || is_Bad(value)) - return value; - - if(dest_mode == mode_b) { - ir_node *zero = new_Const(value_mode, get_mode_null(value_mode)); - ir_node *cmp = new_d_Cmp(dbgi, value, zero); - ir_node *proj = new_d_Proj(dbgi, cmp, mode_b, pn_Cmp_Lg); - return proj; + assert(offset >= 0 && size >= 0); + assert(offset + size <= mode_size); + if(size == mode_size) { + return all_one; } - return new_d_Conv(dbgi, value, dest_mode); + long shiftr = get_mode_size_bits(mode) - size; + long shiftl = offset; + tarval *tv_shiftr = new_tarval_from_long(shiftr, mode_uint); + tarval *tv_shiftl = new_tarval_from_long(shiftl, mode_uint); + tarval *mask0 = tarval_shr(all_one, tv_shiftr); + tarval *mask1 = tarval_shl(mask0, tv_shiftl); + + return mask1; } -static ir_node *create_incdec(const unary_expression_t *expression) +static void bitfield_store_to_firm(const unary_expression_t *expression, + ir_node *value) { - dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); - type_t *type = expression->expression.datatype; - ir_mode *mode = get_ir_mode(type); - expression_t *value = expression->value; + expression_t *select = expression->value; + assert(select->kind == EXPR_SELECT); + type_t *type = select->base.datatype; + assert(type->kind == TYPE_BITFIELD); + ir_mode *mode = get_ir_mode(type->bitfield.base); + ir_node *addr = expression_to_addr(select); - ir_node *value_node = expression_to_firm(value); + assert(get_irn_mode(value) == mode); - ir_node *offset; - if(type->type == TYPE_POINTER) { - 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 { - assert(is_type_arithmetic(type)); - offset = new_Const(mode, get_mode_one(mode)); - } + dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); - switch(expression->type) { - case UNEXPR_POSTFIX_INCREMENT: { - ir_node *new_value = new_d_Add(dbgi, value_node, offset, mode); + /* kill upper bits of value and shift to right position */ + ir_entity *entity = select->select.compound_entry->v.entity; + int bitoffset = get_entity_offset_bits_remainder(entity); + ir_type *entity_type = get_entity_type(entity); + int bitsize = get_mode_size_bits(get_type_mode(entity_type)); + + tarval *mask = create_bitfield_mask(mode, 0, bitsize); + ir_node *mask_node = new_d_Const(dbgi, mode, mask); + ir_node *value_masked = new_d_And(dbgi, value, mask_node, mode); + tarval *shiftl = new_tarval_from_long(bitoffset, mode_uint); + ir_node *shiftcount = new_d_Const(dbgi, mode_uint, shiftl); + ir_node *value_maskshift = new_d_Shl(dbgi, value_masked, shiftcount, mode); + + /* load current value */ + ir_node *mem = get_store(); + ir_node *load = new_d_Load(dbgi, mem, 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); + tarval *shift_mask = create_bitfield_mask(mode, bitoffset, bitsize); + tarval *inv_mask = tarval_not(shift_mask); + ir_node *inv_mask_node = new_d_Const(dbgi, mode, inv_mask); + ir_node *load_res_masked = new_d_And(dbgi, load_res, inv_mask_node, mode); + + /* construct new value and store */ + ir_node *new_val = new_d_Or(dbgi, load_res_masked, value_maskshift, mode); + ir_node *store = new_d_Store(dbgi, load_mem, addr, new_val); + ir_node *store_mem = new_d_Proj(dbgi, store, mode_M, pn_Store_M); + set_store(store_mem); +} + +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->kind == EXPR_REFERENCE) { + const reference_expression_t *ref = &expression->reference; + + declaration_t *declaration = ref->declaration; + assert(declaration->declaration_kind != DECLARATION_KIND_UNKNOWN); + if(declaration->declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE) { + set_value(declaration->v.value_number, value); + return; + } + } + + if(expression->kind == EXPR_UNARY_BITFIELD_EXTRACT) { + bitfield_store_to_firm(&expression->unary, value); + return; + } + + ir_node *addr = expression_to_addr(expression); + type_t *type = skip_typeref(expression->base.datatype); + assign_value(dbgi, addr, type, value); +} + +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 || is_Bad(value)) + return value; + + if(dest_mode == mode_b) { + ir_node *zero = new_Const(value_mode, get_mode_null(value_mode)); + ir_node *cmp = new_d_Cmp(dbgi, value, zero); + ir_node *proj = new_d_Proj(dbgi, cmp, mode_b, pn_Cmp_Lg); + return proj; + } + + return new_d_Conv(dbgi, value, 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 = 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(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_int, elem_size); + } else { + assert(is_type_arithmetic(type)); + offset = new_Const(mode, get_mode_one(mode)); + } + + switch(expression->expression.kind) { + case EXPR_UNARY_POSTFIX_INCREMENT: { + ir_node *new_value = new_d_Add(dbgi, value_node, offset, mode); set_value_for_expression(value, new_value); return value_node; } - case UNEXPR_POSTFIX_DECREMENT: { + case EXPR_UNARY_POSTFIX_DECREMENT: { ir_node *new_value = new_d_Sub(dbgi, value_node, offset, mode); set_value_for_expression(value, new_value); return value_node; } - case UNEXPR_PREFIX_INCREMENT: { + case EXPR_UNARY_PREFIX_INCREMENT: { ir_node *new_value = new_d_Add(dbgi, value_node, offset, mode); set_value_for_expression(value, new_value); return new_value; } - case UNEXPR_PREFIX_DECREMENT: { + case EXPR_UNARY_PREFIX_DECREMENT: { ir_node *new_value = new_d_Sub(dbgi, value_node, offset, mode); set_value_for_expression(value, new_value); return new_value; @@ -1025,72 +1517,236 @@ static ir_node *create_incdec(const unary_expression_t *expression) } } +static bool is_local_variable(expression_t *expression) +{ + if (expression->kind != EXPR_REFERENCE) + return false; + reference_expression_t *ref_expr = &expression->reference; + declaration_t *declaration = ref_expr->declaration; + return declaration->declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE; +} + +static pn_Cmp get_pnc(const expression_kind_t kind) +{ + switch(kind) { + case EXPR_BINARY_EQUAL: return pn_Cmp_Eq; + case EXPR_BINARY_ISLESSGREATER: return pn_Cmp_Lg; + case EXPR_BINARY_NOTEQUAL: return pn_Cmp_Ne; + case EXPR_BINARY_ISLESS: + case EXPR_BINARY_LESS: return pn_Cmp_Lt; + case EXPR_BINARY_ISLESSEQUAL: + case EXPR_BINARY_LESSEQUAL: return pn_Cmp_Le; + case EXPR_BINARY_ISGREATER: + case EXPR_BINARY_GREATER: return pn_Cmp_Gt; + case EXPR_BINARY_ISGREATEREQUAL: + case EXPR_BINARY_GREATEREQUAL: return pn_Cmp_Ge; + case EXPR_BINARY_ISUNORDERED: return pn_Cmp_Uo; + + default: + break; + } + panic("trying to get pn_Cmp from non-comparison binexpr type"); +} + +/** + * Handle the assume optimizer hint: check if a Confirm + * node can be created. + * + * @param dbi debug info + * @param expr the IL assume expression + * + * we support here only some simple cases: + * - var rel const + * - const rel val + * - var rel var + */ +static ir_node *handle_assume_compare(dbg_info *dbi, + const binary_expression_t *expression) +{ + expression_t *op1 = expression->left; + expression_t *op2 = expression->right; + declaration_t *var2, *var = NULL; + ir_node *res = NULL; + pn_Cmp cmp_val; + + cmp_val = get_pnc(expression->expression.kind); + + if (is_local_variable(op1) && is_local_variable(op2)) { + var = op1->reference.declaration; + var2 = op2->reference.declaration; + + type_t *const type = skip_typeref(var->type); + ir_mode *const mode = get_ir_mode(type); + + ir_node *const irn1 = get_value(var->v.value_number, mode); + ir_node *const irn2 = get_value(var2->v.value_number, mode); + + res = new_d_Confirm(dbi, irn2, irn1, get_inversed_pnc(cmp_val)); + set_value(var2->v.value_number, res); + + res = new_d_Confirm(dbi, irn1, irn2, cmp_val); + set_value(var->v.value_number, res); + + return res; + } + + expression_t *con; + if (is_local_variable(op1) && is_constant_expression(op2)) { + var = op1->reference.declaration; + con = op2; + } else if (is_constant_expression(op1) && is_local_variable(op2)) { + cmp_val = get_inversed_pnc(cmp_val); + var = op2->reference.declaration; + con = op1; + } + + if (var != NULL) { + type_t *const type = skip_typeref(var->type); + ir_mode *const mode = get_ir_mode(type); + + res = get_value(var->v.value_number, mode); + res = new_d_Confirm(dbi, res, expression_to_firm(con), cmp_val); + set_value(var->v.value_number, res); + } + return res; +} + +/** + * Handle the assume optimizer hint. + * + * @param dbi debug info + * @param expr the IL assume expression + */ +static ir_node *handle_assume(dbg_info *dbi, const expression_t *expression) { + switch(expression->kind) { + case EXPR_BINARY_EQUAL: + case EXPR_BINARY_NOTEQUAL: + case EXPR_BINARY_LESS: + case EXPR_BINARY_LESSEQUAL: + case EXPR_BINARY_GREATER: + case EXPR_BINARY_GREATEREQUAL: + return handle_assume_compare(dbi, &expression->binary); + default: + return NULL; + } +} + +static ir_node *bitfield_extract_to_firm(const unary_expression_t *expression) +{ + expression_t *select = expression->value; + assert(select->kind == EXPR_SELECT); + + type_t *type = select->base.datatype; + assert(type->kind == TYPE_BITFIELD); + ir_mode *mode = get_ir_mode(type->bitfield.base); + dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); + ir_node *addr = expression_to_addr(select); + ir_node *mem = get_store(); + ir_node *load = new_d_Load(dbgi, mem, 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); + + load_res = create_conv(dbgi, load_res, mode_int); + + set_store(load_mem); + + /* kill upper bits */ + ir_entity *entity = select->select.compound_entry->v.entity; + int bitoffset = get_entity_offset_bits_remainder(entity); + ir_type *entity_type = get_entity_type(entity); + int bitsize = get_mode_size_bits(get_type_mode(entity_type)); + long shift_bitsl = machine_size - bitoffset - bitsize; + assert(shift_bitsl >= 0); + tarval *tvl = new_tarval_from_long(shift_bitsl, mode_uint); + ir_node *countl = new_d_Const(dbgi, mode_uint, tvl); + ir_node *shiftl = new_d_Shl(dbgi, load_res, countl, mode_int); + + long shift_bitsr = bitoffset + shift_bitsl; + assert(shift_bitsr <= (long) machine_size); + tarval *tvr = new_tarval_from_long(shift_bitsr, mode_uint); + ir_node *countr = new_d_Const(dbgi, mode_uint, tvr); + ir_node *shiftr; + if(mode_is_signed(mode)) { + shiftr = new_d_Shrs(dbgi, shiftl, countr, mode_int); + } else { + shiftr = new_d_Shr(dbgi, shiftl, countr, mode_int); + } + + return create_conv(dbgi, shiftr, mode); +} + 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 = skip_typeref(expression->expression.datatype); - if(expression->type == UNEXPR_TAKE_ADDRESS) + if(expression->expression.kind == EXPR_UNARY_TAKE_ADDRESS) return expression_to_addr(expression->value); - const expression_t *value = expression->value; - ir_node *value_node = expression_to_firm(value); + const expression_t *value = expression->value; - switch(expression->type) { - case UNEXPR_NEGATE: - 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, get_ir_mode(type)); - case UNEXPR_NOT: { + switch(expression->expression.kind) { + case EXPR_UNARY_NEGATE: { + ir_node *value_node = expression_to_firm(value); + ir_mode *mode = get_ir_mode(type); + return new_d_Minus(dbgi, value_node, mode); + } + case EXPR_UNARY_PLUS: + return expression_to_firm(value); + case EXPR_UNARY_BITWISE_NEGATE: { + ir_node *value_node = expression_to_firm(value); + ir_mode *mode = get_ir_mode(type); + return new_d_Not(dbgi, value_node, mode); + } + case EXPR_UNARY_NOT: { + ir_node *value_node = expression_to_firm(value); + ir_mode *mode = get_ir_mode(type); 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: { - ir_type *irtype = get_ir_type(type); - return deref_address(irtype, value_node, dbgi); + case EXPR_UNARY_DEREFERENCE: { + ir_node *value_node = expression_to_firm(value); + type_t *value_type = skip_typeref(value->base.datatype); + ir_type *irtype = get_ir_type(value_type); + assert(is_Pointer_type(irtype)); + ir_type *points_to = get_pointer_points_to_type(irtype); + return deref_address(points_to, value_node, dbgi); } - case UNEXPR_POSTFIX_INCREMENT: - case UNEXPR_POSTFIX_DECREMENT: - case UNEXPR_PREFIX_INCREMENT: - case UNEXPR_PREFIX_DECREMENT: + case EXPR_UNARY_POSTFIX_INCREMENT: + case EXPR_UNARY_POSTFIX_DECREMENT: + case EXPR_UNARY_PREFIX_INCREMENT: + case EXPR_UNARY_PREFIX_DECREMENT: return create_incdec(expression); - case UNEXPR_CAST: { - ir_node *node = create_conv(dbgi, value_node, get_ir_mode(type)); + case EXPR_UNARY_CAST: { + ir_node *value_node = expression_to_firm(value); + ir_mode *mode = get_ir_mode(type); + ir_node *node = create_conv(dbgi, value_node, mode); 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: - break; + case EXPR_UNARY_CAST_IMPLICIT: { + ir_node *value_node = expression_to_firm(value); + ir_mode *mode = get_ir_mode(type); + return create_conv(dbgi, value_node, mode); } - panic("invalid UNEXPR type found"); -} + case EXPR_UNARY_ASSUME: + if(firm_opt.confirm) + return handle_assume(dbgi, value); + else + return NULL; + case EXPR_UNARY_BITFIELD_EXTRACT: + return bitfield_extract_to_firm(expression); -static long get_pnc(binary_expression_type_t type) -{ - switch(type) { - case BINEXPR_EQUAL: return pn_Cmp_Eq; - case BINEXPR_NOTEQUAL: return pn_Cmp_Lg; - case BINEXPR_LESS: return pn_Cmp_Lt; - case BINEXPR_LESSEQUAL: return pn_Cmp_Le; - case BINEXPR_GREATER: return pn_Cmp_Gt; - case BINEXPR_GREATEREQUAL: return pn_Cmp_Ge; default: break; } - panic("trying to get pn_Cmp from non-comparison binexpr type"); + panic("invalid UNEXPR type found"); } static ir_node *create_lazy_op(const binary_expression_t *expression) @@ -1099,6 +1755,19 @@ static ir_node *create_lazy_op(const binary_expression_t *expression) type_t *type = expression->expression.datatype; ir_mode *mode = get_ir_mode(type); + if(is_constant_expression(expression->left)) { + long val = fold_constant(expression->left); + expression_kind_t ekind = expression->expression.kind; + if((ekind == EXPR_BINARY_LOGICAL_AND && val != 0) + || (ekind == EXPR_BINARY_LOGICAL_OR && val == 0)) { + return expression_to_firm(expression->right); + } else { + assert((ekind == EXPR_BINARY_LOGICAL_AND && val == 0) + || (ekind == EXPR_BINARY_LOGICAL_OR && val != 0)); + return new_Const(mode, get_mode_one(mode)); + } + } + ir_node *cur_block = get_cur_block(); ir_node *one_block = new_immBlock(); @@ -1151,15 +1820,15 @@ static ir_node *pointer_arithmetic(ir_node *const pointer, dbg_info *const dbgi, const create_arithmetic_func func) { - pointer_type_t *const pointer_type = (pointer_type_t*)type; + pointer_type_t *const pointer_type = &type->pointer; 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 = create_conv(dbgi, integer, mode_int); + ir_node *const cnst = new_Const_long(mode_int, (long)elem_size); + ir_node *const mul = new_d_Mul(dbgi, integer, cnst, mode_int); integer = mul; } @@ -1171,18 +1840,18 @@ static ir_node *create_arithmetic_assign_binop( const binary_expression_t *expression, create_arithmetic_func func) { dbg_info *const dbgi = get_dbg_info(&expression->expression.source_position); - type_t *const type = expression->expression.datatype; + type_t *const type = skip_typeref(expression->expression.datatype); ir_node *value; - if (type->type == TYPE_POINTER) { - ir_node *const pointer = expression_to_firm(expression->left); - ir_node * integer = expression_to_firm(expression->right); + 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); + ir_mode *const mode = get_ir_mode(type); value = create_conv(dbgi, value, mode); set_value_for_expression(expression->left, value); @@ -1206,10 +1875,10 @@ static ir_node *create_add(const binary_expression_t *expression) return new_d_Add(dbgi, left, right, mode); } - if (type_left->type == TYPE_POINTER || type_left->type == TYPE_ARRAY) { + if (is_type_pointer(type_left)) { return pointer_arithmetic(left, right, type, dbgi, new_d_Add); } else { - assert(type_right->type == TYPE_POINTER || type_right->type == TYPE_ARRAY); + assert(is_type_pointer(type_right)); return pointer_arithmetic(right, left, type, dbgi, new_d_Add); } } @@ -1228,20 +1897,19 @@ static ir_node *create_sub(const binary_expression_t *expression) 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) { + } 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 cnst = new_Const_long(mode_int, (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); + assert(is_type_pointer(type_left)); return pointer_arithmetic(left, right, type_left, dbgi, new_d_Sub); } @@ -1254,17 +1922,17 @@ static ir_node *create_shift(const binary_expression_t *expression) ir_mode *mode = get_ir_mode(type); /* firm always wants the shift count to be unsigned */ - right = create_conv(dbgi, right, mode_Iu); + right = create_conv(dbgi, right, mode_uint); ir_node *res; - switch(expression->type) { - case BINEXPR_SHIFTLEFT_ASSIGN: - case BINEXPR_SHIFTLEFT: + switch(expression->expression.kind) { + case EXPR_BINARY_SHIFTLEFT_ASSIGN: + case EXPR_BINARY_SHIFTLEFT: res = new_d_Shl(dbgi, left, right, mode); break; - case BINEXPR_SHIFTRIGHT_ASSIGN: - case BINEXPR_SHIFTRIGHT: { + case EXPR_BINARY_SHIFTRIGHT_ASSIGN: + case EXPR_BINARY_SHIFTRIGHT: { expression_t *expr_left = expression->left; type_t *type_left = skip_typeref(expr_left->base.datatype); @@ -1297,26 +1965,26 @@ static ir_node *create_divmod(const binary_expression_t *expression) ir_node *op; ir_node *res; - switch (expression->type) { - case BINEXPR_DIV: - case BINEXPR_DIV_ASSIGN: - if(mode_is_float(mode)) { - op = new_d_Quot(dbgi, pin, left, right, mode, op_pin_state_floats); - res = new_d_Proj(dbgi, op, mode, pn_Quot_res); - } else { - op = new_d_Div(dbgi, pin, left, right, mode, op_pin_state_floats); - res = new_d_Proj(dbgi, op, mode, pn_Div_res); - } - break; + switch (expression->expression.kind) { + case EXPR_BINARY_DIV: + case EXPR_BINARY_DIV_ASSIGN: + if(mode_is_float(mode)) { + op = new_d_Quot(dbgi, pin, left, right, mode, op_pin_state_floats); + res = new_d_Proj(dbgi, op, mode, pn_Quot_res); + } else { + op = new_d_Div(dbgi, pin, left, right, mode, op_pin_state_floats); + res = new_d_Proj(dbgi, op, mode, pn_Div_res); + } + break; - case BINEXPR_MOD: - case BINEXPR_MOD_ASSIGN: - assert(!mode_is_float(mode)); - op = new_d_Mod(dbgi, pin, left, right, mode, op_pin_state_floats); - res = new_d_Proj(dbgi, op, mode, pn_Mod_res); - break; + case EXPR_BINARY_MOD: + case EXPR_BINARY_MOD_ASSIGN: + assert(!mode_is_float(mode)); + op = new_d_Mod(dbgi, pin, left, right, mode, op_pin_state_floats); + res = new_d_Proj(dbgi, op, mode, pn_Mod_res); + break; - default: panic("unexpected binary expression type in create_divmod()"); + default: panic("unexpected binary expression type in create_divmod()"); } return res; @@ -1330,7 +1998,7 @@ static ir_node *create_arithmetic_assign_divmod( type_t *const type = expression->expression.datatype; ir_mode *const mode = get_ir_mode(type); - assert(type->type != TYPE_POINTER); + assert(type->kind != TYPE_POINTER); value = create_conv(dbgi, value, mode); set_value_for_expression(expression->left, value); @@ -1354,69 +2022,78 @@ static ir_node *create_arithmetic_assign_shift( static ir_node *binary_expression_to_firm(const binary_expression_t *expression) { - binary_expression_type_t type = expression->type; - switch(type) { - case BINEXPR_EQUAL: - case BINEXPR_NOTEQUAL: - case BINEXPR_LESS: - case BINEXPR_LESSEQUAL: - case BINEXPR_GREATER: - case BINEXPR_GREATEREQUAL: { + expression_kind_t kind = expression->expression.kind; + + switch(kind) { + case EXPR_BINARY_EQUAL: + case EXPR_BINARY_NOTEQUAL: + case EXPR_BINARY_LESS: + case EXPR_BINARY_LESSEQUAL: + case EXPR_BINARY_GREATER: + case EXPR_BINARY_GREATEREQUAL: + case EXPR_BINARY_ISGREATER: + case EXPR_BINARY_ISGREATEREQUAL: + case EXPR_BINARY_ISLESS: + case EXPR_BINARY_ISLESSEQUAL: + case EXPR_BINARY_ISLESSGREATER: + case EXPR_BINARY_ISUNORDERED: { 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); ir_node *cmp = new_d_Cmp(dbgi, left, right); - long pnc = get_pnc(type); + long pnc = get_pnc(kind); ir_node *proj = new_d_Proj(dbgi, cmp, mode_b, pnc); return proj; } - case BINEXPR_ASSIGN: { + case EXPR_BINARY_ASSIGN: { ir_node *right = expression_to_firm(expression->right); set_value_for_expression(expression->left, right); return right; } - case BINEXPR_ADD: + case EXPR_BINARY_ADD: return create_add(expression); - case BINEXPR_SUB: + case EXPR_BINARY_SUB: return create_sub(expression); - case BINEXPR_MUL: + case EXPR_BINARY_MUL: return create_arithmetic_binop(expression, new_d_Mul); - case BINEXPR_BITWISE_AND: + case EXPR_BINARY_BITWISE_AND: return create_arithmetic_binop(expression, new_d_And); - case BINEXPR_BITWISE_OR: + case EXPR_BINARY_BITWISE_OR: return create_arithmetic_binop(expression, new_d_Or); - case BINEXPR_BITWISE_XOR: + case EXPR_BINARY_BITWISE_XOR: return create_arithmetic_binop(expression, new_d_Eor); - case BINEXPR_SHIFTLEFT: - case BINEXPR_SHIFTRIGHT: + case EXPR_BINARY_SHIFTLEFT: + case EXPR_BINARY_SHIFTRIGHT: return create_shift(expression); - case BINEXPR_DIV: - case BINEXPR_MOD: + case EXPR_BINARY_DIV: + case EXPR_BINARY_MOD: return create_divmod(expression); - case BINEXPR_LOGICAL_AND: - case BINEXPR_LOGICAL_OR: + case EXPR_BINARY_LOGICAL_AND: + case EXPR_BINARY_LOGICAL_OR: return create_lazy_op(expression); - case BINEXPR_COMMA: + case EXPR_BINARY_COMMA: expression_to_firm(expression->left); return expression_to_firm(expression->right); - case BINEXPR_ADD_ASSIGN: + case EXPR_BINARY_ADD_ASSIGN: return create_arithmetic_assign_binop(expression, new_d_Add); - case BINEXPR_SUB_ASSIGN: + case EXPR_BINARY_SUB_ASSIGN: return create_arithmetic_assign_binop(expression, new_d_Sub); - case BINEXPR_MUL_ASSIGN: + case EXPR_BINARY_MUL_ASSIGN: return create_arithmetic_assign_binop(expression, new_d_Mul); - case BINEXPR_DIV_ASSIGN: + case EXPR_BINARY_DIV_ASSIGN: return create_arithmetic_assign_divmod(expression); - case BINEXPR_BITWISE_AND_ASSIGN: + case EXPR_BINARY_BITWISE_AND_ASSIGN: return create_arithmetic_assign_binop(expression, new_d_And); - case BINEXPR_BITWISE_OR_ASSIGN: + case EXPR_BINARY_BITWISE_OR_ASSIGN: return create_arithmetic_assign_binop(expression, new_d_Or); - case BINEXPR_BITWISE_XOR_ASSIGN: + case EXPR_BINARY_BITWISE_XOR_ASSIGN: return create_arithmetic_assign_binop(expression, new_d_Eor); - case BINEXPR_SHIFTLEFT_ASSIGN: - case BINEXPR_SHIFTRIGHT_ASSIGN: + case EXPR_BINARY_SHIFTLEFT_ASSIGN: + case EXPR_BINARY_SHIFTRIGHT_ASSIGN: return create_arithmetic_assign_shift(expression); + case EXPR_BINARY_BUILTIN_EXPECT: + return expression_to_firm(expression->left); default: panic("TODO binexpr type"); } @@ -1427,17 +2104,17 @@ static ir_node *array_access_addr(const array_access_expression_t *expression) 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); + offset = create_conv(dbgi, offset, mode_uint); 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; + pointer_type_t *pointer_type = &ref_type->pointer; unsigned elem_size = get_type_size(pointer_type->points_to); - ir_node *elem_size_const = new_Const_long(mode_Iu, elem_size); + ir_node *elem_size_const = new_Const_long(mode_uint, elem_size); ir_node *real_offset = new_d_Mul(dbgi, offset, elem_size_const, - mode_Iu); - ir_node *result = new_d_Add(dbgi, base_addr, real_offset, mode_P); + mode_uint); + ir_node *result = new_d_Add(dbgi, base_addr, real_offset, mode_P_data); return result; } @@ -1463,16 +2140,58 @@ static ir_node *sizeof_to_firm(const sizeof_expression_t *expression) assert(type != NULL); } - ir_mode *mode = get_ir_mode(expression->expression.datatype); - unsigned size = get_type_size(type); - ir_node *size_node = new_Const_long(mode, size); + ir_mode *const mode = get_ir_mode(expression->expression.datatype); + symconst_symbol sym; + sym.type_p = get_ir_type(type); + return new_SymConst(mode, sym, symconst_type_size); +} + +static ir_node *alignof_to_firm(const alignof_expression_t *expression) +{ + type_t *const type = expression->type; + ir_mode *const mode = get_ir_mode(expression->expression.datatype); + symconst_symbol sym; + sym.type_p = get_ir_type(type); + return new_SymConst(mode, sym, symconst_type_align); +} + +static long fold_constant(const expression_t *expression) +{ + assert(is_constant_expression(expression)); + + ir_graph *old_current_ir_graph = current_ir_graph; + if(current_ir_graph == NULL) { + current_ir_graph = get_const_code_irg(); + } + + ir_node *cnst = expression_to_firm(expression); + current_ir_graph = old_current_ir_graph; + + if(!is_Const(cnst)) { + panic("couldn't fold constant\n"); + } + + tarval *tv = get_Const_tarval(cnst); + if(!tarval_is_long(tv)) { + panic("result of constant folding is not integer\n"); + } - return size_node; + return get_tarval_long(tv); } static ir_node *conditional_to_firm(const conditional_expression_t *expression) { - dbg_info *dbgi = get_dbg_info(&expression->expression.source_position); + dbg_info *const dbgi = get_dbg_info(&expression->expression.source_position); + + /* first try to fold a constant condition */ + if(is_constant_expression(expression->condition)) { + long val = fold_constant(expression->condition); + if(val) { + return expression_to_firm(expression->true_expression); + } else { + return expression_to_firm(expression->false_expression); + } + } ir_node *cur_block = get_cur_block(); @@ -1501,7 +2220,8 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression) 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; + 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); @@ -1518,7 +2238,7 @@ static ir_node *select_addr(const select_expression_t *expression) ir_node *compound_addr = expression_to_firm(expression->compound); declaration_t *entry = expression->compound_entry; - assert(entry->declaration_type == DECLARATION_TYPE_COMPOUND_MEMBER); + assert(entry->declaration_kind == DECLARATION_KIND_COMPOUND_MEMBER); ir_entity *entity = entry->v.entity; assert(entity != NULL); @@ -1570,24 +2290,24 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex const type_t *const type = expr->type_expression->base.datatype; gcc_type_class tc; - switch (type->type) + switch (type->kind) { case TYPE_ATOMIC: { const atomic_type_t *const atomic_type = &type->atomic; - switch (atomic_type->atype) { - // should not be reached + switch (atomic_type->akind) { + /* should not be reached */ case ATOMIC_TYPE_INVALID: tc = no_type_class; break; - // gcc cannot do that + /* 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_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: @@ -1596,7 +2316,7 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex case ATOMIC_TYPE_ULONG: case ATOMIC_TYPE_LONGLONG: case ATOMIC_TYPE_ULONGLONG: - case ATOMIC_TYPE_BOOL: // gcc handles this as integer + case ATOMIC_TYPE_BOOL: /* gcc handles this as integer */ tc = integer_type_class; break; @@ -1625,13 +2345,13 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex break; } - case TYPE_ARRAY: // gcc handles this as pointer - case TYPE_FUNCTION: // gcc handles this as pointer + 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 + /* gcc handles this as integer */ case TYPE_ENUM: tc = integer_type_class; break; default: @@ -1639,7 +2359,7 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex } dbg_info *const dbgi = get_dbg_info(&expr->expression.source_position); - ir_mode *const mode = mode_Is; + ir_mode *const mode = mode_int; tarval *const tv = new_tarval_from_long(tc, mode); return new_d_Const(dbgi, mode, tv); } @@ -1651,7 +2371,8 @@ static ir_node *function_name_to_firm( 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); + const string_t string = { name, strlen(name) + 1 }; + current_function_name = string_to_firm(src_pos, "__func__", &string); } return current_function_name; @@ -1661,19 +2382,55 @@ 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); + assert(statement->kind == STATEMENT_COMPOUND); + return compound_statement_to_firm(&statement->compound); +} + +static ir_node *va_start_expression_to_firm( + const va_start_expression_t *const expr) +{ + ir_type *const method_type = get_ir_type(current_function_decl->type); + int const n = get_method_n_params(method_type) - 1; + ir_entity *const parm_ent = get_method_value_param_ent(method_type, n); + ir_node *const arg_base = get_irg_value_param_base(current_ir_graph); + dbg_info *const dbgi = + get_dbg_info(&expr->expression.source_position); + ir_node *const no_mem = new_NoMem(); + ir_node *const arg_sel = + new_d_simpleSel(dbgi, no_mem, arg_base, parm_ent); + + size_t const parm_size = get_type_size(expr->parameter->type); + ir_node *const cnst = new_Const_long(mode_uint, parm_size); + ir_node *const add = new_d_Add(dbgi, arg_sel, cnst, mode_P_data); + set_value_for_expression(expr->ap, add); + + return NULL; +} + +static ir_node *va_arg_expression_to_firm(const va_arg_expression_t *const expr) +{ + ir_type *const irtype = get_ir_type(expr->expression.datatype); + ir_node *const ap = expression_to_firm(expr->ap); + dbg_info *const dbgi = get_dbg_info(&expr->expression.source_position); + ir_node *const res = deref_address(irtype, ap, dbgi); + + size_t const parm_size = get_type_size(expr->expression.datatype); + ir_node *const cnst = new_Const_long(mode_uint, parm_size); + ir_node *const add = new_d_Add(dbgi, ap, cnst, mode_P_data); + set_value_for_expression(expr->ap, add); + + return res; } static ir_node *dereference_addr(const unary_expression_t *const expression) { - assert(expression->type == UNEXPR_DEREFERENCE); + assert(expression->expression.kind == EXPR_UNARY_DEREFERENCE); return expression_to_firm(expression->value); } static ir_node *expression_to_addr(const expression_t *expression) { - switch(expression->type) { + switch(expression->kind) { case EXPR_REFERENCE: return reference_addr(&expression->reference); case EXPR_ARRAY_ACCESS: @@ -1682,12 +2439,8 @@ static ir_node *expression_to_addr(const 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 = &expression->unary; - if (unary_expr->type == UNEXPR_DEREFERENCE) { - return dereference_addr(unary_expr); - } - break; + case EXPR_UNARY_DEREFERENCE: { + return dereference_addr(&expression->unary); } default: break; @@ -1695,25 +2448,52 @@ static ir_node *expression_to_addr(const expression_t *expression) panic("trying to get address of non-lvalue"); } +static ir_node *builtin_constant_to_firm( + const builtin_constant_expression_t *expression) +{ + ir_mode *mode = get_ir_mode(expression->expression.datatype); + long v; + + if (is_constant_expression(expression->value)) { + v = 1; + } else { + v = 0; + } + return new_Const_long(mode, v); +} + +static ir_node *builtin_prefetch_to_firm( + const builtin_prefetch_expression_t *expression) +{ + ir_node *adr = expression_to_firm(expression->adr); + /* no Firm support for prefetch yet */ + (void) adr; + return NULL; +} + static ir_node *_expression_to_firm(const expression_t *expression) { - switch(expression->type) { + switch(expression->kind) { case EXPR_CONST: return const_to_firm(&expression->conste); case EXPR_STRING_LITERAL: 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(&expression->reference); case EXPR_CALL: return call_expression_to_firm(&expression->call); - case EXPR_UNARY: + EXPR_UNARY_CASES return unary_expression_to_firm(&expression->unary); - case EXPR_BINARY: + EXPR_BINARY_CASES return binary_expression_to_firm(&expression->binary); case EXPR_ARRAY_ACCESS: return array_access_to_firm(&expression->array_access); case EXPR_SIZEOF: return sizeof_to_firm(&expression->sizeofe); + case EXPR_ALIGNOF: + return alignof_to_firm(&expression->alignofe); case EXPR_CONDITIONAL: return conditional_to_firm(&expression->conditional); case EXPR_SELECT: @@ -1725,10 +2505,17 @@ static ir_node *_expression_to_firm(const expression_t *expression) return function_name_to_firm(&expression->string); case EXPR_STATEMENT: return statement_expression_to_firm(&expression->statement); - case EXPR_OFFSETOF: + case EXPR_VA_START: + return va_start_expression_to_firm(&expression->va_starte); case EXPR_VA_ARG: + return va_arg_expression_to_firm(&expression->va_arge); + case EXPR_OFFSETOF: case EXPR_BUILTIN_SYMBOL: panic("unimplemented expression found"); + case EXPR_BUILTIN_CONSTANT_P: + return builtin_constant_to_firm(&expression->builtin_constant); + case EXPR_BUILTIN_PREFETCH: + return builtin_prefetch_to_firm(&expression->builtin_prefetch); case EXPR_UNKNOWN: case EXPR_INVALID: @@ -1765,44 +2552,40 @@ static void create_condition_evaluation(const expression_t *expression, ir_node *true_block, ir_node *false_block) { - 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; + switch(expression->kind) { + case EXPR_UNARY_NOT: { + const unary_expression_t *unary_expression = &expression->unary; + create_condition_evaluation(unary_expression->value, false_block, + true_block); + return; } - 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; + case EXPR_BINARY_LOGICAL_AND: { + const binary_expression_t *binary_expression = &expression->binary; + + 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; + } + case EXPR_BINARY_LOGICAL_OR: { + const binary_expression_t *binary_expression = &expression->binary; + + 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; } default: break; @@ -1814,322 +2597,44 @@ static void create_condition_evaluation(const expression_t *expression, 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(true_block, true_proj); - add_immBlock_pred(false_block, false_proj); - - 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); + /* set branch prediction info based on __builtin_expect */ + if(expression->kind == EXPR_BINARY_BUILTIN_EXPECT) { + long cnst = fold_constant(expression->binary.right); + cond_jmp_predicate pred; - 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; + if(cnst == 0) { + pred = COND_JMP_PRED_FALSE; } 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); + pred = COND_JMP_PRED_TRUE; } - in_len = 1; - } else { - /* build return_value for its side effects */ - if(statement->return_value != NULL) { - expression_to_firm(statement->return_value); - } - in_len = 0; + set_Cond_jmp_pred(cond, pred); } - 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); + add_immBlock_pred(true_block, true_proj); + add_immBlock_pred(false_block, false_proj); set_cur_block(NULL); } -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) +static void create_declaration_entity(declaration_t *declaration, + declaration_kind_t declaration_kind, + ir_type *parent_type) { - ir_node *result = NULL; - statement_t *statement = compound->statements; - 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); - } - - return result; -} - -static void if_statement_to_firm(if_statement_t *statement) -{ - ir_node *cur_block = get_cur_block(); - - ir_node *fallthrough_block = new_immBlock(); - - /* the true (blocks) */ - 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) { - false_block = new_immBlock(); - - statement_to_firm(statement->false_statement); - if(get_cur_block() != NULL) { - ir_node *jmp = new_Jmp(); - add_immBlock_pred(fallthrough_block, jmp); - } - } else { - 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); - - set_cur_block(fallthrough_block); -} - -static void while_statement_to_firm(while_statement_t *statement) -{ - ir_node *jmp = NULL; - if(get_cur_block() != NULL) { - jmp = new_Jmp(); - } - - /* create the header block */ - ir_node *header_block = new_immBlock(); - if(jmp != NULL) { - add_immBlock_pred(header_block, jmp); - } - - /* the false block */ - ir_node *false_block = new_immBlock(); - - /* the loop body */ - 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; - - 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; - - if(get_cur_block() != NULL) { - jmp = new_Jmp(); - add_immBlock_pred(header_block, jmp); - } - } else { - body_block = 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) -{ - ir_node *jmp = NULL; - if(get_cur_block() != NULL) { - jmp = new_Jmp(); - } - - /* create the header block */ - ir_node *header_block = new_immBlock(); - - /* the false block */ - ir_node *false_block = new_immBlock(); - - /* the loop body */ - ir_node *body_block = new_immBlock(); - if(jmp != NULL) { - add_immBlock_pred(body_block, jmp); - } - - 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); - - 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; - } - } - - ir_node *body_jmp = new_Jmp(); - add_immBlock_pred(header_block, body_jmp); - 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 for_statement_to_firm(for_statement_t *statement) -{ - ir_node *jmp = NULL; - if (get_cur_block() != NULL) { - if(statement->initialisation != NULL) { - expression_to_firm(statement->initialisation); - } - jmp = new_Jmp(); - } - - /* create the step block */ - ir_node *const step_block = new_immBlock(); - if (statement->step != NULL) { - expression_to_firm(statement->step); - } - ir_node *const step_jmp = new_Jmp(); - - /* create the header block */ - ir_node *const header_block = new_immBlock(); - if (jmp != NULL) { - add_immBlock_pred(header_block, jmp); - } - add_immBlock_pred(header_block, step_jmp); - - /* the false block */ - ir_node *const false_block = new_immBlock(); - - /* the loop body */ - 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; - } - - /* 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); - - set_cur_block(false_block); -} - -static void create_declaration_entity(declaration_t *declaration, - declaration_type_t declaration_type, - ir_type *parent_type) -{ - ident *id = new_id_from_str(declaration->symbol->string); - ir_type *irtype = get_ir_type(declaration->type); - ir_entity *entity = new_entity(parent_type, id, irtype); + ident *const id = new_id_from_str(declaration->symbol->string); + ir_type *const irtype = get_ir_type(declaration->type); + dbg_info *const dbgi = get_dbg_info(&declaration->source_position); + ir_entity *const entity = new_d_entity(parent_type, id, irtype, dbgi); set_entity_ld_ident(entity, id); - declaration->declaration_type = (unsigned char) declaration_type; + declaration->declaration_kind = (unsigned char) declaration_kind; declaration->v.entity = entity; set_entity_variability(entity, variability_uninitialized); + if(parent_type == get_tls_type()) + set_entity_allocation(entity, allocation_automatic); + else if(declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE) + set_entity_allocation(entity, allocation_static); /* TODO: visibility? */ } @@ -2191,7 +2696,7 @@ static void create_initializer_compound(initializer_list_t *initializer, { declaration_t *compound_declaration = type->declaration; - declaration_t *compound_entry = compound_declaration->context.declarations; + declaration_t *compound_entry = compound_declaration->scope.declarations; compound_graph_path_entry_t entry; entry.type = COMPOUND_GRAPH_ENTRY_COMPOUND; @@ -2213,10 +2718,10 @@ static void create_initializer_compound(initializer_list_t *initializer, initializer_t *sub_initializer = initializer->initializers[i]; assert(compound_entry != NULL); - assert(compound_entry->declaration_type - == DECLARATION_TYPE_COMPOUND_MEMBER); + assert(compound_entry->declaration_kind + == DECLARATION_KIND_COMPOUND_MEMBER); - if(sub_initializer->type == INITIALIZER_VALUE) { + if(sub_initializer->kind == INITIALIZER_VALUE) { create_initializer_value(&sub_initializer->value, entity, &entry, len); } else { @@ -2248,7 +2753,7 @@ static void create_initializer_array(initializer_list_t *initializer, initializer_t *sub_initializer = initializer->initializers[i]; - if(sub_initializer->type == INITIALIZER_VALUE) { + if(sub_initializer->kind == INITIALIZER_VALUE) { create_initializer_value(&sub_initializer->value, entity, &entry, len); } else { @@ -2281,43 +2786,82 @@ static void create_initializer_string(initializer_string_t *initializer, 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) { + ir_type *const irtype = get_entity_type(entity); + size_t arr_len = get_array_type_size(type); + const char *const p = initializer->string.begin; + if (initializer->string.size < arr_len) { + arr_len = initializer->string.size; + } + for (size_t i = 0; i < arr_len; ++i) { entry.v.array_index = i; - ir_node *node = new_Const_long(mode_Bs, *p); + ir_node *node = new_Const_long(mode_Bs, p[i]); 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) +static void create_initializer_wide_string( + const initializer_wide_string_t *const initializer, array_type_t *const type, + ir_entity *const entity, compound_graph_path_entry_t *const last_entry, + int len) { - if(type->type == TYPE_ARRAY) { - 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; + type_t *element_type = type->element_type; + element_type = skip_typeref(element_type); - assert(type->type == TYPE_COMPOUND_STRUCT - || type->type == TYPE_COMPOUND_UNION); - compound_type_t *compound_type = &type->compound; + compound_graph_path_entry_t entry; + entry.type = COMPOUND_GRAPH_ENTRY_ARRAY; + entry.prev = last_entry; + ++len; + + ir_type *const irtype = get_entity_type(entity); + const size_t arr_len = get_array_type_size(type); + const wchar_rep_t * p = initializer->string.begin; + const wchar_rep_t *const end = p + initializer->string.size; + for (size_t i = 0; i < arr_len && p != end; ++i, ++p) { + entry.v.array_index = i; + + ir_node *node = new_Const_long(mode_int, *p); + compound_graph_path *path = create_compound_path(irtype, &entry, len); + add_compound_ent_value_w_path(entity, node, path); + } +} + +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; + + switch (initializer->kind) { + case INITIALIZER_STRING: { + initializer_string_t *const string = &initializer->string; + create_initializer_string(string, array_type, entity, entry, len); + return; + } + + case INITIALIZER_WIDE_STRING: { + initializer_wide_string_t *const string = &initializer->wide_string; + create_initializer_wide_string(string, array_type, entity, entry, len); + return; + } + + case INITIALIZER_LIST: { + initializer_list_t *const list = &initializer->list; + create_initializer_array(list, array_type, entity, entry, len); + return; + } + + case INITIALIZER_VALUE: + break; + } + panic("Unhandled initializer"); + } else { + assert(initializer->kind == 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); } } @@ -2332,40 +2876,39 @@ static void create_initializer_local_variable_entity(declaration_t *declaration) 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); + if(initializer->kind == 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); + ir_node *value = expression_to_firm(initializer_value->value); + type_t *type = skip_typeref(declaration->type); + assign_value(dbgi, addr, type, value); 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); + ident *const id = unique_ident("initializer"); + ir_type *const irtype = get_ir_type(declaration->type); + ir_type *const global_type = get_glob_type(); + ir_entity *const init_entity = new_d_entity(global_type, id, irtype, dbgi); set_entity_ld_ident(init_entity, id); set_entity_variability(init_entity, variability_initialized); set_entity_visibility(init_entity, visibility_local); + set_entity_allocation(init_entity, allocation_static); - ir_graph *old_current_ir_graph = current_ir_graph; + ir_graph *const old_current_ir_graph = current_ir_graph; current_ir_graph = get_const_code_irg(); - type_t *type = skip_typeref(declaration->type); + type_t *const 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 *const src_addr = create_symconst(dbgi, mode_P_data, init_entity); + ir_node *const copyb = new_d_CopyB(dbgi, memory, addr, src_addr, irtype); - ir_node *copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M_regular); + ir_node *const copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M_regular); set_store(copyb_mem); } @@ -2375,125 +2918,443 @@ 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; + declaration_kind_t declaration_kind + = (declaration_kind_t) declaration->declaration_kind; + if(declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE_ENTITY) { + create_initializer_local_variable_entity(declaration); + return; + } + + if(initializer->kind == INITIALIZER_VALUE) { + initializer_value_t *initializer_value = &initializer->value; + + ir_node *value = expression_to_firm(initializer_value->value); + + if(declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE) { + set_value(declaration->v.value_number, value); + } else { + assert(declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE); + + ir_entity *entity = declaration->v.entity; + + set_entity_variability(entity, variability_initialized); + set_atomic_ent_value(entity, value); + } + } else { + assert(declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE_ENTITY + || declaration_kind == DECLARATION_KIND_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); + } +} + +/** + * Creates a Firm local variable from a declaration. + */ +static void create_local_variable(declaration_t *declaration) +{ + assert(declaration->declaration_kind == DECLARATION_KIND_UNKNOWN); + + bool needs_entity = declaration->address_taken; + type_t *type = skip_typeref(declaration->type); + + if(is_type_array(type) || is_type_compound(type)) { + needs_entity = true; + } + + if(needs_entity) { + ir_type *frame_type = get_irg_frame_type(current_ir_graph); + create_declaration_entity(declaration, + DECLARATION_KIND_LOCAL_VARIABLE_ENTITY, + frame_type); + } else { + declaration->declaration_kind = DECLARATION_KIND_LOCAL_VARIABLE; + declaration->v.value_number = next_value_number_function; + set_irg_loc_description(current_ir_graph, next_value_number_function, declaration); + ++next_value_number_function; + } + + create_initializer(declaration); +} + +static void create_local_static_variable(declaration_t *declaration) +{ + assert(declaration->declaration_kind == DECLARATION_KIND_UNKNOWN); + + type_t *const type = skip_typeref(declaration->type); + ir_type *const global_type = get_glob_type(); + ident *const id = unique_ident(declaration->symbol->string); + ir_type *const irtype = get_ir_type(type); + dbg_info *const dbgi = get_dbg_info(&declaration->source_position); + ir_entity *const entity = new_d_entity(global_type, id, irtype, dbgi); + set_entity_ld_ident(entity, id); + + declaration->declaration_kind = DECLARATION_KIND_GLOBAL_VARIABLE; + declaration->v.entity = entity; + set_entity_variability(entity, variability_uninitialized); + set_entity_visibility(entity, visibility_local); + set_entity_allocation(entity, allocation_static); + + ir_graph *const 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 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 { + /* 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 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->base.next) { + //context2firm(&statement->scope); + + if(statement->base.next == NULL + && statement->kind == STATEMENT_EXPRESSION) { + result = expression_statement_to_firm( + &statement->expression); + break; + } + statement_to_firm(statement); + } + + return result; +} + +static void create_local_declaration(declaration_t *declaration) +{ + type_t *type = skip_typeref(declaration->type); + + switch ((storage_class_tag_t) declaration->storage_class) { + case STORAGE_CLASS_STATIC: + create_local_static_variable(declaration); + return; + case STORAGE_CLASS_ENUM_ENTRY: + panic("enum entry declaration in local block found"); + case STORAGE_CLASS_EXTERN: + panic("extern declaration in local block found"); + case STORAGE_CLASS_NONE: + case STORAGE_CLASS_AUTO: + case STORAGE_CLASS_REGISTER: + if(is_type_function(type)) { + panic("nested functions not supported yet"); + } else { + create_local_variable(declaration); + } + return; + case STORAGE_CLASS_TYPEDEF: + case STORAGE_CLASS_THREAD: + case STORAGE_CLASS_THREAD_EXTERN: + case STORAGE_CLASS_THREAD_STATIC: + return; + } + panic("invalid storage class found"); +} + +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) { + if(declaration->namespc != NAMESPACE_NORMAL) + continue; + create_local_variable(declaration); + } +} + +static void if_statement_to_firm(if_statement_t *statement) +{ + ir_node *cur_block = get_cur_block(); + + ir_node *fallthrough_block = new_immBlock(); + + /* the true (blocks) */ + 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) { + false_block = new_immBlock(); + + statement_to_firm(statement->false_statement); + if(get_cur_block() != NULL) { + ir_node *jmp = new_Jmp(); + add_immBlock_pred(fallthrough_block, jmp); + } + } else { + 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); + + set_cur_block(fallthrough_block); +} + +static void while_statement_to_firm(while_statement_t *statement) +{ + ir_node *jmp = NULL; + if(get_cur_block() != NULL) { + jmp = new_Jmp(); + } + + /* create the header block */ + ir_node *header_block = new_immBlock(); + if(jmp != NULL) { + add_immBlock_pred(header_block, jmp); + } + + /* the false block */ + ir_node *false_block = new_immBlock(); + + /* the loop body */ + 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; + + 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; + + if(get_cur_block() != NULL) { + jmp = new_Jmp(); + add_immBlock_pred(header_block, jmp); + } + } else { + body_block = 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) +{ + ir_node *jmp = NULL; + if(get_cur_block() != NULL) { + jmp = new_Jmp(); + } + + /* create the header block */ + ir_node *header_block = new_immBlock(); + + /* the false block */ + ir_node *false_block = new_immBlock(); + + /* the loop body */ + ir_node *body_block = new_immBlock(); + if(jmp != NULL) { + add_immBlock_pred(body_block, jmp); + } + + 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); + + 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(initializer->type == INITIALIZER_VALUE) { - initializer_value_t *initializer_value = &initializer->value; + ir_node *body_jmp = new_Jmp(); + add_immBlock_pred(header_block, body_jmp); + mature_immBlock(header_block); - ir_node *value = expression_to_firm(initializer_value->value); + /* create the condition */ + set_cur_block(header_block); - if(declaration_type == DECLARATION_TYPE_LOCAL_VARIABLE) { - set_value(declaration->v.value_number, value); - } else { - assert(declaration_type == DECLARATION_TYPE_GLOBAL_VARIABLE); + create_condition_evaluation(statement->condition, body_block, false_block); + mature_immBlock(body_block); + mature_immBlock(false_block); + mature_immBlock(header_block); - ir_entity *entity = declaration->v.entity; + set_cur_block(false_block); +} - set_entity_variability(entity, variability_initialized); - set_atomic_ent_value(entity, value); +static void for_statement_to_firm(for_statement_t *statement) +{ + ir_node *jmp = NULL; + if (get_cur_block() != NULL) { + if(statement->initialisation != NULL) { + expression_to_firm(statement->initialisation); } - } else { - 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 declarations */ + declaration_t *declaration = statement->scope.declarations; + for( ; declaration != NULL; declaration = declaration->next) { + create_local_declaration(declaration); + } - type_t *type = skip_typeref(declaration->type); - create_initializer_object(initializer, type, entity, NULL, 0); + jmp = new_Jmp(); } -} - -static void create_local_variable(declaration_t *declaration) -{ - assert(declaration->declaration_type == DECLARATION_TYPE_UNKNOWN); - 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) { - needs_entity = true; + /* create the step block */ + ir_node *const step_block = new_immBlock(); + if (statement->step != NULL) { + expression_to_firm(statement->step); } + ir_node *const step_jmp = new_Jmp(); - if(needs_entity) { - ir_type *frame_type = get_irg_frame_type(current_ir_graph); - create_declaration_entity(declaration, - DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY, - frame_type); - } else { - declaration->declaration_type = DECLARATION_TYPE_LOCAL_VARIABLE; - declaration->v.value_number = next_value_number_function; - ++next_value_number_function; + /* create the header block */ + ir_node *const header_block = new_immBlock(); + if (jmp != NULL) { + add_immBlock_pred(header_block, jmp); } + add_immBlock_pred(header_block, step_jmp); - create_initializer(declaration); -} - -static void create_local_static_variable(declaration_t *declaration) -{ - assert(declaration->declaration_type == DECLARATION_TYPE_UNKNOWN); + /* the false block */ + ir_node *const false_block = new_immBlock(); - 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); + /* the loop body */ + 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; - declaration->declaration_type = DECLARATION_TYPE_GLOBAL_VARIABLE; - declaration->v.entity = entity; - set_entity_variability(entity, variability_uninitialized); - set_entity_visibility(entity, visibility_local); + body_block = new_immBlock(); + statement_to_firm(statement->body); - ir_graph *old_current_ir_graph = current_ir_graph; - current_ir_graph = get_const_code_irg(); + assert(continue_label == step_block); + assert(break_label == false_block); + continue_label = old_continue_label; + break_label = old_break_label; - create_initializer(declaration); + if (get_cur_block() != NULL) { + jmp = new_Jmp(); + add_immBlock_pred(step_block, jmp); + } + } else { + body_block = step_block; + } - assert(current_ir_graph == get_const_code_irg()); - current_ir_graph = old_current_ir_graph; -} + /* 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); + } -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; + mature_immBlock(body_block); + mature_immBlock(false_block); + mature_immBlock(step_block); + mature_immBlock(header_block); + mature_immBlock(false_block); - switch ((storage_class_tag_t)declaration->storage_class) { - case STORAGE_CLASS_TYPEDEF: - continue; - case STORAGE_CLASS_STATIC: - create_local_static_variable(declaration); - continue; - case STORAGE_CLASS_ENUM_ENTRY: - panic("enum entry declaration in local block found"); - case STORAGE_CLASS_EXTERN: - panic("extern declaration in local block found"); - case STORAGE_CLASS_NONE: - case STORAGE_CLASS_AUTO: - case STORAGE_CLASS_REGISTER: - if(type->type == TYPE_FUNCTION) { - 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"); - } + set_cur_block(false_block); } static void create_jump_statement(const statement_t *statement, @@ -2525,7 +3386,9 @@ static void switch_statement_to_firm(const switch_statement_t *statement) current_switch_cond = cond; break_label = break_block; - statement_to_firm(statement->body); + if (statement->body != NULL) { + statement_to_firm(statement->body); + } if(get_cur_block() != NULL) { ir_node *jmp = new_Jmp(); @@ -2549,26 +3412,6 @@ static void switch_statement_to_firm(const switch_statement_t *statement) set_cur_block(break_block); } -static long fold_constant(const expression_t *expression) -{ - ir_graph *old_current_ir_graph = current_ir_graph; - current_ir_graph = get_const_code_irg(); - - ir_node *cnst = expression_to_firm(expression); - if(!is_Const(cnst)) { - panic("couldn't fold constantl"); - } - tarval *tv = get_Const_tarval(cnst); - if(!tarval_is_long(tv)) { - panic("folded constant not an integer"); - } - - long res = get_tarval_long(tv); - - current_ir_graph = old_current_ir_graph; - return res; -} - static void case_label_to_firm(const case_label_statement_t *statement) { dbg_info *dbgi = get_dbg_info(&statement->statement.source_position); @@ -2599,23 +3442,25 @@ 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); + if(statement->label_statement != NULL) { + statement_to_firm(statement->label_statement); + } } static ir_node *get_label_block(declaration_t *label) { assert(label->namespc == NAMESPACE_LABEL); - if(label->declaration_type == DECLARATION_TYPE_LABEL_BLOCK) { + if(label->declaration_kind == DECLARATION_KIND_LABEL_BLOCK) { return label->v.block; } - assert(label->declaration_type == DECLARATION_TYPE_UNKNOWN); + assert(label->declaration_kind == DECLARATION_KIND_UNKNOWN); ir_node *old_cur_block = get_cur_block(); ir_node *block = new_immBlock(); set_cur_block(old_cur_block); - label->declaration_type = DECLARATION_TYPE_LABEL_BLOCK; + label->declaration_kind = DECLARATION_KIND_LABEL_BLOCK; label->v.block = block; ARR_APP1(ir_node *, imature_blocks, block); @@ -2635,7 +3480,9 @@ static void label_to_firm(const label_statement_t *statement) set_cur_block(block); keep_alive(block); - statement_to_firm(statement->label_statement); + if(statement->label_statement != NULL) { + statement_to_firm(statement->label_statement); + } } static void goto_to_firm(const goto_statement_t *statement) @@ -2650,9 +3497,104 @@ static void goto_to_firm(const goto_statement_t *statement) set_cur_block(NULL); } +typedef enum modifier_t { + ASM_MODIFIER_WRITE_ONLY = 1 << 0, + ASM_MODIFIER_READ_WRITE = 1 << 1, + ASM_MODIFIER_COMMUTATIVE = 1 << 2, + ASM_MODIFIER_EARLYCLOBBER = 1 << 3, +} modifier_t; + +#if 0 +static void asm_statement_to_firm(const asm_statement_t *statement) +{ + bool needs_memory = false; + + size_t n_clobbers = 0; + asm_clobber_t *clobber = statement->clobbers; + for( ; clobber != NULL; clobber = clobber->next) { + if(strcmp(clobber->clobber, "memory") == 0) { + needs_memory = true; + continue; + } + + ident *id = new_id_from_str(clobber->clobber); + obstack_ptr_grow(&asm_obst, id); + ++n_clobbers; + } + assert(obstack_object_size(&asm_obst) == n_clobbers * sizeof(ident*)); + ident **clobbers = NULL; + if(n_clobbers > 0) { + clobbers = obstack_finish(&asm_obst); + } + + /* find and count input and output constraints */ + asm_constraint_t *constraint = statement->inputs; + for( ; constraint != NULL; constraint = constraint->next) { + int modifiers = 0; + bool supports_memop = false; + for(const char *c = constraint->constraints; *c != 0; ++c) { + /* TODO: improve error messages */ + switch(*c) { + case '?': + case '!': + panic("multiple alternative assembler constraints not " + "supported"); + case 'm': + case 'o': + case 'V': + case '<': + case '>': + case 'X': + supports_memop = true; + obstack_1grow(&asm_obst, *c); + break; + case '=': + if(modifiers & ASM_MODIFIER_READ_WRITE) + panic("inconsistent register constraints"); + modifiers |= ASM_MODIFIER_WRITE_ONLY; + break; + case '+': + if(modifiers & ASM_MODIFIER_WRITE_ONLY) + panic("inconsistent register constraints"); + modifiers |= ASM_MODIFIER_READ_WRITE; + break; + case '&': + modifiers |= ASM_MODIFIER_EARLYCLOBBER; + panic("early clobber assembler constraint not supported yet"); + break; + case '%': + modifiers |= ASM_MODIFIER_COMMUTATIVE; + panic("commutative assembler constraint not supported yet"); + break; + case '#': + /* skip register preferences stuff... */ + while(*c != 0 && *c != ',') + ++c; + break; + case '*': + /* skip register preferences stuff... */ + ++c; + break; + default: + obstack_1grow(&asm_obst, *c); + break; + } + } + obstack_1grow(&asm_obst, '\0'); + const char *constraint_string = obstack_finish(&asm_obst); + + needs_memory |= supports_memop; + if(supports_memop) { + + } + } + +} +#endif + static void statement_to_firm(statement_t *statement) { - switch(statement->type) { + switch(statement->kind) { case STATEMENT_INVALID: panic("invalid statement found"); case STATEMENT_COMPOUND: @@ -2698,39 +3640,67 @@ static void statement_to_firm(statement_t *statement) goto_to_firm(&statement->gotos); return; case STATEMENT_ASM: + //asm_statement_to_firm(&statement->asms); + //return; break; } panic("Statement not implemented\n"); } +static int count_decls_in_expression(const expression_t *expression); + static int count_local_declarations(const declaration_t * decl, const declaration_t *const end) { int count = 0; for (; decl != end; decl = decl->next) { + if(decl->namespc != NAMESPACE_NORMAL) + continue; 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; + if (!decl->address_taken && is_type_scalar(type)) + ++count; + const initializer_t *initializer = decl->init.initializer; + /* FIXME: should walk initializer hierarchies... */ + if(initializer != NULL && initializer->kind == INITIALIZER_VALUE) { + count += count_decls_in_expression(initializer->value.value); } } return count; } +static int count_decls_in_expression(const expression_t *expression) { + if(expression == NULL) + return 0; + + switch(expression->base.kind) { + case EXPR_STATEMENT: + return count_decls_in_stmts(expression->statement.statement); + EXPR_BINARY_CASES { + int count_left = count_decls_in_expression(expression->binary.left); + int count_right = count_decls_in_expression(expression->binary.right); + return count_left + count_right; + } + EXPR_UNARY_CASES + return count_decls_in_expression(expression->unary.value); + + default: + break; + } + + /* TODO FIXME: finish/fix that firm patch that allows dynamic value numbers + * (or implement all the missing expressions here/implement a walker) + */ + + return 0; +} + static int count_decls_in_stmts(const statement_t *stmt) { int count = 0; for (; stmt != NULL; stmt = stmt->base.next) { - switch (stmt->type) { + switch (stmt->kind) { case STATEMENT_DECLARATION: { - const declaration_statement_t *const decl_stmt = - (const declaration_statement_t*)stmt; + const declaration_statement_t *const decl_stmt = &stmt->declaration; count += count_local_declarations(decl_stmt->declarations_begin, decl_stmt->declarations_end->next); break; @@ -2738,63 +3708,83 @@ static int count_decls_in_stmts(const statement_t *stmt) case STATEMENT_COMPOUND: { const compound_statement_t *const comp = - (const compound_statement_t*)stmt; + &stmt->compound; count += count_decls_in_stmts(comp->statements); break; } case STATEMENT_IF: { - const if_statement_t *const if_stmt = (const if_statement_t*)stmt; + const if_statement_t *const if_stmt = &stmt->ifs; + count += count_decls_in_expression(if_stmt->condition); 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; + const switch_statement_t *const switch_stmt = &stmt->switchs; + count += count_decls_in_expression(switch_stmt->expression); count += count_decls_in_stmts(switch_stmt->body); break; } case STATEMENT_LABEL: { - const label_statement_t *const label_stmt = - (const label_statement_t*)stmt; + const label_statement_t *const label_stmt = &stmt->label; 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; + const while_statement_t *const while_stmt = &stmt->whiles; + count += count_decls_in_expression(while_stmt->condition); 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; + const do_while_statement_t *const do_while_stmt = &stmt->do_while; + count += count_decls_in_expression(do_while_stmt->condition); 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 */ + const for_statement_t *const for_stmt = &stmt->fors; + count += count_local_declarations(for_stmt->scope.declarations, NULL); + count += count_decls_in_expression(for_stmt->initialisation); + count += count_decls_in_expression(for_stmt->condition); + count += count_decls_in_expression(for_stmt->step); count += count_decls_in_stmts(for_stmt->body); break; } + case STATEMENT_CASE_LABEL: { + const case_label_statement_t *label = &stmt->case_label; + count += count_decls_in_expression(label->expression); + count += count_decls_in_stmts(label->label_statement); + break; + } + case STATEMENT_ASM: case STATEMENT_BREAK: - case STATEMENT_CASE_LABEL: case STATEMENT_CONTINUE: - case STATEMENT_EXPRESSION: + break; + + case STATEMENT_EXPRESSION: { + const expression_statement_t *expr_stmt = &stmt->expression; + count += count_decls_in_expression(expr_stmt->expression); + break; + } + case STATEMENT_GOTO: case STATEMENT_INVALID: - case STATEMENT_RETURN: break; + + case STATEMENT_RETURN: { + const return_statement_t *ret_stmt = &stmt->returns; + count += count_decls_in_expression(ret_stmt->return_value); + break; + } } } return count; @@ -2805,15 +3795,11 @@ static int get_function_n_local_vars(declaration_t *declaration) int count = 0; /* count parameters */ - count += count_local_declarations(declaration->context.declarations, NULL); + count += count_local_declarations(declaration->scope.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; } @@ -2825,14 +3811,14 @@ static void initialize_function_parameters(declaration_t *declaration) ir_type *function_irtype = get_ir_type(declaration->type); int n = 0; - declaration_t *parameter = declaration->context.declarations; + declaration_t *parameter = declaration->scope.declarations; for( ; parameter != NULL; parameter = parameter->next, ++n) { - assert(parameter->declaration_type == DECLARATION_TYPE_UNKNOWN); + assert(parameter->declaration_kind == DECLARATION_KIND_UNKNOWN); 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; } @@ -2841,8 +3827,8 @@ static void initialize_function_parameters(declaration_t *declaration) ident *id = new_id_from_str(parameter->symbol->string); set_entity_ident(entity, id); - parameter->declaration_type - = DECLARATION_TYPE_LOCAL_VARIABLE_ENTITY; + parameter->declaration_kind + = DECLARATION_KIND_LOCAL_VARIABLE_ENTITY; parameter->v.entity = entity; continue; } @@ -2851,14 +3837,50 @@ static void initialize_function_parameters(declaration_t *declaration) long pn = n; ir_node *proj = new_r_Proj(irg, start_block, args, mode, pn); - parameter->declaration_type = DECLARATION_TYPE_LOCAL_VARIABLE; + parameter->declaration_kind = DECLARATION_KIND_LOCAL_VARIABLE; parameter->v.value_number = next_value_number_function; + set_irg_loc_description(current_ir_graph, next_value_number_function, parameter); ++next_value_number_function; set_value(parameter->v.value_number, proj); } } +/** + * Handle additional decl modifiers for IR-graphs + * + * @param irg the IR-graph + * @param dec_modifiers additional modifiers + */ +static void handle_decl_modifier_irg(ir_graph_ptr irg, decl_modifiers_t decl_modifiers) +{ + if (decl_modifiers & DM_NORETURN) { + /* TRUE if the declaration includes the Microsoft + __declspec(noreturn) specifier. */ + set_irg_additional_property(irg, mtp_property_noreturn); + } + if (decl_modifiers & DM_NOTHROW) { + /* TRUE if the declaration includes the Microsoft + __declspec(nothrow) specifier. */ + set_irg_additional_property(irg, mtp_property_nothrow); + } + if (decl_modifiers & DM_NAKED) { + /* TRUE if the declaration includes the Microsoft + __declspec(naked) specifier. */ + set_irg_additional_property(irg, mtp_property_naked); + } + if (decl_modifiers & DM_FORCEINLINE) { + /* TRUE if the declaration includes the + Microsoft __forceinline specifier. */ + set_irg_inline_property(irg, irg_inline_forced); + } + if (decl_modifiers & DM_NOINLINE) { + /* TRUE if the declaration includes the Microsoft + __declspec(noinline) specifier. */ + set_irg_inline_property(irg, irg_inline_forbidden); + } +} + static void create_function(declaration_t *declaration) { ir_entity *function_entity = get_function_entity(declaration); @@ -2876,6 +3898,11 @@ static void create_function(declaration_t *declaration) ir_graph *irg = new_ir_graph(function_entity, n_local_vars); ir_node *first_block = get_cur_block(); + /* set inline flags */ + if (declaration->is_inline) + set_irg_inline_property(irg, irg_inline_recomended); + handle_decl_modifier_irg(irg, declaration->modifiers); + next_value_number_function = 0; initialize_function_parameters(declaration); @@ -2885,23 +3912,25 @@ 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 = &declaration->type->function; - const type_t *result_type = skip_typeref(func_type->result_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 (is_type_atomic(result_type, ATOMIC_TYPE_VOID)) { + if (is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { ret = new_Return(get_store(), 0, NULL); } else { ir_mode *mode; - if(is_type_scalar(result_type)) { - mode = get_ir_mode(func_type->result_type); + 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 + /* §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)); } else { @@ -2991,7 +4020,8 @@ global_var: goto create_var; create_var: - create_declaration_entity(declaration, DECLARATION_TYPE_GLOBAL_VARIABLE, + create_declaration_entity(declaration, + DECLARATION_KIND_GLOBAL_VARIABLE, var_type); set_entity_visibility(declaration->v.entity, vis); @@ -3008,10 +4038,10 @@ create_var: panic("Invalid storage class for global variable"); } -static void context_to_firm(context_t *context) +static void scope_to_firm(scope_t *scope) { /* first pass: create declarations */ - declaration_t *declaration = context->declarations; + declaration_t *declaration = scope->declarations; for( ; declaration != NULL; declaration = declaration->next) { if(declaration->namespc != NAMESPACE_NORMAL) continue; @@ -3021,8 +4051,8 @@ static void context_to_firm(context_t *context) if(declaration->symbol == NULL) continue; - type_t *type = declaration->type; - if(type->type == TYPE_FUNCTION) { + type_t *type = skip_typeref(declaration->type); + if(is_type_function(type)) { get_function_entity(declaration); } else { create_global_variable(declaration); @@ -3030,7 +4060,7 @@ static void context_to_firm(context_t *context) } /* second pass: create code */ - declaration = context->declarations; + declaration = scope->declarations; for( ; declaration != NULL; declaration = declaration->next) { if(declaration->namespc != NAMESPACE_NORMAL) continue; @@ -3041,19 +4071,47 @@ static void context_to_firm(context_t *context) continue; type_t *type = declaration->type; - if(type->type != TYPE_FUNCTION) + if(type->kind != TYPE_FUNCTION) continue; create_function(declaration); } } +void init_ast2firm(void) +{ + obstack_init(&asm_obst); + init_atomic_modes(); + + /* create idents for all known runtime functions */ + for (size_t i = 0; i < sizeof(rts_data) / sizeof(rts_data[0]); ++i) { + predef_idents[rts_data[i].id] = new_id_from_str(rts_data[i].name); + } +} + +void exit_ast2firm(void) +{ + obstack_free(&asm_obst, NULL); +} + void translation_unit_to_firm(translation_unit_t *unit) { + 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; break_label = NULL; current_switch_cond = NULL; - context_to_firm(& unit->context); + scope_to_firm(&unit->scope); }