X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=5fd9b5766d71468ac9a7334d748276885224d9c5;hb=d70f5307ecc25394fc2da35bf4167fea5ac4b9ec;hp=d6be4e78f4247cd9d8720c54fb6a29c8ebd3e313;hpb=0532f87c860311e27747ad011776dbe8da4dcc11;p=cparser diff --git a/ast2firm.c b/ast2firm.c index d6be4e7..5fd9b57 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -19,6 +19,7 @@ #include "parser.h" #include "diagnostic.h" #include "lang_features.h" +#include "types.h" #include "driver/firm_opt.h" #include "driver/firm_cmdline.h" @@ -30,8 +31,6 @@ static ir_type *ir_type_void; static ir_type *ir_type_int; static type_t *type_const_char; -static type_t *type_void; -static type_t *type_int; static int next_value_number_function; static ir_node *continue_label; @@ -63,8 +62,9 @@ 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, "variable '%#T' might be used uninitialized", - declaration->type, declaration->symbol); + warningf(declaration->source_position, + "variable '%#T' might be used uninitialized", + declaration->type, declaration->symbol); return new_r_Unknown(irg, mode); } @@ -353,10 +353,6 @@ static unsigned count_parameters(const function_type_t *function_type) } - - -static long fold_constant(const expression_t *expression); - static ir_type *create_atomic_type(const atomic_type_t *type) { dbg_info *dbgi = get_dbg_info(&type->type.source_position); @@ -426,26 +422,27 @@ 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); - ir_type *ir_type = new_d_type_array(id, 1, ir_element_type, dbgi); + ident *id = unique_ident("array"); + dbg_info *dbgi = get_dbg_info(&type->type.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); + set_type_alignment_bytes(ir_type, align); - if(type->size != NULL) { - int n_elements = fold_constant(type->size); + if(type->size_constant) { + int n_elements = type->size; set_array_bounds_int(ir_type, 0, 0, n_elements); size_t elemsize = get_type_size_bytes(ir_element_type); - int align = get_type_alignment_bytes(ir_element_type); if(elemsize % align > 0) { elemsize += align - (elemsize % align); } 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); } + set_type_state(ir_type, layout_fixed); return ir_type; } @@ -539,35 +536,65 @@ static ir_type *create_bitfield_type(bitfield_type_t *const type) #define INVALID_TYPE ((ir_type_ptr)-1) -static ir_type *create_struct_type(compound_type_t *type) +static ir_type *create_union_type(compound_type_t *type, ir_type *irtype, + size_t *outer_offset, size_t *outer_align); + +static ir_type *create_struct_type(compound_type_t *type, ir_type *irtype, + size_t *outer_offset, size_t *outer_align) { declaration_t *declaration = type->declaration; if(declaration->v.irtype != NULL) { return declaration->v.irtype; } - symbol_t *symbol = declaration->symbol; - ident *id; - if(symbol != NULL) { - id = unique_ident(symbol->string); - } else { - id = unique_ident("__anonymous_struct"); - } - dbg_info *dbgi = get_dbg_info(&type->type.source_position); - ir_type *irtype = new_d_type_struct(id, dbgi); - - declaration->v.irtype = irtype; - type->type.firm_type = irtype; - size_t align_all = 1; size_t offset = 0; size_t bit_offset = 0; + if(irtype == NULL) { + symbol_t *symbol = declaration->symbol; + ident *id; + if(symbol != NULL) { + id = unique_ident(symbol->string); + } else { + id = unique_ident("__anonymous_struct"); + } + dbg_info *dbgi = get_dbg_info(&type->type.source_position); + + irtype = new_d_type_struct(id, dbgi); + + declaration->v.irtype = irtype; + type->type.firm_type = irtype; + } else { + offset = *outer_offset; + align_all = *outer_align; + } + declaration_t *entry = declaration->scope.declarations; for( ; entry != NULL; entry = entry->next) { if(entry->namespc != NAMESPACE_NORMAL) continue; - type_t *entry_type = skip_typeref(entry->type); + symbol_t *symbol = entry->symbol; + type_t *entry_type = skip_typeref(entry->type); + dbg_info *dbgi = get_dbg_info(&entry->source_position); + ident *ident; + if(symbol != NULL) { + ident = new_id_from_str(symbol->string); + } else { + if(entry_type->kind == TYPE_COMPOUND_STRUCT) { + create_struct_type(&entry_type->compound, irtype, &offset, + &align_all); + continue; + } else if(entry_type->kind == TYPE_COMPOUND_UNION) { + create_union_type(&entry_type->compound, irtype, &offset, + &align_all); + continue; + } else { + assert(entry_type->kind == TYPE_BITFIELD); + } + ident = unique_ident("anon"); + } + ir_type *base_irtype; if(entry_type->kind == TYPE_BITFIELD) { base_irtype = get_ir_type(entry_type->bitfield.base); @@ -578,16 +605,8 @@ static ir_type *create_struct_type(compound_type_t *type) size_t entry_alignment = get_type_alignment_bytes(base_irtype); size_t misalign = offset % entry_alignment; - 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); - } + ir_type *entry_irtype = get_ir_type(entry_type); + ir_entity *entity = new_d_entity(irtype, ident, entry_irtype, dbgi); size_t base; size_t bits_remainder; @@ -628,64 +647,104 @@ static ir_type *create_struct_type(compound_type_t *type) 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; - assert(entry->v.entity == NULL); - entry->v.entity = entity; - } + 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; + assert(entry->v.entity == NULL); + entry->v.entity = entity; } 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); + + if(outer_offset != NULL) { + *outer_offset = offset; + *outer_align = align_all; + } else { + set_type_alignment_bytes(irtype, align_all); + set_type_size_bytes(irtype, offset); + set_type_state(irtype, layout_fixed); + } return irtype; } -static ir_type *create_union_type(compound_type_t *type) +static ir_type *create_union_type(compound_type_t *type, ir_type *irtype, + size_t *outer_offset, size_t *outer_align) { declaration_t *declaration = type->declaration; if(declaration->v.irtype != NULL) { return declaration->v.irtype; } - symbol_t *symbol = declaration->symbol; - ident *id; - if(symbol != NULL) { - id = unique_ident(symbol->string); + size_t align_all = 1; + size_t offset = 0; + size_t size = 0; + + if(irtype == NULL) { + symbol_t *symbol = declaration->symbol; + ident *id; + if(symbol != NULL) { + id = unique_ident(symbol->string); + } else { + id = unique_ident("__anonymous_union"); + } + dbg_info *dbgi = get_dbg_info(&type->type.source_position); + + irtype = new_d_type_union(id, dbgi); + + declaration->v.irtype = irtype; + type->type.firm_type = irtype; } else { - id = unique_ident("__anonymous_union"); + offset = *outer_offset; + align_all = *outer_align; } - dbg_info *dbgi = get_dbg_info(&type->type.source_position); - ir_type *irtype = new_d_type_union(id, dbgi); type->type.firm_type = irtype; - int align_all = 1; - int size = 0; 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 *entry_ir_type = get_ir_type(entry->type); + symbol_t *symbol = entry->symbol; + type_t *entry_type = skip_typeref(entry->type); + ir_type *entry_ir_type = get_ir_type(entry_type); + + ident *ident; + if(symbol != NULL) { + ident = new_id_from_str(entry->symbol->string); + } else { + size_t offs = offset; + if(entry_type->kind == TYPE_COMPOUND_STRUCT) { + create_struct_type(&entry_type->compound, irtype, &offs, + &align_all); + continue; + } else if(entry_type->kind == TYPE_COMPOUND_UNION) { + create_union_type(&entry_type->compound, irtype, &offs, + &align_all); + continue; + } else { + panic("anonymous union member must be struct or union"); + } + size_t entry_size = offs - offset; + if(entry_size > size) { + size = entry_size; + } + ident = unique_ident("anon"); + } - int entry_size = get_type_size_bytes(entry_ir_type); - int entry_alignment = get_type_alignment_bytes(entry_ir_type); + size_t entry_size = get_type_size_bytes(entry_ir_type); + size_t entry_alignment = get_type_alignment_bytes(entry_ir_type); 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); + //add_union_member(irtype, entity); set_entity_offset(entity, 0); entry->declaration_kind = DECLARATION_KIND_COMPOUND_MEMBER; assert(entry->v.entity == NULL); @@ -702,11 +761,26 @@ static ir_type *create_union_type(compound_type_t *type) } } - set_type_alignment_bytes(irtype, align_all); - set_type_size_bytes(irtype, size); - set_type_state(irtype, layout_fixed); + if(outer_offset != NULL) { + assert(*outer_offset == offset); - declaration->v.irtype = irtype; + size_t misalign = offset % align_all; + if (misalign != 0) + size += align_all - misalign; + *outer_offset += size; + + if(align_all > *outer_align) { + if(align_all % *outer_align != 0) { + panic("uneven alignments not supported yet"); + } + *outer_align = align_all; + } + } else { + set_type_alignment_bytes(irtype, align_all); + set_type_size_bytes(irtype, size); + set_type_state(irtype, layout_fixed); + declaration->v.irtype = irtype; + } return irtype; } @@ -718,7 +792,7 @@ static ir_type *create_enum_type(enum_type_t *const type) { type->type.firm_type = ir_type_int; - ir_mode *const mode = get_ir_mode((type_t*) type); + ir_mode *const mode = mode_int; tarval *const one = get_mode_one(mode); tarval * tv_next = get_tarval_null(mode); @@ -772,10 +846,10 @@ static ir_type *get_ir_type(type_t *type) firm_type = create_array_type(&type->array); break; case TYPE_COMPOUND_STRUCT: - firm_type = create_struct_type(&type->compound); + firm_type = create_struct_type(&type->compound, NULL, NULL, NULL); break; case TYPE_COMPOUND_UNION: - firm_type = create_union_type(&type->compound); + firm_type = create_union_type(&type->compound, NULL, NULL, NULL); break; case TYPE_ENUM: firm_type = create_enum_type(&type->enumt); @@ -1004,10 +1078,10 @@ static ir_node *string_to_firm(const source_position_t *const src_pos, const char *const id_prefix, const string_t *const value) { - 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_char, dbgi); + 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_char, dbgi); ident *const id = unique_ident(id_prefix); ir_entity *const entity = new_d_entity(global_type, id, type, dbgi); @@ -2183,6 +2257,82 @@ static ir_node *array_access_to_firm( return deref_address(irtype, addr, dbgi); } +static long get_offsetof_offset(const offsetof_expression_t *expression) +{ + type_t *orig_type = expression->type; + long offset = 0; + + designator_t *designator = expression->designator; + for( ; designator != NULL; designator = designator->next) { + type_t *type = skip_typeref(orig_type); + /* be sure the type is constructed */ + (void) get_ir_type(type); + + if(designator->symbol != NULL) { + assert(is_type_compound(type)); + symbol_t *symbol = designator->symbol; + + declaration_t *declaration = type->compound.declaration; + declaration_t *iter = declaration->scope.declarations; + for( ; iter != NULL; iter = iter->next) { + if(iter->symbol == symbol) { + break; + } + } + assert(iter != NULL); + + assert(iter->declaration_kind == DECLARATION_KIND_COMPOUND_MEMBER); + offset += get_entity_offset(iter->v.entity); + + orig_type = iter->type; + } else { + expression_t *array_index = designator->array_index; + assert(designator->array_index != NULL); + assert(is_type_array(type)); + assert(is_type_valid(array_index->base.type)); + + long index = fold_constant(array_index); + ir_type *arr_type = get_ir_type(type); + ir_type *elem_type = get_array_element_type(arr_type); + long elem_size = get_type_size_bytes(elem_type); + + offset += index * elem_size; + + orig_type = type->array.element_type; + } + } + + return offset; +} + +static ir_node *offsetof_to_firm(const offsetof_expression_t *expression) +{ + ir_mode *mode = get_ir_mode(expression->base.type); + long offset = get_offsetof_offset(expression); + tarval *tv = new_tarval_from_long(offset, mode); + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + + return new_d_Const(dbgi, mode, tv); +} + +static ir_node *compound_literal_to_firm( + const compound_literal_expression_t *expression) +{ + /* create an entity on the stack */ + ir_type *frame_type = get_irg_frame_type(current_ir_graph); + + ident *const id = unique_ident("CompLit"); + ir_type *const irtype = get_ir_type(expression->type); + dbg_info *const dbgi = get_dbg_info(&expression->base.source_position); + 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 TODO */ + return NULL; +} + /** * Transform a sizeof expression into Firm code. */ @@ -2224,8 +2374,11 @@ static ir_node *alignof_to_firm(const typeprop_expression_t *expression) return new_SymConst(mode, sym, symconst_type_align); } -static long fold_constant(const expression_t *expression) +static void init_ir_types(void); +long fold_constant(const expression_t *expression) { + init_ir_types(); + assert(is_constant_expression(expression)); ir_graph *old_current_ir_graph = current_ir_graph; @@ -2578,13 +2731,16 @@ static ir_node *_expression_to_firm(const expression_t *expression) 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_OFFSETOF: + return offsetof_to_firm(&expression->offsetofe); + case EXPR_COMPOUND_LITERAL: + return compound_literal_to_firm(&expression->compound_literal); case EXPR_UNKNOWN: case EXPR_INVALID: @@ -2707,256 +2863,389 @@ static void create_declaration_entity(declaration_t *declaration, /* TODO: visibility? */ } -typedef struct compound_graph_path_entry_t compound_graph_path_entry_t; -enum compound_graph_entry_type_t { - COMPOUND_GRAPH_ENTRY_ARRAY, - COMPOUND_GRAPH_ENTRY_COMPOUND +typedef struct type_path_entry_t type_path_entry_t; +struct type_path_entry_t { + type_t *type; + ir_initializer_t *initializer; + size_t index; + declaration_t *compound_entry; }; -struct compound_graph_path_entry_t { - int type; - union { - ir_entity *entity; - int array_index; - } v; - compound_graph_path_entry_t *prev; +typedef struct type_path_t type_path_t; +struct type_path_t { + type_path_entry_t *path; + type_t *top_type; + bool invalid; }; -static void create_initializer_object(initializer_t *initializer, type_t *type, - ir_entity *entity, compound_graph_path_entry_t *entry, int len); - -static compound_graph_path *create_compound_path(ir_type *type, - compound_graph_path_entry_t *entry, int len) +static __attribute__((unused)) void debug_print_type_path(const type_path_t *path) { - compound_graph_path *path = new_compound_graph_path(type, len); + size_t len = ARR_LEN(path->path); + + for(size_t i = 0; i < len; ++i) { + const type_path_entry_t *entry = & path->path[i]; - int i = len - 1; - for( ; entry != NULL; entry = entry->prev, --i) { - assert(i >= 0); - if(entry->type == COMPOUND_GRAPH_ENTRY_COMPOUND) { - set_compound_graph_path_node(path, i, entry->v.entity); + type_t *type = skip_typeref(entry->type); + if(is_type_compound(type)) { + fprintf(stderr, ".%s", entry->compound_entry->symbol->string); + } else if(is_type_array(type)) { + fprintf(stderr, "[%u]", entry->index); } else { - assert(entry->type == COMPOUND_GRAPH_ENTRY_ARRAY); - set_compound_graph_path_array_index(path, i, entry->v.array_index); + fprintf(stderr, "-INVALID-"); } } - assert(i == -1); + fprintf(stderr, " ("); + print_type(path->top_type); + fprintf(stderr, ")"); +} - return path; +static type_path_entry_t *get_type_path_top(const type_path_t *path) +{ + size_t len = ARR_LEN(path->path); + assert(len > 0); + return & path->path[len-1]; } -static void create_initializer_value(initializer_value_t *initializer, - ir_entity *entity, - compound_graph_path_entry_t *entry, - int len) +static type_path_entry_t *append_to_type_path(type_path_t *path) { - ir_node *node = expression_to_firm(initializer->value); - ir_type *type = get_entity_type(entity); - compound_graph_path *path = create_compound_path(type, entry, len); - add_compound_ent_value_w_path(entity, node, path); + size_t len = ARR_LEN(path->path); + ARR_RESIZE(type_path_entry_t, path->path, len+1); + + type_path_entry_t *result = & path->path[len]; + memset(result, 0, sizeof(result[0])); + return result; } -static void create_initializer_compound(initializer_list_t *initializer, - compound_type_t *type, - ir_entity *entity, - compound_graph_path_entry_t *last_entry, - int len) +static size_t get_compound_size(const compound_type_t *type) { - declaration_t *compound_declaration = type->declaration; + declaration_t *declaration = type->declaration; + declaration_t *member = declaration->scope.declarations; + size_t size = 0; + for( ; member != NULL; member = member->next) { + ++size; + } + /* TODO: cache results? */ - declaration_t *compound_entry = compound_declaration->scope.declarations; + return size; +} - compound_graph_path_entry_t entry; - entry.type = COMPOUND_GRAPH_ENTRY_COMPOUND; - entry.prev = last_entry; - ++len; +static ir_initializer_t *get_initializer_entry(type_path_t *path) +{ + type_t *orig_top_type = path->top_type; + type_t *top_type = skip_typeref(orig_top_type); - size_t i = 0; - for( ; compound_entry != NULL; compound_entry = compound_entry->next) { - if(compound_entry->symbol == NULL) - continue; - if(compound_entry->namespc != NAMESPACE_NORMAL) - continue; + assert(is_type_compound(top_type) || is_type_array(top_type)); - if(i >= initializer->len) - break; + if(ARR_LEN(path->path) == 0) { + return NULL; + } else { + type_path_entry_t *top = get_type_path_top(path); + ir_initializer_t *initializer = top->initializer; + return get_initializer_compound_value(initializer, top->index); + } +} - entry.v.entity = compound_entry->v.entity; +static void descend_into_subtype(type_path_t *path) +{ + type_t *orig_top_type = path->top_type; + type_t *top_type = skip_typeref(orig_top_type); - initializer_t *sub_initializer = initializer->initializers[i]; + assert(is_type_compound(top_type) || is_type_array(top_type)); - assert(compound_entry != NULL); - assert(compound_entry->declaration_kind - == DECLARATION_KIND_COMPOUND_MEMBER); + ir_initializer_t *initializer = get_initializer_entry(path); - if(sub_initializer->kind == INITIALIZER_VALUE) { - create_initializer_value(&sub_initializer->value, - entity, &entry, len); - } else { - type_t *entry_type = skip_typeref(compound_entry->type); - create_initializer_object(sub_initializer, entry_type, entity, - &entry, len); - } + type_path_entry_t *top = append_to_type_path(path); + top->type = top_type; - ++i; + size_t len; + + if(is_type_compound(top_type)) { + declaration_t *declaration = top_type->compound.declaration; + declaration_t *entry = declaration->scope.declarations; + + top->compound_entry = entry; + top->index = 0; + path->top_type = entry->type; + len = get_compound_size(&top_type->compound); + } else { + assert(is_type_array(top_type)); + assert(top_type->array.size > 0); + + top->index = 0; + path->top_type = top_type->array.element_type; + len = top_type->array.size; + } + if(initializer == NULL + || get_initializer_kind(initializer) == IR_INITIALIZER_NULL) { + initializer = create_initializer_compound(len); + /* we have to set the entry at the 2nd latest path entry... */ + size_t path_len = ARR_LEN(path->path); + assert(path_len >= 1); + if(path_len > 1) { + type_path_entry_t *entry = & path->path[path_len-2]; + ir_initializer_t *tinitializer = entry->initializer; + set_initializer_compound_value(tinitializer, entry->index, + initializer); + } } + top->initializer = initializer; } -static void create_initializer_array(initializer_list_t *initializer, - array_type_t *type, ir_entity *entity, - compound_graph_path_entry_t *last_entry, - int len) +static void ascend_from_subtype(type_path_t *path) { - type_t *element_type = type->element_type; - element_type = skip_typeref(element_type); + type_path_entry_t *top = get_type_path_top(path); - compound_graph_path_entry_t entry; - entry.type = COMPOUND_GRAPH_ENTRY_ARRAY; - entry.prev = last_entry; - ++len; + path->top_type = top->type; - size_t i; - for(i = 0; i < initializer->len; ++i) { - entry.v.array_index = i; + size_t len = ARR_LEN(path->path); + ARR_RESIZE(type_path_entry_t, path->path, len-1); +} - initializer_t *sub_initializer = initializer->initializers[i]; +static void walk_designator(type_path_t *path, const designator_t *designator) +{ + /* designators start at current object type */ + ARR_RESIZE(type_path_entry_t, path->path, 1); + + for( ; designator != NULL; designator = designator->next) { + type_path_entry_t *top = get_type_path_top(path); + type_t *orig_type = top->type; + type_t *type = skip_typeref(orig_type); + + if(designator->symbol != NULL) { + assert(is_type_compound(type)); + size_t index = 0; + symbol_t *symbol = designator->symbol; + + declaration_t *declaration = type->compound.declaration; + declaration_t *iter = declaration->scope.declarations; + for( ; iter != NULL; iter = iter->next, ++index) { + if(iter->symbol == symbol) { + break; + } + } + assert(iter != NULL); - if(sub_initializer->kind == INITIALIZER_VALUE) { - create_initializer_value(&sub_initializer->value, - entity, &entry, len); + top->type = orig_type; + top->compound_entry = iter; + top->index = index; + orig_type = iter->type; } else { - create_initializer_object(sub_initializer, element_type, entity, - &entry, len); + expression_t *array_index = designator->array_index; + assert(designator->array_index != NULL); + assert(is_type_array(type)); + assert(is_type_valid(array_index->base.type)); + + long index = fold_constant(array_index); + assert(index >= 0); +#ifndef NDEBUG + if(type->array.size_constant == 1) { + long array_size = type->array.size; + assert(index < array_size); + } +#endif + + top->type = orig_type; + top->index = (size_t) index; + orig_type = type->array.element_type; + } + path->top_type = orig_type; + + if(designator->next != NULL) { + descend_into_subtype(path); } } -#if 0 - /* TODO: initialize rest... */ - if(type->size_expression != NULL) { - size_t array_len = fold_constant(type->size_expression); - for( ; i < array_len; ++i) { + path->invalid = false; +} + +static void advance_current_object(type_path_t *path) +{ + if(path->invalid) { + /* TODO: handle this... */ + panic("invalid initializer in ast2firm (excessive elements)"); + return; + } + type_path_entry_t *top = get_type_path_top(path); + + type_t *type = skip_typeref(top->type); + if(is_type_union(type)) { + top->compound_entry = NULL; + } else if(is_type_struct(type)) { + declaration_t *entry = top->compound_entry; + + top->index++; + entry = entry->next; + top->compound_entry = entry; + if(entry != NULL) { + path->top_type = entry->type; + return; + } + } else { + assert(is_type_array(type)); + + top->index++; + if(!type->array.size_constant || top->index < type->array.size) { + return; } } -#endif + + /* we're past the last member of the current sub-aggregate, try if we + * can ascend in the type hierarchy and continue with another subobject */ + size_t len = ARR_LEN(path->path); + + if(len > 1) { + ascend_from_subtype(path); + advance_current_object(path); + } else { + path->invalid = true; + } } -static void create_initializer_string(initializer_string_t *initializer, - array_type_t *type, ir_entity *entity, - compound_graph_path_entry_t *last_entry, - int len) + +static ir_initializer_t *create_ir_initializer( + const initializer_t *initializer, type_t *type); + +static ir_initializer_t *create_ir_initializer_value( + const initializer_value_t *initializer) { - type_t *element_type = type->element_type; - element_type = skip_typeref(element_type); + ir_node *value = expression_to_firm(initializer->value); + return create_initializer_const(value); +} - compound_graph_path_entry_t entry; - entry.type = COMPOUND_GRAPH_ENTRY_ARRAY; - entry.prev = last_entry; - ++len; +static ir_initializer_t *create_ir_initializer_list( + const initializer_list_t *initializer, type_t *type) +{ + type_path_t path; + memset(&path, 0, sizeof(path)); + path.top_type = type; + path.path = NEW_ARR_F(type_path_entry_t, 0); - 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; + descend_into_subtype(&path); + + for(size_t i = 0; i < initializer->len; ++i) { + const initializer_t *sub_initializer = initializer->initializers[i]; + + if(sub_initializer->kind == INITIALIZER_DESIGNATOR) { + walk_designator(&path, sub_initializer->designator.designator); + continue; + } + + if(sub_initializer->kind == INITIALIZER_VALUE) { + /* we might have to descend into types until we're at a scalar + * type */ + while(true) { + type_t *orig_top_type = path.top_type; + type_t *top_type = skip_typeref(orig_top_type); + + if(is_type_scalar(top_type)) + break; + descend_into_subtype(&path); + } + } + + ir_initializer_t *sub_irinitializer + = create_ir_initializer(sub_initializer, path.top_type); - 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); + size_t path_len = ARR_LEN(path.path); + assert(path_len >= 1); + type_path_entry_t *entry = & path.path[path_len-1]; + ir_initializer_t *tinitializer = entry->initializer; + set_initializer_compound_value(tinitializer, entry->index, + sub_irinitializer); + + advance_current_object(&path); } + + assert(ARR_LEN(path.path) >= 1); + ir_initializer_t *result = path.path[0].initializer; + DEL_ARR_F(path.path); + + return result; } -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) +static ir_initializer_t *create_ir_initializer_string( + const initializer_string_t *initializer) { - type_t *element_type = type->element_type; - element_type = skip_typeref(element_type); + size_t len = initializer->string.size; + ir_initializer_t *irinitializer = create_initializer_compound(len); - compound_graph_path_entry_t entry; - entry.type = COMPOUND_GRAPH_ENTRY_ARRAY; - entry.prev = last_entry; - ++len; + const char *string = initializer->string.begin; + ir_mode *mode = get_type_mode(ir_type_const_char); - 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; + for(size_t i = 0; i < len; ++i) { + tarval *tv = new_tarval_from_long(string[i], mode); + ir_initializer_t *char_initializer = create_initializer_tarval(tv); - 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); + set_initializer_compound_value(irinitializer, i, char_initializer); } + + return irinitializer; } -static void create_initializer_object(initializer_t *initializer, type_t *type, - ir_entity *entity, compound_graph_path_entry_t *entry, int len) +static ir_initializer_t *create_ir_initializer_wide_string( + const initializer_wide_string_t *initializer) { - if(is_type_array(type)) { - array_type_t *array_type = &type->array; + size_t len = initializer->string.size; + ir_initializer_t *irinitializer = create_initializer_compound(len); - switch (initializer->kind) { - case INITIALIZER_STRING: { - initializer_string_t *const string = &initializer->string; - create_initializer_string(string, array_type, entity, entry, len); - return; - } + const wchar_rep_t *string = initializer->string.begin; + ir_mode *mode = get_type_mode(ir_type_wchar_t); - case INITIALIZER_WIDE_STRING: { - initializer_wide_string_t *const string = &initializer->wide_string; - create_initializer_wide_string(string, array_type, entity, entry, len); - return; - } + for(size_t i = 0; i < len; ++i) { + tarval *tv = new_tarval_from_long(string[i], mode); + ir_initializer_t *char_initializer = create_initializer_tarval(tv); - case INITIALIZER_LIST: { - initializer_list_t *const list = &initializer->list; - create_initializer_array(list, array_type, entity, entry, len); - return; - } + set_initializer_compound_value(irinitializer, i, char_initializer); + } - case INITIALIZER_VALUE: - break; - } - panic("Unhandled initializer"); - } else { - assert(initializer->kind == INITIALIZER_LIST); - initializer_list_t *list = &initializer->list; + return irinitializer; +} + +static ir_initializer_t *create_ir_initializer( + const initializer_t *initializer, type_t *type) +{ + switch(initializer->kind) { + case INITIALIZER_STRING: + return create_ir_initializer_string(&initializer->string); + + case INITIALIZER_WIDE_STRING: + return create_ir_initializer_wide_string(&initializer->wide_string); + + case INITIALIZER_LIST: + return create_ir_initializer_list(&initializer->list, type); + + case INITIALIZER_VALUE: + return create_ir_initializer_value(&initializer->value); - assert(is_type_compound(type)); - compound_type_t *compound_type = &type->compound; - create_initializer_compound(list, compound_type, entity, entry, len); + case INITIALIZER_DESIGNATOR: + panic("unexpected designator initializer found"); } + panic("unknown initializer"); } -static void create_initializer_local_variable_entity(declaration_t *declaration) + +static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi, + ir_entity *entity, type_t *type) { - initializer_t *initializer = declaration->init.initializer; - dbg_info *dbgi = get_dbg_info(&declaration->source_position); - ir_entity *entity = declaration->v.entity; - ir_node *memory = get_store(); - ir_node *nomem = new_NoMem(); - ir_node *frame = get_irg_frame(current_ir_graph); - ir_node *addr = new_d_simpleSel(dbgi, nomem, frame, entity); + ir_node *memory = get_store(); + ir_node *nomem = new_NoMem(); + ir_node *frame = get_irg_frame(current_ir_graph); + ir_node *addr = new_d_simpleSel(dbgi, nomem, frame, entity); if(initializer->kind == INITIALIZER_VALUE) { initializer_value_t *initializer_value = &initializer->value; ir_node *value = expression_to_firm(initializer_value->value); - type_t *type = skip_typeref(declaration->type); + type = skip_typeref(type); assign_value(dbgi, addr, type, value); return; } /* create a "template" entity which is copied to the entity on the stack */ ident *const id = unique_ident("initializer"); - ir_type *const irtype = get_ir_type(declaration->type); + 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); set_entity_ld_ident(init_entity, id); @@ -2968,8 +3257,8 @@ static void create_initializer_local_variable_entity(declaration_t *declaration) ir_graph *const old_current_ir_graph = current_ir_graph; current_ir_graph = get_const_code_irg(); - type_t *const type = skip_typeref(declaration->type); - create_initializer_object(initializer, type, init_entity, NULL, 0); + ir_initializer_t *irinitializer = create_ir_initializer(initializer, type); + set_entity_initializer(init_entity, irinitializer); assert(current_ir_graph == get_const_code_irg()); current_ir_graph = old_current_ir_graph; @@ -2981,7 +3270,16 @@ static void create_initializer_local_variable_entity(declaration_t *declaration) set_store(copyb_mem); } -static void create_initializer(declaration_t *declaration) +static void create_initializer_local_variable_entity(declaration_t *declaration) +{ + initializer_t *initializer = declaration->init.initializer; + dbg_info *dbgi = get_dbg_info(&declaration->source_position); + ir_entity *entity = declaration->v.entity; + type_t *type = declaration->type; + create_local_initializer(initializer, dbgi, entity, type); +} + +static void create_declaration_initializer(declaration_t *declaration) { initializer_t *initializer = declaration->init.initializer; if(initializer == NULL) @@ -3013,11 +3311,12 @@ static void create_initializer(declaration_t *declaration) 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); + ir_entity *entity = declaration->v.entity; + ir_initializer_t *irinitializer + = create_ir_initializer(initializer, declaration->type); - type_t *type = skip_typeref(declaration->type); - create_initializer_object(initializer, type, entity, NULL, 0); + set_entity_variability(entity, variability_initialized); + set_entity_initializer(entity, irinitializer); } } @@ -3047,7 +3346,7 @@ static void create_local_variable(declaration_t *declaration) ++next_value_number_function; } - create_initializer(declaration); + create_declaration_initializer(declaration); } static void create_local_static_variable(declaration_t *declaration) @@ -3071,7 +3370,7 @@ static void create_local_static_variable(declaration_t *declaration) ir_graph *const old_current_ir_graph = current_ir_graph; current_ir_graph = get_const_code_irg(); - create_initializer(declaration); + create_declaration_initializer(declaration); assert(current_ir_graph == get_const_code_irg()); current_ir_graph = old_current_ir_graph; @@ -3151,6 +3450,60 @@ static ir_node *compound_statement_to_firm(compound_statement_t *compound) return result; } +static void create_global_variable(declaration_t *declaration) +{ + ir_visibility vis; + ir_type *var_type; + switch ((storage_class_tag_t)declaration->storage_class) { + case STORAGE_CLASS_STATIC: + vis = visibility_local; + goto global_var; + + case STORAGE_CLASS_EXTERN: + vis = visibility_external_allocated; + goto global_var; + + case STORAGE_CLASS_NONE: + vis = visibility_external_visible; + goto global_var; + + case STORAGE_CLASS_THREAD: + vis = visibility_external_visible; + goto tls_var; + + case STORAGE_CLASS_THREAD_EXTERN: + vis = visibility_external_allocated; + goto tls_var; + + case STORAGE_CLASS_THREAD_STATIC: + vis = visibility_local; + goto tls_var; + +tls_var: + var_type = get_tls_type(); + goto create_var; + +global_var: + var_type = get_glob_type(); + goto create_var; + +create_var: + create_declaration_entity(declaration, + DECLARATION_KIND_GLOBAL_VARIABLE, + var_type); + set_entity_visibility(declaration->v.entity, vis); + + return; + + case STORAGE_CLASS_TYPEDEF: + case STORAGE_CLASS_AUTO: + case STORAGE_CLASS_REGISTER: + case STORAGE_CLASS_ENUM_ENTRY: + break; + } + panic("Invalid storage class for global variable"); +} + static void create_local_declaration(declaration_t *declaration) { if(declaration->symbol == NULL) @@ -3165,12 +3518,18 @@ static void create_local_declaration(declaration_t *declaration) case STORAGE_CLASS_ENUM_ENTRY: panic("enum entry declaration in local block found"); case STORAGE_CLASS_EXTERN: - panic("extern declaration in local block found"); + create_global_variable(declaration); + create_declaration_initializer(declaration); + return; case STORAGE_CLASS_NONE: case STORAGE_CLASS_AUTO: case STORAGE_CLASS_REGISTER: if(is_type_function(type)) { - panic("nested functions not supported yet"); + if(declaration->init.statement != NULL) { + panic("nested functions not supported yet"); + } else { + get_function_entity(declaration); + } } else { create_local_variable(declaration); } @@ -3767,6 +4126,14 @@ static int count_decls_in_expression(const expression_t *expression) { } EXPR_UNARY_CASES return count_decls_in_expression(expression->unary.value); + case EXPR_CALL: { + int count = 0; + call_argument_t *argument = expression->call.arguments; + for( ; argument != NULL; argument = argument->next) { + count += count_decls_in_expression(argument->expression); + } + return count; + } default: break; @@ -4071,62 +4438,6 @@ static void create_function(declaration_t *declaration) irg_vrfy(irg); } -static void create_global_variable(declaration_t *declaration) -{ - ir_visibility vis; - ir_type *var_type; - switch ((storage_class_tag_t)declaration->storage_class) { - case STORAGE_CLASS_STATIC: - vis = visibility_local; - goto global_var; - - case STORAGE_CLASS_EXTERN: - vis = visibility_external_allocated; - goto global_var; - - case STORAGE_CLASS_NONE: - vis = visibility_external_visible; - goto global_var; - - case STORAGE_CLASS_THREAD: - vis = visibility_external_visible; - goto tls_var; - - case STORAGE_CLASS_THREAD_EXTERN: - vis = visibility_external_allocated; - goto tls_var; - - case STORAGE_CLASS_THREAD_STATIC: - vis = visibility_local; - goto tls_var; - -tls_var: - var_type = get_tls_type(); - goto create_var; - -global_var: - var_type = get_glob_type(); - goto create_var; - -create_var: - create_declaration_entity(declaration, - DECLARATION_KIND_GLOBAL_VARIABLE, - var_type); - set_entity_visibility(declaration->v.entity, vis); - - current_ir_graph = get_const_code_irg(); - create_initializer(declaration); - return; - - case STORAGE_CLASS_TYPEDEF: - case STORAGE_CLASS_AUTO: - case STORAGE_CLASS_REGISTER: - case STORAGE_CLASS_ENUM_ENTRY: - break; - } - panic("Invalid storage class for global variable"); -} - static void scope_to_firm(scope_t *scope) { /* first pass: create declarations */ @@ -4148,7 +4459,7 @@ static void scope_to_firm(scope_t *scope) } } - /* second pass: create code */ + /* second pass: create code/initializers */ declaration = scope->declarations; for( ; declaration != NULL; declaration = declaration->next) { if(declaration->namespc != NAMESPACE_NORMAL) @@ -4160,10 +4471,14 @@ static void scope_to_firm(scope_t *scope) continue; type_t *type = declaration->type; - if(type->kind != TYPE_FUNCTION) - continue; - - create_function(declaration); + if(type->kind == TYPE_FUNCTION) { + create_function(declaration); + } else { + assert(declaration->declaration_kind + == DECLARATION_KIND_GLOBAL_VARIABLE); + current_ir_graph = get_const_code_irg(); + create_declaration_initializer(declaration); + } } } @@ -4178,13 +4493,13 @@ void init_ast2firm(void) } } -void exit_ast2firm(void) +static void init_ir_types(void) { - obstack_free(&asm_obst, NULL); -} + static int ir_types_initialized = 0; + if(ir_types_initialized) + return; + ir_types_initialized = 1; -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); @@ -4196,11 +4511,21 @@ void translation_unit_to_firm(translation_unit_t *unit) type in firm */ type_void->base.firm_type = ir_type_void; +} + +void exit_ast2firm(void) +{ + obstack_free(&asm_obst, NULL); +} +void translation_unit_to_firm(translation_unit_t *unit) +{ /* just to be sure */ continue_label = NULL; break_label = NULL; current_switch_cond = NULL; + init_ir_types(); + scope_to_firm(&unit->scope); }