summaryrefslogtreecommitdiff
path: root/bignum.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-02-26 12:41:02 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-02-26 12:41:02 +0000
commit069d271eb5b237b2274c382c5da011b43b0fa1d9 (patch)
tree583fe3302f89773f8c23968ee43e94c392078f28 /bignum.c
parentd5a16d80be29f9aa39efe8854c324a9b6a43cc07 (diff)
* bignum.c: fix rb_quad_pack and rb_quad_unpack for environments
which don't have 8bytes integer type. This still depends on little endian. (rb_quad_pack): use quad_buf_complement. don't raise for large values. (rb_quad_unpack): use quad_buf_complement. (quad_buf_complement): new function extracted frm rb_quad_pack. add one after bitwise negation. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26770 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'bignum.c')
-rw-r--r--bignum.c30
1 files changed, 18 insertions, 12 deletions
diff --git a/bignum.c b/bignum.c
index 727122849e..de1d11f954 100644
--- a/bignum.c
+++ b/bignum.c
@@ -376,6 +376,20 @@ rb_quad_unpack(const char *buf, int sign)
#else
+static int
+quad_buf_complement(char *buf, size_t len)
+{
+ size_t i;
+ for (i = 0; i < len; i++)
+ buf[i] = ~buf[i];
+ for (i = 0; i < len; i++) {
+ buf[i]++;
+ if (buf[i] != 0)
+ return 0;
+ }
+ return 1;
+}
+
void
rb_quad_pack(char *buf, VALUE val)
{
@@ -388,15 +402,11 @@ rb_quad_pack(char *buf, VALUE val)
}
len = RBIGNUM_LEN(val) * SIZEOF_BDIGITS;
if (len > QUAD_SIZE) {
- rb_raise(rb_eRangeError, "bignum too big to convert into `quad int'");
+ len = QUAD_SIZE;
}
memcpy(buf, (char*)BDIGITS(val), len);
- if (!RBIGNUM_SIGN(val)) {
- len = QUAD_SIZE;
- while (len--) {
- *buf = ~*buf;
- buf++;
- }
+ if (RBIGNUM_NEGATIVE_P(val)) {
+ quad_buf_complement(buf, QUAD_SIZE);
}
}
@@ -409,14 +419,10 @@ rb_quad_unpack(const char *buf, int sign)
memcpy((char*)BDIGITS(big), buf, QUAD_SIZE);
if (sign && BNEG(buf)) {
- long len = QUAD_SIZE;
char *tmp = (char*)BDIGITS(big);
RBIGNUM_SET_SIGN(big, 0);
- while (len--) {
- *tmp = ~*tmp;
- tmp++;
- }
+ quad_buf_complement(tmp, QUAD_SIZE);
}
return bignorm(big);