From a6267179eedbd84392a13349a1515f42d9f46af2 Mon Sep 17 00:00:00 2001 From: mame Date: Fri, 7 Mar 2008 12:14:17 +0000 Subject: * bignum.c (power_cache_init, power_cache_get_power0, Init_Bignum): delayed initializing power cache per base. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ bignum.c | 15 +++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5660f0c574..23e4a7ee5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Mar 7 21:12:19 2008 Yusuke Endoh + + * bignum.c (power_cache_init, power_cache_get_power0, Init_Bignum): + delayed initializing power cache per base. + Fri Mar 7 20:30:05 2008 Nobuyoshi Nakada * cont.c (cont_restore_0): fixed typo. [ruby-core:15821] diff --git a/bignum.c b/bignum.c index 3a7dbe83b0..e5e96e74ae 100644 --- a/bignum.c +++ b/bignum.c @@ -737,17 +737,13 @@ ceil_log2(register unsigned long x) #define MAX_BIG2STR_TABLE_ENTRIES 64 static VALUE big2str_power_cache[35][MAX_BIG2STR_TABLE_ENTRIES]; -static int power_cache_initialized = 0; static void power_cache_init(void) { int i, j; for (i = 0; i < 35; ++i) { - big2str_power_cache[i][0] = - rb_big_pow(rb_int2big(i+2), INT2FIX(KARATSUBA_DIGITS)); - rb_global_variable(&big2str_power_cache[i][0]); - for (j = 1; j < MAX_BIG2STR_TABLE_ENTRIES; ++j) { + for (j = 0; j < MAX_BIG2STR_TABLE_ENTRIES; ++j) { big2str_power_cache[i][j] = Qnil; } } @@ -758,7 +754,8 @@ power_cache_get_power0(int base, int i) { if (NIL_P(big2str_power_cache[base - 2][i])) { big2str_power_cache[base - 2][i] = - bigsqr(power_cache_get_power0(base, i - 1)); + i == 0 ? rb_big_pow(rb_int2big(base), INT2FIX(KARATSUBA_DIGITS)) + : bigsqr(power_cache_get_power0(base, i - 1)); rb_global_variable(&big2str_power_cache[base - 2][i]); } return big2str_power_cache[base - 2][i]; @@ -905,10 +902,6 @@ big2str_karatsuba(VALUE x, int base, char* ptr, return big2str_orig(x, base, ptr, len, hbase, trim); } - if (!power_cache_initialized) { - power_cache_init(); - power_cache_initialized = 1; - } b = power_cache_get_power(base, n1, &m1); bigdivmod(x, b, &q, &r); lh = big2str_karatsuba(q, base, ptr, (len - m1)/2, @@ -2616,4 +2609,6 @@ Init_Bignum(void) rb_define_method(rb_cBignum, "size", rb_big_size, 0); rb_define_method(rb_cBignum, "odd?", rb_big_odd_p, 0); rb_define_method(rb_cBignum, "even?", rb_big_even_p, 0); + + power_cache_init(); } -- cgit v1.2.3