X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firarch.c;h=f51c9b40aa020393870563b90355ffbd144efc97;hb=b4647d67ab7885d5da32c2a30242fbc4ed93d81b;hp=6834f4d138ea235345c457e42206dbf59ce5dfb6;hpb=a1e9069afa4fa1e16e2d176bcd7905d6a1ed4677;p=libfirm diff --git a/ir/ir/irarch.c b/ir/ir/irarch.c index 6834f4d13..f51c9b40a 100644 --- a/ir/ir/irarch.c +++ b/ir/ir/irarch.c @@ -91,6 +91,7 @@ typedef struct mul_env { instruction *root; /**< the root of the instruction tree */ ir_node *op; /**< the operand that is multiplied */ ir_node *blk; /**< the block where the new graph is built */ + ir_graph *irg; dbg_info *dbg; /**< the debug info for the new graph. */ ir_mode *shf_mode; /**< the (unsigned) mode for the shift constants */ int fail; /**< set to 1 if the instruction sequence fails the constraints */ @@ -103,7 +104,7 @@ typedef struct mul_env { * Some kind of default evaluator. Return the cost of * instructions. */ -static int default_evaluate(insn_kind kind, tarval *tv) +static int default_evaluate(insn_kind kind, ir_tarval *tv) { (void) tv; @@ -189,7 +190,7 @@ static instruction *emit_ROOT(mul_env *env, ir_node *root_op) /** * Returns the condensed representation of the tarval tv */ -static unsigned char *value_to_condensed(mul_env *env, tarval *tv, int *pr) +static unsigned char *value_to_condensed(mul_env *env, ir_tarval *tv, int *pr) { ir_mode *mode = get_tarval_mode(tv); int bits = get_mode_size_bits(mode); @@ -278,9 +279,9 @@ static unsigned char *complement_condensed(mul_env *env, unsigned char *R, int r /** * creates a tarval from a condensed representation. */ -static tarval *condensed_to_value(mul_env *env, unsigned char *R, int r) +static ir_tarval *condensed_to_value(mul_env *env, unsigned char *R, int r) { - tarval *res, *tv; + ir_tarval *res, *tv; int i, j; j = 0; @@ -289,7 +290,7 @@ static tarval *condensed_to_value(mul_env *env, unsigned char *R, int r) for (i = 0; i < r; ++i) { j = R[i]; if (j) { - tarval *t = new_tarval_from_long(j, mode_Iu); + ir_tarval *t = new_tarval_from_long(j, mode_Iu); tv = tarval_shl(tv, t); } res = res ? tarval_add(res, tv) : tv; @@ -298,12 +299,12 @@ static tarval *condensed_to_value(mul_env *env, unsigned char *R, int r) } /* forward */ -static instruction *basic_decompose_mul(mul_env *env, unsigned char *R, int r, tarval *N); +static instruction *basic_decompose_mul(mul_env *env, unsigned char *R, int r, ir_tarval *N); /* * handle simple cases with up-to 2 bits set */ -static instruction *decompose_simple_cases(mul_env *env, unsigned char *R, int r, tarval *N) +static instruction *decompose_simple_cases(mul_env *env, unsigned char *R, int r, ir_tarval *N) { instruction *ins, *ins2; @@ -333,7 +334,7 @@ static instruction *decompose_simple_cases(mul_env *env, unsigned char *R, int r /** * Main decompose driver. */ -static instruction *decompose_mul(mul_env *env, unsigned char *R, int r, tarval *N) +static instruction *decompose_mul(mul_env *env, unsigned char *R, int r, ir_tarval *N) { unsigned i; int gain; @@ -379,8 +380,8 @@ static instruction *decompose_mul(mul_env *env, unsigned char *R, int r, tarval N = condensed_to_value(env, R, r); for (i = env->max_S; i > 0; --i) { - tarval *div_res, *mod_res; - tarval *tv = new_tarval_from_long((1 << i) + 1, env->mode); + ir_tarval *div_res, *mod_res; + ir_tarval *tv = new_tarval_from_long((1 << i) + 1, env->mode); div_res = tarval_divmod(N, tv, &mod_res); if (mod_res == get_mode_null(env->mode)) { @@ -402,7 +403,7 @@ static instruction *decompose_mul(mul_env *env, unsigned char *R, int r, tarval /** * basic decomposition routine */ -static instruction *basic_decompose_mul(mul_env *env, unsigned char *R, int r, tarval *N) +static instruction *basic_decompose_mul(mul_env *env, unsigned char *R, int r, ir_tarval *N) { instruction *Ns; unsigned t; @@ -434,6 +435,7 @@ static instruction *basic_decompose_mul(mul_env *env, unsigned char *R, int r, t static ir_node *build_graph(mul_env *env, instruction *inst) { ir_node *l, *r, *c; + ir_graph *irg = env->irg; if (inst->irn) return inst->irn; @@ -442,12 +444,12 @@ static ir_node *build_graph(mul_env *env, instruction *inst) case LEA: l = build_graph(env, inst->in[0]); r = build_graph(env, inst->in[1]); - c = new_Const_long(env->shf_mode, inst->shift_count); + c = new_r_Const_long(irg, env->shf_mode, inst->shift_count); r = new_rd_Shl(env->dbg, env->blk, r, c, env->mode); return inst->irn = new_rd_Add(env->dbg, env->blk, l, r, env->mode); case SHIFT: l = build_graph(env, inst->in[0]); - c = new_Const_long(env->shf_mode, inst->shift_count); + c = new_r_Const_long(irg, env->shf_mode, inst->shift_count); return inst->irn = new_rd_Shl(env->dbg, env->blk, l, c, env->mode); case SUB: l = build_graph(env, inst->in[0]); @@ -458,7 +460,7 @@ static ir_node *build_graph(mul_env *env, instruction *inst) r = build_graph(env, inst->in[1]); return inst->irn = new_rd_Add(env->dbg, env->blk, l, r, env->mode); case ZERO: - return inst->irn = new_Const(get_mode_null(env->mode)); + return inst->irn = new_r_Const(irg, get_mode_null(env->mode)); default: panic("Unsupported instruction kind"); } @@ -518,7 +520,7 @@ static int evaluate_insn(mul_env *env, instruction *inst) * * @return the new graph */ -static ir_node *do_decomposition(ir_node *irn, ir_node *operand, tarval *tv) +static ir_node *do_decomposition(ir_node *irn, ir_node *operand, ir_tarval *tv) { mul_env env; instruction *inst; @@ -536,6 +538,7 @@ static ir_node *do_decomposition(ir_node *irn, ir_node *operand, tarval *tv) env.fail = 0; env.n_shift = env.params->maximum_shifts; env.evaluate = env.params->evaluate != NULL ? env.params->evaluate : default_evaluate; + env.irg = get_irn_irg(irn); R = value_to_condensed(&env, tv, &r); inst = decompose_mul(&env, R, r, tv); @@ -559,13 +562,13 @@ static ir_node *do_decomposition(ir_node *irn, ir_node *operand, tarval *tv) /* Replace Muls with Shifts and Add/Subs. */ ir_node *arch_dep_replace_mul_with_shifts(ir_node *irn) { - ir_graph *irg; - ir_node *res = irn; - ir_mode *mode = get_irn_mode(irn); - ir_node *left; - ir_node *right; - ir_node *operand; - tarval *tv; + ir_node *res = irn; + ir_mode *mode = get_irn_mode(irn); + ir_graph *irg; + ir_node *left; + ir_node *right; + ir_node *operand; + ir_tarval *tv; const ir_settings_arch_dep_t *params = be_get_backend_param()->dep_param; @@ -611,7 +614,7 @@ ir_node *arch_dep_replace_mul_with_shifts(ir_node *irn) /** * calculated the ld2 of a tarval if tarval is 2^n, else returns -1. */ -static int tv_ld2(tarval *tv, int bits) +static int tv_ld2(ir_tarval *tv, int bits) { int i, k = 0, num; @@ -652,7 +655,7 @@ static int tv_ld2(tarval *tv, int bits) /** The result of a the magic() function. */ struct ms { - tarval *M; /**< magic number */ + ir_tarval *M; /**< magic number */ int s; /**< shift amount */ int need_add; /**< an additional add is needed */ int need_sub; /**< an additional sub is needed */ @@ -663,16 +666,16 @@ struct ms { * * see Hacker's Delight: 10-6 Integer Division by Constants: Incorporation into a Compiler */ -static struct ms magic(tarval *d) +static struct ms magic(ir_tarval *d) { ir_mode *mode = get_tarval_mode(d); ir_mode *u_mode = find_unsigned_mode(mode); int bits = get_mode_size_bits(u_mode); int p; - tarval *ad, *anc, *delta, *q1, *r1, *q2, *r2, *t; /* unsigned */ + ir_tarval *ad, *anc, *delta, *q1, *r1, *q2, *r2, *t; /* unsigned */ pn_Cmp d_cmp, M_cmp; - tarval *bits_minus_1, *two_bits_1; + ir_tarval *bits_minus_1, *two_bits_1; struct ms mag; @@ -739,7 +742,7 @@ static struct ms magic(tarval *d) /** The result of the magicu() function. */ struct mu { - tarval *M; /**< magic add constant */ + ir_tarval *M; /**< magic add constant */ int s; /**< shift amount */ int need_add; /**< add indicator */ }; @@ -749,13 +752,13 @@ struct mu { * * see Hacker's Delight: 10-10 Integer Division by Constants: Incorporation into a Compiler (Unsigned) */ -static struct mu magicu(tarval *d) +static struct mu magicu(ir_tarval *d) { ir_mode *mode = get_tarval_mode(d); int bits = get_mode_size_bits(mode); int p; - tarval *nc, *delta, *q1, *r1, *q2, *r2; - tarval *bits_minus_1, *two_bits_1, *seven_ff; + ir_tarval *nc, *delta, *q1, *r1, *q2, *r2; + ir_tarval *bits_minus_1, *two_bits_1, *seven_ff; struct mu magu; @@ -818,7 +821,7 @@ static struct mu magicu(tarval *d) * * Note that 'div' might be a mod or DivMod operation as well */ -static ir_node *replace_div_by_mulh(ir_node *div, tarval *tv) +static ir_node *replace_div_by_mulh(ir_node *div, ir_tarval *tv) { dbg_info *dbg = get_irn_dbg_info(div); ir_node *n = get_binop_left(div); @@ -832,10 +835,11 @@ static ir_node *replace_div_by_mulh(ir_node *div, tarval *tv) return div; if (mode_is_signed(mode)) { + ir_graph *irg = get_irn_irg(div); struct ms mag = magic(tv); /* generate the Mulh instruction */ - c = new_Const(mag.M); + c = new_r_Const(irg, mag.M); q = new_rd_Mulh(dbg, block, n, c, mode); /* do we need an Add or Sub */ @@ -846,21 +850,22 @@ static ir_node *replace_div_by_mulh(ir_node *div, tarval *tv) /* Do we need the shift */ if (mag.s > 0) { - c = new_Const_long(mode_Iu, mag.s); + c = new_r_Const_long(irg, mode_Iu, mag.s); q = new_rd_Shrs(dbg, block, q, c, mode); } /* final */ - c = new_Const_long(mode_Iu, bits - 1); + c = new_r_Const_long(irg, mode_Iu, bits - 1); t = new_rd_Shr(dbg, block, q, c, mode); q = new_rd_Add(dbg, block, q, t, mode); } else { struct mu mag = magicu(tv); ir_node *c; + ir_graph *irg = get_irn_irg(div); /* generate the Mulh instruction */ - c = new_Const(mag.M); + c = new_r_Const(irg, mag.M); q = new_rd_Mulh(dbg, block, n, c, mode); if (mag.need_add) { @@ -868,19 +873,19 @@ static ir_node *replace_div_by_mulh(ir_node *div, tarval *tv) /* use the GM scheme */ t = new_rd_Sub(dbg, block, n, q, mode); - c = new_Const(get_mode_one(mode_Iu)); + c = new_r_Const(irg, get_mode_one(mode_Iu)); t = new_rd_Shr(dbg, block, t, c, mode); t = new_rd_Add(dbg, block, t, q, mode); - c = new_Const_long(mode_Iu, mag.s - 1); + c = new_r_Const_long(irg, mode_Iu, mag.s - 1); q = new_rd_Shr(dbg, block, t, c, mode); } else { /* use the default scheme */ q = new_rd_Add(dbg, block, q, n, mode); } } else if (mag.s > 0) { /* default scheme, shift needed */ - c = new_Const_long(mode_Iu, mag.s); + c = new_r_Const_long(irg, mode_Iu, mag.s); q = new_rd_Shr(dbg, block, q, c, mode); } } @@ -902,7 +907,7 @@ ir_node *arch_dep_replace_div_by_const(ir_node *irn) ir_node *c = get_Div_right(irn); ir_node *block, *left; ir_mode *mode; - tarval *tv, *ntv; + ir_tarval *tv, *ntv; dbg_info *dbg; int n, bits; int k; @@ -939,6 +944,7 @@ ir_node *arch_dep_replace_div_by_const(ir_node *irn) } if (k >= 0) { /* division by 2^k or -2^k */ + ir_graph *irg = get_irn_irg(irn); if (mode_is_signed(mode)) { ir_node *k_node; ir_node *curr = left; @@ -946,11 +952,11 @@ ir_node *arch_dep_replace_div_by_const(ir_node *irn) /* create the correction code for signed values only if there might be a remainder */ if (! get_Div_no_remainder(irn)) { if (k != 1) { - k_node = new_Const_long(mode_Iu, k - 1); + k_node = new_r_Const_long(irg, mode_Iu, k - 1); curr = new_rd_Shrs(dbg, block, left, k_node, mode); } - k_node = new_Const_long(mode_Iu, bits - k); + k_node = new_r_Const_long(irg, mode_Iu, bits - k); curr = new_rd_Shr(dbg, block, curr, k_node, mode); curr = new_rd_Add(dbg, block, left, curr, mode); @@ -958,19 +964,19 @@ ir_node *arch_dep_replace_div_by_const(ir_node *irn) k_node = left; } - k_node = new_Const_long(mode_Iu, k); + k_node = new_r_Const_long(irg, mode_Iu, k); res = new_rd_Shrs(dbg, block, curr, k_node, mode); if (n_flag) { /* negate the result */ ir_node *k_node; - k_node = new_Const(get_mode_null(mode)); + k_node = new_r_Const(irg, get_mode_null(mode)); res = new_rd_Sub(dbg, block, k_node, res, mode); } } else { /* unsigned case */ ir_node *k_node; - k_node = new_Const_long(mode_Iu, k); + k_node = new_r_Const_long(irg, mode_Iu, k); res = new_rd_Shr(dbg, block, left, k_node, mode); } } else { @@ -1001,7 +1007,7 @@ ir_node *arch_dep_replace_mod_by_const(ir_node *irn) ir_node *c = get_Mod_right(irn); ir_node *block, *left; ir_mode *mode; - tarval *tv, *ntv; + ir_tarval *tv, *ntv; dbg_info *dbg; int n, bits; int k; @@ -1034,6 +1040,7 @@ ir_node *arch_dep_replace_mod_by_const(ir_node *irn) } if (k >= 0) { + ir_graph *irg = get_irn_irg(irn); /* division by 2^k or -2^k: * we use "modulus" here, so x % y == x % -y that's why is no difference between the case 2^k and -2^k */ @@ -1042,23 +1049,23 @@ ir_node *arch_dep_replace_mod_by_const(ir_node *irn) ir_node *curr = left; if (k != 1) { - k_node = new_Const_long(mode_Iu, k - 1); + k_node = new_r_Const_long(irg, mode_Iu, k - 1); curr = new_rd_Shrs(dbg, block, left, k_node, mode); } - k_node = new_Const_long(mode_Iu, bits - k); + k_node = new_r_Const_long(irg, mode_Iu, bits - k); curr = new_rd_Shr(dbg, block, curr, k_node, mode); curr = new_rd_Add(dbg, block, left, curr, mode); - k_node = new_Const_long(mode, (-1) << k); + k_node = new_r_Const_long(irg, mode, (-1) << k); curr = new_rd_And(dbg, block, curr, k_node, mode); res = new_rd_Sub(dbg, block, left, curr, mode); } else { /* unsigned case */ ir_node *k_node; - k_node = new_Const_long(mode, (1 << k) - 1); + k_node = new_r_Const_long(irg, mode, (1 << k) - 1); res = new_rd_And(dbg, block, left, k_node, mode); } } else { @@ -1097,7 +1104,7 @@ void arch_dep_replace_divmod_by_const(ir_node **div, ir_node **mod, ir_node *irn ir_node *c = get_DivMod_right(irn); ir_node *block, *left; ir_mode *mode; - tarval *tv, *ntv; + ir_tarval *tv, *ntv; dbg_info *dbg; int n, bits; int k; @@ -1134,42 +1141,39 @@ void arch_dep_replace_divmod_by_const(ir_node **div, ir_node **mod, ir_node *irn } if (k >= 0) { /* division by 2^k or -2^k */ + ir_graph *irg = get_irn_irg(irn); if (mode_is_signed(mode)) { ir_node *k_node, *c_k; ir_node *curr = left; if (k != 1) { - k_node = new_Const_long(mode_Iu, k - 1); + k_node = new_r_Const_long(irg, mode_Iu, k - 1); curr = new_rd_Shrs(dbg, block, left, k_node, mode); } - k_node = new_Const_long(mode_Iu, bits - k); + k_node = new_r_Const_long(irg, mode_Iu, bits - k); curr = new_rd_Shr(dbg, block, curr, k_node, mode); curr = new_rd_Add(dbg, block, left, curr, mode); - c_k = new_Const_long(mode_Iu, k); + c_k = new_r_Const_long(irg, mode_Iu, k); *div = new_rd_Shrs(dbg, block, curr, c_k, mode); if (n_flag) { /* negate the div result */ - ir_node *k_node; - - k_node = new_Const(get_mode_null(mode)); + ir_node *k_node = new_r_Const(irg, get_mode_null(mode)); *div = new_rd_Sub(dbg, block, k_node, *div, mode); } - k_node = new_Const_long(mode, (-1) << k); + k_node = new_r_Const_long(irg, mode, (-1) << k); curr = new_rd_And(dbg, block, curr, k_node, mode); *mod = new_rd_Sub(dbg, block, left, curr, mode); } else { /* unsigned case */ - ir_node *k_node; - - k_node = new_Const_long(mode_Iu, k); + ir_node *k_node = new_r_Const_long(irg, mode_Iu, k); *div = new_rd_Shr(dbg, block, left, k_node, mode); - k_node = new_Const_long(mode, (1 << k) - 1); + k_node = new_r_Const_long(irg, mode, (1 << k) - 1); *mod = new_rd_And(dbg, block, left, k_node, mode); } } else {