Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 81037 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81037 | mark.dickinson | 2010-05-09 21:42:09 +0100 (Sun, 09 May 2010) | 1 line

  Wrap multiline macros in a 'do {} while(0)', for safety.
........
This commit is contained in:
Mark Dickinson 2010-05-10 21:37:34 +00:00
parent 22b20183d5
commit cdd01d2ddb
1 changed files with 39 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
Objects/longobject.c
View File

@ -95,8 +95,10 @@ maybe_small_long(PyLongObject *v)
#define MAX(x, y) ((x) < (y) ? (y) : (x)) #define MAX(x, y) ((x) < (y) ? (y) : (x))
#define MIN(x, y) ((x) > (y) ? (y) : (x)) #define MIN(x, y) ((x) > (y) ? (y) : (x))
#define SIGCHECK(PyTryBlock) \ #define SIGCHECK(PyTryBlock) \
if (PyErr_CheckSignals()) PyTryBlock \ do { \
if (PyErr_CheckSignals()) PyTryBlock \
} while(0)
/* Normalize (remove leading zeros from) a long int object. /* Normalize (remove leading zeros from) a long int object.
Doesn't attempt to free the storage--in most cases, due to the nature Doesn't attempt to free the storage--in most cases, due to the nature
@ -1379,11 +1381,13 @@ PyLong_AsLongLongAndOverflow(PyObject *vv, int *overflow)
#endif /* HAVE_LONG_LONG */ #endif /* HAVE_LONG_LONG */
#define CHECK_BINOP(v,w) \ #define CHECK_BINOP(v,w) \
if (!PyLong_Check(v) || !PyLong_Check(w)) { \ do { \
Py_INCREF(Py_NotImplemented); \ if (!PyLong_Check(v) || !PyLong_Check(w)) { \
return Py_NotImplemented; \ Py_INCREF(Py_NotImplemented); \
} return Py_NotImplemented; \
} \
} while(0)
/* bits_in_digit(d) returns the unique integer k such that 2**(k-1) <= d < /* bits_in_digit(d) returns the unique integer k such that 2**(k-1) <= d <
2**k if d is nonzero, else 0. */ 2**k if d is nonzero, else 0. */
@ -1599,7 +1603,7 @@ long_to_decimal_string(PyObject *aa)
SIGCHECK({ SIGCHECK({
Py_DECREF(scratch); Py_DECREF(scratch);
return NULL; return NULL;
}) });
} }
/* pout should have at least one digit, so that the case when a = 0 /* pout should have at least one digit, so that the case when a = 0
works correctly */ works correctly */
@ -2274,7 +2278,7 @@ x_divrem(PyLongObject *v1, PyLongObject *w1, PyLongObject **prem)
Py_DECREF(v); Py_DECREF(v);
*prem = NULL; *prem = NULL;
return NULL; return NULL;
}) });
/* estimate quotient digit q; may overestimate by 1 (rare) */ /* estimate quotient digit q; may overestimate by 1 (rare) */
vtop = vk[size_w]; vtop = vk[size_w];
@ -2768,7 +2772,7 @@ x_mul(PyLongObject *a, PyLongObject *b)
SIGCHECK({ SIGCHECK({
Py_DECREF(z); Py_DECREF(z);
return NULL; return NULL;
}) });
carry = *pz + f * f; carry = *pz + f * f;
*pz++ = (digit)(carry & PyLong_MASK); *pz++ = (digit)(carry & PyLong_MASK);
@ -2806,7 +2810,7 @@ x_mul(PyLongObject *a, PyLongObject *b)
SIGCHECK({ SIGCHECK({
Py_DECREF(z); Py_DECREF(z);
return NULL; return NULL;
}) });
while (pb < pbend) { while (pb < pbend) {
carry += *pz + *pb++ * f; carry += *pz + *pb++ * f;
@ -3645,26 +3649,28 @@ long_pow(PyObject *v, PyObject *w, PyObject *x)
* is NULL. * is NULL.
*/ */
#define REDUCE(X) \ #define REDUCE(X) \
if (c != NULL) { \ do { \
if (l_divmod(X, c, NULL, &temp) < 0) \ if (c != NULL) { \
goto Error; \ if (l_divmod(X, c, NULL, &temp) < 0) \
Py_XDECREF(X); \ goto Error; \
X = temp; \ Py_XDECREF(X); \
temp = NULL; \ X = temp; \
} temp = NULL; \
} \
} while(0)
/* Multiply two values, then reduce the result: /* Multiply two values, then reduce the result:
result = X*Y % c. If c is NULL, skip the mod. */ result = X*Y % c. If c is NULL, skip the mod. */
#define MULT(X, Y, result) \ #define MULT(X, Y, result) \
{ \ do { \
temp = (PyLongObject *)long_mul(X, Y); \ temp = (PyLongObject *)long_mul(X, Y); \
if (temp == NULL) \ if (temp == NULL) \
goto Error; \ goto Error; \
Py_XDECREF(result); \ Py_XDECREF(result); \
result = temp; \ result = temp; \
temp = NULL; \ temp = NULL; \
REDUCE(result) \ REDUCE(result); \
} } while(0)
if (Py_SIZE(b) <= FIVEARY_CUTOFF) { if (Py_SIZE(b) <= FIVEARY_CUTOFF) {
/* Left-to-right binary exponentiation (HAC Algorithm 14.79) */ /* Left-to-right binary exponentiation (HAC Algorithm 14.79) */
@ -3673,9 +3679,9 @@ long_pow(PyObject *v, PyObject *w, PyObject *x)
digit bi = b->ob_digit[i]; digit bi = b->ob_digit[i];
for (j = (digit)1 << (PyLong_SHIFT-1); j != 0; j >>= 1) { for (j = (digit)1 << (PyLong_SHIFT-1); j != 0; j >>= 1) {
MULT(z, z, z) MULT(z, z, z);
if (bi & j) if (bi & j)
MULT(z, a, z) MULT(z, a, z);
} }
} }
} }
@ -3684,7 +3690,7 @@ long_pow(PyObject *v, PyObject *w, PyObject *x)
Py_INCREF(z); /* still holds 1L */ Py_INCREF(z); /* still holds 1L */
table[0] = z; table[0] = z;
for (i = 1; i < 32; ++i) for (i = 1; i < 32; ++i)
MULT(table[i-1], a, table[i]) MULT(table[i-1], a, table[i]);
for (i = Py_SIZE(b) - 1; i >= 0; --i) { for (i = Py_SIZE(b) - 1; i >= 0; --i) {
const digit bi = b->ob_digit[i]; const digit bi = b->ob_digit[i];
@ -3692,9 +3698,9 @@ long_pow(PyObject *v, PyObject *w, PyObject *x)
for (j = PyLong_SHIFT - 5; j >= 0; j -= 5) { for (j = PyLong_SHIFT - 5; j >= 0; j -= 5) {
const int index = (bi >> j) & 0x1f; const int index = (bi >> j) & 0x1f;
for (k = 0; k < 5; ++k) for (k = 0; k < 5; ++k)
MULT(z, z, z) MULT(z, z, z);
if (index) if (index)
MULT(z, table[index], z) MULT(z, table[index], z);
} }
} }
} }