X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=7db20e2fd27ea0ac8ee33564ad9cbc22dd4a117e;hb=875418c7e5f409c4bf503f749ede8f9c1d8e7996;hp=0bd29c8ea3aa59e9b36d45e940db5ae6963d3a01;hpb=b61b5d58adece8187d98b97ac0caa93af2f7315c;p=cparser diff --git a/ast2firm.c b/ast2firm.c index 0bd29c8..7db20e2 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -43,6 +43,10 @@ #define MAGIC_DEFAULT_PN_NUMBER (long) -314159265 +/* some idents needed for name mangling */ +static ident *id_underscore; +static ident *id_imp; + static ir_type *ir_type_const_char; static ir_type *ir_type_wchar_t; static ir_type *ir_type_void; @@ -82,7 +86,7 @@ ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos) { const declaration_t *declaration = get_irg_loc_description(irg, pos); - warningf(declaration->source_position, + warningf(&declaration->source_position, "variable '%#T' might be used uninitialized", declaration->type, declaration->symbol); return new_r_Unknown(irg, mode); @@ -112,161 +116,79 @@ static dbg_info *get_dbg_info(const source_position_t *pos) return (dbg_info*) pos; } -static unsigned unique_id = 0; - -static ident *unique_ident(const char *tag) -{ - char buf[256]; - - snprintf(buf, sizeof(buf), "%s.%u", tag, unique_id); - unique_id++; - return new_id_from_str(buf); -} - -/** - * Return the signed integer mode of size bytes. - * - * @param size the size - */ -static ir_mode *get_smode(unsigned size) -{ - static ir_mode *s_modes[16 + 1] = {0, }; - ir_mode *res; - - if (size <= 0 || size > 16) - return NULL; +static ir_mode *_atomic_modes[ATOMIC_TYPE_LAST+1]; - res = s_modes[size]; - if (res == NULL) { - unsigned bits; - char name[32]; +static ir_mode *mode_int, *mode_uint; - 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 ); +static ir_node *expression_to_firm(const expression_t *expression); +static inline ir_mode *get_ir_mode(type_t *type); - s_modes[size] = res; +static ir_mode *init_atomic_ir_mode(atomic_type_kind_t kind) +{ + unsigned flags = get_atomic_type_flags(kind); + unsigned size = get_atomic_type_size(kind); + if( (flags & (ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_FLOAT)) + && !(flags & ATOMIC_TYPE_FLAG_COMPLEX)) { + char name[64]; + mode_sort sort; + unsigned bit_size = size * 8; + bool is_signed = (flags & ATOMIC_TYPE_FLAG_SIGNED) != 0; + mode_arithmetic arithmetic; + unsigned modulo_shift; + + if(flags & ATOMIC_TYPE_FLAG_INTEGER) { + assert(! (flags & ATOMIC_TYPE_FLAG_FLOAT)); + snprintf(name, sizeof(name), "i%s%d", is_signed?"":"u", bit_size); + sort = irms_int_number; + arithmetic = irma_twos_complement; + modulo_shift = bit_size < machine_size ? machine_size : bit_size; + } else { + assert(flags & ATOMIC_TYPE_FLAG_FLOAT); + snprintf(name, sizeof(name), "f%d", bit_size); + sort = irms_float_number; + arithmetic = irma_ieee754; + modulo_shift = 0; + } + return new_ir_mode(name, sort, bit_size, is_signed, arithmetic, + modulo_shift); } - 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 NULL; } /** - * Return the pointer mode of size bytes. - * - * @param size the size + * Initialises the atomic modes depending on the machine size. */ -static ir_mode *get_ptrmode(unsigned size, char *name) +static void init_atomic_modes(void) { - 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)); + for(int i = 0; i <= ATOMIC_TYPE_LAST; ++i) { + _atomic_modes[i] = init_atomic_ir_mode((atomic_type_kind_t) i); } - return res; -} + mode_int = _atomic_modes[ATOMIC_TYPE_INT]; + mode_uint = _atomic_modes[ATOMIC_TYPE_UINT]; -static ir_mode *_atomic_modes[ATOMIC_TYPE_LAST+1]; + /* there's no real void type in firm */ + _atomic_modes[ATOMIC_TYPE_VOID] = mode_int; -static ir_mode *mode_int, *mode_uint; + /* initialize pointer modes */ + char name[64]; + mode_sort sort = irms_reference; + unsigned bit_size = machine_size; + bool is_signed = 0; + mode_arithmetic arithmetic = irma_twos_complement; + unsigned modulo_shift + = bit_size < machine_size ? machine_size : bit_size; -static ir_node *expression_to_firm(const expression_t *expression); -static inline ir_mode *get_ir_mode(type_t *type); + snprintf(name, sizeof(name), "p%d", machine_size); + ir_mode *ptr_mode = new_ir_mode(name, sort, bit_size, is_signed, arithmetic, + modulo_shift); -/** - * 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); - - _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]; + set_reference_mode_signed_eq(ptr_mode, _atomic_modes[get_intptr_kind()]); + set_reference_mode_unsigned_eq(ptr_mode, _atomic_modes[get_uintptr_kind()]); /* 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; + set_modeP_data(ptr_mode); + set_modeP_code(ptr_mode); } static unsigned get_compound_type_size(compound_type_t *type) @@ -292,6 +214,10 @@ static unsigned get_type_size_const(type_t *type) panic("error type occured"); case TYPE_ATOMIC: return get_atomic_type_size(type->atomic.akind); + case TYPE_COMPLEX: + return 2 * get_atomic_type_size(type->complex.akind); + case TYPE_IMAGINARY: + return get_atomic_type_size(type->imaginary.akind); case TYPE_ENUM: return get_mode_size_bytes(mode_int); case TYPE_COMPOUND_UNION: @@ -352,22 +278,51 @@ static unsigned count_parameters(const function_type_t *function_type) return count; } - +/** + * Creates a Firm type for an atomic type + */ static ir_type *create_atomic_type(const atomic_type_t *type) { - dbg_info *dbgi = get_dbg_info(&type->type.source_position); - ir_mode *mode = get_atomic_mode(type); - ident *id = get_mode_ident(mode); - ir_type *irtype = new_d_type_primitive(id, mode, dbgi); + dbg_info *dbgi = get_dbg_info(&type->base.source_position); + atomic_type_kind_t kind = type->akind; + ir_mode *mode = _atomic_modes[kind]; + ident *id = get_mode_ident(mode); + ir_type *irtype = new_d_type_primitive(id, mode, dbgi); - /* TODO: this is x86 specific, we should fiddle this into - * lang_features.h somehow... */ - if(type->akind == ATOMIC_TYPE_LONG_DOUBLE - || type->akind == ATOMIC_TYPE_DOUBLE - || type->akind == ATOMIC_TYPE_LONGLONG - || type->akind == ATOMIC_TYPE_ULONGLONG) { - set_type_alignment_bytes(irtype, 4); - } + set_type_alignment_bytes(irtype, type->base.alignment); + + return irtype; +} + +/** + * Creates a Firm type for a complex type + */ +static ir_type *create_complex_type(const complex_type_t *type) +{ + dbg_info *dbgi = get_dbg_info(&type->base.source_position); + atomic_type_kind_t kind = type->akind; + ir_mode *mode = _atomic_modes[kind]; + ident *id = get_mode_ident(mode); + + (void) id; + (void) dbgi; + + /* FIXME: finish the array */ + return NULL; +} + +/** + * Creates a Firm type for an imaginary type + */ +static ir_type *create_imaginary_type(const imaginary_type_t *type) +{ + dbg_info *dbgi = get_dbg_info(&type->base.source_position); + atomic_type_kind_t kind = type->akind; + ir_mode *mode = _atomic_modes[kind]; + ident *id = get_mode_ident(mode); + ir_type *irtype = new_d_type_primitive(id, mode, dbgi); + + set_type_alignment_bytes(irtype, type->base.alignment); return irtype; } @@ -376,10 +331,10 @@ static ir_type *create_method_type(const function_type_t *function_type) { type_t *return_type = function_type->return_type; - ident *id = unique_ident("functiontype"); + ident *id = id_unique("functiontype.%u"); int n_parameters = count_parameters(function_type); int n_results = return_type == type_void ? 0 : 1; - dbg_info *dbgi = get_dbg_info(&function_type->type.source_position); + dbg_info *dbgi = get_dbg_info(&function_type->base.source_position); ir_type *irtype = new_d_type_method(id, n_parameters, n_results, dbgi); if(return_type != type_void) { @@ -410,10 +365,10 @@ static ir_type *create_pointer_type(pointer_type_t *type) * again (might be a struct). We therefore first create a void* pointer * and then set the real points_to type */ - dbg_info *dbgi = get_dbg_info(&type->type.source_position); - ir_type *ir_type = new_d_type_pointer(unique_ident("pointer"), + dbg_info *dbgi = get_dbg_info(&type->base.source_position); + ir_type *ir_type = new_d_type_pointer(id_unique("pointer.%u"), ir_type_void, mode_P_data, dbgi); - type->type.firm_type = ir_type; + type->base.firm_type = ir_type; ir_points_to = get_ir_type(points_to); set_pointer_points_to_type(ir_type, ir_points_to); @@ -426,8 +381,8 @@ static ir_type *create_array_type(array_type_t *type) type_t *element_type = type->element_type; ir_type *ir_element_type = get_ir_type(element_type); - ident *id = unique_ident("array"); - dbg_info *dbgi = get_dbg_info(&type->type.source_position); + ident *id = id_unique("array.%u"); + dbg_info *dbgi = get_dbg_info(&type->base.source_position); ir_type *ir_type = new_d_type_array(id, 1, ir_element_type, dbgi); const int align = get_type_alignment_bytes(ir_element_type); @@ -524,7 +479,7 @@ static ir_type *get_unsigned_int_type_for_bit_size(ir_type *base_tp, static ir_type *create_bitfield_type(bitfield_type_t *const type) { - type_t *base = skip_typeref(type->base); + type_t *base = skip_typeref(type->base_type); assert(base->kind == TYPE_ATOMIC); ir_type *irbase = get_ir_type(base); @@ -558,16 +513,16 @@ static ir_type *create_struct_type(compound_type_t *type, ir_type *irtype, symbol_t *symbol = declaration->symbol; ident *id; if(symbol != NULL) { - id = unique_ident(symbol->string); + id = new_id_from_str(symbol->string); } else { - id = unique_ident("__anonymous_struct"); + id = id_unique("__anonymous_struct.%u"); } - dbg_info *dbgi = get_dbg_info(&type->type.source_position); + dbg_info *dbgi = get_dbg_info(&type->base.source_position); irtype = new_d_type_struct(id, dbgi); declaration->v.irtype = irtype; - type->type.firm_type = irtype; + type->base.firm_type = irtype; } else { offset = *outer_offset; align_all = *outer_align; @@ -596,12 +551,12 @@ static ir_type *create_struct_type(compound_type_t *type, ir_type *irtype, } else { assert(entry_type->kind == TYPE_BITFIELD); } - ident = unique_ident("anon"); + ident = id_unique("anon.%u"); } ir_type *base_irtype; if(entry_type->kind == TYPE_BITFIELD) { - base_irtype = get_ir_type(entry_type->bitfield.base); + base_irtype = get_ir_type(entry_type->bitfield.base_type); } else { base_irtype = get_ir_type(entry_type); } @@ -693,22 +648,22 @@ static ir_type *create_union_type(compound_type_t *type, ir_type *irtype, symbol_t *symbol = declaration->symbol; ident *id; if(symbol != NULL) { - id = unique_ident(symbol->string); + id = new_id_from_str(symbol->string); } else { - id = unique_ident("__anonymous_union"); + id = id_unique("__anonymous_union.%u"); } - dbg_info *dbgi = get_dbg_info(&type->type.source_position); + dbg_info *dbgi = get_dbg_info(&type->base.source_position); irtype = new_d_type_union(id, dbgi); declaration->v.irtype = irtype; - type->type.firm_type = irtype; + type->base.firm_type = irtype; } else { offset = *outer_offset; align_all = *outer_align; } - type->type.firm_type = irtype; + type->base.firm_type = irtype; declaration_t *entry = declaration->scope.declarations; for( ; entry != NULL; entry = entry->next) { @@ -739,7 +694,7 @@ static ir_type *create_union_type(compound_type_t *type, ir_type *irtype, if(entry_size > size) { size = entry_size; } - ident = unique_ident("anon"); + ident = id_unique("anon.%u"); } size_t entry_size = get_type_size_bytes(entry_ir_type); @@ -791,7 +746,7 @@ static ir_type *create_union_type(compound_type_t *type, ir_type *irtype, static ir_type *create_enum_type(enum_type_t *const type) { - type->type.firm_type = ir_type_int; + type->base.firm_type = ir_type_int; ir_mode *const mode = mode_int; tarval *const one = get_mode_one(mode); @@ -833,10 +788,16 @@ static ir_type *get_ir_type(type_t *type) ir_type *firm_type = NULL; switch(type->kind) { case TYPE_ERROR: - panic("error type occured"); + panic("error type occurred"); case TYPE_ATOMIC: firm_type = create_atomic_type(&type->atomic); break; + case TYPE_COMPLEX: + firm_type = create_complex_type(&type->complex); + break; + case TYPE_IMAGINARY: + firm_type = create_imaginary_type(&type->imaginary); + break; case TYPE_FUNCTION: firm_type = create_method_type(&type->function); break; @@ -971,6 +932,61 @@ static const struct { { rts_strncmp, 1, "strncmp", 3, _C89 } }; +/** + * Mangles an entity linker (ld) name for win32 usage. + * + * @param ent the entity to be mangled + * @param declaration the declaration + */ +static ident *create_ld_ident_win32(ir_entity *ent, declaration_t *declaration) +{ + ident *id; + + if (is_Method_type(get_entity_type(ent))) + id = decorate_win32_c_fkt(ent, get_entity_ident(ent)); + else { + /* always add an underscore in win32 */ + id = mangle(id_underscore, get_entity_ident(ent)); + } + + decl_modifiers_t decl_modifiers = declaration->decl_modifiers; + if (decl_modifiers & DM_DLLIMPORT) { + /* add prefix for imported symbols */ + id = mangle(id_imp, id); + } + return id; +} + +/** + * Mangles an entity linker (ld) name for Linux ELF usage. + * + * @param ent the entity to be mangled + * @param declaration the declaration + */ +static ident *create_ld_ident_linux_elf(ir_entity *entity, + declaration_t *declaration) +{ + (void) declaration; + return get_entity_ident(entity); +} + +/** + * Mangles an entity linker (ld) name for Mach-O usage. + * + * @param ent the entity to be mangled + * @param declaration the declaration + */ +static ident *create_ld_ident_macho(ir_entity *ent, declaration_t *declaration) +{ + (void) declaration; + ident *id = mangle(id_underscore, get_entity_ident(ent)); + return id; +} + +typedef ident* (*create_ld_ident_func)(ir_entity *entity, + declaration_t *declaration); +create_ld_ident_func create_ld_ident = create_ld_ident_linux_elf; + static ir_entity* get_function_entity(declaration_t *declaration) { if(declaration->declaration_kind == DECLARATION_KIND_FUNCTION) @@ -986,7 +1002,7 @@ static ir_entity* get_function_entity(declaration_t *declaration) 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); + set_entity_ld_ident(entity, create_ld_ident(entity, declaration)); if(declaration->storage_class == STORAGE_CLASS_STATIC || declaration->is_inline) { set_entity_visibility(entity, visibility_local); @@ -1081,7 +1097,7 @@ static ir_node *wide_character_constant_to_firm(const const_expression_t *cnst) } static ir_node *create_symconst(dbg_info *dbgi, ir_mode *mode, - ir_entity *entity) + ir_entity *entity) { assert(entity != NULL); union symconst_symbol sym; @@ -1095,10 +1111,10 @@ static ir_node *string_to_firm(const source_position_t *const src_pos, { ir_type *const global_type = get_glob_type(); dbg_info *const dbgi = get_dbg_info(src_pos); - ir_type *const type = new_d_type_array(unique_ident("strtype"), 1, + ir_type *const type = new_d_type_array(id_unique("strtype.%u"), 1, ir_type_const_char, dbgi); - ident *const id = unique_ident(id_prefix); + ident *const id = id_unique(id_prefix); ir_entity *const entity = new_d_entity(global_type, id, type, dbgi); set_entity_ld_ident(entity, id); set_entity_variability(entity, variability_constant); @@ -1129,7 +1145,7 @@ static ir_node *string_to_firm(const source_position_t *const src_pos, static ir_node *string_literal_to_firm( const string_literal_expression_t* literal) { - return string_to_firm(&literal->base.source_position, "Lstr", + return string_to_firm(&literal->base.source_position, "Lstr.%u", &literal->value); } @@ -1139,10 +1155,10 @@ static ir_node *wide_string_literal_to_firm( ir_type *const global_type = get_glob_type(); ir_type *const elem_type = ir_type_wchar_t; dbg_info *const dbgi = get_dbg_info(&literal->base.source_position); - ir_type *const type = new_d_type_array(unique_ident("strtype"), 1, + ir_type *const type = new_d_type_array(id_unique("strtype.%u"), 1, elem_type, dbgi); - ident *const id = unique_ident("Lstr"); + ident *const id = id_unique("Lstr.%u"); ir_entity *const entity = new_d_entity(global_type, id, type, dbgi); set_entity_ld_ident(entity, id); set_entity_variability(entity, variability_constant); @@ -1169,12 +1185,13 @@ static ir_node *wide_string_literal_to_firm( return create_symconst(dbgi, mode_P_data, entity); } -static ir_node *deref_address(ir_type *const irtype, ir_node *const addr, +static ir_node *deref_address(type_t *const type, ir_node *const addr, dbg_info *const dbgi) { - if (is_compound_type(irtype) || - is_Method_type(irtype) || - is_Array_type(irtype)) { + ir_type *irtype = get_ir_type(type); + if (is_compound_type(irtype) + || is_Method_type(irtype) + || is_Array_type(irtype)) { return addr; } @@ -1183,6 +1200,11 @@ static ir_node *deref_address(ir_type *const irtype, ir_node *const addr, ir_node *const load = new_d_Load(dbgi, memory, addr, mode); ir_node *const load_mem = new_d_Proj(dbgi, load, mode_M, pn_Load_M); ir_node *const load_res = new_d_Proj(dbgi, load, mode, pn_Load_res); + + if(type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { + set_Load_volatility(load, volatility_is_volatile); + } + set_store(load_mem); return load_res; } @@ -1270,16 +1292,14 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref) } 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); + return deref_address(declaration->type, addr, dbgi); } case DECLARATION_KIND_LOCAL_VARIABLE_ENTITY: { ir_entity *entity = declaration->v.entity; 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); + return deref_address(declaration->type, sel, dbgi); } case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY: @@ -1413,7 +1433,7 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) * arguments... */ int n_res = get_method_n_ress(ir_method_type); dbg_info *dbgi = get_dbg_info(&call->base.source_position); - new_method_type = new_d_type_method(unique_ident("calltype"), + new_method_type = new_d_type_method(id_unique("calltype.%u"), n_parameters, n_res, dbgi); set_method_calling_convention(new_method_type, get_method_calling_convention(ir_method_type)); @@ -1489,6 +1509,8 @@ static void assign_value(dbg_info *dbgi, ir_node *addr, type_t *type, 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); + if(type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) + set_Store_volatility(store, volatility_is_volatile); set_store(store_mem); } else { ir_type *irtype = get_ir_type(type); @@ -1526,7 +1548,7 @@ static void bitfield_store_to_firm(const unary_expression_t *expression, assert(select->kind == EXPR_SELECT); type_t *type = select->base.type; assert(type->kind == TYPE_BITFIELD); - ir_mode *mode = get_ir_mode(type->bitfield.base); + ir_mode *mode = get_ir_mode(type->bitfield.base_type); ir_node *addr = expression_to_addr(select); assert(get_irn_mode(value) == mode); @@ -1561,6 +1583,11 @@ static void bitfield_store_to_firm(const unary_expression_t *expression, 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); + + if(type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { + set_Load_volatility(load, volatility_is_volatile); + set_Store_volatility(store, volatility_is_volatile); + } } static void set_value_for_expression(const expression_t *expression, @@ -1774,7 +1801,7 @@ static ir_node *bitfield_extract_to_firm(const unary_expression_t *expression) type_t *type = select->base.type; assert(type->kind == TYPE_BITFIELD); - ir_mode *mode = get_ir_mode(type->bitfield.base); + ir_mode *mode = get_ir_mode(type->bitfield.base_type); dbg_info *dbgi = get_dbg_info(&expression->base.source_position); ir_node *addr = expression_to_addr(select); ir_node *mem = get_store(); @@ -1849,9 +1876,8 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) case EXPR_UNARY_DEREFERENCE: { ir_node *value_node = expression_to_firm(value); type_t *value_type = skip_typeref(value->base.type); - ir_type *irtype = get_ir_type(value_type); - assert(is_Pointer_type(irtype)); - ir_type *points_to = get_pointer_points_to_type(irtype); + assert(is_type_pointer(value_type)); + type_t *points_to = value_type->pointer.points_to; return deref_address(points_to, value_node, dbgi); } case EXPR_UNARY_POSTFIX_INCREMENT: @@ -2280,9 +2306,8 @@ static ir_node *array_access_to_firm( type_t *type = revert_automatic_type_conversion( (const expression_t*) expression); type = skip_typeref(type); - ir_type *irtype = get_ir_type(type); - return deref_address(irtype, addr, dbgi); + return deref_address(type, addr, dbgi); } static long get_offsetof_offset(const offsetof_expression_t *expression) @@ -2354,7 +2379,7 @@ static ir_node *compound_literal_to_firm( /* create an entity on the stack */ ir_type *frame_type = get_irg_frame_type(current_ir_graph); - ident *const id = unique_ident("CompLit"); + ident *const id = id_unique("CompLit.%u"); ir_type *const irtype = get_ir_type(type); dbg_info *const dbgi = get_dbg_info(&expression->base.source_position); ir_entity *const entity = new_d_entity(frame_type, id, irtype, dbgi); @@ -2520,9 +2545,8 @@ static ir_node *select_to_firm(const select_expression_t *expression) type_t *type = revert_automatic_type_conversion( (const expression_t*) expression); type = skip_typeref(type); - ir_type *irtype = get_ir_type(type); - return deref_address(irtype, addr, dbgi); + return deref_address(type, addr, dbgi); } /* Values returned by __builtin_classify_type. */ @@ -2559,7 +2583,7 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex { case TYPE_ATOMIC: { const atomic_type_t *const atomic_type = &type->atomic; - switch ((atomic_type_kind_t) atomic_type->akind) { + switch (atomic_type->akind) { /* should not be reached */ case ATOMIC_TYPE_INVALID: tc = no_type_class; @@ -2590,21 +2614,12 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex case ATOMIC_TYPE_LONG_DOUBLE: tc = real_type_class; goto make_const; - - case ATOMIC_TYPE_FLOAT_COMPLEX: - case ATOMIC_TYPE_DOUBLE_COMPLEX: - case ATOMIC_TYPE_LONG_DOUBLE_COMPLEX: - tc = complex_type_class; - goto make_const; - case ATOMIC_TYPE_FLOAT_IMAGINARY: - case ATOMIC_TYPE_DOUBLE_IMAGINARY: - case ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY: - tc = complex_type_class; - goto make_const; } panic("Unexpected atomic type in classify_type_to_firm()."); } + case TYPE_COMPLEX: tc = complex_type_class; goto make_const; + case TYPE_IMAGINARY: tc = complex_type_class; goto make_const; case TYPE_BITFIELD: tc = integer_type_class; goto make_const; case TYPE_ARRAY: /* gcc handles this as pointer */ case TYPE_FUNCTION: /* gcc handles this as pointer */ @@ -2643,7 +2658,7 @@ static ir_node *function_name_to_firm( const source_position_t *const src_pos = &expr->base.source_position; const char *const name = current_function_decl->symbol->string; const string_t string = { name, strlen(name) + 1 }; - current_function_name = string_to_firm(src_pos, "__func__", &string); + current_function_name = string_to_firm(src_pos, "__func__.%u", &string); } return current_function_name; case FUNCNAME_FUNCSIG: @@ -2652,7 +2667,7 @@ static ir_node *function_name_to_firm( ir_entity *ent = get_irg_entity(current_ir_graph); const char *const name = get_entity_ld_name(ent); const string_t string = { name, strlen(name) + 1 }; - current_funcsig = string_to_firm(src_pos, "__FUNCSIG__", &string); + current_funcsig = string_to_firm(src_pos, "__FUNCSIG__.%u", &string); } return current_funcsig; } @@ -2688,13 +2703,13 @@ static ir_node *va_start_expression_to_firm( static ir_node *va_arg_expression_to_firm(const va_arg_expression_t *const expr) { - ir_type *const irtype = get_ir_type(expr->base.type); + type_t *const type = expr->base.type; ir_node *const ap = expression_to_firm(expr->ap); dbg_info *const dbgi = get_dbg_info(&expr->base.source_position); - ir_node *const res = deref_address(irtype, ap, dbgi); + ir_node *const res = deref_address(type, ap, dbgi); - ir_node *const cnst = get_type_size(expr->base.type); - ir_node *const add = new_d_Add(dbgi, ap, cnst, mode_P_data); + ir_node *const cnst = get_type_size(expr->base.type); + ir_node *const add = new_d_Add(dbgi, ap, cnst, mode_P_data); set_value_for_expression(expr->ap, add); return res; @@ -2917,19 +2932,23 @@ static void create_declaration_entity(declaration_t *declaration, ir_type *parent_type) { ident *const id = new_id_from_str(declaration->symbol->string); - ir_type *const irtype = get_ir_type(declaration->type); + type_t *const type = skip_typeref(declaration->type); + 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(parent_type, id, irtype, dbgi); - set_entity_ld_ident(entity, id); declaration->declaration_kind = (unsigned char) declaration_kind; declaration->v.entity = entity; set_entity_variability(entity, variability_uninitialized); + set_entity_ld_ident(entity, create_ld_ident(entity, declaration)); 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? */ + + if(type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { + set_entity_volatility(entity, volatility_is_volatile); + } } @@ -3253,7 +3272,7 @@ static ir_initializer_t *create_ir_initializer_string( if(i < string_len) c = string[i]; - tarval *tv = new_tarval_from_long(string[i], mode); + tarval *tv = new_tarval_from_long(c, mode); ir_initializer_t *char_initializer = create_initializer_tarval(tv); set_initializer_compound_value(irinitializer, i, char_initializer); @@ -3278,7 +3297,7 @@ static ir_initializer_t *create_ir_initializer_wide_string( if(i < string_len) { c = string[i]; } - tarval *tv = new_tarval_from_long(string[i], mode); + tarval *tv = new_tarval_from_long(c, mode); ir_initializer_t *char_initializer = create_initializer_tarval(tv); set_initializer_compound_value(irinitializer, i, char_initializer); @@ -3310,6 +3329,22 @@ static ir_initializer_t *create_ir_initializer( panic("unknown initializer"); } +#if 0 +static void create_dynamic_null_initializer(ir_type *type, dbg_info *dbgi, + ir_node *base_addr) +{ + ir_mode *mode = get_type_mode(type); + tarval *zero = get_mode_null(mode); + ir_node *cnst = new_d_Const(dbgi, mode, zero); + + /* TODO: bitfields */ + ir_node *mem = get_store(); + ir_node *store = new_d_Store(dbgi, mem, base_addr, cnst); + ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M); + set_store(proj_m); +} +#endif + static void create_dynamic_initializer_sub(ir_initializer_t *initializer, ir_type *type, dbg_info *dbgi, ir_node *base_addr) { @@ -3442,7 +3477,7 @@ static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi, current_ir_graph = old_current_ir_graph; /* create a "template" entity which is copied to the entity on the stack */ - ident *const id = unique_ident("initializer"); + ident *const id = id_unique("initializer.%u"); ir_type *const irtype = get_ir_type(type); ir_type *const global_type = get_glob_type(); ir_entity *const init_entity = new_d_entity(global_type, id, irtype, dbgi); @@ -3553,6 +3588,8 @@ static void create_local_variable(declaration_t *declaration) return; } else if(is_type_array(type) || is_type_compound(type)) { needs_entity = true; + } else if(type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { + needs_entity = true; } if(needs_entity) { @@ -3576,14 +3613,18 @@ static void create_local_static_variable(declaration_t *declaration) type_t *const type = skip_typeref(declaration->type); ir_type *const global_type = get_glob_type(); - ident *const id = unique_ident(declaration->symbol->string); + ident *const id = new_id_from_str(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); + + if(type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { + set_entity_volatility(entity, volatility_is_volatile); + } declaration->declaration_kind = DECLARATION_KIND_GLOBAL_VARIABLE; declaration->v.entity = entity; + set_entity_ld_ident(entity, create_ld_ident(entity, declaration)); set_entity_variability(entity, variability_uninitialized); set_entity_visibility(entity, visibility_local); set_entity_allocation(entity, allocation_static); @@ -4257,6 +4298,15 @@ static void asm_statement_to_firm(const asm_statement_t *statement) #endif } +static void ms_try_statement_to_firm(ms_try_statement_t *statement) { + statement_to_firm(statement->try_statement); + warningf(&statement->base.source_position, "structured exception handling ignored"); +} + +static void leave_statement_to_firm(leave_statement_t *statement) { + errorf(&statement->base.source_position, "__leave not supported yet"); +} + static void statement_to_firm(statement_t *statement) { switch(statement->kind) { @@ -4311,6 +4361,12 @@ static void statement_to_firm(statement_t *statement) case STATEMENT_ASM: asm_statement_to_firm(&statement->asms); return; + case STATEMENT_MS_TRY: + ms_try_statement_to_firm(&statement->ms_try); + return; + case STATEMENT_LEAVE: + leave_statement_to_firm(&statement->leave); + return; } panic("Statement not implemented\n"); } @@ -4517,6 +4573,7 @@ static int count_decls_in_stmts(const statement_t *stmt) } case STATEMENT_GOTO: + case STATEMENT_LEAVE: case STATEMENT_INVALID: break; @@ -4525,6 +4582,15 @@ static int count_decls_in_stmts(const statement_t *stmt) count += count_decls_in_expression(ret_stmt->value); break; } + + case STATEMENT_MS_TRY: { + const ms_try_statement_t *const try_stmt = &stmt->ms_try; + count += count_decls_in_stmts(try_stmt->try_statement); + if(try_stmt->except_expression != NULL) + count += count_decls_in_expression(try_stmt->except_expression); + count += count_decls_in_stmts(try_stmt->final_statement); + break; + } } } return count; @@ -4642,7 +4708,7 @@ static void create_function(declaration_t *declaration) /* set inline flags */ if (declaration->is_inline) set_irg_inline_property(irg, irg_inline_recomended); - handle_decl_modifier_irg(irg, declaration->modifiers); + handle_decl_modifier_irg(irg, declaration->decl_modifiers); next_value_number_function = 0; initialize_function_parameters(declaration); @@ -4771,6 +4837,27 @@ void init_ast2firm(void) obstack_init(&asm_obst); init_atomic_modes(); + id_underscore = new_id_from_chars("_", 1); + id_imp = new_id_from_chars("__imp_", 6); + + /* OS option must be set to the backend */ + const char *s = "ia32-gasmode=linux"; + switch (firm_opt.os_support) { + case OS_SUPPORT_WIN32: + create_ld_ident = create_ld_ident_win32; + s = "ia32-gasmode=mingw"; + break; + case OS_SUPPORT_LINUX: + create_ld_ident = create_ld_ident_linux_elf; + s = "ia32-gasmode=linux"; break; + break; + case OS_SUPPORT_MACHO: + create_ld_ident = create_ld_ident_macho; + s = "ia32-gasmode=macho"; break; + break; + } + firm_be_option(s); + /* 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); @@ -4791,10 +4878,7 @@ static void init_ir_types(void) 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; + ir_type_void = get_ir_type(type_void); } void exit_ast2firm(void)