X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=cb640abc526be4a290ba21eec70fa4ba4950187a;hb=0d918ca248f8137f8d66ee7d1442c5b128ac0e4b;hp=a4ee31558293142e1b40bb9cff45cae453304dea;hpb=75ae8cbb081fcb2b3af3d8ccade7b07562f773b5;p=cparser diff --git a/ast2firm.c b/ast2firm.c index a4ee315..cb640ab 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -1,7 +1,24 @@ +/* + * This file is part of cparser. + * Copyright (C) 2007-2008 Matthias Braun + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ #include -#define _GNU_SOURCE - #include #include #include @@ -13,25 +30,29 @@ #include "adt/error.h" #include "adt/array.h" +#include "symbol_t.h" #include "token_t.h" #include "type_t.h" #include "ast_t.h" #include "parser.h" #include "diagnostic.h" #include "lang_features.h" +#include "types.h" #include "driver/firm_opt.h" #include "driver/firm_cmdline.h" #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; 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; @@ -42,29 +63,35 @@ static ir_node **imature_blocks; static const declaration_t *current_function_decl; static ir_node *current_function_name; +static ir_node *current_funcsig; static struct obstack asm_obst; typedef enum declaration_kind_t { DECLARATION_KIND_UNKNOWN, DECLARATION_KIND_FUNCTION, + DECLARATION_KIND_VARIABLE_LENGTH_ARRAY, DECLARATION_KIND_GLOBAL_VARIABLE, DECLARATION_KIND_LOCAL_VARIABLE, DECLARATION_KIND_LOCAL_VARIABLE_ENTITY, DECLARATION_KIND_COMPOUND_MEMBER, DECLARATION_KIND_LABEL_BLOCK, - DECLARATION_KIND_ENUM_ENTRY + DECLARATION_KIND_ENUM_ENTRY, + DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE, + DECLARATION_KIND_COMPOUND_TYPE_COMPLETE } declaration_kind_t; static ir_type *get_ir_type(type_t *type); +static ir_type *get_ir_type_incomplete(type_t *type); static int count_decls_in_stmts(const statement_t *stmt); ir_node *uninitialized_local_var(ir_graph *irg, ir_mode *mode, int pos) { 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); } @@ -92,206 +119,79 @@ static dbg_info *get_dbg_info(const source_position_t *pos) return (dbg_info*) pos; } -static unsigned unique_id = 0; +static ir_mode *_atomic_modes[ATOMIC_TYPE_LAST+1]; -static ident *unique_ident(const char *tag) -{ - char buf[256]; +static ir_mode *mode_int, *mode_uint; - snprintf(buf, sizeof(buf), "%s.%u", tag, unique_id); - unique_id++; - return new_id_from_str(buf); -} +static ir_node *expression_to_firm(const expression_t *expression); +static inline ir_mode *get_ir_mode(type_t *type); -/** - * Return the signed integer mode of size bytes. - * - * @param size the size - */ -static ir_mode *get_smode(unsigned size) +static ir_mode *init_atomic_ir_mode(atomic_type_kind_t kind) { - static ir_mode *s_modes[16 + 1] = {0, }; - ir_mode *res; - - if (size <= 0 || size > 16) - return NULL; - - res = s_modes[size]; - if (res == NULL) { - unsigned bits; - char name[32]; - - bits = size * 8; - snprintf(name, sizeof(name), "i%u", bits); - res = new_ir_mode(name, irms_int_number, bits, 1, irma_twos_complement, - bits <= machine_size ? machine_size : bits ); - - s_modes[size] = res; + 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; -} - -static ir_mode *_atomic_modes[ATOMIC_TYPE_LAST]; - -static ir_mode *mode_int, *mode_uint; - -/** - * Initialises the atomic modes depending on the machine size. - */ -static void init_atomic_modes(void) { - unsigned int_size = machine_size < 32 ? 2 : 4; - unsigned long_size = machine_size < 64 ? 4 : 8; - unsigned llong_size = machine_size < 32 ? 4 : 8; - - /* firm has no real void... */ - _atomic_modes[ATOMIC_TYPE_VOID] = mode_T; - _atomic_modes[ATOMIC_TYPE_CHAR] = char_is_signed ? get_smode(1) : get_umode(1); - _atomic_modes[ATOMIC_TYPE_SCHAR] = get_smode(1); - _atomic_modes[ATOMIC_TYPE_UCHAR] = get_umode(1); - _atomic_modes[ATOMIC_TYPE_SHORT] = get_smode(2); - _atomic_modes[ATOMIC_TYPE_USHORT] = get_umode(2); - _atomic_modes[ATOMIC_TYPE_INT] = get_smode(int_size); - _atomic_modes[ATOMIC_TYPE_UINT] = get_umode(int_size); - _atomic_modes[ATOMIC_TYPE_LONG] = get_smode(long_size); - _atomic_modes[ATOMIC_TYPE_ULONG] = get_umode(long_size); - _atomic_modes[ATOMIC_TYPE_LONGLONG] = get_smode(llong_size); - _atomic_modes[ATOMIC_TYPE_ULONGLONG] = get_umode(llong_size); - _atomic_modes[ATOMIC_TYPE_FLOAT] = mode_F; - _atomic_modes[ATOMIC_TYPE_DOUBLE] = mode_D; - _atomic_modes[ATOMIC_TYPE_LONG_DOUBLE] = mode_E; - _atomic_modes[ATOMIC_TYPE_BOOL] = get_umode(int_size); - -#ifdef PROVIDE_COMPLEX - _atomic_modes[ATOMIC_TYPE_BOOL] = _atomic_modes[ATOMIC_TYPE_INT]; - _atomic_modes[ATOMIC_TYPE_FLOAT_IMAGINARY] = _atomic_modes[ATOMIC_TYPE_FLOAT]; - _atomic_modes[ATOMIC_TYPE_DOUBLE_IMAGINARY] = _atomic_modes[ATOMIC_TYPE_DOUBLE]; - _atomic_modes[ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY] = _atomic_modes[ATOMIC_TYPE_LONG_DOUBLE]; -#endif - - /* Hmm, pointers should be machine size */ - set_modeP_data(get_ptrmode(machine_size >> 3, NULL)); - set_modeP_code(get_ptrmode(machine_size >> 3, NULL)); - mode_int = _atomic_modes[ATOMIC_TYPE_INT]; mode_uint = _atomic_modes[ATOMIC_TYPE_UINT]; -} -static ir_mode *get_atomic_mode(const atomic_type_t* atomic_type) -{ - ir_mode *res = NULL; - if ((unsigned)atomic_type->akind < (unsigned)ATOMIC_TYPE_LAST) - res = _atomic_modes[(unsigned)atomic_type->akind]; - if (res == NULL) - panic("Encountered unknown atomic type"); - return res; -} - -static unsigned get_type_size(type_t *type); - -static unsigned get_atomic_type_size(const atomic_type_t *type) -{ - switch(type->akind) { - case ATOMIC_TYPE_CHAR: - case ATOMIC_TYPE_SCHAR: - case ATOMIC_TYPE_UCHAR: - return 1; - - case ATOMIC_TYPE_SHORT: - case ATOMIC_TYPE_USHORT: - return 2; - - case ATOMIC_TYPE_BOOL: - case ATOMIC_TYPE_INT: - case ATOMIC_TYPE_UINT: - return machine_size >> 3; - - case ATOMIC_TYPE_LONG: - case ATOMIC_TYPE_ULONG: - return machine_size > 16 ? machine_size >> 3 : 4; - - case ATOMIC_TYPE_LONGLONG: - case ATOMIC_TYPE_ULONGLONG: - return machine_size > 16 ? 8 : 4; + /* there's no real void type in firm */ + _atomic_modes[ATOMIC_TYPE_VOID] = mode_int; - case ATOMIC_TYPE_FLOAT: - return 4; + /* 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; - case ATOMIC_TYPE_DOUBLE: - return 8; + snprintf(name, sizeof(name), "p%d", machine_size); + ir_mode *ptr_mode = new_ir_mode(name, sort, bit_size, is_signed, arithmetic, + modulo_shift); - case ATOMIC_TYPE_LONG_DOUBLE: - return 12; + set_reference_mode_signed_eq(ptr_mode, _atomic_modes[get_intptr_kind()]); + set_reference_mode_unsigned_eq(ptr_mode, _atomic_modes[get_uintptr_kind()]); - case ATOMIC_TYPE_VOID: - return 1; - - case ATOMIC_TYPE_INVALID: - case ATOMIC_TYPE_LAST: - break; - } - panic("Trying to determine size of invalid atomic type"); + /* Hmm, pointers should be machine size */ + set_modeP_data(ptr_mode); + set_modeP_code(ptr_mode); } static unsigned get_compound_type_size(compound_type_t *type) @@ -302,12 +202,13 @@ static unsigned get_compound_type_size(compound_type_t *type) static unsigned get_array_type_size(array_type_t *type) { + assert(!type->is_vla); ir_type *irtype = get_ir_type((type_t*) type); return get_type_size_bytes(irtype); } -static unsigned get_type_size(type_t *type) +static unsigned get_type_size_const(type_t *type) { type = skip_typeref(type); @@ -315,7 +216,11 @@ static unsigned get_type_size(type_t *type) case TYPE_ERROR: panic("error type occured"); case TYPE_ATOMIC: - return get_atomic_type_size(&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: @@ -329,7 +234,7 @@ static unsigned get_type_size(type_t *type) case TYPE_ARRAY: return get_array_type_size(&type->array); case TYPE_BUILTIN: - return get_type_size(type->builtin.real_type); + return get_type_size_const(type->builtin.real_type); case TYPE_BITFIELD: panic("type size of bitfield request"); case TYPE_TYPEDEF: @@ -340,6 +245,30 @@ static unsigned get_type_size(type_t *type) panic("Trying to determine size of invalid type"); } +static ir_node *get_type_size(type_t *type) +{ + type = skip_typeref(type); + + if(is_type_array(type) && type->array.is_vla) { + ir_node *size_node = type->array.size_node; + if(size_node == NULL) { + size_node = expression_to_firm(type->array.size_expression); + assert(!is_Const(size_node)); + type->array.size_node = size_node; + } + + ir_node *elem_size = get_type_size(type->array.element_type); + ir_mode *mode = get_irn_mode(size_node); + ir_node *real_size = new_d_Mul(NULL, size_node, elem_size, mode); + return real_size; + } + + ir_mode *mode = get_ir_mode(type_size_t); + symconst_symbol sym; + sym.type_p = get_ir_type(type); + return new_SymConst(mode, sym, symconst_type_size); +} + static unsigned count_parameters(const function_type_t *function_type) { unsigned count = 0; @@ -352,22 +281,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->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; +} -static long fold_constant(const expression_t *expression); +/** + * 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); -static ir_type *create_atomic_type(const atomic_type_t *type) + (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->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); - if(type->akind == ATOMIC_TYPE_LONG_DOUBLE - || type->akind == ATOMIC_TYPE_DOUBLE) { - set_type_alignment_bytes(irtype, 4); - } + set_type_alignment_bytes(irtype, type->base.alignment); return irtype; } @@ -376,10 +334,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) { @@ -404,19 +362,11 @@ static ir_type *create_method_type(const function_type_t *function_type) static ir_type *create_pointer_type(pointer_type_t *type) { - type_t *points_to = type->points_to; - ir_type *ir_points_to; - /* Avoid endless recursion if the points_to type contains this poiner 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"), - ir_type_void, mode_P_data, dbgi); - type->type.firm_type = ir_type; - - ir_points_to = get_ir_type(points_to); - set_pointer_points_to_type(ir_type, ir_points_to); + type_t *points_to = type->points_to; + ir_type *ir_points_to = get_ir_type_incomplete(points_to); + dbg_info *dbgi = get_dbg_info(&type->base.source_position); + ir_type *ir_type = new_d_type_pointer(id_unique("pointer.%u"), + ir_points_to, mode_P_data, dbgi); return ir_type; } @@ -426,15 +376,15 @@ 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 = 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); 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); @@ -524,7 +474,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); @@ -540,68 +490,101 @@ static ir_type *create_bitfield_type(bitfield_type_t *const type) #define INVALID_TYPE ((ir_type_ptr)-1) -static ir_type *create_union_type(compound_type_t *type, ir_type *irtype, - size_t *outer_offset, size_t *outer_align); +enum { + COMPOUND_IS_STRUCT = false, + COMPOUND_IS_UNION = true +}; -static ir_type *create_struct_type(compound_type_t *type, ir_type *irtype, - size_t *outer_offset, size_t *outer_align) +/** + * Construct firm type from ast struct tyep. + * + * As anonymous inner structs get flattened to a single firm type, we might get + * irtype, outer_offset and out_align passed (they represent the position of + * the anonymous inner struct inside the resulting firm struct) + */ +static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype, + size_t *outer_offset, size_t *outer_align, + bool incomplete, bool is_union) { - declaration_t *declaration = type->declaration; - if(declaration->v.irtype != NULL) { + declaration_t *declaration = type->declaration; + declaration_kind_t kind = declaration->declaration_kind; + + if(kind == DECLARATION_KIND_COMPOUND_TYPE_COMPLETE + || (kind == DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE + && incomplete)) return declaration->v.irtype; - } size_t align_all = 1; size_t offset = 0; size_t bit_offset = 0; + size_t size = 0; + if(irtype == NULL) { 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"); + if (is_union) { + id = id_unique("__anonymous_union.%u"); + } else { + 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); + if (is_union) { + irtype = new_d_type_union(id, dbgi); + } else { + irtype = new_d_type_struct(id, dbgi); + } - declaration->v.irtype = irtype; - type->type.firm_type = irtype; + declaration->declaration_kind + = DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE; + declaration->v.irtype = irtype; + //type->base.firm_type = irtype; } else { offset = *outer_offset; align_all = *outer_align; } + if(incomplete) + return irtype; + + declaration->declaration_kind = DECLARATION_KIND_COMPOUND_TYPE_COMPLETE; + declaration_t *entry = declaration->scope.declarations; for( ; entry != NULL; entry = entry->next) { if(entry->namespc != NAMESPACE_NORMAL) continue; + size_t prev_offset = offset; + 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; + create_compound_type(&entry_type->compound, irtype, &offset, + &align_all, false, COMPOUND_IS_STRUCT); + goto finished_member; } else if(entry_type->kind == TYPE_COMPOUND_UNION) { - create_union_type(&entry_type->compound, irtype, &offset, - &align_all); - continue; + create_compound_type(&entry_type->compound, irtype, &offset, + &align_all, false, COMPOUND_IS_UNION); + goto finished_member; } 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); } @@ -658,118 +641,35 @@ static ir_type *create_struct_type(compound_type_t *type, ir_type *irtype, 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; - } - - 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, 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; - } - - size_t offset = 0; - size_t align_all = 1; - 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); - } else { - offset = *outer_offset; - align_all = *outer_align; - } - - type->type.firm_type = irtype; - - 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); - ir_type *entry_ir_type = get_ir_type(entry_type); - ident *ident; - if(entry->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) { +finished_member: + if (is_union) { + size_t entry_size = offset - prev_offset; + if (entry_size > size) { size = entry_size; } - ident = unique_ident("anon"); + offset = 0; + bit_offset = 0; } + } - 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); - set_entity_offset(entity, 0); - entry->declaration_kind = DECLARATION_KIND_COMPOUND_MEMBER; - assert(entry->v.entity == NULL); - entry->v.entity = entity; + if (!is_union) { + size = offset; + } - if(entry_size > size) { - size = entry_size; - } - if(entry_alignment > align_all) { - if(entry_alignment % align_all != 0) { - panic("Uneven alignments not supported yet"); - } - align_all = entry_alignment; - } + size_t misalign = offset % align_all; + if(misalign > 0 || bit_offset > 0) { + size += align_all - misalign; } if(outer_offset != NULL) { - assert(*outer_offset == offset); - - size_t misalign = offset % align_all; - if (misalign != 0) - size += align_all - misalign; - *outer_offset += size; + if (!is_union) { + *outer_offset = offset; + } else { + *outer_offset += size; + } - if(align_all > *outer_align) { + if (align_all > *outer_align) { if(align_all % *outer_align != 0) { panic("uneven alignments not supported yet"); } @@ -779,20 +679,16 @@ static ir_type *create_union_type(compound_type_t *type, ir_type *irtype, 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; } -static ir_node *expression_to_firm(const expression_t *expression); -static inline ir_mode *get_ir_mode(type_t *type); - static ir_type *create_enum_type(enum_type_t *const type) { - type->type.firm_type = ir_type_int; + type->base.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); @@ -818,24 +714,53 @@ static ir_type *create_enum_type(enum_type_t *const type) return ir_type_int; } +static ir_type *get_ir_type_incomplete(type_t *type) +{ + assert(type != NULL); + type = skip_typeref(type); + + if (type->base.firm_type != NULL) { + assert(type->base.firm_type != INVALID_TYPE); + return type->base.firm_type; + } + + switch (type->kind) { + case TYPE_COMPOUND_STRUCT: + return create_compound_type(&type->compound, NULL, NULL, NULL, + true, COMPOUND_IS_STRUCT); + break; + case TYPE_COMPOUND_UNION: + return create_compound_type(&type->compound, NULL, NULL, NULL, + true, COMPOUND_IS_UNION); + default: + return get_ir_type(type); + } +} + static ir_type *get_ir_type(type_t *type) { assert(type != NULL); type = skip_typeref(type); - if(type->base.firm_type != NULL) { + if (type->base.firm_type != NULL) { assert(type->base.firm_type != INVALID_TYPE); return type->base.firm_type; } ir_type *firm_type = NULL; - switch(type->kind) { + 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; @@ -846,10 +771,12 @@ 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, NULL, NULL, NULL); + firm_type = create_compound_type(&type->compound, NULL, NULL, NULL, + false, COMPOUND_IS_STRUCT); break; case TYPE_COMPOUND_UNION: - firm_type = create_union_type(&type->compound, NULL, NULL, NULL); + firm_type = create_compound_type(&type->compound, NULL, NULL, NULL, + false, COMPOUND_IS_UNION); break; case TYPE_ENUM: firm_type = create_enum_type(&type->enumt); @@ -970,6 +897,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) @@ -985,7 +967,12 @@ 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->init.statement == NULL) { + /* this entity was declared, but never defined */ + set_entity_peculiarity(entity, peculiarity_description); + } if(declaration->storage_class == STORAGE_CLASS_STATIC || declaration->is_inline) { set_entity_visibility(entity, visibility_local); @@ -1049,14 +1036,18 @@ static ir_node *const_to_firm(const const_expression_t *cnst) return new_d_Const(dbgi, mode, tv); } -static ir_node *char_const_to_firm(const const_expression_t *cnst) +static ir_node *character_constant_to_firm(const const_expression_t *cnst) { dbg_info *dbgi = get_dbg_info(&cnst->base.source_position); ir_mode *mode = get_ir_mode(cnst->base.type); long long int v = 0; - for (size_t i = 0; i < cnst->v.chars.size; ++i) { - v = (v << 8) | ((unsigned char)cnst->v.chars.begin[i]); + for (size_t i = 0; i < cnst->v.character.size; ++i) { + if (char_is_signed) { + v = (v << 8) | ((signed char)cnst->v.character.begin[i]); + } else { + v = (v << 8) | ((unsigned char)cnst->v.character.begin[i]); + } } char buf[128]; size_t len = snprintf(buf, sizeof(buf), "%lld", v); @@ -1065,8 +1056,22 @@ static ir_node *char_const_to_firm(const const_expression_t *cnst) return new_d_Const(dbgi, mode, tv); } +static ir_node *wide_character_constant_to_firm(const const_expression_t *cnst) +{ + dbg_info *dbgi = get_dbg_info(&cnst->base.source_position); + ir_mode *mode = get_ir_mode(cnst->base.type); + + long long int v = cnst->v.wide_character.begin[0]; + + char buf[128]; + size_t len = snprintf(buf, sizeof(buf), "%lld", v); + tarval *tv = new_tarval_from_str(buf, len, mode); + + return new_d_Const(dbgi, mode, tv); +} + static ir_node *create_symconst(dbg_info *dbgi, ir_mode *mode, - ir_entity *entity) + ir_entity *entity) { assert(entity != NULL); union symconst_symbol sym; @@ -1078,12 +1083,12 @@ 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(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); @@ -1114,7 +1119,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); } @@ -1124,10 +1129,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); @@ -1154,12 +1159,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; } @@ -1168,6 +1174,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; } @@ -1176,9 +1187,9 @@ static ir_node *do_strict_conv(dbg_info *dbgi, ir_node *node) { ir_mode *mode = get_irn_mode(node); - if(!(get_irg_fp_model(current_ir_graph) & fp_explicit_rounding)) + if (!(get_irg_fp_model(current_ir_graph) & fp_explicit_rounding)) return node; - if(!mode_is_float(mode)) + if (!mode_is_float(mode)) return node; /* check if there is already a Conv */ @@ -1226,6 +1237,23 @@ static ir_node *get_local_frame(ir_entity *const ent) } } +static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) +{ + ir_mode *value_mode = get_irn_mode(value); + + if (value_mode == dest_mode || is_Bad(value)) + return value; + + if(dest_mode == mode_b) { + ir_node *zero = new_Const(value_mode, get_mode_null(value_mode)); + ir_node *cmp = new_d_Cmp(dbgi, value, zero); + ir_node *proj = new_d_Proj(dbgi, cmp, mode_b, pn_Cmp_Lg); + return proj; + } + + return new_d_Conv(dbgi, value, dest_mode); +} + static ir_node *reference_expression_to_firm(const reference_expression_t *ref) { dbg_info *dbgi = get_dbg_info(&ref->base.source_position); @@ -1255,18 +1283,21 @@ 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: + return declaration->v.vla_base; + + case DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE: + case DECLARATION_KIND_COMPOUND_TYPE_COMPLETE: case DECLARATION_KIND_COMPOUND_MEMBER: case DECLARATION_KIND_LABEL_BLOCK: panic("not implemented reference type"); @@ -1302,9 +1333,14 @@ static ir_node *reference_addr(const reference_expression_t *ref) return sel; } + case DECLARATION_KIND_VARIABLE_LENGTH_ARRAY: + return declaration->v.vla_base; + case DECLARATION_KIND_ENUM_ENTRY: panic("trying to reference enum entry"); + case DECLARATION_KIND_COMPOUND_TYPE_INCOMPLETE: + case DECLARATION_KIND_COMPOUND_TYPE_COMPLETE: case DECLARATION_KIND_COMPOUND_MEMBER: case DECLARATION_KIND_LABEL_BLOCK: panic("not implemented reference type"); @@ -1343,6 +1379,12 @@ static ir_node *process_builtin_call(const call_expression_t *call) return res; } + case T___builtin_huge_val: { + ir_mode *mode = get_ir_mode(function_type->function.return_type); + tarval *tv = get_mode_infinite(mode); + ir_node *res = new_d_Const(dbgi, mode, tv); + return res; + } case T___builtin_nan: case T___builtin_nanf: case T___builtin_nand: { @@ -1377,55 +1419,58 @@ static ir_node *call_expression_to_firm(const call_expression_t *call) assert(is_type_function(points_to)); function_type_t *function_type = &points_to->function; - int n_parameters = 0; - call_argument_t *argument = call->arguments; - for( ; argument != NULL; argument = argument->next) { - ++n_parameters; - } - dbg_info *dbgi = get_dbg_info(&call->base.source_position); + int n_parameters = 0; ir_type *ir_method_type = get_ir_type((type_t*) function_type); ir_type *new_method_type = NULL; if(function_type->variadic || function_type->unspecified_parameters) { + const call_argument_t *argument = call->arguments; + for( ; argument != NULL; argument = argument->next) { + ++n_parameters; + } + /* we need to construct a new method type matching the 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"), - n_parameters, n_res, dbgi); + 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)); set_method_additional_properties(new_method_type, get_method_additional_properties(ir_method_type)); + set_method_variadicity(new_method_type, + get_method_variadicity(ir_method_type)); for(int i = 0; i < n_res; ++i) { set_method_res_type(new_method_type, i, get_method_res_type(ir_method_type, i)); } + argument = call->arguments; + for(int i = 0; i < n_parameters; ++i, argument = argument->next) { + expression_t *expression = argument->expression; + ir_type *irtype = get_ir_type(expression->base.type); + set_method_param_type(new_method_type, i, irtype); + } + ir_method_type = new_method_type; + } else { + n_parameters = get_method_n_params(ir_method_type); } + ir_node *in[n_parameters]; - argument = call->arguments; - int n = 0; - for( ; argument != NULL; argument = argument->next) { + const call_argument_t *argument = call->arguments; + for(int n = 0; n < n_parameters; ++n) { expression_t *expression = argument->expression; ir_node *arg_node = expression_to_firm(expression); arg_node = do_strict_conv(dbgi, arg_node); in[n] = arg_node; - if(new_method_type != NULL) { - ir_type *irtype = get_ir_type(expression->base.type); - set_method_param_type(new_method_type, n, irtype); - } - n++; + argument = argument->next; } - assert(n == n_parameters); - - if(new_method_type != NULL) - ir_method_type = new_method_type; ir_node *store = get_store(); ir_node *node = new_d_Call(dbgi, store, callee, n_parameters, in, @@ -1468,6 +1513,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); @@ -1505,10 +1552,10 @@ 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); + assert(get_irn_mode(value) == mode || is_Bad(value)); dbg_info *dbgi = get_dbg_info(&expression->base.source_position); @@ -1540,6 +1587,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, @@ -1569,23 +1621,6 @@ static void set_value_for_expression(const expression_t *expression, assign_value(dbgi, addr, type, value); } -static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode) -{ - ir_mode *value_mode = get_irn_mode(value); - - if (value_mode == dest_mode || is_Bad(value)) - return value; - - if(dest_mode == mode_b) { - ir_node *zero = new_Const(value_mode, get_mode_null(value_mode)); - ir_node *cmp = new_d_Cmp(dbgi, value, zero); - ir_node *proj = new_d_Proj(dbgi, cmp, mode_b, pn_Cmp_Lg); - return proj; - } - - return new_d_Conv(dbgi, value, dest_mode); -} - static ir_node *create_incdec(const unary_expression_t *expression) { dbg_info *dbgi = get_dbg_info(&expression->base.source_position); @@ -1598,8 +1633,7 @@ static ir_node *create_incdec(const unary_expression_t *expression) ir_node *offset; if(is_type_pointer(type)) { pointer_type_t *pointer_type = &type->pointer; - unsigned elem_size = get_type_size(pointer_type->points_to); - offset = new_Const_long(mode_int, elem_size); + offset = get_type_size(pointer_type->points_to); } else { assert(is_type_arithmetic(type)); offset = new_Const(mode, get_mode_one(mode)); @@ -1754,7 +1788,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(); @@ -1829,9 +1863,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: @@ -1847,6 +1880,8 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) node = do_strict_conv(dbgi, node); return node; } else { + /* make sure firm type is constructed */ + (void) get_ir_type(type); return value_node; } } @@ -1873,25 +1908,10 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression) panic("invalid UNEXPR type found"); } -static ir_node *create_lazy_op(const binary_expression_t *expression) +static ir_node *produce_condition_result(const expression_t *expression, + dbg_info *dbgi) { - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); - type_t *type = expression->base.type; - ir_mode *mode = get_ir_mode(type); - - if(is_constant_expression(expression->left)) { - long val = fold_constant(expression->left); - expression_kind_t ekind = expression->base.kind; - if((ekind == EXPR_BINARY_LOGICAL_AND && val != 0) - || (ekind == EXPR_BINARY_LOGICAL_OR && val == 0)) { - return expression_to_firm(expression->right); - } else { - assert((ekind == EXPR_BINARY_LOGICAL_AND && val == 0) - || (ekind == EXPR_BINARY_LOGICAL_OR && val != 0)); - return new_Const(mode, get_mode_one(mode)); - } - } - + ir_mode *mode = get_ir_mode(expression->base.type); ir_node *cur_block = get_cur_block(); ir_node *one_block = new_immBlock(); @@ -1903,8 +1923,7 @@ static ir_node *create_lazy_op(const binary_expression_t *expression) ir_node *jmp_zero = new_d_Jmp(dbgi); set_cur_block(cur_block); - create_condition_evaluation((const expression_t*) expression, - one_block, zero_block); + create_condition_evaluation(expression, one_block, zero_block); mature_immBlock(one_block); mature_immBlock(zero_block); @@ -1919,6 +1938,28 @@ static ir_node *create_lazy_op(const binary_expression_t *expression) return val; } +static ir_node *create_lazy_op(const binary_expression_t *expression) +{ + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + type_t *type = expression->base.type; + ir_mode *mode = get_ir_mode(type); + + if(is_constant_expression(expression->left)) { + long val = fold_constant(expression->left); + expression_kind_t ekind = expression->base.kind; + if((ekind == EXPR_BINARY_LOGICAL_AND && val != 0) + || (ekind == EXPR_BINARY_LOGICAL_OR && val == 0)) { + return expression_to_firm(expression->right); + } else { + assert((ekind == EXPR_BINARY_LOGICAL_AND && val == 0) + || (ekind == EXPR_BINARY_LOGICAL_OR && val != 0)); + return new_Const(mode, get_mode_one(mode)); + } + } + + return produce_condition_result((const expression_t*) expression, dbgi); +} + typedef ir_node * (*create_arithmetic_func)(dbg_info *dbgi, ir_node *left, ir_node *right, ir_mode *mode); @@ -1946,7 +1987,7 @@ static ir_node *pointer_arithmetic(ir_node *const pointer, { pointer_type_t *const pointer_type = &type->pointer; type_t *const points_to = pointer_type->points_to; - const unsigned elem_size = get_type_size(points_to); + const unsigned elem_size = get_type_size_const(points_to); assert(elem_size >= 1); if (elem_size > 1) { @@ -2023,13 +2064,14 @@ static ir_node *create_sub(const binary_expression_t *expression) return new_d_Sub(dbgi, left, right, mode); } else if (is_type_pointer(type_left) && is_type_pointer(type_right)) { const pointer_type_t *const ptr_type = &type_left->pointer; - const unsigned elem_size = get_type_size(ptr_type->points_to); - ir_mode *const mode = get_ir_mode(type); - ir_node *const sub = new_d_Sub(dbgi, left, right, mode); - ir_node *const cnst = new_Const_long(mode_int, (long)elem_size); - ir_node *const no_mem = new_NoMem(); - ir_node *const div = new_d_Div(dbgi, no_mem, sub, cnst, mode, - op_pin_state_floats); + + ir_node *const elem_size = get_type_size(ptr_type->points_to); + ir_mode *const mode = get_ir_mode(type); + ir_node *const conv_size = new_d_Conv(dbgi, elem_size, mode); + ir_node *const sub = new_d_Sub(dbgi, left, right, mode); + ir_node *const no_mem = new_NoMem(); + ir_node *const div = new_d_DivRL(dbgi, no_mem, sub, conv_size, mode, + op_pin_state_floats); return new_d_Proj(dbgi, div, mode, pn_Div_res); } @@ -2229,16 +2271,22 @@ static ir_node *array_access_addr(const array_access_expression_t *expression) dbg_info *dbgi = get_dbg_info(&expression->base.source_position); ir_node *base_addr = expression_to_firm(expression->array_ref); ir_node *offset = expression_to_firm(expression->index); - offset = create_conv(dbgi, offset, mode_uint); + + /* Matze: it would be better to force mode to mode_uint as this creates more + * opportunities for CSE. Unforunately we still have some optimisations that + * are too conservative in the presence of convs. So we better go with the + * mode of offset and avoid the conv */ + ir_mode *mode = get_irn_mode(offset); + offset = create_conv(dbgi, offset, mode); type_t *ref_type = skip_typeref(expression->array_ref->base.type); assert(is_type_pointer(ref_type)); pointer_type_t *pointer_type = &ref_type->pointer; - unsigned elem_size = get_type_size(pointer_type->points_to); - ir_node *elem_size_const = new_Const_long(mode_uint, elem_size); + ir_node *elem_size_const = get_type_size(pointer_type->points_to); + elem_size_const = create_conv(dbgi, elem_size_const, mode); ir_node *real_offset = new_d_Mul(dbgi, offset, elem_size_const, - mode_uint); + mode); ir_node *result = new_d_Add(dbgi, base_addr, real_offset, mode_P_data); return result; @@ -2252,9 +2300,95 @@ 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) +{ + 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 void create_local_initializer(initializer_t *initializer, dbg_info *dbgi, + ir_entity *entity, type_t *type); + +static ir_node *compound_literal_to_firm( + const compound_literal_expression_t *expression) +{ + type_t *type = expression->type; + + /* create an entity on the stack */ + ir_type *frame_type = get_irg_frame_type(current_ir_graph); + + 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); + 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); + + /* create a sel for the compound literal address */ + ir_node *frame = get_local_frame(entity); + ir_node *sel = new_d_simpleSel(dbgi, new_NoMem(), frame, entity); + return sel; } /** @@ -2268,10 +2402,14 @@ static ir_node *sizeof_to_firm(const typeprop_expression_t *expression) assert(type != NULL); } - ir_mode *const mode = get_ir_mode(expression->base.type); - symconst_symbol sym; - sym.type_p = get_ir_type(type); - return new_SymConst(mode, sym, symconst_type_size); + type = skip_typeref(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) { + expression_to_firm(expression->tp_expression); + } + + return get_type_size(type); } /** @@ -2298,8 +2436,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; @@ -2380,6 +2521,13 @@ static ir_node *select_addr(const select_expression_t *expression) ir_node *compound_addr = expression_to_firm(expression->compound); + /* make sure the type is constructed */ + type_t *type = skip_typeref(expression->compound->base.type); + if (is_type_pointer(type)) { + type = type->pointer.points_to; + } + (void) get_ir_type(type); + declaration_t *entry = expression->compound_entry; assert(entry->declaration_kind == DECLARATION_KIND_COMPOUND_MEMBER); ir_entity *entity = entry->v.entity; @@ -2398,9 +2546,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. */ @@ -2430,7 +2577,7 @@ typedef enum gcc_type_class static ir_node *classify_type_to_firm(const classify_type_expression_t *const expr) { - const type_t *const type = expr->type_expression->base.type; + const type_t *const type = skip_typeref(expr->type_expression->base.type); gcc_type_class tc; switch (type->kind) @@ -2441,12 +2588,12 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex /* should not be reached */ case ATOMIC_TYPE_INVALID: tc = no_type_class; - break; + goto make_const; /* gcc cannot do that */ case ATOMIC_TYPE_VOID: tc = void_type_class; - break; + goto make_const; case ATOMIC_TYPE_CHAR: /* gcc handles this as integer */ case ATOMIC_TYPE_SCHAR: /* gcc handles this as integer */ @@ -2461,46 +2608,40 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex case ATOMIC_TYPE_ULONGLONG: case ATOMIC_TYPE_BOOL: /* gcc handles this as integer */ tc = integer_type_class; - break; + goto make_const; case ATOMIC_TYPE_FLOAT: case ATOMIC_TYPE_DOUBLE: case ATOMIC_TYPE_LONG_DOUBLE: tc = real_type_class; - break; - -#ifdef PROVIDE_COMPLEX - case ATOMIC_TYPE_FLOAT_COMPLEX: - case ATOMIC_TYPE_DOUBLE_COMPLEX: - case ATOMIC_TYPE_LONG_DOUBLE_COMPLEX: - tc = complex_type_class; - break; - case ATOMIC_TYPE_FLOAT_IMAGINARY: - case ATOMIC_TYPE_DOUBLE_IMAGINARY: - case ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY: - tc = complex_type_class; - break; -#endif - - default: - panic("Unimplemented case in classify_type_to_firm()."); + goto make_const; } - break; + 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 */ - case TYPE_POINTER: tc = pointer_type_class; break; - case TYPE_COMPOUND_STRUCT: tc = record_type_class; break; - case TYPE_COMPOUND_UNION: tc = union_type_class; break; + case TYPE_POINTER: tc = pointer_type_class; goto make_const; + case TYPE_COMPOUND_STRUCT: tc = record_type_class; goto make_const; + case TYPE_COMPOUND_UNION: tc = union_type_class; goto make_const; /* gcc handles this as integer */ - case TYPE_ENUM: tc = integer_type_class; break; - - default: - panic("Unimplemented case in classify_type_to_firm()."); + case TYPE_ENUM: tc = integer_type_class; goto make_const; + + case TYPE_BUILTIN: + /* typedef/typeof should be skipped already */ + case TYPE_TYPEDEF: + case TYPE_TYPEOF: + case TYPE_INVALID: + case TYPE_ERROR: + break; } + panic("unexpected TYPE classify_type_to_firm()."); +make_const: ; dbg_info *const dbgi = get_dbg_info(&expr->base.source_position); ir_mode *const mode = mode_int; tarval *const tv = new_tarval_from_long(tc, mode); @@ -2508,16 +2649,30 @@ static ir_node *classify_type_to_firm(const classify_type_expression_t *const ex } static ir_node *function_name_to_firm( - const string_literal_expression_t *const expr) + const funcname_expression_t *const expr) { - if (current_function_name == NULL) { - 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); + switch(expr->kind) { + case FUNCNAME_FUNCTION: + case FUNCNAME_PRETTY_FUNCTION: + case FUNCNAME_FUNCDNAME: + if (current_function_name == NULL) { + 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__.%u", &string); + } + return current_function_name; + case FUNCNAME_FUNCSIG: + if (current_funcsig == NULL) { + const source_position_t *const src_pos = &expr->base.source_position; + 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__.%u", &string); + } + return current_funcsig; } - - return current_function_name; + panic("Unsupported function name"); } static ir_node *statement_expression_to_firm(const statement_expression_t *expr) @@ -2540,8 +2695,7 @@ static ir_node *va_start_expression_to_firm( ir_node *const arg_sel = new_d_simpleSel(dbgi, no_mem, arg_base, parm_ent); - size_t const parm_size = get_type_size(expr->parameter->type); - ir_node *const cnst = new_Const_long(mode_uint, parm_size); + ir_node *const cnst = get_type_size(expr->parameter->type); ir_node *const add = new_d_Add(dbgi, arg_sel, cnst, mode_P_data); set_value_for_expression(expr->ap, add); @@ -2550,14 +2704,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); - size_t const parm_size = get_type_size(expr->base.type); - ir_node *const cnst = new_Const_long(mode_uint, parm_size); - 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; @@ -2615,8 +2768,10 @@ static ir_node *builtin_prefetch_to_firm( static ir_node *_expression_to_firm(const expression_t *expression) { switch(expression->kind) { - case EXPR_CHAR_CONST: - return char_const_to_firm(&expression->conste); + case EXPR_CHARACTER_CONSTANT: + return character_constant_to_firm(&expression->conste); + case EXPR_WIDE_CHARACTER_CONSTANT: + return wide_character_constant_to_firm(&expression->conste); case EXPR_CONST: return const_to_firm(&expression->conste); case EXPR_STRING_LITERAL: @@ -2643,22 +2798,24 @@ static ir_node *_expression_to_firm(const expression_t *expression) return select_to_firm(&expression->select); case EXPR_CLASSIFY_TYPE: return classify_type_to_firm(&expression->classify_type); - case EXPR_FUNCTION: - case EXPR_PRETTY_FUNCTION: - return function_name_to_firm(&expression->string); + case EXPR_FUNCNAME: + return function_name_to_firm(&expression->funcname); case EXPR_STATEMENT: return statement_expression_to_firm(&expression->statement); case EXPR_VA_START: return va_start_expression_to_firm(&expression->va_starte); case EXPR_VA_ARG: return va_arg_expression_to_firm(&expression->va_arge); - case EXPR_OFFSETOF: case EXPR_BUILTIN_SYMBOL: panic("unimplemented expression found"); case EXPR_BUILTIN_CONSTANT_P: return builtin_constant_to_firm(&expression->builtin_constant); case EXPR_BUILTIN_PREFETCH: return builtin_prefetch_to_firm(&expression->builtin_prefetch); + case EXPR_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: @@ -2673,7 +2830,17 @@ static ir_node *expression_to_firm(const expression_t *expression) if(res != NULL && get_irn_mode(res) == mode_b) { ir_mode *mode = get_ir_mode(expression->base.type); - res = create_conv(NULL, res, mode); + if(is_Const(res)) { + if(is_Const_null(res)) { + return new_Const_long(mode, 0); + } else { + assert(is_Const_one(res)); + return new_Const_long(mode, 1); + } + } + + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + return produce_condition_result(expression, dbgi); } return res; @@ -2734,91 +2901,382 @@ static void create_condition_evaluation(const expression_t *expression, break; } - dbg_info *dbgi = get_dbg_info(&expression->base.source_position); - ir_node *condition = expression_to_modeb(expression); - ir_node *cond = new_d_Cond(dbgi, condition); - ir_node *true_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true); - ir_node *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false); + dbg_info *dbgi = get_dbg_info(&expression->base.source_position); + ir_node *condition = expression_to_modeb(expression); + ir_node *cond = new_d_Cond(dbgi, condition); + ir_node *true_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true); + ir_node *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false); + + /* set branch prediction info based on __builtin_expect */ + if(expression->kind == EXPR_BINARY_BUILTIN_EXPECT) { + long cnst = fold_constant(expression->binary.right); + cond_jmp_predicate pred; + + if(cnst == 0) { + pred = COND_JMP_PRED_FALSE; + } else { + pred = COND_JMP_PRED_TRUE; + } + set_Cond_jmp_pred(cond, pred); + } + + add_immBlock_pred(true_block, true_proj); + add_immBlock_pred(false_block, false_proj); + + set_cur_block(NULL); +} + + + +static void create_declaration_entity(declaration_t *declaration, + declaration_kind_t declaration_kind, + ir_type *parent_type) +{ + ident *const id = new_id_from_str(declaration->symbol->string); + 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); + + 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); + + if(type->base.qualifiers & TYPE_QUALIFIER_VOLATILE) { + set_entity_volatility(entity, volatility_is_volatile); + } +} + + +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; +}; + +typedef struct type_path_t type_path_t; +struct type_path_t { + type_path_entry_t *path; + type_t *top_type; + bool invalid; +}; + +static __attribute__((unused)) void debug_print_type_path(const type_path_t *path) +{ + size_t len = ARR_LEN(path->path); + + for(size_t i = 0; i < len; ++i) { + const type_path_entry_t *entry = & path->path[i]; + + 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, "[%zd]", entry->index); + } else { + fprintf(stderr, "-INVALID-"); + } + } + fprintf(stderr, " ("); + print_type(path->top_type); + fprintf(stderr, ")"); +} + +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 type_path_entry_t *append_to_type_path(type_path_t *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 size_t get_compound_size(const compound_type_t *type) +{ + 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? */ + + return size; +} + +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); + + assert(is_type_compound(top_type) || is_type_array(top_type)); + + 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); + } +} + +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); + + assert(is_type_compound(top_type) || is_type_array(top_type)); - /* set branch prediction info based on __builtin_expect */ - if(expression->kind == EXPR_BINARY_BUILTIN_EXPECT) { - long cnst = fold_constant(expression->binary.right); - cond_jmp_predicate pred; + ir_initializer_t *initializer = get_initializer_entry(path); - if(cnst == 0) { - pred = COND_JMP_PRED_FALSE; - } else { - pred = COND_JMP_PRED_TRUE; + type_path_entry_t *top = append_to_type_path(path); + top->type = top_type; + + 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; + len = get_compound_size(&top_type->compound); + if(entry != NULL) + path->top_type = entry->type; + } 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); } - set_Cond_jmp_pred(cond, pred); } + top->initializer = initializer; +} - add_immBlock_pred(true_block, true_proj); - add_immBlock_pred(false_block, false_proj); +static void ascend_from_subtype(type_path_t *path) +{ + type_path_entry_t *top = get_type_path_top(path); - set_cur_block(NULL); + path->top_type = top->type; + + size_t len = ARR_LEN(path->path); + ARR_RESIZE(type_path_entry_t, path->path, len-1); } +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); + top->type = orig_type; + top->compound_entry = iter; + top->index = index; + 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); + assert(index >= 0); +#ifndef NDEBUG + if(type->array.size_constant == 1) { + long array_size = type->array.size; + assert(index < array_size); + } +#endif -static void create_declaration_entity(declaration_t *declaration, - declaration_kind_t declaration_kind, - ir_type *parent_type) + 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); + } + } + + path->invalid = false; +} + +static void advance_current_object(type_path_t *path) { - ident *const id = new_id_from_str(declaration->symbol->string); - ir_type *const irtype = get_ir_type(declaration->type); - dbg_info *const dbgi = get_dbg_info(&declaration->source_position); - ir_entity *const entity = new_d_entity(parent_type, id, irtype, dbgi); - set_entity_ld_ident(entity, id); + if(path->invalid) { + /* TODO: handle this... */ + panic("invalid initializer in ast2firm (excessive elements)"); + return; + } - declaration->declaration_kind = (unsigned char) declaration_kind; - declaration->v.entity = entity; - set_entity_variability(entity, variability_uninitialized); - if(parent_type == get_tls_type()) - set_entity_allocation(entity, allocation_automatic); - else if(declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE) - set_entity_allocation(entity, allocation_static); - /* TODO: visibility? */ + 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; + } + } + + /* 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 ir_initializer_t *create_ir_initializer( - const initializer_t *initializer); + const initializer_t *initializer, type_t *type); static ir_initializer_t *create_ir_initializer_value( const initializer_value_t *initializer) { + if (is_type_compound(initializer->value->base.type)) { + panic("initializer creation for compounds not implemented yet"); + } ir_node *value = expression_to_firm(initializer->value); return create_initializer_const(value); } -static ir_initializer_t *create_ir_initializer_compound( - const initializer_list_t *initializer) +static ir_initializer_t *create_ir_initializer_list( + const initializer_list_t *initializer, type_t *type) { - ir_initializer_t *irinitializer - = create_initializer_compound(initializer->len); + type_path_t path; + memset(&path, 0, sizeof(path)); + path.top_type = type; + path.path = NEW_ARR_F(type_path_entry_t, 0); + + descend_into_subtype(&path); for(size_t i = 0; i < initializer->len; ++i) { - const initializer_t *sub_initializer = initializer->initializers[i]; - ir_initializer_t *sub_irinitializer - = create_ir_initializer(sub_initializer); + 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); + + 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); - set_initializer_compound_value(irinitializer, i, sub_irinitializer); + advance_current_object(&path); } - return irinitializer; + assert(ARR_LEN(path.path) >= 1); + ir_initializer_t *result = path.path[0].initializer; + DEL_ARR_F(path.path); + + return result; } static ir_initializer_t *create_ir_initializer_string( - const initializer_string_t *initializer) + const initializer_string_t *initializer, type_t *type) { - size_t len = initializer->string.size; + type = skip_typeref(type); + + size_t string_len = initializer->string.size; + assert(type->kind == TYPE_ARRAY && type->array.size_constant); + size_t len = type->array.size; ir_initializer_t *irinitializer = create_initializer_compound(len); const char *string = initializer->string.begin; ir_mode *mode = get_type_mode(ir_type_const_char); for(size_t i = 0; i < len; ++i) { - tarval *tv = new_tarval_from_long(string[i], mode); + char c = 0; + if(i < string_len) + c = string[i]; + + 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); @@ -2828,16 +3286,22 @@ static ir_initializer_t *create_ir_initializer_string( } static ir_initializer_t *create_ir_initializer_wide_string( - const initializer_wide_string_t *initializer) + const initializer_wide_string_t *initializer, type_t *type) { - size_t len = initializer->string.size; + size_t string_len = initializer->string.size; + assert(type->kind == TYPE_ARRAY && type->array.size_constant); + size_t len = type->array.size; ir_initializer_t *irinitializer = create_initializer_compound(len); const wchar_rep_t *string = initializer->string.begin; ir_mode *mode = get_type_mode(ir_type_wchar_t); for(size_t i = 0; i < len; ++i) { - tarval *tv = new_tarval_from_long(string[i], mode); + wchar_rep_t c = 0; + if(i < string_len) { + c = string[i]; + } + 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); @@ -2846,46 +3310,198 @@ static ir_initializer_t *create_ir_initializer_wide_string( return irinitializer; } -static ir_initializer_t *create_ir_initializer(const initializer_t *initializer) +static ir_initializer_t *create_ir_initializer( + const initializer_t *initializer, type_t *type) { - switch((initializer_kind_t) initializer->kind) { + switch(initializer->kind) { case INITIALIZER_STRING: - return create_ir_initializer_string(&initializer->string); + return create_ir_initializer_string(&initializer->string, type); case INITIALIZER_WIDE_STRING: - return create_ir_initializer_wide_string(&initializer->wide_string); + return create_ir_initializer_wide_string(&initializer->wide_string, + type); case INITIALIZER_LIST: - return create_ir_initializer_compound(&initializer->list); + return create_ir_initializer_list(&initializer->list, type); case INITIALIZER_VALUE: return create_ir_initializer_value(&initializer->value); + + case INITIALIZER_DESIGNATOR: + panic("unexpected designator initializer found"); } panic("unknown initializer"); } -static void create_initializer_local_variable_entity(declaration_t *declaration) +static void create_dynamic_null_initializer(ir_type *type, dbg_info *dbgi, + ir_node *base_addr) { - initializer_t *initializer = declaration->init.initializer; - dbg_info *dbgi = get_dbg_info(&declaration->source_position); - ir_entity *entity = declaration->v.entity; - ir_node *memory = get_store(); - ir_node *nomem = new_NoMem(); - ir_node *frame = get_irg_frame(current_ir_graph); - ir_node *addr = new_d_simpleSel(dbgi, nomem, frame, entity); + if (is_atomic_type(type)) { + 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); + } 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, mode_uint, 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_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); + return; + } + case IR_INITIALIZER_CONST: { + ir_node *node = get_initializer_const_value(initializer); + ir_mode *mode = get_irn_mode(node); + assert(get_type_mode(type) == mode); + + /* TODO: bitfields... */ + ir_node *mem = get_store(); + ir_node *store = new_d_Store(dbgi, mem, base_addr, node); + ir_node *proj_m = new_Proj(store, mode_M, pn_Store_M); + set_store(proj_m); + return; + } + case IR_INITIALIZER_TARVAL: { + tarval *tv = get_initializer_tarval_value(initializer); + ir_mode *mode = get_tarval_mode(tv); + ir_node *cnst = new_d_Const(dbgi, mode, tv); + assert(get_type_mode(type) == mode); + + /* 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); + return; + } + case IR_INITIALIZER_COMPOUND: { + 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); + } + + if(get_initializer_compound_n_entries(initializer) + != (unsigned) n_members) + panic("initializer doesn't match compound 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, mode_uint, 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); + } + + ir_initializer_t *sub_init + = get_initializer_compound_value(initializer, i); + + create_dynamic_initializer_sub(sub_init, irtype, dbgi, addr); + } + return; + } + } + + panic("invalid IR_INITIALIZER found"); +} + +static void create_dynamic_initializer(ir_initializer_t *initializer, + dbg_info *dbgi, ir_entity *entity) +{ + ir_node *frame = get_local_frame(entity); + ir_node *base_addr = new_d_simpleSel(dbgi, new_NoMem(), frame, entity); + ir_type *type = get_entity_type(entity); + + create_dynamic_initializer_sub(initializer, type, dbgi, base_addr); +} + +static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi, + ir_entity *entity, type_t *type) +{ + 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; } + if(!is_constant_initializer(initializer)) { + ir_initializer_t *irinitializer + = create_ir_initializer(initializer, type); + + create_dynamic_initializer(irinitializer, dbgi, entity); + return; + } + + /* create the ir_initializer */ + ir_graph *const old_current_ir_graph = current_ir_graph; + current_ir_graph = get_const_code_irg(); + + ir_initializer_t *irinitializer = create_ir_initializer(initializer, type); + + assert(current_ir_graph == get_const_code_irg()); + 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"); - ir_type *const irtype = get_ir_type(declaration->type); + 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); set_entity_ld_ident(init_entity, id); @@ -2894,22 +3510,24 @@ static void create_initializer_local_variable_entity(declaration_t *declaration) set_entity_visibility(init_entity, visibility_local); set_entity_allocation(init_entity, allocation_static); - ir_graph *const old_current_ir_graph = current_ir_graph; - current_ir_graph = get_const_code_irg(); - - ir_initializer_t *irinitializer = create_ir_initializer(initializer); set_entity_initializer(init_entity, irinitializer); - assert(current_ir_graph == get_const_code_irg()); - current_ir_graph = old_current_ir_graph; - - 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 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); set_store(copyb_mem); } +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; @@ -2925,8 +3543,11 @@ static void create_declaration_initializer(declaration_t *declaration) if(initializer->kind == INITIALIZER_VALUE) { initializer_value_t *initializer_value = &initializer->value; + dbg_info *dbgi + = get_dbg_info(&declaration->source_position); ir_node *value = expression_to_firm(initializer_value->value); + value = do_strict_conv(dbgi, value); if(declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE) { set_value(declaration->v.value_number, value); @@ -2943,13 +3564,40 @@ static void create_declaration_initializer(declaration_t *declaration) || declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE); ir_entity *entity = declaration->v.entity; - ir_initializer_t *irinitializer = create_ir_initializer(initializer); + ir_initializer_t *irinitializer + = create_ir_initializer(initializer, declaration->type); set_entity_variability(entity, variability_initialized); set_entity_initializer(entity, irinitializer); } } +static void create_variable_length_array(declaration_t *declaration) +{ + dbg_info *dbgi = get_dbg_info(&declaration->source_position); + type_t *type = declaration->type; + ir_node *mem = get_store(); + ir_type *el_type = get_ir_type(type->array.element_type); + + /* make sure size_node is calculated */ + get_type_size(type); + ir_node *elems = type->array.size_node; + ir_node *alloc = new_d_Alloc(dbgi, mem, elems, el_type, stack_alloc); + + ir_node *proj_m = new_d_Proj(dbgi, alloc, mode_M, pn_Alloc_M); + ir_node *addr = new_d_Proj(dbgi, alloc, mode_P_data, pn_Alloc_res); + set_store(proj_m); + + /* initializers are not allowed for VLAs */ + assert(declaration->init.initializer == NULL); + + declaration->declaration_kind = DECLARATION_KIND_VARIABLE_LENGTH_ARRAY; + declaration->v.vla_base = addr; + + /* TODO: record VLA somewhere so we create the free node when we leave + * it's scope */ +} + /** * Creates a Firm local variable from a declaration. */ @@ -2960,7 +3608,13 @@ static void create_local_variable(declaration_t *declaration) bool needs_entity = declaration->address_taken; type_t *type = skip_typeref(declaration->type); - if(is_type_array(type) || is_type_compound(type)) { + /* is it a variable length array? */ + if(is_type_array(type) && !type->array.size_constant) { + create_variable_length_array(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; } @@ -2985,14 +3639,23 @@ 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); ir_type *const irtype = get_ir_type(type); dbg_info *const dbgi = get_dbg_info(&declaration->source_position); + + size_t l = strlen(declaration->symbol->string); + char buf[l + sizeof(".%u")]; + snprintf(buf, sizeof(buf), "%s.%%u", declaration->symbol->string); + ident *const id = id_unique(buf); + 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); @@ -3145,8 +3808,6 @@ static void create_local_declaration(declaration_t *declaration) case STORAGE_CLASS_STATIC: create_local_static_variable(declaration); return; - case STORAGE_CLASS_ENUM_ENTRY: - panic("enum entry declaration in local block found"); case STORAGE_CLASS_EXTERN: create_global_variable(declaration); create_declaration_initializer(declaration); @@ -3164,6 +3825,7 @@ static void create_local_declaration(declaration_t *declaration) create_local_variable(declaration); } return; + case STORAGE_CLASS_ENUM_ENTRY: case STORAGE_CLASS_TYPEDEF: case STORAGE_CLASS_THREAD: case STORAGE_CLASS_THREAD_EXTERN: @@ -3667,11 +4329,24 @@ 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) { case STATEMENT_INVALID: panic("invalid statement found"); + return; + case STATEMENT_EMPTY: + /* nothing */ + return; case STATEMENT_COMPOUND: compound_statement_to_firm(&statement->compound); return; @@ -3717,6 +4392,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"); } @@ -3743,10 +4424,12 @@ static int count_local_declarations(const declaration_t * decl, } static int count_decls_in_expression(const expression_t *expression) { + int count = 0; + if(expression == NULL) return 0; - switch(expression->base.kind) { + switch((expression_kind_t) expression->base.kind) { case EXPR_STATEMENT: return count_decls_in_stmts(expression->statement.statement); EXPR_BINARY_CASES { @@ -3757,7 +4440,6 @@ 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); @@ -3765,7 +4447,63 @@ static int count_decls_in_expression(const expression_t *expression) { return count; } - default: + case EXPR_UNKNOWN: + case EXPR_INVALID: + panic("unexpected expression kind"); + + case EXPR_COMPOUND_LITERAL: + /* TODO... */ + break; + + case EXPR_CONDITIONAL: + count += count_decls_in_expression(expression->conditional.condition); + count += count_decls_in_expression(expression->conditional.true_expression); + count += count_decls_in_expression(expression->conditional.false_expression); + return count; + + case EXPR_BUILTIN_PREFETCH: + count += count_decls_in_expression(expression->builtin_prefetch.adr); + count += count_decls_in_expression(expression->builtin_prefetch.rw); + count += count_decls_in_expression(expression->builtin_prefetch.locality); + return count; + + case EXPR_BUILTIN_CONSTANT_P: + count += count_decls_in_expression(expression->builtin_constant.value); + return count; + + case EXPR_SELECT: + count += count_decls_in_expression(expression->select.compound); + return count; + + case EXPR_ARRAY_ACCESS: + count += count_decls_in_expression(expression->array_access.array_ref); + count += count_decls_in_expression(expression->array_access.index); + return count; + + case EXPR_CLASSIFY_TYPE: + count += count_decls_in_expression(expression->classify_type.type_expression); + return count; + + case EXPR_SIZEOF: + case EXPR_ALIGNOF: { + expression_t *tp_expression = expression->typeprop.tp_expression; + if (tp_expression != NULL) { + count += count_decls_in_expression(tp_expression); + } + return count; + } + + case EXPR_OFFSETOF: + case EXPR_REFERENCE: + case EXPR_CONST: + case EXPR_CHARACTER_CONSTANT: + case EXPR_WIDE_CHARACTER_CONSTANT: + case EXPR_STRING_LITERAL: + case EXPR_WIDE_STRING_LITERAL: + case EXPR_FUNCNAME: + case EXPR_BUILTIN_SYMBOL: + case EXPR_VA_START: + case EXPR_VA_ARG: break; } @@ -3781,6 +4519,9 @@ static int count_decls_in_stmts(const statement_t *stmt) int count = 0; for (; stmt != NULL; stmt = stmt->base.next) { switch (stmt->kind) { + case STATEMENT_EMPTY: + break; + case STATEMENT_DECLARATION: { const declaration_statement_t *const decl_stmt = &stmt->declaration; count += count_local_declarations(decl_stmt->declarations_begin, @@ -3863,6 +4604,7 @@ static int count_decls_in_stmts(const statement_t *stmt) } case STATEMENT_GOTO: + case STATEMENT_LEAVE: case STATEMENT_INVALID: break; @@ -3871,6 +4613,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; @@ -3976,18 +4727,24 @@ static void create_function(declaration_t *declaration) current_function_decl = declaration; current_function_name = NULL; + current_funcsig = NULL; assert(imature_blocks == NULL); imature_blocks = NEW_ARR_F(ir_node*, 0); int n_local_vars = get_function_n_local_vars(declaration); ir_graph *irg = new_ir_graph(function_entity, n_local_vars); - ir_node *first_block = get_cur_block(); + + set_irg_fp_model(irg, firm_opt.fp_model); + tarval_enable_fp_ops((firm_opt.fp_model & fp_strict_algebraic) == 0); + set_irn_dbg_info(get_irg_start_block(irg), get_entity_dbg_info(function_entity)); + + ir_node *first_block = get_cur_block(); /* set inline flags */ if (declaration->is_inline) - set_irg_inline_property(irg, irg_inline_recomended); - handle_decl_modifier_irg(irg, declaration->modifiers); + set_irg_inline_property(irg, irg_inline_recomended); + handle_decl_modifier_irg(irg, declaration->decl_modifiers); next_value_number_function = 0; initialize_function_parameters(declaration); @@ -4063,7 +4820,6 @@ static void create_function(declaration_t *declaration) } set_type_size_bytes(frame_type, offset); set_type_alignment_bytes(frame_type, align_all); - set_type_state(frame_type, layout_fixed); irg_vrfy(irg); } @@ -4117,19 +4873,40 @@ 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); } } -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); @@ -4137,15 +4914,22 @@ void translation_unit_to_firm(translation_unit_t *unit) 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 */ + ir_type_void = get_ir_type(type_void); +} - 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); }