mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

dtoa.c: remove code for platforms with 64-bit integers (#17884)

Browse source
This commit is contained in:
Benjamin Peterson 2016-09-06 12:44:21 -07:00
parent bbeedc261f
commit 5d75f441ef
1 changed files with 0 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

104
Python/dtoa.c
View file

@ -448,13 +448,8 @@ static Bigint *
multadd(Bigint *b, int m, int a) /* multiply by m and add a */ multadd(Bigint *b, int m, int a) /* multiply by m and add a */
{ {
int i, wds; int i, wds;
#ifdef ULLong
ULong *x; ULong *x;
ULLong carry, y; ULLong carry, y;
#else
ULong carry, *x, y;
ULong xi, z;
#endif
Bigint *b1; Bigint *b1;
wds = b->wds; wds = b->wds;
@ -462,17 +457,9 @@ multadd(Bigint *b, int m, int a) /* multiply by m and add a */
i = 0; i = 0;
carry = a; carry = a;
do { do {
#ifdef ULLong
y = *x * (ULLong)m + carry; y = *x * (ULLong)m + carry;
carry = y >> 32; carry = y >> 32;
*x++ = (ULong)(y & FFFFFFFF); *x++ = (ULong)(y & FFFFFFFF);
#else
xi = *x;
y = (xi & 0xffff) * m + carry;
z = (xi >> 16) * m + (y >> 16);
carry = z >> 16;
*x++ = (z << 16) + (y & 0xffff);
#endif
} }
while(++i < wds); while(++i < wds);
if (carry) { if (carry) {
@ -633,12 +620,7 @@ mult(Bigint *a, Bigint *b)
int k, wa, wb, wc; int k, wa, wb, wc;
ULong *x, *xa, *xae, *xb, *xbe, *xc, *xc0; ULong *x, *xa, *xae, *xb, *xbe, *xc, *xc0;
ULong y; ULong y;
#ifdef ULLong
ULLong carry, z; ULLong carry, z;
#else
ULong carry, z;
ULong z2;
#endif
if ((!a->x[0] && a->wds == 1) || (!b->x[0] && b->wds == 1)) { if ((!a->x[0] && a->wds == 1) || (!b->x[0] && b->wds == 1)) {
c = Balloc(0); c = Balloc(0);
@ -670,7 +652,6 @@ mult(Bigint *a, Bigint *b)
xb = b->x; xb = b->x;
xbe = xb + wb; xbe = xb + wb;
xc0 = c->x; xc0 = c->x;
#ifdef ULLong
for(; xb < xbe; xc0++) { for(; xb < xbe; xc0++) {
if ((y = *xb++)) { if ((y = *xb++)) {
x = xa; x = xa;
@ -685,39 +666,6 @@ mult(Bigint *a, Bigint *b)
*xc = (ULong)carry; *xc = (ULong)carry;
} }
} }
#else
for(; xb < xbe; xb++, xc0++) {
if (y = *xb & 0xffff) {
x = xa;
xc = xc0;
carry = 0;
do {
z = (*x & 0xffff) * y + (*xc & 0xffff) + carry;
carry = z >> 16;
z2 = (*x++ >> 16) * y + (*xc >> 16) + carry;
carry = z2 >> 16;
Storeinc(xc, z2, z);
}
while(x < xae);
*xc = carry;
}
if (y = *xb >> 16) {
x = xa;
xc = xc0;
carry = 0;
z2 = *xc;
do {
z = (*x & 0xffff) * y + (*xc >> 16) + carry;
carry = z >> 16;
Storeinc(xc, z, z2);
z2 = (*x++ >> 16) * y + (*xc & 0xffff) + carry;
carry = z2 >> 16;
}
while(x < xae);
*xc = z2;
}
}
#endif
for(xc0 = c->x, xc = xc0 + wc; wc > 0 && !*--xc; --wc) ; for(xc0 = c->x, xc = xc0 + wc; wc > 0 && !*--xc; --wc) ;
c->wds = wc; c->wds = wc;
return c; return c;
@ -926,12 +874,7 @@ diff(Bigint *a, Bigint *b)
Bigint *c; Bigint *c;
int i, wa, wb; int i, wa, wb;
ULong *xa, *xae, *xb, *xbe, *xc; ULong *xa, *xae, *xb, *xbe, *xc;
#ifdef ULLong
ULLong borrow, y; ULLong borrow, y;
#else
ULong borrow, y;
ULong z;
#endif
i = cmp(a,b); i = cmp(a,b);
if (!i) { if (!i) {
@ -962,7 +905,6 @@ diff(Bigint *a, Bigint *b)
xbe = xb + wb; xbe = xb + wb;
xc = c->x; xc = c->x;
borrow = 0; borrow = 0;
#ifdef ULLong
do { do {
y = (ULLong)*xa++ - *xb++ - borrow; y = (ULLong)*xa++ - *xb++ - borrow;
borrow = y >> 32 & (ULong)1; borrow = y >> 32 & (ULong)1;
@ -974,23 +916,6 @@ diff(Bigint *a, Bigint *b)
borrow = y >> 32 & (ULong)1; borrow = y >> 32 & (ULong)1;
*xc++ = (ULong)(y & FFFFFFFF); *xc++ = (ULong)(y & FFFFFFFF);
} }
#else
do {
y = (*xa & 0xffff) - (*xb & 0xffff) - borrow;
borrow = (y & 0x10000) >> 16;
z = (*xa++ >> 16) - (*xb++ >> 16) - borrow;
borrow = (z & 0x10000) >> 16;
Storeinc(xc, z, y);
}
while(xb < xbe);
while(xa < xae) {
y = (*xa & 0xffff) - borrow;
borrow = (y & 0x10000) >> 16;
z = (*xa++ >> 16) - borrow;
borrow = (z & 0x10000) >> 16;
Storeinc(xc, z, y);
}
#endif
while(!*--xc) while(!*--xc)
wa--; wa--;
c->wds = wa; c->wds = wa;
@ -1235,12 +1160,7 @@ quorem(Bigint *b, Bigint *S)
{ {
int n; int n;
ULong *bx, *bxe, q, *sx, *sxe; ULong *bx, *bxe, q, *sx, *sxe;
#ifdef ULLong
ULLong borrow, carry, y, ys; ULLong borrow, carry, y, ys;
#else
ULong borrow, carry, y, ys;
ULong si, z, zs;
#endif
n = S->wds; n = S->wds;
#ifdef DEBUG #ifdef DEBUG
@ -1262,23 +1182,11 @@ quorem(Bigint *b, Bigint *S)
borrow = 0; borrow = 0;
carry = 0; carry = 0;
do { do {
#ifdef ULLong
ys = *sx++ * (ULLong)q + carry; ys = *sx++ * (ULLong)q + carry;
carry = ys >> 32; carry = ys >> 32;
y = *bx - (ys & FFFFFFFF) - borrow; y = *bx - (ys & FFFFFFFF) - borrow;
borrow = y >> 32 & (ULong)1; borrow = y >> 32 & (ULong)1;
*bx++ = (ULong)(y & FFFFFFFF); *bx++ = (ULong)(y & FFFFFFFF);
#else
si = *sx++;
ys = (si & 0xffff) * q + carry;
zs = (si >> 16) * q + (ys >> 16);
carry = zs >> 16;
y = (*bx & 0xffff) - (ys & 0xffff) - borrow;
borrow = (y & 0x10000) >> 16;
z = (*bx >> 16) - (zs & 0xffff) - borrow;
borrow = (z & 0x10000) >> 16;
Storeinc(bx, z, y);
#endif
} }
while(sx <= sxe); while(sx <= sxe);
if (!*bxe) { if (!*bxe) {
@ -1295,23 +1203,11 @@ quorem(Bigint *b, Bigint *S)
bx = b->x; bx = b->x;
sx = S->x; sx = S->x;
do { do {
#ifdef ULLong
ys = *sx++ + carry; ys = *sx++ + carry;
carry = ys >> 32; carry = ys >> 32;
y = *bx - (ys & FFFFFFFF) - borrow; y = *bx - (ys & FFFFFFFF) - borrow;
borrow = y >> 32 & (ULong)1; borrow = y >> 32 & (ULong)1;
*bx++ = (ULong)(y & FFFFFFFF); *bx++ = (ULong)(y & FFFFFFFF);
#else
si = *sx++;
ys = (si & 0xffff) + carry;
zs = (si >> 16) + (ys >> 16);
carry = zs >> 16;
y = (*bx & 0xffff) - (ys & 0xffff) - borrow;
borrow = (y & 0x10000) >> 16;
z = (*bx >> 16) - (zs & 0xffff) - borrow;
borrow = (z & 0x10000) >> 16;
Storeinc(bx, z, y);
#endif
} }
while(sx <= sxe); while(sx <= sxe);
bx = b->x; bx = b->x;