X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=2fbe089e9fa8f00514b55653541aeeecd6e2aaab;hb=4c38cd011a7e7567a4cb462cd4a991d263ed0900;hp=e3240ee93e6d9aadd12ca399a51777b86b64fcaa;hpb=632637178c32981a86718a24290111d0291d2265;p=cparser diff --git a/ast2firm.c b/ast2firm.c index e3240ee..2fbe089 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -1,6 +1,6 @@ /* * This file is part of cparser. - * Copyright (C) 2007-2008 Matthias Braun + * Copyright (C) 2007-2009 Matthias Braun * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -46,6 +46,7 @@ #include "mangle.h" #include "walk_statements.h" #include "warning.h" +#include "printer.h" #include "entitymap_t.h" #include "driver/firm_opt.h" #include "driver/firm_cmdline.h" @@ -79,6 +80,7 @@ static label_t **all_labels; static entity_t **inner_functions; static ir_node *ijmp_list; static bool constant_folding; +static bool initializer_use_bitfield_basetype; extern bool have_const_functions; @@ -140,16 +142,7 @@ ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos) return new_r_Unknown(irg, mode); } -unsigned dbg_snprint(char *buf, unsigned len, const dbg_info *dbg) -{ - const source_position_t *pos = (const source_position_t*) dbg; - if (pos == NULL) - return 0; - return (unsigned) snprintf(buf, len, "%s:%u", pos->input_name, - pos->linenr); -} - -const char *dbg_retrieve(const dbg_info *dbg, unsigned *line) +static const char *dbg_retrieve(const dbg_info *dbg, unsigned *line) { const source_position_t *pos = (const source_position_t*) dbg; if (pos == NULL) @@ -164,6 +157,21 @@ static dbg_info *get_dbg_info(const source_position_t *pos) return (dbg_info*) pos; } +static void dbg_print_type_dbg_info(char *buffer, size_t buffer_size, + const type_dbg_info *dbg) +{ + assert(dbg != NULL); + print_to_buffer(buffer, buffer_size); + const type_t *type = (const type_t*) dbg; + print_type(type); + finish_print_to_buffer(); +} + +static type_dbg_info *get_type_dbg_info_(const type_t *type) +{ + return (type_dbg_info*) type; +} + static ir_mode *atomic_modes[ATOMIC_TYPE_LAST+1]; static ir_mode *mode_int, *mode_uint; @@ -293,11 +301,11 @@ static unsigned count_parameters(const function_type_t *function_type) /** * Creates a Firm type for an atomic type */ -static ir_type *create_atomic_type(atomic_type_kind_t akind) +static ir_type *create_atomic_type(atomic_type_kind_t akind, const type_t *type) { ir_mode *mode = atomic_modes[akind]; - ident *id = get_mode_ident(mode); - ir_type *irtype = new_type_primitive(id, mode); + type_dbg_info *dbgi = get_type_dbg_info_(type); + ir_type *irtype = new_d_type_primitive(mode, dbgi); il_alignment_t alignment = get_atomic_type_alignment(akind); set_type_alignment_bytes(irtype, alignment); @@ -325,15 +333,7 @@ static ir_type *create_complex_type(const complex_type_t *type) */ static ir_type *create_imaginary_type(imaginary_type_t *type) { - atomic_type_kind_t kind = type->akind; - ir_mode *mode = atomic_modes[kind]; - ident *id = get_mode_ident(mode); - ir_type *irtype = new_type_primitive(id, mode); - il_alignment_t alignment = get_type_alignment((type_t*) type); - - set_type_alignment_bytes(irtype, alignment); - - return irtype; + return create_atomic_type(type->akind, (const type_t*) type); } /** @@ -354,12 +354,13 @@ static type_t *get_parameter_type(type_t *orig_type) static ir_type *create_method_type(const function_type_t *function_type, bool for_closure) { - type_t *return_type = skip_typeref(function_type->return_type); + type_t *return_type = skip_typeref(function_type->return_type); - ident *id = id_unique("functiontype.%u"); - int n_parameters = count_parameters(function_type) + (for_closure ? 1 : 0); - int n_results = return_type == type_void ? 0 : 1; - ir_type *irtype = new_type_method(id, n_parameters, n_results); + int n_parameters = count_parameters(function_type) + + (for_closure ? 1 : 0); + int n_results = return_type == type_void ? 0 : 1; + type_dbg_info *dbgi = get_type_dbg_info_((const type_t*) function_type); + ir_type *irtype = new_d_type_method(n_parameters, n_results, dbgi); if (return_type != type_void) { ir_type *restype = get_ir_type(return_type); @@ -380,10 +381,10 @@ static ir_type *create_method_type(const function_type_t *function_type, bool fo ++n; } - if (function_type->variadic || - (function_type->unspecified_parameters && !function_type->prototyped)) { + bool is_variadic = function_type->variadic; + + if (is_variadic) set_method_variadicity(irtype, variadicity_variadic); - } unsigned cc = get_method_calling_convention(irtype); switch (function_type->calling_convention) { @@ -394,7 +395,7 @@ is_cdecl: break; case CC_STDCALL: - if (function_type->variadic || function_type->unspecified_parameters) + if (is_variadic) goto is_cdecl; /* only non-variadic function can use stdcall, else use cdecl */ @@ -402,7 +403,7 @@ is_cdecl: break; case CC_FASTCALL: - if (function_type->variadic || function_type->unspecified_parameters) + if (is_variadic) goto is_cdecl; /* only non-variadic function can use fastcall, else use cdecl */ set_method_calling_convention(irtype, SET_FASTCALL(cc)); @@ -421,31 +422,30 @@ is_cdecl: static ir_type *create_pointer_type(pointer_type_t *type) { - type_t *points_to = type->points_to; - ir_type *ir_points_to = get_ir_type_incomplete(points_to); - ir_type *ir_type = new_type_pointer(id_unique("pointer.%u"), - ir_points_to, mode_P_data); + type_dbg_info *dbgi = get_type_dbg_info_((const type_t*) type); + type_t *points_to = type->points_to; + ir_type *ir_points_to = get_ir_type_incomplete(points_to); + ir_type *ir_type = new_d_type_pointer(ir_points_to, dbgi); return ir_type; } static ir_type *create_reference_type(reference_type_t *type) { - type_t *refers_to = type->refers_to; - ir_type *ir_refers_to = get_ir_type_incomplete(refers_to); - ir_type *ir_type = new_type_pointer(id_unique("reference.%u"), - ir_refers_to, mode_P_data); + type_dbg_info *dbgi = get_type_dbg_info_((const type_t*) type); + type_t *refers_to = type->refers_to; + ir_type *ir_refers_to = get_ir_type_incomplete(refers_to); + ir_type *ir_type = new_d_type_pointer(ir_refers_to, dbgi); return ir_type; } 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 = id_unique("array.%u"); - ir_type *ir_type = new_type_array(id, 1, ir_element_type); + type_dbg_info *dbgi = get_type_dbg_info_((const type_t*) type); + type_t *element_type = type->element_type; + ir_type *ir_element_type = get_ir_type(element_type); + ir_type *ir_type = new_d_type_array(1, ir_element_type, dbgi); const int align = get_type_alignment_bytes(ir_element_type); set_type_alignment_bytes(ir_type, align); @@ -474,7 +474,8 @@ static ir_type *create_array_type(array_type_t *type) * @param size the size */ static ir_type *get_signed_int_type_for_bit_size(ir_type *base_tp, - unsigned size) + unsigned size, + const type_t *type) { static ir_mode *s_modes[64 + 1] = {NULL, }; ir_type *res; @@ -493,11 +494,8 @@ static ir_type *get_signed_int_type_for_bit_size(ir_type *base_tp, s_modes[size] = mode; } - char name[32]; - snprintf(name, sizeof(name), "I%u", size); - ident *id = new_id_from_str(name); - dbg_info *dbgi = get_dbg_info(&builtin_source_position); - res = new_d_type_primitive(id_mangle_u(get_type_ident(base_tp), id), mode, dbgi); + type_dbg_info *dbgi = get_type_dbg_info_(type); + res = new_d_type_primitive(mode, dbgi); set_primitive_base_type(res, base_tp); return res; @@ -509,7 +507,8 @@ static ir_type *get_signed_int_type_for_bit_size(ir_type *base_tp, * @param size the size */ static ir_type *get_unsigned_int_type_for_bit_size(ir_type *base_tp, - unsigned size) + unsigned size, + const type_t *type) { static ir_mode *u_modes[64 + 1] = {NULL, }; ir_type *res; @@ -528,12 +527,8 @@ static ir_type *get_unsigned_int_type_for_bit_size(ir_type *base_tp, u_modes[size] = mode; } - char name[32]; - - snprintf(name, sizeof(name), "U%u", size); - ident *id = new_id_from_str(name); - dbg_info *dbgi = get_dbg_info(&builtin_source_position); - res = new_d_type_primitive(id_mangle_u(get_type_ident(base_tp), id), mode, dbgi); + type_dbg_info *dbgi = get_type_dbg_info_(type); + res = new_d_type_primitive(mode, dbgi); set_primitive_base_type(res, base_tp); return res; @@ -549,9 +544,11 @@ static ir_type *create_bitfield_type(bitfield_type_t *const type) assert(!is_type_float(base)); if (is_type_signed(base)) { - return get_signed_int_type_for_bit_size(irbase, size); + return get_signed_int_type_for_bit_size(irbase, size, + (const type_t*) type); } else { - return get_unsigned_int_type_for_bit_size(irbase, size); + return get_unsigned_int_type_for_bit_size(irbase, size, + (const type_t*) type); } } @@ -585,13 +582,12 @@ static ir_type *create_compound_type(compound_type_t *type, id = id_unique("__anonymous_struct.%u"); } } - dbg_info *dbgi = get_dbg_info(&compound->base.source_position); ir_type *irtype; if (is_union) { - irtype = new_d_type_union(id, dbgi); + irtype = new_type_union(id); } else { - irtype = new_d_type_struct(id, dbgi); + irtype = new_type_struct(id); } compound->irtype_complete = false; @@ -679,7 +675,7 @@ static ir_type *create_enum_type(enum_type_t *const type) constant_folding = constant_folding_old; - return create_atomic_type(type->akind); + return create_atomic_type(type->akind, (const type_t*) type); } static ir_type *get_ir_type_incomplete(type_t *type) @@ -717,10 +713,10 @@ ir_type *get_ir_type(type_t *type) switch (type->kind) { case TYPE_ERROR: /* Happens while constant folding, when there was an error */ - return create_atomic_type(ATOMIC_TYPE_VOID); + return create_atomic_type(ATOMIC_TYPE_VOID, NULL); case TYPE_ATOMIC: - firm_type = create_atomic_type(type->atomic.akind); + firm_type = create_atomic_type(type->atomic.akind, type); break; case TYPE_COMPLEX: firm_type = create_complex_type(&type->complex); @@ -893,19 +889,21 @@ static void handle_decl_modifiers(ir_entity *irentity, entity_t *entity) { assert(is_declaration(entity)); decl_modifiers_t modifiers = entity->declaration.modifiers; - if (modifiers & DM_PURE) { - /* TRUE if the declaration includes the GNU - __attribute__((pure)) specifier. */ - set_entity_additional_property(irentity, mtp_property_pure); - } - if (modifiers & DM_CONST) { - set_entity_additional_property(irentity, mtp_property_const); - have_const_functions = true; + + if (is_method_entity(irentity)) { + if (modifiers & DM_PURE) { + set_entity_additional_property(irentity, mtp_property_pure); + } + if (modifiers & DM_CONST) { + set_entity_additional_property(irentity, mtp_property_const); + have_const_functions = true; + } } if (modifiers & DM_USED) { - /* TRUE if the declaration includes the GNU - __attribute__((used)) specifier. */ - set_entity_stickyness(irentity, stickyness_sticky); + add_entity_linkage(irentity, IR_LINKAGE_HIDDEN_USER); + } + if (modifiers & DM_WEAK) { + add_entity_linkage(irentity, IR_LINKAGE_WEAK); } } @@ -959,9 +957,9 @@ static ir_entity *get_function_entity(entity_t *entity, ir_type *owner_type) ir_entity *irentity = entitymap_get(&entitymap, symbol); bool const has_body = entity->function.statement != NULL; if (irentity != NULL) { - if (get_entity_visibility(irentity) == visibility_external_allocated + if (get_entity_visibility(irentity) == ir_visibility_external && has_body) { - set_entity_visibility(irentity, visibility_external_visible); + set_entity_visibility(irentity, ir_visibility_default); } goto entity_created; } @@ -1000,24 +998,19 @@ static ir_entity *get_function_entity(entity_t *entity, ir_type *owner_type) bool const is_inline = entity->function.is_inline; if (is_inline && storage_class == STORAGE_CLASS_NONE && has_body) { - set_entity_visibility(irentity, visibility_external_visible); + set_entity_visibility(irentity, ir_visibility_default); } else if (storage_class == STORAGE_CLASS_STATIC || (is_inline && has_body)) { - if (!has_body) { - /* this entity was declared, but is defined nowhere */ - set_entity_peculiarity(irentity, peculiarity_description); - } - set_entity_visibility(irentity, visibility_local); + set_entity_visibility(irentity, ir_visibility_local); } else if (has_body) { - set_entity_visibility(irentity, visibility_external_visible); + set_entity_visibility(irentity, ir_visibility_default); } else { - set_entity_visibility(irentity, visibility_external_allocated); + set_entity_visibility(irentity, ir_visibility_external); } } else { /* nested functions are always local */ - set_entity_visibility(irentity, visibility_local); + set_entity_visibility(irentity, ir_visibility_local); } - set_entity_allocation(irentity, allocation_static); /* We should check for file scope here, but as long as we compile C only this is not needed. */ @@ -1136,17 +1129,17 @@ static ir_node *wide_character_constant_to_firm(const const_expression_t *cnst) * Allocate an area of size bytes aligned at alignment * at a frame type. */ -static ir_entity *alloc_trampoline(ir_type *frame_type, int size, unsigned alignment) { +static ir_entity *alloc_trampoline(ir_type *frame_type, int size, unsigned alignment) +{ static unsigned area_cnt = 0; char buf[32]; - snprintf(buf, sizeof(buf), "trampolin%u", area_cnt++); - ident *name = new_id_from_str(buf); - - ir_type *tp = new_type_array(id_mangle_u(get_type_ident(frame_type), name), 1, ir_type_char); + ir_type *tp = new_type_array(1, ir_type_char); set_array_bounds_int(tp, 0, 0, size); set_type_alignment_bytes(tp, alignment); + snprintf(buf, sizeof(buf), "trampolin%u", area_cnt++); + ident *name = new_id_from_str(buf); ir_entity *area = new_entity(frame_type, name, tp); /* mark this entity as compiler generated */ @@ -1155,11 +1148,11 @@ static ir_entity *alloc_trampoline(ir_type *frame_type, int size, unsigned align } /** - * Return a node representing a trampoline reagion - * for a given entity. + * Return a node representing a trampoline region + * for a given function entity. * * @param dbgi debug info - * @param entity the entity + * @param entity the function entity */ static ir_node *get_trampoline_region(dbg_info *dbgi, ir_entity *entity) { @@ -1211,11 +1204,11 @@ static ir_node *create_symconst(dbg_info *dbgi, ir_mode *mode, } /** - * Creates a SymConst for a given trampoline of an entity. + * Creates a trampoline for a function represented by an entity. * * @param dbgi debug info - * @param mode the (reference) mode for the SymConst - * @param entity the entity + * @param mode the (reference) mode for the function address + * @param entity the function entity */ static ir_node *create_trampoline(dbg_info *dbgi, ir_mode *mode, ir_entity *entity) @@ -1226,7 +1219,7 @@ static ir_node *create_trampoline(dbg_info *dbgi, ir_mode *mode, in[1] = create_symconst(dbgi, mode, entity); in[2] = get_irg_frame(current_ir_graph); - ir_node *irn = new_d_Builtin(dbgi, get_store(), ir_bk_inner_trampoline, 3, in, get_unknown_type()); + ir_node *irn = new_d_Builtin(dbgi, get_store(), 3, in, ir_bk_inner_trampoline, get_unknown_type()); set_store(new_Proj(irn, mode_M, pn_Builtin_M)); return new_Proj(irn, mode, pn_Builtin_1_result); } @@ -1244,15 +1237,13 @@ 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(id_unique("strtype.%u"), 1, - ir_type_const_char, dbgi); + ir_type *const type = new_type_array(1, ir_type_const_char); 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); - set_entity_allocation(entity, allocation_static); - set_entity_visibility(entity, visibility_local); + set_entity_visibility(entity, ir_visibility_local); + add_entity_linkage(entity, IR_LINKAGE_CONSTANT); ir_type *const elem_type = ir_type_const_char; ir_mode *const mode = get_type_mode(elem_type); @@ -1265,13 +1256,13 @@ static ir_node *string_to_firm(const source_position_t *const src_pos, set_type_size_bytes(type, slen); set_type_state(type, layout_fixed); - tarval **const tvs = xmalloc(slen * sizeof(tvs[0])); + ir_initializer_t *initializer = create_initializer_compound(slen); for (size_t i = 0; i < slen; ++i) { - tvs[i] = new_tarval_from_long(string[i], mode); + tarval *tv = new_tarval_from_long(string[i], mode); + ir_initializer_t *val = create_initializer_tarval(tv); + set_initializer_compound_value(initializer, i, val); } - - set_array_entity_values(entity, tvs, slen); - free(tvs); + set_entity_initializer(entity, initializer); return create_symconst(dbgi, mode_P_data, entity); } @@ -1299,14 +1290,13 @@ 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(id_unique("strtype.%u"), 1, - elem_type, dbgi); + ir_type *const type = new_type_array(1, elem_type); 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); - set_entity_allocation(entity, allocation_static); + set_entity_visibility(entity, ir_visibility_local); + add_entity_linkage(entity, IR_LINKAGE_CONSTANT); ir_mode *const mode = get_type_mode(elem_type); @@ -1315,16 +1305,16 @@ static ir_node *wide_string_literal_to_firm( set_array_lower_bound_int(type, 0, 0); set_array_upper_bound_int(type, 0, slen); - set_type_size_bytes(type, slen); + set_type_size_bytes(type, slen * get_mode_size_bytes(mode)); set_type_state(type, layout_fixed); - tarval **const tvs = xmalloc(slen * sizeof(tvs[0])); + ir_initializer_t *initializer = create_initializer_compound(slen); for (size_t i = 0; i < slen; ++i) { - tvs[i] = new_tarval_from_long(string[i], mode); + tarval *tv = new_tarval_from_long(string[i], mode); + ir_initializer_t *val = create_initializer_tarval(tv); + set_initializer_compound_value(initializer, i, val); } - - set_array_entity_values(entity, tvs, slen); - free(tvs); + set_entity_initializer(entity, initializer); return create_symconst(dbgi, mode_P_data, entity); } @@ -1455,6 +1445,21 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref) /* make sure the type is constructed */ (void) get_ir_type(type); + /* for gcc compatibility we have to produce (dummy) addresses for some + * builtins */ + if (entity->kind == ENTITY_FUNCTION && entity->function.btk != bk_none) { + if (warning.other) { + warningf(&ref->base.source_position, + "taking address of builtin '%Y'", ref->entity->base.symbol); + } + + /* simply create a NULL pointer */ + ir_mode *mode = get_ir_mode_arithmetic(type_void_ptr); + ir_node *res = new_Const_long(mode, 0); + + return res; + } + switch ((declaration_kind_t) entity->declaration.kind) { case DECLARATION_KIND_UNKNOWN: break; @@ -1471,21 +1476,6 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref) } case DECLARATION_KIND_FUNCTION: { ir_mode *const mode = get_ir_mode_storage(type); - - if (entity->function.btk != bk_none) { - /* for gcc compatibility we have to produce (dummy) addresses for some - * builtins */ - if (warning.other) { - warningf(&ref->base.source_position, - "taking address of builtin '%Y'", ref->entity->base.symbol); - } - - /* simply create a NULL pointer */ - ir_mode *mode = get_ir_mode_arithmetic(type_void_ptr); - ir_node *res = new_Const_long(mode, 0); - - return res; - } return create_symconst(dbgi, mode, entity->function.irentity); } case DECLARATION_KIND_INNER_FUNCTION: { @@ -1603,7 +1593,7 @@ static ir_node *gen_unary_builtin(ir_builtin_kind kind, expression_t *op, type_t ir_type *tp = get_ir_type(function_type); ir_type *res = get_method_res_type(tp, 0); - ir_node *irn = new_d_Builtin(db, get_irg_no_mem(current_ir_graph), kind, 1, in, tp); + ir_node *irn = new_d_Builtin(db, get_irg_no_mem(current_ir_graph), 1, in, kind, tp); set_irn_pinned(irn, op_pin_state_floats); return new_Proj(irn, get_type_mode(res), pn_Builtin_1_result); } @@ -1624,7 +1614,7 @@ static ir_node *gen_unary_builtin_pinned(ir_builtin_kind kind, expression_t *op, ir_type *tp = get_ir_type(function_type); ir_type *res = get_method_res_type(tp, 0); ir_node *mem = get_store(); - ir_node *irn = new_d_Builtin(db, mem, kind, 1, in, tp); + ir_node *irn = new_d_Builtin(db, mem, 1, in, kind, tp); set_store(new_Proj(irn, mode_M, pn_Builtin_M)); return new_Proj(irn, get_type_mode(res), pn_Builtin_1_result); } @@ -1648,7 +1638,7 @@ static ir_node *gen_binary_builtin_mem(ir_builtin_kind kind, expression_t *op1, ir_type *tp = get_ir_type(function_type); ir_node *mem = get_store(); - ir_node *irn = new_d_Builtin(db, mem, kind, 2, in, tp); + ir_node *irn = new_d_Builtin(db, mem, 2, in, kind, tp); set_store(new_Proj(irn, mode_M, pn_Builtin_M)); return NULL; } @@ -1687,6 +1677,8 @@ static ir_node *process_builtin_call(const call_expression_t *call) } case bk_gnu_builtin_huge_val: + case bk_gnu_builtin_huge_valf: + case bk_gnu_builtin_huge_vall: case bk_gnu_builtin_inf: case bk_gnu_builtin_inff: case bk_gnu_builtin_infl: { @@ -1728,7 +1720,7 @@ static ir_node *process_builtin_call(const call_expression_t *call) in[0] = expression_to_firm(expression); in[1] = get_irg_frame(current_ir_graph); ir_type *tp = get_ir_type(function_type); - ir_node *irn = new_d_Builtin(dbgi, get_irg_no_mem(current_ir_graph), ir_bk_frame_addess, 2, in, tp); + ir_node *irn = new_d_Builtin(dbgi, get_irg_no_mem(current_ir_graph), 2, in, ir_bk_frame_address, tp); return new_Proj(irn, mode_P_data, pn_Builtin_1_result); } } @@ -1740,7 +1732,7 @@ static ir_node *process_builtin_call(const call_expression_t *call) in[0] = expression_to_firm(expression); in[1] = get_irg_frame(current_ir_graph); ir_type *tp = get_ir_type(function_type); - ir_node *irn = new_d_Builtin(dbgi, get_irg_no_mem(current_ir_graph), ir_bk_return_address, 2, in, tp); + ir_node *irn = new_d_Builtin(dbgi, get_irg_no_mem(current_ir_graph), 2, in, ir_bk_return_address, tp); return new_Proj(irn, mode_P_data, pn_Builtin_1_result); } case bk_gnu_builtin_ffs: @@ -1777,7 +1769,7 @@ static ir_node *process_builtin_call(const call_expression_t *call) in[2] = new_Const_long(mode_int, 3); } ir_type *tp = get_ir_type(function_type); - ir_node *irn = new_d_Builtin(dbgi, get_store(), ir_bk_prefetch, 3, in, tp); + ir_node *irn = new_d_Builtin(dbgi, get_store(), 3, in, ir_bk_prefetch, tp); set_store(new_Proj(irn, mode_M, pn_Builtin_M)); return NULL; } @@ -1785,13 +1777,13 @@ static ir_node *process_builtin_call(const call_expression_t *call) case bk_ms__ud2: { ir_type *tp = get_ir_type(function_type); - ir_node *irn = new_d_Builtin(dbgi, get_store(), ir_bk_trap, 0, NULL, tp); + ir_node *irn = new_d_Builtin(dbgi, get_store(), 0, NULL, ir_bk_trap, tp); set_store(new_Proj(irn, mode_M, pn_Builtin_M)); return NULL; } case bk_ms__debugbreak: { ir_type *tp = get_ir_type(function_type); - ir_node *irn = new_d_Builtin(dbgi, get_store(), ir_bk_debugbreak, 0, NULL, tp); + ir_node *irn = new_d_Builtin(dbgi, get_store(), 0, NULL, ir_bk_debugbreak, tp); set_store(new_Proj(irn, mode_M, pn_Builtin_M)); return NULL; } @@ -1801,7 +1793,7 @@ static ir_node *process_builtin_call(const call_expression_t *call) in[0] = new_Const_long(mode_int, 0); in[1] = get_irg_frame(current_ir_graph); ir_type *tp = get_ir_type(function_type); - ir_node *irn = new_d_Builtin(dbgi, get_irg_no_mem(current_ir_graph), ir_bk_return_address, 2, in, tp); + ir_node *irn = new_d_Builtin(dbgi, get_irg_no_mem(current_ir_graph), 2, in, ir_bk_return_address, tp); return new_Proj(irn, mode_P_data, pn_Builtin_1_result); } case bk_ms_rotl: @@ -1903,9 +1895,9 @@ static ir_node *call_expression_to_firm(const call_expression_t *const call) /* we need to construct a new method type matching the call * arguments... */ + type_dbg_info *tdbgi = get_type_dbg_info_((const type_t*) function_type); int n_res = get_method_n_ress(ir_method_type); - new_method_type = new_d_type_method(id_unique("calltype.%u"), - n_parameters, n_res, dbgi); + new_method_type = new_d_type_method(n_parameters, n_res, tdbgi); set_method_calling_convention(new_method_type, get_method_calling_convention(ir_method_type)); set_method_additional_properties(new_method_type, @@ -1950,7 +1942,7 @@ static ir_node *call_expression_to_firm(const call_expression_t *const call) ir_node *store = get_store(); ir_node *node = new_d_Call(dbgi, store, callee, n_parameters, in, ir_method_type); - ir_node *mem = new_d_Proj(dbgi, node, mode_M, pn_Call_M_regular); + ir_node *mem = new_d_Proj(dbgi, node, mode_M, pn_Call_M); set_store(mem); type_t *return_type = skip_typeref(function_type->return_type); @@ -2010,7 +2002,7 @@ static void assign_value(dbg_info *dbgi, ir_node *addr, type_t *type, } else { ir_type *irtype = get_ir_type(type); ir_node *copyb = new_d_CopyB(dbgi, memory, addr, value, irtype); - ir_node *copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M_regular); + ir_node *copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M); set_store(copyb_mem); } } @@ -2398,6 +2390,50 @@ static ir_node *handle_assume(dbg_info *dbi, const expression_t *expression) } } +static ir_node *create_cast(dbg_info *dbgi, ir_node *value_node, + type_t *from_type, type_t *type) +{ + type = skip_typeref(type); + if (!is_type_scalar(type)) { + /* make sure firm type is constructed */ + (void) get_ir_type(type); + return value_node; + } + + from_type = skip_typeref(from_type); + ir_mode *mode = get_ir_mode_storage(type); + /* check for conversion from / to __based types */ + if (is_type_pointer(type) && is_type_pointer(from_type)) { + const variable_t *from_var = from_type->pointer.base_variable; + const variable_t *to_var = type->pointer.base_variable; + if (from_var != to_var) { + if (from_var != NULL) { + ir_node *const addr = get_global_var_address(dbgi, from_var); + ir_node *const base = deref_address(dbgi, from_var->base.type, addr); + value_node = new_d_Add(dbgi, value_node, base, get_ir_mode_storage(from_type)); + } + if (to_var != NULL) { + ir_node *const addr = get_global_var_address(dbgi, to_var); + ir_node *const base = deref_address(dbgi, to_var->base.type, addr); + value_node = new_d_Sub(dbgi, value_node, base, mode); + } + } + } + + if (is_type_atomic(type, ATOMIC_TYPE_BOOL)) { + /* bool adjustments (we save a mode_Bu, but have to temporarily + * convert to mode_b so we only get a 0/1 value */ + value_node = create_conv(dbgi, value_node, mode_b); + } + + ir_mode *mode_arith = get_ir_mode_arithmetic(type); + ir_node *node = create_conv(dbgi, value_node, mode); + node = do_strict_conv(dbgi, node); + node = create_conv(dbgi, node, mode_arith); + + return node; +} + static ir_node *unary_expression_to_firm(const unary_expression_t *expression) { dbg_info *dbgi = get_dbg_info(&expression->base.source_position); @@ -2447,50 +2483,11 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) case EXPR_UNARY_PREFIX_INCREMENT: case EXPR_UNARY_PREFIX_DECREMENT: return create_incdec(expression); + case EXPR_UNARY_CAST_IMPLICIT: case EXPR_UNARY_CAST: { ir_node *value_node = expression_to_firm(value); - if (is_type_scalar(type)) { - ir_mode *mode = get_ir_mode_storage(type); - type_t *from_type = skip_typeref(value->base.type); - /* check for conversion from / to __based types */ - if (is_type_pointer(type) && is_type_pointer(from_type)) { - const variable_t *from_var = from_type->pointer.base_variable; - const variable_t *to_var = type->pointer.base_variable; - if (from_var != to_var) { - if (from_var != NULL) { - ir_node *const addr = get_global_var_address(dbgi, from_var); - ir_node *const base = deref_address(dbgi, from_var->base.type, addr); - value_node = new_d_Add(dbgi, value_node, base, get_ir_mode_storage(from_type)); - } - if (to_var != NULL) { - ir_node *const addr = get_global_var_address(dbgi, to_var); - ir_node *const base = deref_address(dbgi, to_var->base.type, addr); - value_node = new_d_Sub(dbgi, value_node, base, mode); - } - } - } - ir_node *node = create_conv(dbgi, value_node, mode); - node = do_strict_conv(dbgi, node); - ir_mode *mode_arith = get_ir_mode_arithmetic(type); - node = create_conv(dbgi, node, mode_arith); - return node; - } else { - /* make sure firm type is constructed */ - (void) get_ir_type(type); - return value_node; - } - } - case EXPR_UNARY_CAST_IMPLICIT: { - ir_node *value_node = expression_to_firm(value); - if (is_type_scalar(type)) { - ir_mode *mode = get_ir_mode_storage(type); - ir_node *res = create_conv(dbgi, value_node, mode); - ir_mode *mode_arith = get_ir_mode_arithmetic(type); - res = create_conv(dbgi, res, mode_arith); - return res; - } else { - return value_node; - } + type_t *from_type = value->base.type; + return create_cast(dbgi, value_node, from_type, type); } case EXPR_UNARY_ASSUME: if (firm_opt.confirm) @@ -2709,13 +2706,12 @@ static ir_node *create_assign_binop(const binary_expression_t *expression) dbg_info *const dbgi = get_dbg_info(&expression->base.source_position); const expression_t *left_expr = expression->left; type_t *type = skip_typeref(left_expr->base.type); - ir_mode *left_mode = get_ir_mode_storage(type); ir_node *right = expression_to_firm(expression->right); ir_node *left_addr = expression_to_addr(left_expr); ir_node *left = get_value_from_lvalue(left_expr, left_addr); ir_node *result = create_op(dbgi, expression, left, right); - result = create_conv(dbgi, result, left_mode); + result = create_cast(dbgi, result, expression->right->base.type, type); result = do_strict_conv(dbgi, result); result = set_value_for_expression_addr(left_expr, result, left_addr); @@ -2904,8 +2900,6 @@ static ir_node *compound_literal_to_firm( ir_entity *const entity = new_d_entity(frame_type, id, irtype, dbgi); set_entity_ld_ident(entity, id); - set_entity_variability(entity, variability_uninitialized); - /* create initialisation code */ initializer_t *initializer = expression->initializer; create_local_initializer(initializer, dbgi, entity, type); @@ -2921,13 +2915,7 @@ static ir_node *compound_literal_to_firm( */ static ir_node *sizeof_to_firm(const typeprop_expression_t *expression) { - type_t *type = expression->type; - if (type == NULL) { - type = expression->tp_expression->base.type; - assert(type != NULL); - } - - type = skip_typeref(type); + type_t *const type = skip_typeref(expression->type); /* §6.5.3.4:2 if the type is a VLA, evaluate the expression. */ if (is_type_array(type) && type->array.is_vla && expression->tp_expression != NULL) { @@ -3424,19 +3412,15 @@ static ir_node *get_label_block(label_t *label) * Pointer to a label. This is used for the * GNU address-of-label extension. */ -static ir_node *label_address_to_firm( - const label_address_expression_t *label) +static ir_node *label_address_to_firm(const label_address_expression_t *label) { - ir_node *block = get_label_block(label->label); - ir_label_t nr = get_Block_label(block); + dbg_info *dbgi = get_dbg_info(&label->base.source_position); + ir_node *block = get_label_block(label->label); + ir_entity *entity = create_Block_entity(block); - if (nr == 0) { - nr = get_irp_next_label_nr(); - set_Block_label(block, nr); - } symconst_symbol value; - value.label = nr; - return new_SymConst(mode_P_code, value, symconst_label); + value.entity_p = entity; + return new_d_SymConst(dbgi, mode_P_code, value, symconst_addr_ent); } /** @@ -3682,14 +3666,8 @@ static void create_variable_entity(entity_t *variable, variable->declaration.kind = (unsigned char) declaration_kind; variable->variable.v.entity = irentity; - set_entity_variability(irentity, variability_uninitialized); set_entity_ld_ident(irentity, create_ld_ident(variable)); - if (parent_type == get_tls_type()) - set_entity_allocation(irentity, allocation_automatic); - else if (declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE) - set_entity_allocation(irentity, allocation_static); - if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { set_entity_volatility(irentity, volatility_is_volatile); } @@ -3861,6 +3839,27 @@ static void walk_designator(type_path_t *path, const designator_t *designator) } assert(iter != NULL); + /* revert previous initialisations of other union elements */ + if (type->kind == TYPE_COMPOUND_UNION) { + ir_initializer_t *initializer = top->initializer; + if (initializer != NULL + && get_initializer_kind(initializer) == IR_INITIALIZER_COMPOUND) { + /* are we writing to a new element? */ + ir_initializer_t *oldi + = get_initializer_compound_value(initializer, index); + if (get_initializer_kind(oldi) == IR_INITIALIZER_NULL) { + /* clear initializer */ + size_t len + = get_initializer_compound_n_entries(initializer); + ir_initializer_t *nulli = get_initializer_null(); + for (size_t i = 0; i < len; ++i) { + set_initializer_compound_value(initializer, i, + nulli); + } + } + } + } + top->type = orig_type; top->compound_entry = iter; top->index = index; @@ -3904,6 +3903,7 @@ static void advance_current_object(type_path_t *path) type_t *type = skip_typeref(top->type); if (is_type_union(type)) { + /* only the first element is initialized in unions */ top->compound_entry = NULL; } else if (is_type_struct(type)) { entity_t *entry = top->compound_entry; @@ -3947,8 +3947,18 @@ static ir_initializer_t *create_ir_initializer_value( if (is_type_compound(initializer->value->base.type)) { panic("initializer creation for compounds not implemented yet"); } - ir_node *value = expression_to_firm(initializer->value); - type_t *type = initializer->value->base.type; + type_t *type = initializer->value->base.type; + expression_t *expr = initializer->value; + if (initializer_use_bitfield_basetype) { + type_t *skipped = skip_typeref(type); + if (skipped->kind == TYPE_BITFIELD) { + /* remove the bitfield cast... */ + assert(expr->kind == EXPR_UNARY_CAST_IMPLICIT); + expr = expr->unary.value; + type = skipped->bitfield.base_type; + } + } + ir_node *value = expression_to_firm(expr); ir_mode *mode = get_ir_mode_storage(type); value = create_conv(NULL, value, mode); return create_initializer_const(value); @@ -4109,58 +4119,12 @@ static ir_initializer_t *create_ir_initializer( panic("unknown initializer"); } -static void create_dynamic_null_initializer(ir_type *type, dbg_info *dbgi, - ir_node *base_addr) -{ - if (is_atomic_type(type)) { - ir_mode *mode = get_type_mode(type); - tarval *zero = get_mode_null(mode); - ir_node *cnst = new_d_Const(dbgi, zero); - - /* TODO: bitfields */ - ir_node *mem = get_store(); - ir_node *store = new_d_Store(dbgi, mem, base_addr, cnst, cons_none); - ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M); - set_store(proj_m); - } else { - assert(is_compound_type(type)); - - int n_members; - if (is_Array_type(type)) { - assert(has_array_upper_bound(type, 0)); - n_members = get_array_upper_bound_int(type, 0); - } else { - n_members = get_compound_n_members(type); - } - - for (int i = 0; i < n_members; ++i) { - ir_node *addr; - ir_type *irtype; - if (is_Array_type(type)) { - ir_entity *entity = get_array_element_entity(type); - tarval *index_tv = new_tarval_from_long(i, mode_uint); - ir_node *cnst = new_d_Const(dbgi, index_tv); - ir_node *in[1] = { cnst }; - irtype = get_array_element_type(type); - addr = new_d_Sel(dbgi, new_NoMem(), base_addr, 1, in, entity); - } else { - ir_entity *member = get_compound_member(type, i); - - irtype = get_entity_type(member); - addr = new_d_simpleSel(dbgi, new_NoMem(), base_addr, member); - } - - create_dynamic_null_initializer(irtype, dbgi, addr); - } - } -} - static void create_dynamic_initializer_sub(ir_initializer_t *initializer, ir_entity *entity, ir_type *type, dbg_info *dbgi, ir_node *base_addr) { switch(get_initializer_kind(initializer)) { case IR_INITIALIZER_NULL: { - create_dynamic_null_initializer(type, dbgi, base_addr); + /* NULL is undefined for dynamic initializers */ return; } case IR_INITIALIZER_CONST: { @@ -4276,8 +4240,13 @@ static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi, } if (!is_constant_initializer(initializer)) { + bool old_initializer_use_bitfield_basetype + = initializer_use_bitfield_basetype; + initializer_use_bitfield_basetype = true; ir_initializer_t *irinitializer = create_ir_initializer(initializer, type); + initializer_use_bitfield_basetype + = old_initializer_use_bitfield_basetype; create_dynamic_initializer(irinitializer, dbgi, entity); return; @@ -4299,16 +4268,15 @@ static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi, 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); + set_entity_visibility(init_entity, ir_visibility_local); + add_entity_linkage(init_entity, IR_LINKAGE_CONSTANT); set_entity_initializer(init_entity, irinitializer); 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 *const copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M_regular); + ir_node *const copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M); set_store(copyb_mem); } @@ -4358,10 +4326,9 @@ static void create_variable_initializer(entity_t *entity) ir_entity *irentity = entity->variable.v.entity; - if (tq & TYPE_QUALIFIER_CONST) { - set_entity_variability(irentity, variability_constant); - } else { - set_entity_variability(irentity, variability_initialized); + if (tq & TYPE_QUALIFIER_CONST + && get_entity_owner(irentity) != get_tls_type()) { + add_entity_linkage(irentity, IR_LINKAGE_CONSTANT); } set_atomic_ent_value(irentity, value); } @@ -4374,9 +4341,7 @@ static void create_variable_initializer(entity_t *entity) = create_ir_initializer(initializer, type); if (tq & TYPE_QUALIFIER_CONST) { - set_entity_variability(irentity, variability_constant); - } else { - set_entity_variability(irentity, variability_initialized); + add_entity_linkage(irentity, IR_LINKAGE_CONSTANT); } set_entity_initializer(irentity, irinitializer); } @@ -4467,8 +4432,7 @@ static void create_local_static_variable(entity_t *entity) size_t l = strlen(entity->base.symbol->string); char buf[l + sizeof(".%u")]; snprintf(buf, sizeof(buf), "%s.%%u", entity->base.symbol->string); - ident *const id = id_unique(buf); - + ident *const id = id_unique(buf); ir_entity *const irentity = new_d_entity(var_type, id, irtype, dbgi); if (type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { @@ -4479,10 +4443,7 @@ static void create_local_static_variable(entity_t *entity) entity->variable.v.entity = irentity; set_entity_ld_ident(irentity, id); - set_entity_variability(irentity, variability_uninitialized); - set_entity_visibility(irentity, visibility_local); - set_entity_allocation(irentity, entity->variable.thread_local ? - allocation_automatic : allocation_static); + set_entity_visibility(irentity, ir_visibility_local); ir_graph *const old_current_ir_graph = current_ir_graph; current_ir_graph = get_const_code_irg(); @@ -4581,22 +4542,36 @@ static ir_node *compound_statement_to_firm(compound_statement_t *compound) static void create_global_variable(entity_t *entity) { + ir_linkage linkage = 0; + ir_visibility visibility = ir_visibility_default; + ir_entity *irentity; assert(entity->kind == ENTITY_VARIABLE); - ir_visibility vis; switch ((storage_class_tag_t)entity->declaration.storage_class) { - case STORAGE_CLASS_STATIC: vis = visibility_local; break; - case STORAGE_CLASS_EXTERN: vis = visibility_external_allocated; break; - case STORAGE_CLASS_NONE: vis = visibility_external_visible; break; - - default: panic("Invalid storage class for global variable"); + case STORAGE_CLASS_EXTERN: visibility = ir_visibility_external; break; + case STORAGE_CLASS_STATIC: visibility = ir_visibility_local; break; + case STORAGE_CLASS_NONE: + visibility = ir_visibility_default; + /* uninitialized globals get merged in C */ + if (entity->variable.initializer == NULL) + linkage |= IR_LINKAGE_MERGE; + break; + case STORAGE_CLASS_TYPEDEF: + case STORAGE_CLASS_AUTO: + case STORAGE_CLASS_REGISTER: + panic("invalid storage class for global var"); } - ir_type *var_type = entity->variable.thread_local ? - get_tls_type() : get_glob_type(); - create_variable_entity(entity, - DECLARATION_KIND_GLOBAL_VARIABLE, var_type); - set_entity_visibility(entity->variable.v.entity, vis); + ir_type *var_type = get_glob_type(); + if (entity->variable.thread_local) { + var_type = get_tls_type(); + /* LINKAGE_MERGE not supported by current linkers */ + linkage &= ~IR_LINKAGE_MERGE; + } + create_variable_entity(entity, DECLARATION_KIND_GLOBAL_VARIABLE, var_type); + irentity = entity->variable.v.entity; + add_entity_linkage(irentity, linkage); + set_entity_visibility(irentity, visibility); } static void create_local_declaration(entity_t *entity) @@ -4611,7 +4586,11 @@ static void create_local_declaration(entity_t *entity) switch ((storage_class_tag_t) entity->declaration.storage_class) { case STORAGE_CLASS_STATIC: - create_local_static_variable(entity); + if (entity->kind == ENTITY_FUNCTION) { + (void)get_function_entity(entity, NULL); + } else { + create_local_static_variable(entity); + } return; case STORAGE_CLASS_EXTERN: if (entity->kind == ENTITY_FUNCTION) { @@ -4997,10 +4976,15 @@ static ir_node *get_break_label(void) static void switch_statement_to_firm(switch_statement_t *statement) { - dbg_info *dbgi = get_dbg_info(&statement->base.source_position); + ir_node *first_block = NULL; + dbg_info *dbgi = get_dbg_info(&statement->base.source_position); + ir_node *cond = NULL; - ir_node *expression = expression_to_firm(statement->expression); - ir_node *cond = new_d_Cond(dbgi, expression); + if (get_cur_block() != NULL) { + ir_node *expression = expression_to_firm(statement->expression); + cond = new_d_Cond(dbgi, expression); + first_block = get_cur_block(); + } set_cur_block(NULL); @@ -5075,8 +5059,8 @@ static void switch_statement_to_firm(switch_statement_t *statement) add_immBlock_pred(get_break_label(), jmp); } - if (!saw_default_label) { - set_cur_block(get_nodes_block(cond)); + if (!saw_default_label && first_block != NULL) { + set_cur_block(first_block); ir_node *const proj = new_d_defaultProj(dbgi, cond, statement->default_proj_nr); add_immBlock_pred(get_break_label(), proj); @@ -5104,24 +5088,26 @@ static void case_label_to_firm(const case_label_statement_t *statement) ir_node *const fallthrough = (get_cur_block() == NULL ? NULL : new_Jmp()); ir_node *proj; - ir_node *block = new_immBlock(); - - set_cur_block(get_nodes_block(current_switch_cond)); - if (statement->expression != NULL) { - long pn = statement->first_case; - long end_pn = statement->last_case; - assert(pn <= end_pn); - /* create jumps for all cases in the given range */ - do { - proj = new_d_Proj(dbgi, current_switch_cond, mode_X, pn); - add_immBlock_pred(block, proj); - } while (pn++ < end_pn); - } else { - saw_default_label = true; - proj = new_d_defaultProj(dbgi, current_switch_cond, - current_switch->default_proj_nr); + ir_node *block = new_immBlock(); - add_immBlock_pred(block, proj); + if (current_switch_cond != NULL) { + set_cur_block(get_nodes_block(current_switch_cond)); + if (statement->expression != NULL) { + long pn = statement->first_case; + long end_pn = statement->last_case; + assert(pn <= end_pn); + /* create jumps for all cases in the given range */ + do { + proj = new_d_Proj(dbgi, current_switch_cond, mode_X, pn); + add_immBlock_pred(block, proj); + } while (pn++ < end_pn); + } else { + saw_default_label = true; + proj = new_d_defaultProj(dbgi, current_switch_cond, + current_switch->default_proj_nr); + + add_immBlock_pred(block, proj); + } } if (fallthrough != NULL) { @@ -5260,7 +5246,7 @@ static void asm_statement_to_firm(const asm_statement_t *statement) char buf[64]; ir_node *value = get_value_from_lvalue(expr, addr); - snprintf(buf, sizeof(buf), "%u", pos); + snprintf(buf, sizeof(buf), "%u", (unsigned) out_size); ir_asm_constraint constraint; constraint.pos = pos; @@ -5574,7 +5560,7 @@ static void initialize_function_parameters(entity_t *entity) if (entity->function.need_closure) { /* add an extra parameter for the static link */ - entity->function.static_link = new_r_Proj(irg, start_block, args, mode_P_data, 0); + entity->function.static_link = new_r_Proj(start_block, args, mode_P_data, 0); ++first_param_nr; } @@ -5608,7 +5594,7 @@ static void initialize_function_parameters(entity_t *entity) ir_mode *param_mode = get_type_mode(param_irtype); long pn = n + first_param_nr; - ir_node *value = new_r_Proj(irg, start_block, args, param_mode, pn); + ir_node *value = new_r_Proj(start_block, args, param_mode, pn); ir_mode *mode = get_ir_mode_storage(type); value = create_conv(NULL, value, mode); @@ -5668,17 +5654,22 @@ static void add_function_pointer(ir_type *segment, ir_entity *method, const char *unique_template) { ir_type *method_type = get_entity_type(method); - ident *id = id_unique(unique_template); - ir_type *ptr_type = new_type_pointer(id, method_type, mode_P_code); + ir_type *ptr_type = new_type_pointer(method_type); + /* these entities don't really have a name but firm only allows + * "" in ld_ident. + * Note that we mustn't give these entities a name since for example + * Mach-O doesn't allow them. */ ident *ide = id_unique(unique_template); ir_entity *ptr = new_entity(segment, ide, ptr_type); ir_graph *irg = get_const_code_irg(); ir_node *val = new_rd_SymConst_addr_ent(NULL, irg, mode_P_code, method, NULL); + set_entity_ld_ident(ptr, new_id_from_chars("", 0)); set_entity_compiler_generated(ptr, 1); - set_entity_variability(ptr, variability_constant); + set_entity_visibility(ptr, ir_visibility_local); + add_entity_linkage(ptr, IR_LINKAGE_CONSTANT|IR_LINKAGE_HIDDEN_USER); set_atomic_ent_value(ptr, val); } @@ -5880,6 +5871,8 @@ static void scope_to_firm(scope_t *scope) (void)get_function_entity(entity, NULL); } else if (entity->kind == ENTITY_VARIABLE) { create_global_variable(entity); + } else if (entity->kind == ENTITY_NAMESPACE) { + scope_to_firm(&entity->namespacee.members); } } @@ -5909,6 +5902,9 @@ void init_ast2firm(void) obstack_init(&asm_obst); init_atomic_modes(); + ir_set_debug_retrieve(dbg_retrieve); + ir_set_type_debug_retrieve(dbg_print_type_dbg_info); + /* OS option must be set to the backend */ switch (firm_opt.os_support) { case OS_SUPPORT_MINGW: