djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py: Fix rshift and not of zero/one edge cases in mpz.

Browse Source 
Addresses issue #1027.
This commit is contained in:
Damien George 2014-12-31 19:35:01 +00:00
parent 816a46a4ab
commit e0ac194f4f
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
py/mpz.c
View File

@ -871,11 +871,17 @@ void mpz_not_inpl(mpz_t *dest, const mpz_t *z) {
if (dest != z) { if (dest != z) {
mpz_set(dest, z); mpz_set(dest, z);
} }
if (dest->neg) { if (dest->len == 0) {
mpz_need_dig(dest, 1);
dest->dig[0] = 1;
dest->len = 1;
dest->neg = 1;
} else if (dest->neg) {
dest->neg = 0; dest->neg = 0;
mpz_dig_t k = 1; mpz_dig_t k = 1;
dest->len = mpn_sub(dest->dig, dest->dig, dest->len, &k, 1); dest->len = mpn_sub(dest->dig, dest->dig, dest->len, &k, 1);
} else { } else {
mpz_need_dig(dest, dest->len + 1);
mpz_dig_t k = 1; mpz_dig_t k = 1;
dest->len = mpn_add(dest->dig, dest->dig, dest->len, &k, 1); dest->len = mpn_add(dest->dig, dest->dig, dest->len, &k, 1);
dest->neg = 1; dest->neg = 1;
@ -924,7 +930,14 @@ void mpz_shr_inpl(mpz_t *dest, const mpz_t *lhs, mp_int_t rhs) {
round_up = 1; round_up = 1;
} }
if (round_up) { if (round_up) {
dest->len = mpn_add(dest->dig, dest->dig, dest->len, &round_up, 1); if (dest->len == 0) {
// dest == 0, so need to add 1 by hand (answer will be -1)
dest->dig[0] = 1;
dest->len = 1;
} else {
// dest > 0, so can use mpn_add to add 1
dest->len = mpn_add(dest->dig, dest->dig, dest->len, &round_up, 1);
}
} }
} }
} }

14
tests/basics/int_big_zeroone.py Normal file
View File

@ -0,0 +1,14 @@
# test [0,-0,1,-1] edge cases of bignum
long_zero = (2**64) >> 65
long_neg_zero = -long_zero
long_one = long_zero + 1
long_neg_one = -long_one
cases = [long_zero, long_neg_zero, long_one, long_neg_one]
print(cases)
print([-c for c in cases])
print([~c for c in cases])
print([c >> 1 for c in cases])
print([c << 1 for c in cases])