diff options
-rw-r--r-- | bignum.c | 22 |
1 files changed, 10 insertions, 12 deletions
@@ -6994,38 +6994,36 @@ int_pow_tmp2(VALUE x, VALUE y, long mm, int nega_flg) #ifdef DLONG DLONG const mmm = mm; long xx = FIX2LONG(x); +# define MUL_MODULO(a, b, c) (long)(((DLONG)(a) * (DLONG)(b)) % (c)) for (/*NOP*/; ! FIXNUM_P(y); y = rb_funcall(y, idGTGT, 1, LONG2FIX(1L))) { if (RTEST(rb_int_odd_p(y))) { - tmp = ((DLONG)tmp * (DLONG)xx) % mmm; + tmp = MUL_MODULO(tmp, xx, mmm); } - xx = ((DLONG)xx * (DLONG)xx) % mmm; + xx = MUL_MODULO(xx, xx, mmm); } for (yy = FIX2LONG(y); yy; yy >>= 1L) { if (yy & 1L) { - tmp = ((DLONG)tmp * (DLONG)xx) % mmm; + tmp = MUL_MODULO(tmp, xx, mmm); } - xx = ((DLONG)xx * (DLONG)xx) % mmm; + xx = MUL_MODULO(xx, xx, mmm); } #else VALUE const m = LONG2FIX(mm); VALUE tmp2 = LONG2FIX(tmp); +# define MUL_MODULO(a, b, c) rb_int_modulo(rb_fix_mul_fix((a), (b)), (c)) for (/*NOP*/; ! FIXNUM_P(y); y = rb_funcall(y, idGTGT, 1, LONG2FIX(1L))) { if (RTEST(rb_int_odd_p(y))) { - tmp2 = rb_fix_mul_fix(tmp2, x); - tmp2 = rb_int_modulo(tmp2, m); + tmp2 = MUL_MODULO(tmp2, x, m); } - x = rb_fix_mul_fix(x, x); - x = rb_int_modulo(x, m); + x = MUL_MODULO(x, x, m); } for (yy = FIX2LONG(y); yy; yy >>= 1L) { if (yy & 1L) { - tmp2 = rb_fix_mul_fix(tmp2, x); - tmp2 = rb_int_modulo(tmp2, m); + tmp2 = MUL_MODULO(tmp2, x, m); } - x = rb_fix_mul_fix(x, x); - x = rb_int_modulo(x, m); + x = MUL_MODULO(x, x, m); } tmp = FIX2LONG(tmp2); |