X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_intrinsics.c;h=09faa9d1097777f6921082655b67ef3bc4499681;hb=ca42e4ac671c49f7ba8e9dfffd805abf49b2c733;hp=f748f439a3d7856ec44b9d72ca74e04c6cbf5a30;hpb=7412de5cd8ccbd237f84e363bcb80e73ff4f1d79;p=libfirm diff --git a/ir/lower/lower_intrinsics.c b/ir/lower/lower_intrinsics.c index f748f439a..09faa9d10 100644 --- a/ir/lower/lower_intrinsics.c +++ b/ir/lower/lower_intrinsics.c @@ -23,9 +23,10 @@ * @author Michael Beck * @version $Id$ */ - #include "config.h" +#include + #include "lowering.h" #include "irop_t.h" #include "irprog_t.h" @@ -36,15 +37,16 @@ #include "irgmod.h" #include "irgopt.h" #include "trouts.h" -#include "irvrfy.h" +#include "irverify.h" #include "pmap.h" #include "array_t.h" #include "irpass_t.h" #include "iropt_dbg.h" #include "error.h" +#include "be.h" /** Walker environment. */ -typedef struct _walker_env { +typedef struct walker_env { pmap *c_map; /**< The intrinsic call map. */ unsigned nr_of_intrinsics; /**< statistics */ i_instr_record **i_map; /**< The intrinsic instruction map. */ @@ -53,7 +55,8 @@ typedef struct _walker_env { /** * walker: call all mapper functions */ -static void call_mapper(ir_node *node, void *env) { +static void call_mapper(ir_node *node, void *env) +{ walker_env_t *wenv = env; ir_op *op = get_irn_op(node); @@ -90,7 +93,8 @@ static void call_mapper(ir_node *node, void *env) { } /* call_mapper */ /* Go through all graphs and map calls to intrinsic functions. */ -unsigned lower_intrinsics(i_record *list, int length, int part_block_used) { +unsigned lower_intrinsics(i_record *list, int length, int part_block_used) +{ int i, n_ops = get_irp_n_opcodes(); ir_graph *irg; pmap *c_map = pmap_create_ex(length); @@ -99,7 +103,7 @@ unsigned lower_intrinsics(i_record *list, int length, int part_block_used) { walker_env_t wenv; /* we use the ir_op generic pointers here */ - NEW_ARR_A(const i_instr_record *, i_map, n_ops); + NEW_ARR_A(i_instr_record *, i_map, n_ops); memset((void *)i_map, 0, sizeof(*i_map) * n_ops); /* fill a map for faster search */ @@ -146,7 +150,7 @@ unsigned lower_intrinsics(i_record *list, int length, int part_block_used) { set_trouts_inconsistent(); /* verify here */ - irg_verify(irg, VRFY_NORMAL); + irg_verify(irg, VERIFY_NORMAL); /* Optimize it, tuple might be created. */ optimize_graph_df(irg); @@ -173,44 +177,32 @@ struct pass_t { static int pass_wrapper(ir_prog *irp, void *context) { struct pass_t *pass = context; + (void) irp; /* TODO: set current irp, or remove parameter */ lower_intrinsics(pass->list, pass->length, pass->part_block_used); /* probably this pass should not run again */ return 0; -} /* pass_wrapper */ +} /** * Creates an ir_prog pass for lower_intrinsics. * * @param name the name of this pass or NULL - * @param verify should this pass be verified? - * @param dump should this pass result be dumped? * @param list an array of intrinsic map records * @param length the length of the array * @param part_block_used set to true if part_block() must be using during lowering */ ir_prog_pass_t *lower_intrinsics_pass( const char *name, - int verify, - int dump, i_record *list, int length, int part_block_used) { struct pass_t *pass = xmalloc(sizeof(*pass) + (length-1) * sizeof(pass->list[0])); - memset(&pass->pass, 0, sizeof(pass->pass)); - pass->pass.kind = k_ir_prog_pass; - pass->pass.run_on_irprog = pass_wrapper; - pass->pass.context = pass; - pass->pass.name = name ? name : "lower_intrinsics"; - pass->pass.verify = verify != 0; - pass->pass.dump = dump != 0; - - INIT_LIST_HEAD(&pass->pass.list); - memcpy(pass->list, list, sizeof(list[0]) * length); pass->length = length; pass->part_block_used = part_block_used; - return &pass->pass; + return def_prog_pass_constructor( + &pass->pass, name ? name : "lower_intrinsics", pass_wrapper); } /* lower_intrinsics_pass*/ /** @@ -222,8 +214,10 @@ 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) { - ir_node *block = get_nodes_block(call); +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); if (reg_jmp == NULL) { @@ -232,36 +226,49 @@ static void replace_call(ir_node *irn, ir_node *call, ir_node *mem, ir_node *reg set_opt_cse(0); reg_jmp = new_r_Jmp(block); set_opt_cse(old_cse); - exc_jmp = new_Bad(); + exc_jmp = new_r_Bad(irg); } irn = new_r_Tuple(block, 1, &irn); turn_into_tuple(call, pn_Call_max); - set_Tuple_pred(call, pn_Call_M_regular, mem); + 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_M_except, mem); - set_Tuple_pred(call, pn_Call_P_value_res_base, new_Bad()); + set_Tuple_pred(call, pn_Call_P_value_res_base, new_r_Bad(irg)); } /* replace_call */ /* A mapper for the integer abs. */ -int i_mapper_abs(ir_node *call, void *ctx) { - ir_node *mem = get_Call_mem(call); - ir_node *block = get_nodes_block(call); - ir_node *op = get_Call_param(call, 0); - ir_node *irn; - dbg_info *dbg = get_irn_dbg_info(call); +int i_mapper_abs(ir_node *call, void *ctx) +{ + ir_node *mem = get_Call_mem(call); + ir_node *block = get_nodes_block(call); + ir_node *op = get_Call_param(call, 0); + ir_graph *irg = get_irn_irg(call); + 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 *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; - irn = new_rd_Abs(dbg, block, op, get_irn_mode(op)); - DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_ABS); - replace_call(irn, call, mem, NULL, NULL); + /* mux allowed by backend? */ + if (!allow_ifconv(cond, op, minus_op)) + return 0; + + /* construct Mux */ + mux = new_rd_Mux(dbg, block, cond, 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) { +int i_mapper_bswap(ir_node *call, void *ctx) +{ ir_node *mem = get_Call_mem(call); ir_node *block = get_nodes_block(call); ir_node *op = get_Call_param(call, 0); @@ -272,14 +279,14 @@ 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); - DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_ABS); - irn = new_r_Proj(block, irn, get_irn_mode(op), pn_Builtin_1_result); + irn = new_r_Proj(irn, get_irn_mode(op), pn_Builtin_1_result); 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) { +int i_mapper_alloca(ir_node *call, void *ctx) +{ ir_node *mem = get_Call_mem(call); ir_node *block = get_nodes_block(call); ir_node *op = get_Call_param(call, 0); @@ -297,10 +304,10 @@ int i_mapper_alloca(ir_node *call, void *ctx) { } irn = new_rd_Alloc(dbg, block, mem, op, firm_unknown_type, stack_alloc); - mem = new_rd_Proj(dbg, block, irn, mode_M, pn_Alloc_M); - no_exc = new_rd_Proj(dbg, block, irn, mode_X, pn_Alloc_X_regular); - exc = new_rd_Proj(dbg, block, irn, mode_X, pn_Alloc_X_except); - irn = new_rd_Proj(dbg, block, irn, get_modeP_data(), pn_Alloc_res); + 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); DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_ALLOCA); replace_call(irn, call, mem, no_exc, exc); @@ -308,7 +315,8 @@ int i_mapper_alloca(ir_node *call, void *ctx) { } /* i_mapper_alloca */ /* A mapper for the floating point sqrt. */ -int i_mapper_sqrt(ir_node *call, void *ctx) { +int i_mapper_sqrt(ir_node *call, void *ctx) +{ ir_node *mem; tarval *tv; ir_node *op = get_Call_param(call, 0); @@ -330,7 +338,8 @@ int i_mapper_sqrt(ir_node *call, void *ctx) { } /* i_mapper_sqrt */ /* A mapper for the floating point cbrt. */ -int i_mapper_cbrt(ir_node *call, void *ctx) { +int i_mapper_cbrt(ir_node *call, void *ctx) +{ ir_node *mem; tarval *tv; ir_node *op = get_Call_param(call, 0); @@ -352,13 +361,15 @@ int i_mapper_cbrt(ir_node *call, void *ctx) { } /* i_mapper_cbrt */ /* A mapper for the floating point pow. */ -int i_mapper_pow(ir_node *call, void *ctx) { +int i_mapper_pow(ir_node *call, void *ctx) +{ 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_node *irn, *reg_jmp = NULL, *exc_jmp = NULL; + 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)) { @@ -369,7 +380,7 @@ int i_mapper_pow(ir_node *call, void *ctx) { if (tarval_is_null(tv)) { /* pow(x, 0.0) = 1.0 */ ir_mode *mode = get_tarval_mode(tv); - irn = new_Const(get_mode_one(mode)); + irn = new_r_Const(irg, get_mode_one(mode)); } else if (tarval_is_one(tv)) { /* pow(x, 1.0) = x */ irn = left; @@ -389,12 +400,12 @@ int i_mapper_pow(ir_node *call, void *ctx) { ir_mode *mode = get_irn_mode(left); ir_node *quot; - irn = new_Const(get_mode_one(mode)); + 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(block, quot, mode_M, pn_Quot_M); - irn = new_r_Proj(block, quot, mode, pn_Quot_res); - reg_jmp = new_r_Proj(block, quot, mode_X, pn_Quot_X_regular); - exc_jmp = new_r_Proj(block, quot, mode_X, pn_Quot_X_except); + 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); } DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_POW); replace_call(irn, call, mem, reg_jmp, exc_jmp); @@ -402,14 +413,16 @@ int i_mapper_pow(ir_node *call, void *ctx) { } /* i_mapper_pow */ /* A mapper for the floating point exp. */ -int i_mapper_exp(ir_node *call, void *ctx) { +int i_mapper_exp(ir_node *call, void *ctx) +{ ir_node *val = get_Call_param(call, 0); (void) ctx; if (is_Const(val) && is_Const_null(val)) { /* exp(0.0) = 1.0 */ + ir_graph *irg = get_irn_irg(val); ir_mode *mode = get_irn_mode(val); - ir_node *irn = new_Const(get_mode_one(mode)); + ir_node *irn = new_r_Const(irg, get_mode_one(mode)); ir_node *mem = get_Call_mem(call); DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_EXP); replace_call(irn, call, mem, NULL, NULL); @@ -421,7 +434,8 @@ int i_mapper_exp(ir_node *call, void *ctx) { /** * A mapper for mapping f(0.0) to 0.0. */ -static int i_mapper_zero_to_zero(ir_node *call, void *ctx, int reason) { +static int i_mapper_zero_to_zero(ir_node *call, void *ctx, int reason) +{ ir_node *val = get_Call_param(call, 0); (void) ctx; @@ -438,15 +452,17 @@ static int i_mapper_zero_to_zero(ir_node *call, void *ctx, int reason) { /** * A mapper for mapping f(1.0) to 0.0. */ -static int i_mapper_one_to_zero(ir_node *call, void *ctx, int reason) { +static int i_mapper_one_to_zero(ir_node *call, void *ctx, int reason) +{ ir_node *val = get_Call_param(call, 0); (void) ctx; if (is_Const(val) && is_Const_one(val)) { /* acos(1.0) = 0.0 */ - ir_mode *mode = get_irn_mode(val); - ir_node *irn = new_Const(get_mode_null(mode)); - ir_node *mem = get_Call_mem(call); + ir_graph *irg = get_irn_irg(val); + ir_mode *mode = get_irn_mode(val); + ir_node *irn = new_r_Const(irg, get_mode_null(mode)); + ir_node *mem = get_Call_mem(call); DBG_OPT_ALGSIM0(call, irn, reason); replace_call(irn, call, mem, NULL, NULL); return 1; @@ -459,7 +475,8 @@ static int i_mapper_one_to_zero(ir_node *call, void *ctx, int reason) { * f(-x) = f(x). * f(0.0) = 1.0 */ -static int i_mapper_symmetric_zero_to_one(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); (void) ctx; @@ -489,8 +506,9 @@ static int i_mapper_symmetric_zero_to_one(ir_node *call, void *ctx, int reason) if (is_Const(val) && is_Const_null(val)) { /* f(0.0) = 1.0 */ + ir_graph *irg = get_irn_irg(val); ir_mode *mode = get_irn_mode(val); - ir_node *irn = new_Const(get_mode_one(mode)); + ir_node *irn = new_r_Const(irg, get_mode_one(mode)); ir_node *mem = get_Call_mem(call); DBG_OPT_ALGSIM0(call, irn, reason); replace_call(irn, call, mem, NULL, NULL); @@ -500,61 +518,71 @@ static int i_mapper_symmetric_zero_to_one(ir_node *call, void *ctx, int reason) } /* i_mapper_symmetric_zero_to_one */ /* A mapper for the floating point log. */ -int i_mapper_log(ir_node *call, void *ctx) { +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 */ /* A mapper for the floating point sin. */ -int i_mapper_sin(ir_node *call, void *ctx) { +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) { +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) { +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) { +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) { +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) { +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) { +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) { +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) { +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 */ @@ -565,12 +593,12 @@ int i_mapper_tanh(ir_node *call, void *ctx) { * * @param ptr the pointer */ -static ir_entity *get_const_entity(ir_node *ptr) { - /* FIXME: this cannot handle constant strings inside struct initializers yet */ +static ir_entity *get_const_entity(ir_node *ptr) +{ if (is_Global(ptr)) { ir_entity *ent = get_Global_entity(ptr); - if (get_entity_variability(ent) == variability_constant) { + if (get_entity_linkage(ent) & IR_LINKAGE_CONSTANT) { /* a constant entity */ return ent; } @@ -578,6 +606,27 @@ static ir_entity *get_const_entity(ir_node *ptr) { return NULL; } /* get_const_entity */ +static bool initializer_val_is_null(ir_initializer_t *init) +{ + tarval *tv; + + if (get_initializer_kind(init) == IR_INITIALIZER_NULL) + return true; + + if (get_initializer_kind(init) == IR_INITIALIZER_TARVAL) { + tv = get_initializer_tarval_value(init); + } else if (get_initializer_kind(init) == IR_INITIALIZER_CONST) { + ir_node *irn = get_initializer_const_value(init); + if (!is_Const(irn)) + return false; + tv = get_Const_tarval(irn); + } else { + return false; + } + + return tarval_is_null(tv); +} + /** * Calculate the value of strlen if possible. * @@ -587,10 +636,13 @@ static ir_entity *get_const_entity(ir_node *ptr) { * @return a Const node containing the strlen() result or NULL * if the evaluation fails */ -static ir_node *eval_strlen(ir_entity *ent, ir_type *res_tp) { +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; - int i, n, len = -1; + ir_initializer_t *initializer; + unsigned size; + unsigned i; if (! is_Array_type(tp)) return NULL; @@ -603,28 +655,50 @@ static ir_node *eval_strlen(ir_entity *ent, ir_type *res_tp) { if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8) return NULL; - n = get_compound_ent_n_values(ent); - for (i = 0; i < n; ++i) { - ir_node *irn = get_compound_ent_value(ent, i); + if (!has_entity_initializer(ent)) { + int len = 0; + int n; + int i = -1; + + 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(irn)) + return NULL; - if (is_Const_null(irn)) { - /* found the length */ - len = i; - break; + if (is_Const_null(irn)) { + /* found the length */ + len = i; + break; + } } + if (len >= 0) { + tarval *tv = new_tarval_from_long(len, get_type_mode(res_tp)); + return new_r_Const(irg, tv); + } + return NULL; } - if (len >= 0) { - tarval *tv = new_tarval_from_long(len, get_type_mode(res_tp)); - return new_Const_type(tv, res_tp); + + initializer = get_entity_initializer(ent); + if (get_initializer_kind(initializer) != IR_INITIALIZER_COMPOUND) + return NULL; + + size = get_initializer_compound_n_entries(initializer); + for (i = 0; i < size; ++i) { + ir_initializer_t *val = get_initializer_compound_value(initializer, i); + if (initializer_val_is_null(val)) { + tarval *tv = new_tarval_from_long(i, get_type_mode(res_tp)); + return new_r_Const(irg, tv); + } } + return NULL; } /* eval_strlen */ /* A mapper for strlen */ -int i_mapper_strlen(ir_node *call, void *ctx) { +int i_mapper_strlen(ir_node *call, void *ctx) +{ ir_node *s = get_Call_param(call, 0); ir_entity *ent = get_const_entity(s); @@ -637,7 +711,7 @@ int i_mapper_strlen(ir_node *call, void *ctx) { ir_node *irn; tp = get_method_res_type(tp, 0); - irn = eval_strlen(ent, tp); + irn = eval_strlen(get_irn_irg(call), ent, tp); if (irn) { ir_node *mem = get_Call_mem(call); @@ -659,7 +733,9 @@ int i_mapper_strlen(ir_node *call, void *ctx) { * @return a Const node containing the strcmp() result or NULL * if the evaluation fails */ -static ir_node *eval_strcmp(ir_entity *left, ir_entity *right, ir_type *res_tp) { +static ir_node *eval_strcmp(ir_graph *irg, ir_entity *left, ir_entity *right, + ir_type *res_tp) +{ ir_type *tp; ir_mode *mode; int i, n, n_r, res; @@ -688,46 +764,55 @@ static ir_node *eval_strcmp(ir_entity *left, ir_entity *right, ir_type *res_tp) if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8) return NULL; - n = get_compound_ent_n_values(left); - n_r = get_compound_ent_n_values(right); - if (n_r < n) - n = n_r; - for (i = 0; i < n; ++i) { - ir_node *irn; - long v_l, v_r; - 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 (!has_entity_initializer(left) && !has_entity_initializer(right)) { + /* code that uses deprecated compound_graph_path stuff */ + + n = get_compound_ent_n_values(left); + n_r = get_compound_ent_n_values(right); + if (n_r < n) + n = n_r; + res = 0; + for (i = 0; i < n; ++i) { + ir_node *irn; + long v_l, v_r; + 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; + } - if (v_l < v_r) { - res = -1; - break; - } - if (v_l > v_r) { - res = +1; - break; + if (v_l == 0) { + res = 0; + break; + } } - - if (v_l == 0) { - res = 0; - break; + if (i < n) { + /* we found an end */ + tarval *tv = new_tarval_from_long(res, get_type_mode(res_tp)); + return new_r_Const(irg, tv); } + return NULL; } - if (i < n) { - /* we found an end */ - tarval *tv = new_tarval_from_long(res, get_type_mode(res_tp)); - return new_Const_type(tv, res_tp); - } + + /* TODO */ + return NULL; } /* eval_strcmp */ @@ -738,11 +823,13 @@ static ir_node *eval_strcmp(ir_entity *left, ir_entity *right, ir_type *res_tp) * * @return non-zero if ent represents the empty string */ -static int is_empty_string(ir_entity *ent) { - ir_type *tp = get_entity_type(ent); - ir_mode *mode; - int n; - ir_node *irn; +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; if (! is_Array_type(tp)) return 0; @@ -755,16 +842,30 @@ static int is_empty_string(ir_entity *ent) { if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8) return 0; - n = get_compound_ent_n_values(ent); - if (n < 1) + if (!has_entity_initializer(ent)) { + /* code for deprecated compound_graph_path stuff */ + int 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; - irn = get_compound_ent_value(ent, 0); - return is_Const(irn) && is_Const_null(irn); + if (get_initializer_compound_n_entries(initializer) < 1) + return 0; + + 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) { +int i_mapper_strcmp(ir_node *call, void *ctx) +{ ir_node *left = get_Call_param(call, 0); ir_node *right = get_Call_param(call, 1); ir_node *irn = NULL; @@ -790,10 +891,11 @@ int i_mapper_strcmp(ir_node *call, void *ctx) { if (left == right) { /* a strcmp(s, s) ==> 0 */ + ir_graph *irg = get_irn_irg(call); ir_node *mem = get_Call_mem(call); ir_mode *mode = get_type_mode(res_tp); - irn = new_Const(get_mode_null(mode)); + irn = new_r_Const(irg, get_mode_null(mode)); DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_STRCMP); replace_call(irn, call, mem, NULL, NULL); return 1; @@ -803,7 +905,7 @@ int i_mapper_strcmp(ir_node *call, void *ctx) { if (ent_l != NULL && ent_r != NULL) { /* both entities are const, try to evaluate */ - irn = eval_strcmp(ent_l, ent_r, res_tp); + irn = eval_strcmp(get_irn_irg(call), ent_l, ent_r, res_tp); } else if (ent_l != NULL) { if (is_empty_string(ent_l)) { /* s strcmp("", s) ==> -(*s)*/ @@ -826,10 +928,10 @@ replace_by_call: /* replace the strcmp by (*x) */ irn = new_rd_Load(dbg, block, mem, v, mode, 0); - mem = new_r_Proj(block, irn, mode_M, pn_Load_M); - exc = new_r_Proj(block, irn, mode_X, pn_Load_X_except); - reg = new_r_Proj(block, irn, mode_X, pn_Load_X_regular); - irn = new_r_Proj(block, irn, mode, pn_Load_res); + 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); /* conv to the result mode */ mode = get_type_mode(res_tp); @@ -853,7 +955,8 @@ replace_by_call: } /* i_mapper_strcmp */ /* A mapper for strncmp */ -int i_mapper_strncmp(ir_node *call, void *ctx) { +int i_mapper_strncmp(ir_node *call, void *ctx) +{ ir_node *left = get_Call_param(call, 0); ir_node *right = get_Call_param(call, 1); ir_node *len = get_Call_param(call, 2); @@ -863,6 +966,7 @@ int i_mapper_strncmp(ir_node *call, void *ctx) { if (left == right || (is_Const(len) && is_Const_null(len))) { /* a strncmp(s, s, len) ==> 0 OR a strncmp(a, b, 0) ==> 0 */ + ir_graph *irg = get_irn_irg(call); ir_node *mem = get_Call_mem(call); ir_node *adr = get_Call_ptr(call); ir_entity *ent = get_SymConst_entity(adr); @@ -870,7 +974,7 @@ int i_mapper_strncmp(ir_node *call, void *ctx) { ir_type *res_tp = get_method_res_type(call_tp, 0); ir_mode *mode = get_type_mode(res_tp); - irn = new_Const(get_mode_null(mode)); + irn = new_r_Const(irg, get_mode_null(mode)); DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_STRNCMP); replace_call(irn, call, mem, NULL, NULL); return 1; @@ -879,7 +983,8 @@ int i_mapper_strncmp(ir_node *call, void *ctx) { } /* i_mapper_strncmp */ /* A mapper for strcpy */ -int i_mapper_strcpy(ir_node *call, void *ctx) { +int i_mapper_strcpy(ir_node *call, void *ctx) +{ ir_node *dst = get_Call_param(call, 0); ir_node *src = get_Call_param(call, 1); (void) ctx; @@ -897,7 +1002,8 @@ int i_mapper_strcpy(ir_node *call, void *ctx) { } /* i_mapper_strcpy */ /* A mapper for memcpy */ -int i_mapper_memcpy(ir_node *call, void *ctx) { +int i_mapper_memcpy(ir_node *call, void *ctx) +{ ir_node *dst = get_Call_param(call, 0); ir_node *src = get_Call_param(call, 1); ir_node *len = get_Call_param(call, 2); @@ -916,7 +1022,8 @@ int i_mapper_memcpy(ir_node *call, void *ctx) { } /* i_mapper_memcpy */ /* A mapper for mempcpy */ -int i_mapper_mempcpy(ir_node *call, void *ctx) { +int i_mapper_mempcpy(ir_node *call, void *ctx) +{ ir_node *dst = get_Call_param(call, 0); ir_node *src = get_Call_param(call, 1); ir_node *len = get_Call_param(call, 2); @@ -939,7 +1046,8 @@ int i_mapper_mempcpy(ir_node *call, void *ctx) { } /* i_mapper_mempcpy */ /* A mapper for memmove */ -int i_mapper_memmove(ir_node *call, void *ctx) { +int i_mapper_memmove(ir_node *call, void *ctx) +{ ir_node *dst = get_Call_param(call, 0); ir_node *src = get_Call_param(call, 1); ir_node *len = get_Call_param(call, 2); @@ -958,7 +1066,8 @@ int i_mapper_memmove(ir_node *call, void *ctx) { } /* i_mapper_memmove */ /* A mapper for memset */ -int i_mapper_memset(ir_node *call, void *ctx) { +int i_mapper_memset(ir_node *call, void *ctx) +{ ir_node *len = get_Call_param(call, 2); (void) ctx; @@ -975,7 +1084,8 @@ int i_mapper_memset(ir_node *call, void *ctx) { } /* i_mapper_memset */ /* A mapper for memcmp */ -int i_mapper_memcmp(ir_node *call, void *ctx) { +int i_mapper_memcmp(ir_node *call, void *ctx) +{ ir_node *left = get_Call_param(call, 0); ir_node *right = get_Call_param(call, 1); ir_node *len = get_Call_param(call, 2); @@ -985,6 +1095,7 @@ int i_mapper_memcmp(ir_node *call, void *ctx) { if (left == right || (is_Const(len) && is_Const_null(len))) { /* a memcmp(s, s, len) ==> 0 OR a memcmp(a, b, 0) ==> 0 */ + ir_graph *irg = get_irn_irg(call); ir_node *mem = get_Call_mem(call); ir_node *adr = get_Call_ptr(call); ir_entity *ent = get_SymConst_entity(adr); @@ -992,7 +1103,7 @@ int i_mapper_memcmp(ir_node *call, void *ctx) { ir_type *res_tp = get_method_res_type(call_tp, 0); ir_mode *mode = get_type_mode(res_tp); - irn = new_Const(get_mode_null(mode)); + irn = new_r_Const(irg, get_mode_null(mode)); DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_STRNCMP); replace_call(irn, call, mem, NULL, NULL); return 1; @@ -1003,7 +1114,8 @@ int i_mapper_memcmp(ir_node *call, void *ctx) { /** * Returns the result mode of a node. */ -static ir_mode *get_irn_res_mode(ir_node *node) { +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); @@ -1017,7 +1129,8 @@ static ir_mode *get_irn_res_mode(ir_node *node) { #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_mapper_RuntimeCall(ir_node *node, runtime_rt *rt) +{ int i, j, arity, first, n_param, n_res; long n_proj; ir_type *mtp; @@ -1100,7 +1213,7 @@ int i_mapper_RuntimeCall(ir_node *node, runtime_rt *rt) { set_irn_pinned(call, get_irn_pinned(node)); if (n_res > 0) - res_proj = new_r_Proj(bl, call, mode_T, pn_Call_T_result); + res_proj = new_r_Proj(call, mode_T, pn_Call_T_result); else res_proj = NULL; @@ -1113,29 +1226,29 @@ int i_mapper_RuntimeCall(ir_node *node, runtime_rt *rt) { 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(bl, call, mode_M, pn_Call_M_regular)); + 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(bl, call, mode_X, pn_Call_X_regular)); + 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(bl, call, mode_X, pn_Call_X_except)); + 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(bl, call, mode_M, pn_Call_M_except)); + set_Tuple_pred(node, rt->mem_proj_nr, new_r_Proj(call, mode_M, pn_Call_M)); } 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(bl, res_proj, get_type_mode(get_method_res_type(mtp, i)), i)); + new_r_Proj(res_proj, get_type_mode(get_method_res_type(mtp, i)), i)); return 1; } else { /* only one return value supported */ if (n_res > 0) { ir_mode *mode = get_type_mode(get_method_res_type(mtp, 0)); - res_proj = new_r_Proj(bl, call, mode_T, pn_Call_T_result); - res_proj = new_r_Proj(bl, res_proj, mode, 0); + res_proj = new_r_Proj(call, mode_T, pn_Call_T_result); + res_proj = new_r_Proj(res_proj, mode, 0); exchange(node, res_proj); return 1;