From 5a4f1cb7e702a322f2f63a2845d0f8fbd1e443a6 Mon Sep 17 00:00:00 2001 From: matz Date: Thu, 11 Sep 2008 02:40:52 +0000 Subject: * bignum.c (big2str_karatsuba): remove unnecessary fixnum code. a patch from TOYOFUKU Chikanobu in [ruby-dev:36217]. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19292 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ bignum.c | 19 ++----------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 61d637d8d..64dc2fbdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,12 @@ Wed Sep 10 23:00:43 2008 Yusuke Endoh * tool/compile_prelude.rb: print "" instead of "prelude.rb" on stack trace. [ruby-dev:36129] +Wed Sep 10 21:19:58 2008 Yukihiro Matsumoto + + * bignum.c (big2str_karatsuba): remove unnecessary fixnum code. a + patch from TOYOFUKU Chikanobu in + [ruby-dev:36217]. + Wed Sep 10 21:09:32 2008 Masaki Suketa * test/win32ole/test_err_in_callback.rb: InternetExplorer should diff --git a/bignum.c b/bignum.c index 08e7ebb21..3e4ac0dea 100644 --- a/bignum.c +++ b/bignum.c @@ -893,21 +893,6 @@ big2str_karatsuba(VALUE x, int base, char* ptr, long lh, ll, m1; VALUE b, q, r; - if (FIXNUM_P(x)) { - VALUE str = rb_fix2str(x, base); - char* str_ptr = RSTRING_PTR(str); - long str_len = RSTRING_LEN(str); - if (trim) { - if (FIX2INT(x) == 0) return 0; - MEMCPY(ptr, str_ptr, char, str_len); - return str_len; - } - else { - memset(ptr, '0', len - str_len); - MEMCPY(ptr + len - str_len, str_ptr, char, str_len); - return len; - } - } if (BIGZEROP(x)) { if (trim) return 0; else { @@ -922,10 +907,10 @@ big2str_karatsuba(VALUE x, int base, char* ptr, b = power_cache_get_power(base, n1, &m1); bigdivmod(x, b, &q, &r); - lh = big2str_karatsuba(q, base, ptr, (len - m1)/2, + lh = big2str_karatsuba(q, base, ptr, (len - m1)/2, len - m1, hbase, trim); ll = big2str_karatsuba(r, base, ptr + lh, m1/2, - m1, hbase, !lh && trim); + m1, hbase, !lh && trim); return lh + ll; } -- cgit