X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_intrinsics.c;h=4c52ccff499a75b6116be14bb6c205d03844a764;hb=532ca14c1686c1b14cf923371c079055670de7e6;hp=82b150419f8c9a578413584da7b0c558ed15e04a;hpb=9d4e23060441530a20af5d331268435bfe18f305;p=libfirm diff --git a/ir/lower/lower_intrinsics.c b/ir/lower/lower_intrinsics.c index 82b150419..4c52ccff4 100644 --- a/ir/lower/lower_intrinsics.c +++ b/ir/lower/lower_intrinsics.c @@ -21,7 +21,6 @@ * @file * @brief lowering of Calls of intrinsic functions * @author Michael Beck - * @version $Id$ */ #include "config.h" @@ -44,6 +43,7 @@ #include "iropt_dbg.h" #include "error.h" #include "be.h" +#include "util.h" /** Walker environment. */ typedef struct walker_env { @@ -62,19 +62,17 @@ static void call_mapper(ir_node *node, void *env) if (op == op_Call) { ir_node *symconst; - pmap_entry *p; const i_call_record *r; ir_entity *ent; symconst = get_Call_ptr(node); - if (! is_Global(symconst)) + if (! is_SymConst_addr_ent(symconst)) return; - ent = get_Global_entity(symconst); - p = pmap_find(wenv->c_map, ent); + ent = get_SymConst_entity(symconst); + r = pmap_get(i_call_record const, wenv->c_map, ent); - if (p) { - r = (const i_call_record*)p->value; + if (r != NULL) { wenv->nr_of_intrinsics += r->i_mapper(node, r->ctx) ? 1 : 0; } } else { @@ -90,13 +88,12 @@ static void call_mapper(ir_node *node, void *env) } } } -} /* call_mapper */ +} -/* Go through all graphs and map calls to intrinsic functions. */ size_t lower_intrinsics(i_record *list, size_t length, int part_block_used) { size_t i, n; - size_t n_ops = get_irp_n_opcodes(); + size_t n_ops = ir_get_n_opcodes(); ir_graph *irg; pmap *c_map = pmap_create_ex(length); i_instr_record **i_map; @@ -138,31 +135,14 @@ size_t lower_intrinsics(i_record *list, size_t length, int part_block_used) ir_free_resources(irg, IR_RESOURCE_IRN_LINK | IR_RESOURCE_PHI_LIST); if (wenv.nr_of_intrinsics > 0) { - /* Changes detected: we might have added/removed nodes. */ - set_irg_outs_inconsistent(irg); - set_irg_callee_info_state(irg, irg_callee_info_inconsistent); - - /* Exception control flow might have changed / new block might have added. */ - set_irg_doms_inconsistent(irg); - set_irg_extblk_inconsistent(irg); - set_irg_loopinfo_inconsistent(irg); - - /* Calls might be removed/added. */ - set_trouts_inconsistent(); - - /* verify here */ - irg_verify(irg, VERIFY_NORMAL); - - /* Optimize it, tuple might be created. */ - optimize_graph_df(irg); - + confirm_irg_properties(irg, IR_GRAPH_PROPERTIES_NONE); nr_of_intrinsics += wenv.nr_of_intrinsics; } } pmap_destroy(c_map); return nr_of_intrinsics; -} /* lower_intrinsics */ +} typedef struct pass_t { ir_prog_pass_t pass; @@ -196,15 +176,14 @@ ir_prog_pass_t *lower_intrinsics_pass( const char *name, i_record *list, size_t length, int part_block_used) { - pass_t *pass = (pass_t*)xmalloc(sizeof(*pass) + (length-1) * sizeof(pass->list[0])); - + pass_t *const pass = XMALLOCF(pass_t, list, length); memcpy(pass->list, list, sizeof(list[0]) * length); pass->length = length; pass->part_block_used = part_block_used; return def_prog_pass_constructor( &pass->pass, name ? name : "lower_intrinsics", pass_wrapper); -} /* lower_intrinsics_pass*/ +} /** * Helper function, replace the call by the given node. @@ -215,31 +194,35 @@ ir_prog_pass_t *lower_intrinsics_pass( * @param reg_jmp new regular control flow, if NULL, a Jmp will be used * @param exc_jmp new exception control flow, if reg_jmp == NULL, a Bad will be used */ -static void replace_call(ir_node *irn, ir_node *call, ir_node *mem, ir_node *reg_jmp, ir_node *exc_jmp) +static void replace_call(ir_node *irn, ir_node *call, ir_node *mem, + ir_node *reg_jmp, ir_node *exc_jmp) { ir_node *block = get_nodes_block(call); ir_graph *irg = get_irn_irg(block); + ir_node *rest = new_r_Tuple(block, 1, &irn); - if (reg_jmp == NULL) { - - /* Beware: do we need here a protection against CSE? Better we do it. */ - int old_cse = get_opt_cse(); - set_opt_cse(0); - reg_jmp = new_r_Jmp(block); - set_opt_cse(old_cse); - exc_jmp = new_r_Bad(irg); + if (ir_throws_exception(call)) { + turn_into_tuple(call, pn_Call_max+1); + if (reg_jmp == NULL) { + reg_jmp = new_r_Jmp(block); + } + if (exc_jmp == NULL) { + exc_jmp = new_r_Bad(irg, mode_X); + } + set_Tuple_pred(call, pn_Call_X_regular, reg_jmp); + set_Tuple_pred(call, pn_Call_X_except, exc_jmp); + } else { + assert(reg_jmp == NULL); + assert(exc_jmp == NULL); + turn_into_tuple(call, pn_Call_T_result+1); + assert(pn_Call_M <= pn_Call_T_result); + assert(pn_Call_X_regular > pn_Call_T_result); + assert(pn_Call_X_except > pn_Call_T_result); } - irn = new_r_Tuple(block, 1, &irn); - - turn_into_tuple(call, pn_Call_max); set_Tuple_pred(call, pn_Call_M, mem); - set_Tuple_pred(call, pn_Call_X_regular, reg_jmp); - set_Tuple_pred(call, pn_Call_X_except, exc_jmp); - set_Tuple_pred(call, pn_Call_T_result, irn); - set_Tuple_pred(call, pn_Call_P_value_res_base, new_r_Bad(irg)); -} /* replace_call */ + set_Tuple_pred(call, pn_Call_T_result, rest); +} -/* A mapper for the integer abs. */ int i_mapper_abs(ir_node *call, void *ctx) { ir_node *mem = get_Call_mem(call); @@ -249,25 +232,23 @@ int i_mapper_abs(ir_node *call, void *ctx) ir_mode *mode = get_irn_mode(op); dbg_info *dbg = get_irn_dbg_info(call); ir_node *zero = new_r_Const(irg, get_mode_null(mode)); - ir_node *cmp = new_rd_Cmp(dbg, block, op, zero); - ir_node *cond = new_r_Proj(cmp, mode_b, pn_Cmp_Lt); + ir_node *cmp = new_rd_Cmp(dbg, block, op, zero, ir_relation_less); ir_node *minus_op = new_rd_Minus(dbg, block, op, mode); ir_node *mux; arch_allow_ifconv_func allow_ifconv = be_get_backend_param()->allow_ifconv; (void) ctx; /* mux allowed by backend? */ - if (!allow_ifconv(cond, op, minus_op)) + if (!allow_ifconv(cmp, op, minus_op)) return 0; /* construct Mux */ - mux = new_rd_Mux(dbg, block, cond, op, minus_op, mode); + mux = new_rd_Mux(dbg, block, cmp, op, minus_op, mode); DBG_OPT_ALGSIM0(call, mux, FS_OPT_RTS_ABS); replace_call(mux, call, mem, NULL, NULL); return 1; -} /* i_mapper_abs */ +} -/* A mapper for the integer bswap. */ int i_mapper_bswap(ir_node *call, void *ctx) { ir_node *mem = get_Call_mem(call); @@ -280,12 +261,11 @@ int i_mapper_bswap(ir_node *call, void *ctx) irn = new_rd_Builtin(dbg, block, get_irg_no_mem(current_ir_graph), 1, &op, ir_bk_bswap, tp); set_irn_pinned(irn, op_pin_state_floats); - irn = new_r_Proj(irn, get_irn_mode(op), pn_Builtin_1_result); + irn = new_r_Proj(irn, get_irn_mode(op), pn_Builtin_max+1); replace_call(irn, call, mem, NULL, NULL); return 1; -} /* i_mapper_bswap */ +} -/* A mapper for the alloca() function. */ int i_mapper_alloca(ir_node *call, void *ctx) { ir_node *mem = get_Call_mem(call); @@ -304,18 +284,23 @@ int i_mapper_alloca(ir_node *call, void *ctx) op = new_rd_Conv(dbg, block, op, mode); } - irn = new_rd_Alloc(dbg, block, mem, op, firm_unknown_type, stack_alloc); + irn = new_rd_Alloc(dbg, block, mem, op, get_unknown_type(), stack_alloc); mem = new_rd_Proj(dbg, irn, mode_M, pn_Alloc_M); - no_exc = new_rd_Proj(dbg, irn, mode_X, pn_Alloc_X_regular); - exc = new_rd_Proj(dbg, irn, mode_X, pn_Alloc_X_except); irn = new_rd_Proj(dbg, irn, get_modeP_data(), pn_Alloc_res); + if (ir_throws_exception(call)) { + no_exc = new_rd_Proj(dbg, irn, mode_X, pn_Alloc_X_regular); + exc = new_rd_Proj(dbg, irn, mode_X, pn_Alloc_X_except); + ir_set_throws_exception(irn, true); + } else { + no_exc = NULL; + exc = NULL; + } DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_ALLOCA); replace_call(irn, call, mem, no_exc, exc); return 1; -} /* i_mapper_alloca */ +} -/* A mapper for the floating point sqrt. */ int i_mapper_sqrt(ir_node *call, void *ctx) { ir_node *mem; @@ -336,9 +321,8 @@ int i_mapper_sqrt(ir_node *call, void *ctx) DBG_OPT_ALGSIM0(call, op, FS_OPT_RTS_SQRT); replace_call(op, call, mem, NULL, NULL); return 1; -} /* i_mapper_sqrt */ +} -/* A mapper for the floating point cbrt. */ int i_mapper_cbrt(ir_node *call, void *ctx) { ir_node *mem; @@ -359,18 +343,19 @@ int i_mapper_cbrt(ir_node *call, void *ctx) DBG_OPT_ALGSIM0(call, op, FS_OPT_RTS_CBRT); replace_call(op, call, mem, NULL, NULL); return 1; -} /* i_mapper_cbrt */ +} -/* A mapper for the floating point pow. */ int i_mapper_pow(ir_node *call, void *ctx) { + ir_node *left = get_Call_param(call, 0); + ir_node *right = get_Call_param(call, 1); + ir_node *block = get_nodes_block(call); + ir_graph *irg = get_irn_irg(block); + ir_node *reg_jmp = NULL; + ir_node *exc_jmp = NULL; + ir_node *irn; dbg_info *dbg; ir_node *mem; - ir_node *left = get_Call_param(call, 0); - ir_node *right = get_Call_param(call, 1); - ir_node *block = get_nodes_block(call); - ir_graph *irg = get_irn_irg(block); - ir_node *irn, *reg_jmp = NULL, *exc_jmp = NULL; (void) ctx; if (is_Const(left) && is_Const_one(left)) { @@ -398,22 +383,34 @@ int i_mapper_pow(ir_node *call, void *ctx) dbg = get_irn_dbg_info(call); if (irn == NULL) { - ir_mode *mode = get_irn_mode(left); - ir_node *quot; + ir_mode *result_mode = get_irn_mode(left); + ir_node *div; + + ir_mode *mode = result_mode; + ir_mode *float_arithmetic = be_get_backend_param()->mode_float_arithmetic; + if (float_arithmetic != NULL) { + left = new_r_Conv(block, left, float_arithmetic); + mode = float_arithmetic; + } irn = new_r_Const(irg, get_mode_one(mode)); - quot = new_rd_Quot(dbg, block, mem, irn, left, mode, op_pin_state_pinned); - mem = new_r_Proj(quot, mode_M, pn_Quot_M); - irn = new_r_Proj(quot, mode, pn_Quot_res); - reg_jmp = new_r_Proj(quot, mode_X, pn_Quot_X_regular); - exc_jmp = new_r_Proj(quot, mode_X, pn_Quot_X_except); + div = new_rd_Div(dbg, block, mem, irn, left, mode, op_pin_state_pinned); + mem = new_r_Proj(div, mode_M, pn_Div_M); + irn = new_r_Proj(div, mode, pn_Div_res); + if (ir_throws_exception(call)) { + reg_jmp = new_r_Proj(div, mode_X, pn_Div_X_regular); + exc_jmp = new_r_Proj(div, mode_X, pn_Div_X_except); + ir_set_throws_exception(div, true); + } + if (result_mode != mode) { + irn = new_r_Conv(block, irn, result_mode); + } } DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_POW); replace_call(irn, call, mem, reg_jmp, exc_jmp); return 1; -} /* i_mapper_pow */ +} -/* A mapper for the floating point exp. */ int i_mapper_exp(ir_node *call, void *ctx) { ir_node *val = get_Call_param(call, 0); @@ -430,7 +427,17 @@ int i_mapper_exp(ir_node *call, void *ctx) return 1; } return 0; -} /* i_mapper_exp */ +} + +int i_mapper_exp2(ir_node *call, void *ctx) +{ + return i_mapper_exp(call, ctx); +} + +int i_mapper_exp10(ir_node *call, void *ctx) +{ + return i_mapper_exp(call, ctx); +} /** * A mapper for mapping f(0.0) to 0.0. @@ -448,7 +455,7 @@ static int i_mapper_zero_to_zero(ir_node *call, void *ctx, int reason) return 1; } return 0; -} /* i_mapper_zero_to_zero */ +} /** * A mapper for mapping f(1.0) to 0.0. @@ -469,7 +476,7 @@ static int i_mapper_one_to_zero(ir_node *call, void *ctx, int reason) return 1; } return 0; -} /* i_mapper_one_to_zero */ +} /** * A mapper for mapping a functions with the following characteristics: @@ -478,10 +485,11 @@ static int i_mapper_one_to_zero(ir_node *call, void *ctx, int reason) */ static int i_mapper_symmetric_zero_to_one(ir_node *call, void *ctx, int reason) { - ir_node *val = get_Call_param(call, 0); + int changed = 0; + ir_node *val = get_Call_param(call, 0); (void) ctx; - if (is_strictConv(val)) { + if (is_Conv(val)) { ir_node *op = get_Conv_op(val); if (is_Minus(op)) { /* f(-x) = f(x) with strictConv */ @@ -491,18 +499,16 @@ static int i_mapper_symmetric_zero_to_one(ir_node *call, void *ctx, int reason) op = get_Minus_op(op); val = new_rd_Conv(dbg, block, op, mode); - if (is_Conv(val)) { - /* still a Conv ? */ - set_Conv_strict(val, 1); - } DBG_OPT_ALGSIM2(call, op, call, FS_OPT_RTS_SYMMETRIC); set_Call_param(call, 0, val); + changed = 1; } } else if (is_Minus(val)) { /* f(-x) = f(x) */ val = get_Minus_op(val); DBG_OPT_ALGSIM2(call, val, call, FS_OPT_RTS_SYMMETRIC); set_Call_param(call, 0, val); + changed = 1; } if (is_Const(val) && is_Const_null(val)) { @@ -513,80 +519,82 @@ static int i_mapper_symmetric_zero_to_one(ir_node *call, void *ctx, int reason) ir_node *mem = get_Call_mem(call); DBG_OPT_ALGSIM0(call, irn, reason); replace_call(irn, call, mem, NULL, NULL); - return 1; + changed = 1; } - return 0; -} /* i_mapper_symmetric_zero_to_one */ + return changed; +} -/* A mapper for the floating point log. */ int i_mapper_log(ir_node *call, void *ctx) { /* log(1.0) = 0.0 */ return i_mapper_one_to_zero(call, ctx, FS_OPT_RTS_LOG); -} /* i_mapper_log */ +} + +int i_mapper_log2(ir_node *call, void *ctx) +{ + /* log2(1.0) = 0.0 */ + return i_mapper_one_to_zero(call, ctx, FS_OPT_RTS_LOG); +} + +int i_mapper_log10(ir_node *call, void *ctx) +{ + /* log10(1.0) = 0.0 */ + return i_mapper_one_to_zero(call, ctx, FS_OPT_RTS_LOG); +} -/* A mapper for the floating point sin. */ int i_mapper_sin(ir_node *call, void *ctx) { /* sin(0.0) = 0.0 */ return i_mapper_zero_to_zero(call, ctx, FS_OPT_RTS_SIN); -} /* i_mapper_sin */ +} -/* A mapper for the floating point cos. */ int i_mapper_cos(ir_node *call, void *ctx) { /* cos(0.0) = 1.0, cos(-x) = x */ return i_mapper_symmetric_zero_to_one(call, ctx, FS_OPT_RTS_COS); -} /* i_mapper_cos */ +} -/* A mapper for the floating point tan. */ int i_mapper_tan(ir_node *call, void *ctx) { /* tan(0.0) = 0.0 */ return i_mapper_zero_to_zero(call, ctx, FS_OPT_RTS_TAN); -} /* i_mapper_tan */ +} -/* A mapper for the floating point asin. */ int i_mapper_asin(ir_node *call, void *ctx) { /* asin(0.0) = 0.0 */ return i_mapper_zero_to_zero(call, ctx, FS_OPT_RTS_ASIN); -} /* i_mapper_asin */ +} -/* A mapper for the floating point acos. */ int i_mapper_acos(ir_node *call, void *ctx) { /* acos(1.0) = 0.0 */ return i_mapper_one_to_zero(call, ctx, FS_OPT_RTS_ACOS); -} /* i_mapper_acos */ +} -/* A mapper for the floating point atan. */ int i_mapper_atan(ir_node *call, void *ctx) { /* atan(0.0) = 0.0 */ return i_mapper_zero_to_zero(call, ctx, FS_OPT_RTS_ATAN); -} /* i_mapper_atan */ +} -/* A mapper for the floating point sinh. */ int i_mapper_sinh(ir_node *call, void *ctx) { /* sinh(0.0) = 0.0 */ return i_mapper_zero_to_zero(call, ctx, FS_OPT_RTS_SINH); -} /* i_mapper_sinh */ +} -/* A mapper for the floating point cosh. */ int i_mapper_cosh(ir_node *call, void *ctx) { /* cosh(0.0) = 1.0, cosh(-x) = x */ return i_mapper_symmetric_zero_to_one(call, ctx, FS_OPT_RTS_COSH); -} /* i_mapper_cosh */ +} -/* A mapper for the floating point tanh. */ int i_mapper_tanh(ir_node *call, void *ctx) { /* tanh(0.0) = 0.0 */ return i_mapper_zero_to_zero(call, ctx, FS_OPT_RTS_TANH); -} /* i_mapper_tanh */ +} /** * Return the const entity that is accessed through the pointer ptr or @@ -596,8 +604,8 @@ int i_mapper_tanh(ir_node *call, void *ctx) */ static ir_entity *get_const_entity(ir_node *ptr) { - if (is_Global(ptr)) { - ir_entity *ent = get_Global_entity(ptr); + if (is_SymConst_addr_ent(ptr)) { + ir_entity *ent = get_SymConst_entity(ptr); if (get_entity_linkage(ent) & IR_LINKAGE_CONSTANT) { /* a constant entity */ @@ -605,7 +613,30 @@ static ir_entity *get_const_entity(ir_node *ptr) } } return NULL; -} /* get_const_entity */ +} + +static ir_tarval *get_initializer_value(ir_initializer_t *const init, ir_mode *const mode) +{ + switch (get_initializer_kind(init)) { + case IR_INITIALIZER_NULL: + return get_mode_null(mode); + + case IR_INITIALIZER_TARVAL: + return get_initializer_tarval_value(init); + + case IR_INITIALIZER_CONST: { + ir_node *const irn = get_initializer_const_value(init); + if (is_Const(irn)) + return get_Const_tarval(irn); + break; + } + + case IR_INITIALIZER_COMPOUND: + break; + } + + return get_tarval_undefined(); +} static bool initializer_val_is_null(ir_initializer_t *init) { @@ -642,8 +673,8 @@ static ir_node *eval_strlen(ir_graph *irg, ir_entity *ent, ir_type *res_tp) ir_type *tp = get_entity_type(ent); ir_mode *mode; ir_initializer_t *initializer; - unsigned size; - unsigned i; + size_t size; + size_t i; if (! is_Array_type(tp)) return NULL; @@ -656,25 +687,6 @@ static ir_node *eval_strlen(ir_graph *irg, ir_entity *ent, ir_type *res_tp) if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8) return NULL; - if (!has_entity_initializer(ent)) { - size_t i, n; - - n = get_compound_ent_n_values(ent); - for (i = 0; i < n; ++i) { - ir_node *irn = get_compound_ent_value(ent, i); - - if (! is_Const(irn)) - return NULL; - - if (is_Const_null(irn)) { - /* found the length */ - ir_tarval *tv = new_tarval_from_long(i, get_type_mode(res_tp)); - return new_r_Const(irg, tv); - } - } - return NULL; - } - initializer = get_entity_initializer(ent); if (get_initializer_kind(initializer) != IR_INITIALIZER_COMPOUND) return NULL; @@ -689,9 +701,8 @@ static ir_node *eval_strlen(ir_graph *irg, ir_entity *ent, ir_type *res_tp) } return NULL; -} /* eval_strlen */ +} -/* A mapper for strlen */ int i_mapper_strlen(ir_node *call, void *ctx) { ir_node *s = get_Call_param(call, 0); @@ -716,7 +727,7 @@ int i_mapper_strlen(ir_node *call, void *ctx) } } return 0; -} /* i_mapper_strlen */ +} /** * Calculate the value of strlen if possible. @@ -731,8 +742,14 @@ int i_mapper_strlen(ir_node *call, void *ctx) static ir_node *eval_strcmp(ir_graph *irg, ir_entity *left, ir_entity *right, ir_type *res_tp) { - ir_type *tp; - ir_mode *mode; + ir_type *tp; + ir_mode *mode; + ir_initializer_t *init_l; + ir_initializer_t *init_r; + size_t size_l; + size_t size_r; + size_t size; + size_t i; tp = get_entity_type(left); if (! is_Array_type(tp)) @@ -758,58 +775,41 @@ static ir_node *eval_strcmp(ir_graph *irg, ir_entity *left, ir_entity *right, if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8) return NULL; - if (!has_entity_initializer(left) && !has_entity_initializer(right)) { - /* code that uses deprecated compound_graph_path stuff */ - size_t n = get_compound_ent_n_values(left); - size_t n_r = get_compound_ent_n_values(right); - size_t i; - int res = 0; - - if (n_r < n) - n = n_r; - for (i = 0; i < n; ++i) { - ir_node *irn; - long v_l, v_r; - ir_tarval *tv; - - irn = get_compound_ent_value(left, i); - if (! is_Const(irn)) - return NULL; - tv = get_Const_tarval(irn); - v_l = get_tarval_long(tv); - - irn = get_compound_ent_value(right, i); - if (! is_Const(irn)) - return NULL; - tv = get_Const_tarval(irn); - v_r = get_tarval_long(tv); - - if (v_l < v_r) { - res = -1; - break; - } - if (v_l > v_r) { - res = +1; - break; - } + init_l = get_entity_initializer(left); + init_r = get_entity_initializer(right); + if (get_initializer_kind(init_l) != IR_INITIALIZER_COMPOUND || + get_initializer_kind(init_r) != IR_INITIALIZER_COMPOUND) + return NULL; - if (v_l == 0) { - res = 0; - break; - } + size_l = get_initializer_compound_n_entries(init_l); + size_r = get_initializer_compound_n_entries(init_r); + size = size_l < size_r ? size_l : size_r; + + for (i = 0; i != size; ++i) { + ir_initializer_t *const val_l = get_initializer_compound_value(init_l, i); + ir_tarval *const tv_l = get_initializer_value(val_l, mode); + ir_initializer_t *const val_r = get_initializer_compound_value(init_r, i); + ir_tarval *const tv_r = get_initializer_value(val_r, mode); + + if (!tarval_is_constant(tv_l) || !tarval_is_constant(tv_r)) + return NULL; + + if (tv_l != tv_r) { + ir_mode *const res_mode = get_type_mode(res_tp); + ir_tarval *const res_l = tarval_convert_to(tv_l, res_mode); + ir_tarval *const res_r = tarval_convert_to(tv_r, res_mode); + ir_tarval *const tv = tarval_sub(res_l, res_r, res_mode); + return new_r_Const(irg, tv); } - if (i < n) { - /* we found an end */ - ir_tarval *tv = new_tarval_from_long(res, get_type_mode(res_tp)); + + if (tarval_is_null(tv_l)) { + ir_tarval *const tv = get_mode_null(get_type_mode(res_tp)); return new_r_Const(irg, tv); } - return NULL; } - /* TODO */ - return NULL; -} /* eval_strcmp */ +} /** * Checks if an entity represents the empty string. @@ -822,7 +822,6 @@ static int is_empty_string(ir_entity *ent) { ir_type *tp = get_entity_type(ent); ir_mode *mode; - ir_node *irn; ir_initializer_t *initializer; ir_initializer_t *init0; @@ -837,16 +836,6 @@ static int is_empty_string(ir_entity *ent) if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8) return 0; - if (!has_entity_initializer(ent)) { - /* code for deprecated compound_graph_path stuff */ - size_t n = get_compound_ent_n_values(ent); - if (n < 1) - return 0; - irn = get_compound_ent_value(ent, 0); - - return is_Const(irn) && is_Const_null(irn); - } - initializer = get_entity_initializer(ent); if (get_initializer_kind(initializer) != IR_INITIALIZER_COMPOUND) return 0; @@ -856,9 +845,8 @@ static int is_empty_string(ir_entity *ent) init0 = get_initializer_compound_value(initializer, 0); return initializer_val_is_null(init0); -} /* is_empty_string */ +} -/* A mapper for strcmp */ int i_mapper_strcmp(ir_node *call, void *ctx) { ir_node *left = get_Call_param(call, 0); @@ -924,9 +912,15 @@ replace_by_call: /* replace the strcmp by (*x) */ irn = new_rd_Load(dbg, block, mem, v, mode, cons_none); mem = new_r_Proj(irn, mode_M, pn_Load_M); - exc = new_r_Proj(irn, mode_X, pn_Load_X_except); - reg = new_r_Proj(irn, mode_X, pn_Load_X_regular); irn = new_r_Proj(irn, mode, pn_Load_res); + if (ir_throws_exception(call)) { + exc = new_r_Proj(irn, mode_X, pn_Load_X_except); + reg = new_r_Proj(irn, mode_X, pn_Load_X_regular); + ir_set_throws_exception(irn, true); + } else { + exc = NULL; + reg = NULL; + } /* conv to the result mode */ mode = get_type_mode(res_tp); @@ -947,9 +941,8 @@ replace_by_call: } return 0; -} /* i_mapper_strcmp */ +} -/* A mapper for strncmp */ int i_mapper_strncmp(ir_node *call, void *ctx) { ir_node *left = get_Call_param(call, 0); @@ -975,9 +968,8 @@ int i_mapper_strncmp(ir_node *call, void *ctx) return 1; } return 0; -} /* i_mapper_strncmp */ +} -/* A mapper for strcpy */ int i_mapper_strcpy(ir_node *call, void *ctx) { ir_node *dst = get_Call_param(call, 0); @@ -994,9 +986,8 @@ int i_mapper_strcpy(ir_node *call, void *ctx) return 1; } return 0; -} /* i_mapper_strcpy */ +} -/* A mapper for memcpy */ int i_mapper_memcpy(ir_node *call, void *ctx) { ir_node *dst = get_Call_param(call, 0); @@ -1014,9 +1005,8 @@ int i_mapper_memcpy(ir_node *call, void *ctx) return 1; } return 0; -} /* i_mapper_memcpy */ +} -/* A mapper for mempcpy */ int i_mapper_mempcpy(ir_node *call, void *ctx) { ir_node *dst = get_Call_param(call, 0); @@ -1038,9 +1028,8 @@ int i_mapper_mempcpy(ir_node *call, void *ctx) return 1; } return 0; -} /* i_mapper_mempcpy */ +} -/* A mapper for memmove */ int i_mapper_memmove(ir_node *call, void *ctx) { ir_node *dst = get_Call_param(call, 0); @@ -1058,9 +1047,8 @@ int i_mapper_memmove(ir_node *call, void *ctx) return 1; } return 0; -} /* i_mapper_memmove */ +} -/* A mapper for memset */ int i_mapper_memset(ir_node *call, void *ctx) { ir_node *len = get_Call_param(call, 2); @@ -1076,9 +1064,8 @@ int i_mapper_memset(ir_node *call, void *ctx) return 1; } return 0; -} /* i_mapper_memset */ +} -/* A mapper for memcmp */ int i_mapper_memcmp(ir_node *call, void *ctx) { ir_node *left = get_Call_param(call, 0); @@ -1104,7 +1091,7 @@ int i_mapper_memcmp(ir_node *call, void *ctx) return 1; } return 0; -} /* i_mapper_memcmp */ +} /** * Returns the result mode of a node. @@ -1113,17 +1100,12 @@ static ir_mode *get_irn_res_mode(ir_node *node) { switch (get_irn_opcode(node)) { case iro_Load: return get_Load_mode(node); - case iro_Quot: return get_Quot_resmode(node); case iro_Div: return get_Div_resmode(node); case iro_Mod: return get_Mod_resmode(node); - case iro_DivMod: return get_DivMod_resmode(node); default: return NULL; } -} /* get_irn_res_mode */ - -#define LMAX(a, b) ((a) > (b) ? (a) : (b)) +} -/* A mapper for mapping unsupported instructions to runtime calls. */ int i_mapper_RuntimeCall(ir_node *node, runtime_rt *rt) { int i, j, arity, first, n_param, n_res; @@ -1131,6 +1113,8 @@ int i_mapper_RuntimeCall(ir_node *node, runtime_rt *rt) ir_type *mtp; ir_node *mem, *bl, *call, *addr, *res_proj; ir_node **in; + bool throws_exception; + ir_op *op; ir_graph *irg; symconst_symbol sym; ir_mode *mode = get_irn_mode(node); @@ -1171,15 +1155,17 @@ int i_mapper_RuntimeCall(ir_node *node, runtime_rt *rt) return 0; } - n_res = get_method_n_ress(mtp); + n_res = get_method_n_ress(mtp); + throws_exception = ir_throws_exception(node); /* step 0: calculate the number of needed Proj's */ n_proj = 0; - n_proj = LMAX(n_proj, rt->mem_proj_nr + 1); - n_proj = LMAX(n_proj, rt->regular_proj_nr + 1); - n_proj = LMAX(n_proj, rt->exc_proj_nr + 1); - n_proj = LMAX(n_proj, rt->exc_mem_proj_nr + 1); - n_proj = LMAX(n_proj, rt->res_proj_nr + 1); + n_proj = MAX(n_proj, rt->mem_proj_nr + 1); + n_proj = MAX(n_proj, rt->res_proj_nr + 1); + if (throws_exception) { + n_proj = MAX(n_proj, rt->regular_proj_nr + 1); + n_proj = MAX(n_proj, rt->exc_proj_nr + 1); + } if (n_proj > 0) { if (rt->mode != mode_T) /* must be mode_T */ @@ -1193,6 +1179,7 @@ int i_mapper_RuntimeCall(ir_node *node, runtime_rt *rt) /* ok, when we are here, the number of predecessors match as well as the parameter modes */ bl = get_nodes_block(node); + op = get_irn_op(node); in = NULL; if (n_param > 0) { @@ -1218,25 +1205,21 @@ int i_mapper_RuntimeCall(ir_node *node, runtime_rt *rt) /* we are ready */ turn_into_tuple(node, n_proj); - for (i = 0; i < n_proj; ++i) - set_Tuple_pred(node, i, new_r_Bad(irg)); if (rt->mem_proj_nr >= 0) set_Tuple_pred(node, rt->mem_proj_nr, new_r_Proj(call, mode_M, pn_Call_M)); - if (!is_NoMem(mem)) { - /* Exceptions can only be handled with real memory */ - if (rt->regular_proj_nr >= 0) - set_Tuple_pred(node, rt->regular_proj_nr, new_r_Proj(call, mode_X, pn_Call_X_regular)); - if (rt->exc_proj_nr >= 0) - set_Tuple_pred(node, rt->exc_proj_nr, new_r_Proj(call, mode_X, pn_Call_X_except)); - if (rt->exc_mem_proj_nr >= 0) - set_Tuple_pred(node, rt->mem_proj_nr, new_r_Proj(call, mode_M, pn_Call_M)); + if (throws_exception) { + set_Tuple_pred(node, op->pn_x_regular, new_r_Proj(call, mode_X, pn_Call_X_regular)); + set_Tuple_pred(node, op->pn_x_except, new_r_Proj(call, mode_X, pn_Call_X_except)); } - if (rt->res_proj_nr >= 0) - for (i = 0; i < n_res; ++i) - set_Tuple_pred(node, rt->res_proj_nr + i, - new_r_Proj(res_proj, get_type_mode(get_method_res_type(mtp, i)), i)); - return 1; + if (rt->res_proj_nr >= 0) { + for (i = 0; i < n_res; ++i) { + ir_mode *mode = get_type_mode(get_method_res_type(mtp, i)); + ir_node *proj = new_r_Proj(res_proj, mode, i); + set_Tuple_pred(node, rt->res_proj_nr + i, proj); + } + } + return 1; } else { /* only one return value supported */ if (n_res > 0) { @@ -1251,4 +1234,4 @@ int i_mapper_RuntimeCall(ir_node *node, runtime_rt *rt) } /* should not happen */ return 0; -} /* i_mapper_RuntimeCall */ +}