X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast2firm.c;h=4145de94873f06a0dd986d97c210783105d3bcf2;hb=2151f7ff22ee388e6a57ff024d2558101907e7f7;hp=8745247b9429f492b44973bfaaca72374a9a6c3e;hpb=fd16b92f058181088a385c3224c8814831c006d3;p=cparser diff --git a/ast2firm.c b/ast2firm.c index 8745247..4145de9 100644 --- a/ast2firm.c +++ b/ast2firm.c @@ -30,6 +30,7 @@ #include "adt/error.h" #include "adt/array.h" +#include "symbol_t.h" #include "token_t.h" #include "type_t.h" #include "ast_t.h" @@ -58,6 +59,7 @@ 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; @@ -211,7 +213,7 @@ static ir_mode *get_ptrmode(unsigned size, char *name) return res; } -static ir_mode *_atomic_modes[ATOMIC_TYPE_LAST]; +static ir_mode *_atomic_modes[ATOMIC_TYPE_LAST+1]; static ir_mode *mode_int, *mode_uint; @@ -244,12 +246,10 @@ static void init_atomic_modes(void) { _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)); @@ -262,57 +262,13 @@ static void init_atomic_modes(void) { 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) + 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_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; - - case ATOMIC_TYPE_FLOAT: - return 4; - - case ATOMIC_TYPE_DOUBLE: - return 8; - - case ATOMIC_TYPE_LONG_DOUBLE: - return 12; - - case ATOMIC_TYPE_VOID: - return 1; - - case ATOMIC_TYPE_INVALID: - case ATOMIC_TYPE_LAST: - break; - } - panic("Trying to determine size of invalid atomic type"); -} - static unsigned get_compound_type_size(compound_type_t *type) { ir_type *irtype = get_ir_type((type_t*) type); @@ -335,7 +291,7 @@ static unsigned get_type_size_const(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_ENUM: return get_mode_size_bytes(mode_int); case TYPE_COMPOUND_UNION: @@ -1094,14 +1050,14 @@ 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) { + v = (v << 8) | ((unsigned char)cnst->v.character.begin[i]); } char buf[128]; size_t len = snprintf(buf, sizeof(buf), "%lld", v); @@ -1110,6 +1066,20 @@ 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) { @@ -1897,6 +1867,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; } } @@ -2082,10 +2054,11 @@ static ir_node *create_sub(const binary_expression_t *expression) 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_Div(dbgi, no_mem, sub, elem_size, mode, - op_pin_state_floats); + 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); } @@ -2579,23 +2552,23 @@ 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) { case TYPE_ATOMIC: { const atomic_type_t *const atomic_type = &type->atomic; - switch (atomic_type->akind) { + switch ((atomic_type_kind_t) atomic_type->akind) { /* 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 */ @@ -2610,46 +2583,49 @@ 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; + goto make_const; -#ifdef PROVIDE_COMPLEX case ATOMIC_TYPE_FLOAT_COMPLEX: case ATOMIC_TYPE_DOUBLE_COMPLEX: case ATOMIC_TYPE_LONG_DOUBLE_COMPLEX: tc = complex_type_class; - break; + goto make_const; 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_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); @@ -2669,6 +2645,20 @@ static ir_node *function_name_to_firm( return current_function_name; } +static ir_node *funcsig_to_firm( + const string_literal_expression_t *const expr) +{ + 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__", &string); + } + + return current_funcsig; +} + static ir_node *statement_expression_to_firm(const statement_expression_t *expr) { statement_t *statement = expr->statement; @@ -2762,8 +2752,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: @@ -2792,7 +2784,10 @@ static ir_node *_expression_to_firm(const expression_t *expression) return classify_type_to_firm(&expression->classify_type); case EXPR_FUNCTION: case EXPR_PRETTY_FUNCTION: + case EXPR_FUNCDNAME: return function_name_to_firm(&expression->string); + case EXPR_FUNCSIG: + return funcsig_to_firm(&expression->string); case EXPR_STATEMENT: return statement_expression_to_firm(&expression->statement); case EXPR_VA_START: @@ -2968,7 +2963,7 @@ static __attribute__((unused)) void debug_print_type_path(const type_path_t *pat if(is_type_compound(type)) { fprintf(stderr, ".%s", entry->compound_entry->symbol->string); } else if(is_type_array(type)) { - fprintf(stderr, "[%u]", entry->index); + fprintf(stderr, "[%zd]", entry->index); } else { fprintf(stderr, "-INVALID-"); } @@ -3044,8 +3039,9 @@ static void descend_into_subtype(type_path_t *path) top->compound_entry = entry; top->index = 0; - path->top_type = entry->type; 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); @@ -3246,6 +3242,8 @@ static ir_initializer_t *create_ir_initializer_list( static ir_initializer_t *create_ir_initializer_string( const initializer_string_t *initializer, type_t *type) { + 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; @@ -3321,9 +3319,10 @@ static void create_dynamic_initializer_sub(ir_initializer_t *initializer, { switch(get_initializer_kind(initializer)) { case IR_INITIALIZER_NULL: { - ir_mode *mode = get_type_mode(type); /* TODO: implement this for compound types... */ assert(type != NULL); + + ir_mode *mode = get_type_mode(type); tarval *zero = get_mode_null(mode); ir_node *cnst = new_d_Const(dbgi, mode, zero); @@ -4267,6 +4266,10 @@ 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; @@ -4338,10 +4341,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 { @@ -4352,7 +4357,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); @@ -4360,7 +4364,66 @@ 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_FUNCTION: + case EXPR_PRETTY_FUNCTION: + case EXPR_FUNCSIG: + case EXPR_FUNCDNAME: + case EXPR_BUILTIN_SYMBOL: + case EXPR_VA_START: + case EXPR_VA_ARG: break; } @@ -4376,6 +4439,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, @@ -4571,6 +4637,7 @@ 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);