[Python-checkins] cpython: 1) State restrictions for the transform length.
stefan.krah
python-checkins at python.org
Sun Jun 10 16:52:11 CEST 2012
http://hg.python.org/cpython/rev/27b9ab483c59
changeset: 77399:27b9ab483c59
user: Stefan Krah <skrah at bytereef.org>
date: Sun Jun 10 16:50:55 2012 +0200
summary:
1) State restrictions for the transform length.
2) Switch argument order to match the function signature of mpd_calloc()
(cosmetic change, since the order is irrelevant).
files:
Modules/_decimal/libmpdec/mpdecimal.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Modules/_decimal/libmpdec/mpdecimal.c b/Modules/_decimal/libmpdec/mpdecimal.c
--- a/Modules/_decimal/libmpdec/mpdecimal.c
+++ b/Modules/_decimal/libmpdec/mpdecimal.c
@@ -5158,7 +5158,11 @@
}
-/* Determine the minimum length for the number theoretic transform. */
+/*
+ * Determine the minimum length for the number theoretic transform. Valid
+ * transform lengths are 2**n or 3*2**n, where 2**n <= MPD_MAXTRANSFORM_2N.
+ * The function finds the shortest length m such that rsize <= m.
+ */
static inline mpd_size_t
_mpd_get_transform_len(mpd_size_t rsize)
{
@@ -5169,6 +5173,7 @@
log2rsize = mpd_bsr(rsize);
if (rsize <= 1024) {
+ /* 2**n is faster in this range. */
x = ((mpd_size_t)1)<<log2rsize;
return (rsize == x) ? x : x<<1;
}
@@ -5264,13 +5269,13 @@
goto malloc_error;
}
- if ((c1 = mpd_calloc(sizeof *c1, n)) == NULL) {
+ if ((c1 = mpd_calloc(n, sizeof *c1)) == NULL) {
goto malloc_error;
}
- if ((c2 = mpd_calloc(sizeof *c2, n)) == NULL) {
+ if ((c2 = mpd_calloc(n, sizeof *c2)) == NULL) {
goto malloc_error;
}
- if ((c3 = mpd_calloc(sizeof *c3, n)) == NULL) {
+ if ((c3 = mpd_calloc(n, sizeof *c3)) == NULL) {
goto malloc_error;
}
@@ -5286,7 +5291,7 @@
}
}
else {
- if ((vtmp = mpd_calloc(sizeof *vtmp, n)) == NULL) {
+ if ((vtmp = mpd_calloc(n, sizeof *vtmp)) == NULL) {
goto malloc_error;
}
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list