mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fixed bug in long masking ops.

Browse source
This commit is contained in:
Guido van Rossum 1991-12-31 13:14:13 +00:00
parent 768a3f0ab8
commit afbb8db8e6
1 changed files with 31 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

59
Objects/longobject.c
View file

@ -1145,6 +1145,9 @@ long_lshift(a, b)
return (object *) long_znormalize(z); return (object *) long_znormalize(z);
} }
#define MAX(x, y) ((x) < (y) ? (y) : (x))
#define MIN(x, y) ((x) > (y) ? (y) : (x))
/* Logical or the absolute values of two long integers. /* Logical or the absolute values of two long integers.
The second value is first xor'ed with 'mask'. */ The second value is first xor'ed with 'mask'. */
@ -1155,22 +1158,23 @@ x_or(a, b, mask)
int mask; int mask;
{ {
int size_a = ZABS(a->ob_size), size_b = ZABS(b->ob_size); int size_a = ZABS(a->ob_size), size_b = ZABS(b->ob_size);
int size_max = MAX(size_a, size_b);
int size_min = MIN(size_a, size_b);
longobject *z; longobject *z;
int i; int i;
/* Ensure a is the larger of the two: */ z = alloclongobject(size_max);
if (size_a < size_b) {
{ longobject *temp = a; a = b; b = temp; }
{ int size_temp = size_a; size_a = size_b; size_b = size_temp; }
}
z = alloclongobject(size_a);
if (z == NULL) if (z == NULL)
return NULL; return NULL;
for (i = 0; i < size_b; ++i) { for (i = 0; i < size_min; ++i) {
z->ob_digit[i] = a->ob_digit[i] | (b->ob_digit[i] ^ mask); z->ob_digit[i] = a->ob_digit[i] | (b->ob_digit[i] ^ mask);
} }
/* At most one of the following two loops executes */
for (; i < size_a; ++i) { for (; i < size_a; ++i) {
z->ob_digit[i] = a->ob_digit[i] | mask; z->ob_digit[i] = a->ob_digit[i] | (0 ^ mask);
}
for (; i < size_b; ++i) {
z->ob_digit[i] = 0 | (b->ob_digit[i] ^ mask);
} }
return long_znormalize(z); return long_znormalize(z);
} }
@ -1185,22 +1189,23 @@ x_and(a, b, mask)
int mask; int mask;
{ {
int size_a = ZABS(a->ob_size), size_b = ZABS(b->ob_size); int size_a = ZABS(a->ob_size), size_b = ZABS(b->ob_size);
int size_max = MAX(size_a, size_b);
int size_min = MIN(size_a, size_b);
longobject *z; longobject *z;
int i; int i;
/* Ensure a is the larger of the two: */ z = alloclongobject(size_max);
if (size_a < size_b) {
{ longobject *temp = a; a = b; b = temp; }
{ int size_temp = size_a; size_a = size_b; size_b = size_temp; }
}
z = alloclongobject(size_a);
if (z == NULL) if (z == NULL)
return NULL; return NULL;
for (i = 0; i < size_b; ++i) { for (i = 0; i < size_min; ++i) {
z->ob_digit[i] = a->ob_digit[i] & (b->ob_digit[i] ^ mask); z->ob_digit[i] = a->ob_digit[i] & (b->ob_digit[i] ^ mask);
} }
/* At most one of the following two loops executes */
for (; i < size_a; ++i) { for (; i < size_a; ++i) {
z->ob_digit[i] = a->ob_digit[i] & mask; z->ob_digit[i] = a->ob_digit[i] & (0 ^ mask);
}
for (; i < size_b; ++i) {
z->ob_digit[i] = 0 & (b->ob_digit[i] ^ mask);
} }
return long_znormalize(z); return long_znormalize(z);
} }
@ -1208,36 +1213,34 @@ x_and(a, b, mask)
/* Logical xor the absolute values of two long integers. /* Logical xor the absolute values of two long integers.
The second value is first xor'ed with 'mask'. */ The second value is first xor'ed with 'mask'. */
static longobject *x_and PROTO((longobject *, longobject *, int)); static longobject *x_xor PROTO((longobject *, longobject *, int));
static longobject * static longobject *
x_xor(a, b, mask) x_xor(a, b, mask)
longobject *a, *b; longobject *a, *b;
int mask; int mask;
{ {
int size_a = ZABS(a->ob_size), size_b = ZABS(b->ob_size); int size_a = ZABS(a->ob_size), size_b = ZABS(b->ob_size);
int size_max = MAX(size_a, size_b);
int size_min = MIN(size_a, size_b);
longobject *z; longobject *z;
int i; int i;
/* Ensure a is the larger of the two: */ z = alloclongobject(size_max);
if (size_a < size_b) {
{ longobject *temp = a; a = b; b = temp; }
{ int size_temp = size_a; size_a = size_b; size_b = size_temp; }
}
z = alloclongobject(size_a);
if (z == NULL) if (z == NULL)
return NULL; return NULL;
for (i = 0; i < size_b; ++i) { for (i = 0; i < size_min; ++i) {
z->ob_digit[i] = a->ob_digit[i] ^ (b->ob_digit[i] ^ mask); z->ob_digit[i] = a->ob_digit[i] ^ (b->ob_digit[i] ^ mask);
} }
/* At most one of the following two loops executes */
for (; i < size_a; ++i) { for (; i < size_a; ++i) {
z->ob_digit[i] = a->ob_digit[i] ^ mask; z->ob_digit[i] = a->ob_digit[i] ^ (0 ^ mask);
}
for (; i < size_b; ++i) {
z->ob_digit[i] = 0 ^ (b->ob_digit[i] ^ mask);
} }
return long_znormalize(z); return long_znormalize(z);
} }
#define MAX(x, y) ((x) < (y) ? (y) : (x))
#define MIN(x, y) ((x) > (y) ? (y) : (x))
static object * static object *
long_and(a, w) long_and(a, w)
longobject *a; longobject *a;