1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* marshal.c (r_object0): Use rb_integer_unpack.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41181 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2013-06-08 14:14:46 +00:00
parent 874f10cbf2
commit 5a9984d7aa
2 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Sat Jun 8 22:53:45 2013 Tanaka Akira <akr@fsij.org>
* marshal.c (r_object0): Use rb_integer_unpack.
Sat Jun 8 22:18:57 2013 Tanaka Akira <akr@fsij.org> Sat Jun 8 22:18:57 2013 Tanaka Akira <akr@fsij.org>
* time.c (v2w): Use rb_absint_size instead of RBIGNUM_LEN. * time.c (v2w): Use rb_absint_size instead of RBIGNUM_LEN.

37
marshal.c
View File

@ -1610,44 +1610,15 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
case TYPE_BIGNUM: case TYPE_BIGNUM:
{ {
long len; long len;
BDIGIT *digits;
VALUE data; VALUE data;
int sign;
NEWOBJ_OF(big, struct RBignum, rb_cBignum, T_BIGNUM | (RGENGC_WB_PROTECTED_BIGNUM ? FL_WB_PROTECTED : 0)); sign = r_byte(arg);
RBIGNUM_SET_SIGN(big, (r_byte(arg) == '+'));
len = r_long(arg); len = r_long(arg);
data = r_bytes0(len * 2, arg); data = r_bytes0(len * 2, arg);
#if SIZEOF_BDIGITS == SIZEOF_SHORT v = rb_integer_unpack(sign == '-' ? -1 : +1, RSTRING_PTR(data), len, 2, 0,
rb_big_resize((VALUE)big, len); INTEGER_PACK_LITTLE_ENDIAN);
#else
rb_big_resize((VALUE)big, (len * 2 + sizeof(BDIGIT) - 1) / sizeof(BDIGIT));
#endif
digits = RBIGNUM_DIGITS(big);
MEMCPY(digits, RSTRING_PTR(data), char, len * 2);
rb_str_resize(data, 0L); rb_str_resize(data, 0L);
#if SIZEOF_BDIGITS > SIZEOF_SHORT
MEMZERO((char *)digits + len * 2, char,
RBIGNUM_LEN(big) * sizeof(BDIGIT) - len * 2);
#endif
len = RBIGNUM_LEN(big);
while (len > 0) {
unsigned char *p = (unsigned char *)digits;
BDIGIT num = 0;
#if SIZEOF_BDIGITS > SIZEOF_SHORT
int shift = 0;
int i;
for (i=0; i<SIZEOF_BDIGITS; i++) {
num |= (BDIGIT)p[i] << shift;
shift += 8;
}
#else
num = p[0] | (p[1] << 8);
#endif
*digits++ = num;
len--;
}
v = rb_big_norm((VALUE)big);
v = r_entry(v, arg); v = r_entry(v, arg);
v = r_leave(v, arg); v = r_leave(v, arg);
} }