github
/
ruby
зеркало из https://github.com/github/ruby.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

* bignum.c (BIGUP): Use LSHIFTX and avoid cast to consider the type 

of x is bigger than BDIGIT_DBL.
  (big2ulong): Use unsigned long to store the result.
  (big2ull): Use unsigned LONG_LONG to store the result.
  (bigand_int): Use long for num to avoid data loss.
  (bigor_int): Ditto.
  (bigxor_int): Ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41588 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2013-06-23 16:05:15 +00:00
Родитель ad6d79e7cb
Коммит 6225d547d5
2 изменённых файлов: 17 добавлений и 7 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
ChangeLog
Просмотреть файл

@ -1,3 +1,13 @@
Mon Jun 24 00:59:35 2013 Tanaka Akira <akr@fsij.org>
* bignum.c (BIGUP): Use LSHIFTX and avoid cast to consider the type
of x is bigger than BDIGIT_DBL.
(big2ulong): Use unsigned long to store the result.
(big2ull): Use unsigned LONG_LONG to store the result.
(bigand_int): Use long for num to avoid data loss.
(bigor_int): Ditto.
(bigxor_int): Ditto.
Sun Jun 23 23:05:58 2013 Tanaka Akira <akr@fsij.org>
* include/ruby/defines.h (BDIGIT): Define it only if it is not defined

14
bignum.c
Просмотреть файл

@ -55,7 +55,7 @@ static VALUE big_three = Qnil;
#if defined(HAVE_LONG_LONG) && SIZEOF_LONG_LONG >= SIZEOF_BDIGITS
# define DIGSPERLL (SIZEOF_LONG_LONG/SIZEOF_BDIGITS)
#endif
#define BIGUP(x) ((BDIGIT_DBL)(x) << BITSPERDIG)
#define BIGUP(x) LSHIFTX(((x) + (BDIGIT_DBL)0), BITSPERDIG)
#define BIGDN(x) RSHIFT((x),BITSPERDIG)
#define BIGLO(x) ((BDIGIT)((x) & BDIGMAX))
#define BDIGMAX ((BDIGIT)(BIGRAD-1))
@ -2409,7 +2409,7 @@ static unsigned long
big2ulong(VALUE x, const char *type, int check)
{
long len = RBIGNUM_LEN(x);
BDIGIT_DBL num;
unsigned long num;
BDIGIT *ds;
if (BIGSIZE(x) > sizeof(long)) {
@ -2423,7 +2423,7 @@ big2ulong(VALUE x, const char *type, int check)
num = BIGUP(num);
num += ds[len];
}
return (unsigned long)num;
return num;
}
VALUE
@ -2477,7 +2477,7 @@ static unsigned LONG_LONG
big2ull(VALUE x, const char *type)
{
long len = RBIGNUM_LEN(x);
BDIGIT_DBL num;
unsigned LONG_LONG num;
BDIGIT *ds;
if (len > SIZEOF_LONG_LONG/SIZEOF_BDIGITS)
@ -4569,7 +4569,7 @@ bigand_int(VALUE x, long y)
zds[0] = xds[0] & y;
#else
{
BDIGIT_DBL num = y;
long num = y;
for (i=0; i<bdigit_roomof(SIZEOF_LONG); i++) {
zds[i] = xds[i] & BIGLO(num);
@ -4665,7 +4665,7 @@ bigor_int(VALUE x, long y)
zds[0] = xds[0] | y;
#else
{
BDIGIT_DBL num = y;
long num = y;
for (i=0; i<bdigit_roomof(SIZEOF_LONG); i++) {
zds[i] = xds[i] | BIGLO(num);
@ -4761,7 +4761,7 @@ bigxor_int(VALUE x, long y)
zds[0] = xds[0] ^ y;
#else
{
BDIGIT_DBL num = y;
long num = y;
for (i=0; i<bdigit_roomof(SIZEOF_LONG); i++) {
zds[i] = xds[i] ^ BIGLO(num);