cpython-lru_cache-weakref: Objects/longobject.c annotate

annotate Objects/longobject.c @ 46149:7fdff02e6f45 legacy-trunk

Revert r61969 which added casts to Py_CHARMASK to avoid compiler warnings. Rather than sprinkle casts throughout the code, change Py_CHARMASK to always cast it's result to an unsigned char. This should ensure we do the right thing when accessing an array with the result.

author	Neal Norwitz <nnorwitz@gmail.com>
date	Fri, 28 Mar 2008 04:58:51 +0000
parents	5078b7ee16dc
children	38c831b47dc5

rev	line source
35999 9541369b0dca Add const to several API functions that take char . Jeremy Hylton <jeremy@alum.mit.edu>* parents: 35254 diff changeset	1
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3 /* Long (arbitrary precision) integer object implementation */
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4
242 316a0d9c0096 Many small changes Guido van Rossum <guido@python.org> parents: 230 diff changeset	5 /* XXX The functional organization of this file is terrible */
316a0d9c0096 Many small changes Guido van Rossum <guido@python.org> parents: 230 diff changeset	6
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	7 #include "Python.h"
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	8 #include "longintrepr.h"
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	9 #include "formatter_string.h"
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	10
1837 87364d9e3444 New patches by Andrew to fix various problems Guido van Rossum <guido@python.org> parents: 1391 diff changeset	11 #include <ctype.h>
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	12
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	13 /* For long multiplication, use the O(N**2) school algorithm unless
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	14 * both operands contain more than KARATSUBA_CUTOFF digits (this
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	15 * being an internal Python long digit, in base PyLong_BASE).
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	16 */
33325 1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	17 #define KARATSUBA_CUTOFF 70
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	18 #define KARATSUBA_SQUARE_CUTOFF (2 * KARATSUBA_CUTOFF)
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	19
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	20 /* For exponentiation, use the binary left-to-right algorithm
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	21 * unless the exponent contains more than FIVEARY_CUTOFF digits.
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	22 * In that case, do 5 bits at a time. The potential drawback is that
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	23 * a table of 2**5 intermediate results is computed.
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	24 */
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	25 #define FIVEARY_CUTOFF 8
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	26
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	27 #define ABS(x) ((x) < 0 ? -(x) : (x))
405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	28
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	29 #undef MIN
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	30 #undef MAX
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	31 #define MAX(x, y) ((x) < (y) ? (y) : (x))
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	32 #define MIN(x, y) ((x) > (y) ? (y) : (x))
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	33
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	34 /* Forward */
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	35 static PyLongObject long_normalize(PyLongObject );
a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	36 static PyLongObject mul1(PyLongObject , wdigit);
a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	37 static PyLongObject muladd1(PyLongObject , wdigit, wdigit);
18594 19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	38 static PyLongObject divrem1(PyLongObject , digit, digit *);
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	39
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	40 #define SIGCHECK(PyTryBlock) \
25108 3a26e352f0a6 replace thread state objects' ticker and checkinterval fields with two Skip Montanaro <skip@pobox.com> parents: 24919 diff changeset	41 if (--_Py_Ticker < 0) { \
3a26e352f0a6 replace thread state objects' ticker and checkinterval fields with two Skip Montanaro <skip@pobox.com> parents: 24919 diff changeset	42 _Py_Ticker = _Py_CheckInterval; \
38331 7a6af4a143c6 Patch #1494387: SVN longobject.c compiler warnings Tim Peters <tim.peters@gmail.com> parents: 38307 diff changeset	43 if (PyErr_CheckSignals()) PyTryBlock \
242 316a0d9c0096 Many small changes Guido van Rossum <guido@python.org> parents: 230 diff changeset	44 }
316a0d9c0096 Many small changes Guido van Rossum <guido@python.org> parents: 230 diff changeset	45
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	46 /* Normalize (remove leading zeros from) a long int object.
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	47 Doesn't attempt to free the storage--in most cases, due to the nature
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	48 of the algorithms used, this could save at most be one word anyway. */
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	49
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	50 static PyLongObject *
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	51 long_normalize(register PyLongObject *v)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	52 {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	53 Py_ssize_t j = ABS(Py_SIZE(v));
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	54 Py_ssize_t i = j;
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	55
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	56 while (i > 0 && v->ob_digit[i-1] == 0)
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	57 --i;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	58 if (i != j)
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	59 Py_SIZE(v) = (Py_SIZE(v) < 0) ? -(i) : i;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	60 return v;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	61 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	62
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	63 /* Allocate a new long int object with size digits.
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	64 Return NULL and set exception if we run out of memory. */
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	65
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	66 PyLongObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	67 _PyLong_New(Py_ssize_t size)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	68 {
38139 f1e24452dbba Fix problems found by Coverity. Neal Norwitz <nnorwitz@gmail.com> parents: 37815 diff changeset	69 if (size > PY_SSIZE_T_MAX) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	70 PyErr_NoMemory();
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	71 return NULL;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	72 }
44749 55ddb166f1d1 Silence Coverity false alerts with CIDs #172, #183, #184 Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	73 /* coverity[ampersand_in_size] */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	74 return PyObject_NEW_VAR(PyLongObject, &PyLong_Type, size);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	75 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	76
19837 5158e4789459 SF bug #460020: bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19787 diff changeset	77 PyObject *
5158e4789459 SF bug #460020: bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19787 diff changeset	78 _PyLong_Copy(PyLongObject *src)
5158e4789459 SF bug #460020: bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19787 diff changeset	79 {
5158e4789459 SF bug #460020: bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19787 diff changeset	80 PyLongObject *result;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	81 Py_ssize_t i;
19837 5158e4789459 SF bug #460020: bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19787 diff changeset	82
5158e4789459 SF bug #460020: bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19787 diff changeset	83 assert(src != NULL);
5158e4789459 SF bug #460020: bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19787 diff changeset	84 i = src->ob_size;
5158e4789459 SF bug #460020: bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19787 diff changeset	85 if (i < 0)
5158e4789459 SF bug #460020: bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19787 diff changeset	86 i = -(i);
5158e4789459 SF bug #460020: bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19787 diff changeset	87 result = _PyLong_New(i);
5158e4789459 SF bug #460020: bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19787 diff changeset	88 if (result != NULL) {
22147 1d1a01d956a2 backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21968 diff changeset	89 result->ob_size = src->ob_size;
19837 5158e4789459 SF bug #460020: bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19787 diff changeset	90 while (--i >= 0)
5158e4789459 SF bug #460020: bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19787 diff changeset	91 result->ob_digit[i] = src->ob_digit[i];
5158e4789459 SF bug #460020: bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19787 diff changeset	92 }
5158e4789459 SF bug #460020: bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19787 diff changeset	93 return (PyObject *)result;
5158e4789459 SF bug #460020: bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19787 diff changeset	94 }
5158e4789459 SF bug #460020: bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19787 diff changeset	95
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	96 /* Create a new long int object from a C long int */
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	97
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	98 PyObject *
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	99 PyLong_FromLong(long ival)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	100 {
18114 31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	101 PyLongObject *v;
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	102 unsigned long t; /* unsigned so >> doesn't propagate sign bit */
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	103 int ndigits = 0;
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	104 int negative = 0;
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	105
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	106 if (ival < 0) {
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	107 ival = -ival;
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	108 negative = 1;
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	109 }
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	110
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	111 /* Count the number of Python digits.
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	112 We used to pick 5 ("big enough for anything"), but that's a
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	113 waste of time and space given that 5*15 = 75 bits are rarely
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	114 needed. */
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	115 t = (unsigned long)ival;
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	116 while (t) {
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	117 ++ndigits;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	118 t >>= PyLong_SHIFT;
18114 31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	119 }
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	120 v = _PyLong_New(ndigits);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	121 if (v != NULL) {
18114 31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	122 digit *p = v->ob_digit;
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	123 v->ob_size = negative ? -ndigits : ndigits;
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	124 t = (unsigned long)ival;
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	125 while (t) {
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	126 *p++ = (digit)(t & PyLong_MASK);
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	127 t >>= PyLong_SHIFT;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	128 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	129 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	130 return (PyObject *)v;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	131 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	132
4870 68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	133 /* Create a new long int object from a C unsigned long int */
68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	134
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	135 PyObject *
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	136 PyLong_FromUnsignedLong(unsigned long ival)
4870 68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	137 {
18114 31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	138 PyLongObject *v;
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	139 unsigned long t;
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	140 int ndigits = 0;
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	141
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	142 /* Count the number of Python digits. */
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	143 t = (unsigned long)ival;
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	144 while (t) {
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	145 ++ndigits;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	146 t >>= PyLong_SHIFT;
18114 31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	147 }
31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	148 v = _PyLong_New(ndigits);
4870 68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	149 if (v != NULL) {
18114 31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	150 digit *p = v->ob_digit;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	151 Py_SIZE(v) = ndigits;
18114 31cd0db0f09f PyLong_From{Unsigned,}Long: count the # of digits first, so no more space Tim Peters <tim.peters@gmail.com> parents: 18110 diff changeset	152 while (ival) {
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	153 *p++ = (digit)(ival & PyLong_MASK);
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	154 ival >>= PyLong_SHIFT;
4870 68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	155 }
68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	156 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	157 return (PyObject *)v;
4870 68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	158 }
68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	159
254 71b0bd5ed162 Added dnewlongobject(), function to convert double to long int. Guido van Rossum <guido@python.org> parents: 250 diff changeset	160 /* Create a new long int object from a C double */
71b0bd5ed162 Added dnewlongobject(), function to convert double to long int. Guido van Rossum <guido@python.org> parents: 250 diff changeset	161
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	162 PyObject *
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	163 PyLong_FromDouble(double dval)
254 71b0bd5ed162 Added dnewlongobject(), function to convert double to long int. Guido van Rossum <guido@python.org> parents: 250 diff changeset	164 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	165 PyLongObject *v;
254 71b0bd5ed162 Added dnewlongobject(), function to convert double to long int. Guido van Rossum <guido@python.org> parents: 250 diff changeset	166 double frac;
71b0bd5ed162 Added dnewlongobject(), function to convert double to long int. Guido van Rossum <guido@python.org> parents: 250 diff changeset	167 int i, ndig, expo, neg;
71b0bd5ed162 Added dnewlongobject(), function to convert double to long int. Guido van Rossum <guido@python.org> parents: 250 diff changeset	168 neg = 0;
13976 5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13761 diff changeset	169 if (Py_IS_INFINITY(dval)) {
11331 4fdc9c1ecaf6 Patch by Tim Peters fixing PR#89: Guido van Rossum <guido@python.org> parents: 9969 diff changeset	170 PyErr_SetString(PyExc_OverflowError,
4fdc9c1ecaf6 Patch by Tim Peters fixing PR#89: Guido van Rossum <guido@python.org> parents: 9969 diff changeset	171 "cannot convert float infinity to long");
4fdc9c1ecaf6 Patch by Tim Peters fixing PR#89: Guido van Rossum <guido@python.org> parents: 9969 diff changeset	172 return NULL;
4fdc9c1ecaf6 Patch by Tim Peters fixing PR#89: Guido van Rossum <guido@python.org> parents: 9969 diff changeset	173 }
44448 5e0170d3c4da Bug #1481296: Fixed long(float('nan'))!=0L. Christian Heimes <christian@cheimes.de> parents: 44432 diff changeset	174 if (Py_IS_NAN(dval)) {
5e0170d3c4da Bug #1481296: Fixed long(float('nan'))!=0L. Christian Heimes <christian@cheimes.de> parents: 44432 diff changeset	175 return PyLong_FromLong(0L);
5e0170d3c4da Bug #1481296: Fixed long(float('nan'))!=0L. Christian Heimes <christian@cheimes.de> parents: 44432 diff changeset	176 }
254 71b0bd5ed162 Added dnewlongobject(), function to convert double to long int. Guido van Rossum <guido@python.org> parents: 250 diff changeset	177 if (dval < 0.0) {
71b0bd5ed162 Added dnewlongobject(), function to convert double to long int. Guido van Rossum <guido@python.org> parents: 250 diff changeset	178 neg = 1;
71b0bd5ed162 Added dnewlongobject(), function to convert double to long int. Guido van Rossum <guido@python.org> parents: 250 diff changeset	179 dval = -dval;
71b0bd5ed162 Added dnewlongobject(), function to convert double to long int. Guido van Rossum <guido@python.org> parents: 250 diff changeset	180 }
71b0bd5ed162 Added dnewlongobject(), function to convert double to long int. Guido van Rossum <guido@python.org> parents: 250 diff changeset	181 frac = frexp(dval, &expo); /* dval = frac2expo; 0.0 <= frac < 1.0 /
71b0bd5ed162 Added dnewlongobject(), function to convert double to long int. Guido van Rossum <guido@python.org> parents: 250 diff changeset	182 if (expo <= 0)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	183 return PyLong_FromLong(0L);
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	184 ndig = (expo-1) / PyLong_SHIFT + 1; /* Number of 'digits' in result */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	185 v = _PyLong_New(ndig);
254 71b0bd5ed162 Added dnewlongobject(), function to convert double to long int. Guido van Rossum <guido@python.org> parents: 250 diff changeset	186 if (v == NULL)
71b0bd5ed162 Added dnewlongobject(), function to convert double to long int. Guido van Rossum <guido@python.org> parents: 250 diff changeset	187 return NULL;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	188 frac = ldexp(frac, (expo-1) % PyLong_SHIFT + 1);
254 71b0bd5ed162 Added dnewlongobject(), function to convert double to long int. Guido van Rossum <guido@python.org> parents: 250 diff changeset	189 for (i = ndig; --i >= 0; ) {
71b0bd5ed162 Added dnewlongobject(), function to convert double to long int. Guido van Rossum <guido@python.org> parents: 250 diff changeset	190 long bits = (long)frac;
5288 0f1711b7d367 Tweaks to keep the Microsoft compiler quiet. Guido van Rossum <guido@python.org> parents: 5199 diff changeset	191 v->ob_digit[i] = (digit) bits;
254 71b0bd5ed162 Added dnewlongobject(), function to convert double to long int. Guido van Rossum <guido@python.org> parents: 250 diff changeset	192 frac = frac - (double)bits;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	193 frac = ldexp(frac, PyLong_SHIFT);
254 71b0bd5ed162 Added dnewlongobject(), function to convert double to long int. Guido van Rossum <guido@python.org> parents: 250 diff changeset	194 }
71b0bd5ed162 Added dnewlongobject(), function to convert double to long int. Guido van Rossum <guido@python.org> parents: 250 diff changeset	195 if (neg)
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	196 Py_SIZE(v) = -(Py_SIZE(v));
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	197 return (PyObject *)v;
254 71b0bd5ed162 Added dnewlongobject(), function to convert double to long int. Guido van Rossum <guido@python.org> parents: 250 diff changeset	198 }
71b0bd5ed162 Added dnewlongobject(), function to convert double to long int. Guido van Rossum <guido@python.org> parents: 250 diff changeset	199
39995 6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	200 /* Checking for overflow in PyLong_AsLong is a PITA since C doesn't define
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	201 * anything about what happens when a signed integer operation overflows,
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	202 * and some compilers think they're doing you a favor by being "clever"
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	203 * then. The bit pattern for the largest postive signed long is
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	204 * (unsigned long)LONG_MAX, and for the smallest negative signed long
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	205 * it is abs(LONG_MIN), which we could write -(unsigned long)LONG_MIN.
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	206 * However, some other compilers warn about applying unary minus to an
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	207 * unsigned operand. Hence the weird "0-".
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	208 */
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	209 #define PY_ABS_LONG_MIN (0-(unsigned long)LONG_MIN)
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	210 #define PY_ABS_SSIZE_T_MIN (0-(size_t)PY_SSIZE_T_MIN)
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	211
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	212 /* Get a C long int from a long int object.
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	213 Returns -1 and sets an error condition if overflow occurs. */
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	214
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	215 long
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	216 PyLong_AsLong(PyObject *vv)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	217 {
8425 e2d41bf1a0f0 Subject: Buglet in PyLong_AsLong Guido van Rossum <guido@python.org> parents: 7981 diff changeset	218 /* This version by Tim Peters */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	219 register PyLongObject *v;
8425 e2d41bf1a0f0 Subject: Buglet in PyLong_AsLong Guido van Rossum <guido@python.org> parents: 7981 diff changeset	220 unsigned long x, prev;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	221 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	222 int sign;
8425 e2d41bf1a0f0 Subject: Buglet in PyLong_AsLong Guido van Rossum <guido@python.org> parents: 7981 diff changeset	223
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	224 if (vv == NULL \|\| !PyLong_Check(vv)) {
19925 df409844b659 A fix for SF bug #461546 (bug in long_mul). Guido van Rossum <guido@python.org> parents: 19897 diff changeset	225 if (vv != NULL && PyInt_Check(vv))
df409844b659 A fix for SF bug #461546 (bug in long_mul). Guido van Rossum <guido@python.org> parents: 19897 diff changeset	226 return PyInt_AsLong(vv);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	227 PyErr_BadInternalCall();
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	228 return -1;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	229 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	230 v = (PyLongObject *)vv;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	231 i = v->ob_size;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	232 sign = 1;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	233 x = 0;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	234 if (i < 0) {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	235 sign = -1;
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	236 i = -(i);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	237 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	238 while (--i >= 0) {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	239 prev = x;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	240 x = (x << PyLong_SHIFT) + v->ob_digit[i];
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	241 if ((x >> PyLong_SHIFT) != prev)
8425 e2d41bf1a0f0 Subject: Buglet in PyLong_AsLong Guido van Rossum <guido@python.org> parents: 7981 diff changeset	242 goto overflow;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	243 }
39995 6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	244 /* Haven't lost any bits, but casting to long requires extra care
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	245 * (see comment above).
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	246 */
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	247 if (x <= (unsigned long)LONG_MAX) {
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	248 return (long)x * sign;
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	249 }
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	250 else if (sign < 0 && x == PY_ABS_LONG_MIN) {
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	251 return LONG_MIN;
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	252 }
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	253 /* else overflow */
8425 e2d41bf1a0f0 Subject: Buglet in PyLong_AsLong Guido van Rossum <guido@python.org> parents: 7981 diff changeset	254
e2d41bf1a0f0 Subject: Buglet in PyLong_AsLong Guido van Rossum <guido@python.org> parents: 7981 diff changeset	255 overflow:
e2d41bf1a0f0 Subject: Buglet in PyLong_AsLong Guido van Rossum <guido@python.org> parents: 7981 diff changeset	256 PyErr_SetString(PyExc_OverflowError,
19897 84376356ff89 based upon a suggestion in c.l.py, this slight expansion of the Skip Montanaro <skip@pobox.com> parents: 19882 diff changeset	257 "long int too large to convert to int");
8425 e2d41bf1a0f0 Subject: Buglet in PyLong_AsLong Guido van Rossum <guido@python.org> parents: 7981 diff changeset	258 return -1;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	259 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	260
39463 6cafdc81cfde Patch #1538606, Patch to fix __index__() clipping. Neal Norwitz <nnorwitz@gmail.com> parents: 39141 diff changeset	261 /* Get a Py_ssize_t from a long int object.
6cafdc81cfde Patch #1538606, Patch to fix __index__() clipping. Neal Norwitz <nnorwitz@gmail.com> parents: 39141 diff changeset	262 Returns -1 and sets an error condition if overflow occurs. */
6cafdc81cfde Patch #1538606, Patch to fix __index__() clipping. Neal Norwitz <nnorwitz@gmail.com> parents: 39141 diff changeset	263
6cafdc81cfde Patch #1538606, Patch to fix __index__() clipping. Neal Norwitz <nnorwitz@gmail.com> parents: 39141 diff changeset	264 Py_ssize_t
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	265 PyLong_AsSsize_t(PyObject *vv) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	266 register PyLongObject *v;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	267 size_t x, prev;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	268 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	269 int sign;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	270
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	271 if (vv == NULL \|\| !PyLong_Check(vv)) {
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	272 PyErr_BadInternalCall();
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	273 return -1;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	274 }
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	275 v = (PyLongObject *)vv;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	276 i = v->ob_size;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	277 sign = 1;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	278 x = 0;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	279 if (i < 0) {
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	280 sign = -1;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	281 i = -(i);
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	282 }
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	283 while (--i >= 0) {
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	284 prev = x;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	285 x = (x << PyLong_SHIFT) + v->ob_digit[i];
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	286 if ((x >> PyLong_SHIFT) != prev)
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	287 goto overflow;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	288 }
39995 6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	289 /* Haven't lost any bits, but casting to a signed type requires
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	290 * extra care (see comment above).
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	291 */
39995 6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	292 if (x <= (size_t)PY_SSIZE_T_MAX) {
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	293 return (Py_ssize_t)x * sign;
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	294 }
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	295 else if (sign < 0 && x == PY_ABS_SSIZE_T_MIN) {
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	296 return PY_SSIZE_T_MIN;
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	297 }
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	298 /* else overflow */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	299
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	300 overflow:
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	301 PyErr_SetString(PyExc_OverflowError,
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	302 "long int too large to convert to int");
39463 6cafdc81cfde Patch #1538606, Patch to fix __index__() clipping. Neal Norwitz <nnorwitz@gmail.com> parents: 39141 diff changeset	303 return -1;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	304 }
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	305
24777 696a284569e6 Fix comment for PyLong_AsUnsignedLong() to say that the return value Guido van Rossum <guido@python.org> parents: 24775 diff changeset	306 /* Get a C unsigned long int from a long int object.
4870 68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	307 Returns -1 and sets an error condition if overflow occurs. */
68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	308
68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	309 unsigned long
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	310 PyLong_AsUnsignedLong(PyObject *vv)
4870 68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	311 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	312 register PyLongObject *v;
4870 68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	313 unsigned long x, prev;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	314 Py_ssize_t i;
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	315
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	316 if (vv == NULL \|\| !PyLong_Check(vv)) {
33524 30d428f992f9 Patch #1024670: Support int objects in PyLong_AsUnsignedLong[Mask]. Martin v. Löwis <martin@v.loewis.de> parents: 33328 diff changeset	317 if (vv != NULL && PyInt_Check(vv)) {
30d428f992f9 Patch #1024670: Support int objects in PyLong_AsUnsignedLong[Mask]. Martin v. Löwis <martin@v.loewis.de> parents: 33328 diff changeset	318 long val = PyInt_AsLong(vv);
30d428f992f9 Patch #1024670: Support int objects in PyLong_AsUnsignedLong[Mask]. Martin v. Löwis <martin@v.loewis.de> parents: 33328 diff changeset	319 if (val < 0) {
30d428f992f9 Patch #1024670: Support int objects in PyLong_AsUnsignedLong[Mask]. Martin v. Löwis <martin@v.loewis.de> parents: 33328 diff changeset	320 PyErr_SetString(PyExc_OverflowError,
30d428f992f9 Patch #1024670: Support int objects in PyLong_AsUnsignedLong[Mask]. Martin v. Löwis <martin@v.loewis.de> parents: 33328 diff changeset	321 "can't convert negative value to unsigned long");
30d428f992f9 Patch #1024670: Support int objects in PyLong_AsUnsignedLong[Mask]. Martin v. Löwis <martin@v.loewis.de> parents: 33328 diff changeset	322 return (unsigned long) -1;
30d428f992f9 Patch #1024670: Support int objects in PyLong_AsUnsignedLong[Mask]. Martin v. Löwis <martin@v.loewis.de> parents: 33328 diff changeset	323 }
30d428f992f9 Patch #1024670: Support int objects in PyLong_AsUnsignedLong[Mask]. Martin v. Löwis <martin@v.loewis.de> parents: 33328 diff changeset	324 return val;
30d428f992f9 Patch #1024670: Support int objects in PyLong_AsUnsignedLong[Mask]. Martin v. Löwis <martin@v.loewis.de> parents: 33328 diff changeset	325 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	326 PyErr_BadInternalCall();
4870 68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	327 return (unsigned long) -1;
68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	328 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	329 v = (PyLongObject *)vv;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	330 i = Py_SIZE(v);
4870 68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	331 x = 0;
68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	332 if (i < 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	333 PyErr_SetString(PyExc_OverflowError,
4870 68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	334 "can't convert negative value to unsigned long");
68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	335 return (unsigned long) -1;
68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	336 }
68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	337 while (--i >= 0) {
68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	338 prev = x;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	339 x = (x << PyLong_SHIFT) + v->ob_digit[i];
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	340 if ((x >> PyLong_SHIFT) != prev) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	341 PyErr_SetString(PyExc_OverflowError,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15041 diff changeset	342 "long int too large to convert");
4870 68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	343 return (unsigned long) -1;
68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	344 }
68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	345 }
68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	346 return x;
68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	347 }
68f4134869db Added PyLong_FromUnsignedLong() and PyLong_AsUnsignedLong(). Guido van Rossum <guido@python.org> parents: 4587 diff changeset	348
28652 28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	349 /* Get a C unsigned long int from a long int object, ignoring the high bits.
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	350 Returns -1 and sets an error condition if an error occurs. */
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	351
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	352 unsigned long
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	353 PyLong_AsUnsignedLongMask(PyObject *vv)
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	354 {
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	355 register PyLongObject *v;
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	356 unsigned long x;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	357 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	358 int sign;
28652 28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	359
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	360 if (vv == NULL \|\| !PyLong_Check(vv)) {
33524 30d428f992f9 Patch #1024670: Support int objects in PyLong_AsUnsignedLong[Mask]. Martin v. Löwis <martin@v.loewis.de> parents: 33328 diff changeset	361 if (vv != NULL && PyInt_Check(vv))
30d428f992f9 Patch #1024670: Support int objects in PyLong_AsUnsignedLong[Mask]. Martin v. Löwis <martin@v.loewis.de> parents: 33328 diff changeset	362 return PyInt_AsUnsignedLongMask(vv);
28652 28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	363 PyErr_BadInternalCall();
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	364 return (unsigned long) -1;
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	365 }
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	366 v = (PyLongObject *)vv;
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	367 i = v->ob_size;
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	368 sign = 1;
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	369 x = 0;
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	370 if (i < 0) {
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	371 sign = -1;
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	372 i = -i;
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	373 }
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	374 while (--i >= 0) {
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	375 x = (x << PyLong_SHIFT) + v->ob_digit[i];
28652 28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	376 }
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	377 return x * sign;
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	378 }
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	379
27549 7fcdeeb16ec0 _PyLong_NumBits(): The definition of this was too specific to the quirky Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	380 int
7fcdeeb16ec0 _PyLong_NumBits(): The definition of this was too specific to the quirky Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	381 _PyLong_Sign(PyObject *vv)
7fcdeeb16ec0 _PyLong_NumBits(): The definition of this was too specific to the quirky Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	382 {
7fcdeeb16ec0 _PyLong_NumBits(): The definition of this was too specific to the quirky Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	383 PyLongObject v = (PyLongObject )vv;
7fcdeeb16ec0 _PyLong_NumBits(): The definition of this was too specific to the quirky Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	384
7fcdeeb16ec0 _PyLong_NumBits(): The definition of this was too specific to the quirky Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	385 assert(v != NULL);
7fcdeeb16ec0 _PyLong_NumBits(): The definition of this was too specific to the quirky Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	386 assert(PyLong_Check(v));
7fcdeeb16ec0 _PyLong_NumBits(): The definition of this was too specific to the quirky Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	387
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	388 return Py_SIZE(v) == 0 ? 0 : (Py_SIZE(v) < 0 ? -1 : 1);
27549 7fcdeeb16ec0 _PyLong_NumBits(): The definition of this was too specific to the quirky Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	389 }
7fcdeeb16ec0 _PyLong_NumBits(): The definition of this was too specific to the quirky Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	390
27487 0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	391 size_t
0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	392 _PyLong_NumBits(PyObject *vv)
0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	393 {
0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	394 PyLongObject v = (PyLongObject )vv;
27549 7fcdeeb16ec0 _PyLong_NumBits(): The definition of this was too specific to the quirky Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	395 size_t result = 0;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	396 Py_ssize_t ndigits;
27487 0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	397
0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	398 assert(v != NULL);
0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	399 assert(PyLong_Check(v));
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	400 ndigits = ABS(Py_SIZE(v));
27487 0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	401 assert(ndigits == 0 \|\| v->ob_digit[ndigits - 1] != 0);
0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	402 if (ndigits > 0) {
0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	403 digit msd = v->ob_digit[ndigits - 1];
0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	404
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	405 result = (ndigits - 1) * PyLong_SHIFT;
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	406 if (result / PyLong_SHIFT != (size_t)(ndigits - 1))
27487 0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	407 goto Overflow;
0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	408 do {
0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	409 ++result;
0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	410 if (result == 0)
0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	411 goto Overflow;
0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	412 msd >>= 1;
0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	413 } while (msd);
0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	414 }
0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	415 return result;
0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	416
0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	417 Overflow:
0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	418 PyErr_SetString(PyExc_OverflowError, "long has too many bits "
0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	419 "to express in a platform size_t");
0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	420 return (size_t)-1;
0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	421 }
0904d878b8f1 Added new private API function _PyLong_NumBits. This will be used at the Tim Peters <tim.peters@gmail.com> parents: 26867 diff changeset	422
18082 dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	423 PyObject *
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	424 _PyLong_FromByteArray(const unsigned char* bytes, size_t n,
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	425 int little_endian, int is_signed)
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	426 {
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	427 const unsigned char* pstartbyte;/* LSB of bytes */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	428 int incr; /* direction to move pstartbyte */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	429 const unsigned char* pendbyte; /* MSB of bytes */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	430 size_t numsignificantbytes; /* number of bytes that matter */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	431 size_t ndigits; /* number of Python long digits */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	432 PyLongObject* v; /* result */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	433 int idigit = 0; /* next free index in v->ob_digit */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	434
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	435 if (n == 0)
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	436 return PyLong_FromLong(0L);
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	437
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	438 if (little_endian) {
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	439 pstartbyte = bytes;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	440 pendbyte = bytes + n - 1;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	441 incr = 1;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	442 }
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	443 else {
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	444 pstartbyte = bytes + n - 1;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	445 pendbyte = bytes;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	446 incr = -1;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	447 }
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	448
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	449 if (is_signed)
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	450 is_signed = *pendbyte >= 0x80;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	451
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	452 /* Compute numsignificantbytes. This consists of finding the most
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	453 significant byte. Leading 0 bytes are insignficant if the number
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	454 is positive, and leading 0xff bytes if negative. */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	455 {
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	456 size_t i;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	457 const unsigned char* p = pendbyte;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	458 const int pincr = -incr; /* search MSB to LSB */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	459 const unsigned char insignficant = is_signed ? 0xff : 0x00;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	460
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	461 for (i = 0; i < n; ++i, p += pincr) {
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	462 if (*p != insignficant)
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	463 break;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	464 }
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	465 numsignificantbytes = n - i;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	466 /* 2's-comp is a bit tricky here, e.g. 0xff00 == -0x0100, so
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	467 actually has 2 significant bytes. OTOH, 0xff0001 ==
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	468 -0x00ffff, so we wouldn't need to bump it there; but we
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	469 do for 0xffff = -0x0001. To be safe without bothering to
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	470 check every case, bump it regardless. */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	471 if (is_signed && numsignificantbytes < n)
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	472 ++numsignificantbytes;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	473 }
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	474
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	475 /* How many Python long digits do we need? We have
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	476 8*numsignificantbytes bits, and each Python long digit has PyLong_SHIFT
18082 dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	477 bits, so it's the ceiling of the quotient. */
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	478 ndigits = (numsignificantbytes * 8 + PyLong_SHIFT - 1) / PyLong_SHIFT;
18082 dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	479 if (ndigits > (size_t)INT_MAX)
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	480 return PyErr_NoMemory();
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	481 v = _PyLong_New((int)ndigits);
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	482 if (v == NULL)
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	483 return NULL;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	484
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	485 /* Copy the bits over. The tricky parts are computing 2's-comp on
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	486 the fly for signed numbers, and dealing with the mismatch between
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	487 8-bit bytes and (probably) 15-bit Python digits.*/
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	488 {
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	489 size_t i;
18110 e21cd4135f3d _PyLong_FromByteArray: changed decl of "carry" to match "thisbyte". No Tim Peters <tim.peters@gmail.com> parents: 18109 diff changeset	490 twodigits carry = 1; /* for 2's-comp calculation */
18082 dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	491 twodigits accum = 0; /* sliding register */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	492 unsigned int accumbits = 0; /* number of bits in accum */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	493 const unsigned char* p = pstartbyte;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	494
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	495 for (i = 0; i < numsignificantbytes; ++i, p += incr) {
18091 a001fcb76177 _PyLong_{As,From}ByteArray: Minor code rearrangement aimed at improving Tim Peters <tim.peters@gmail.com> parents: 18084 diff changeset	496 twodigits thisbyte = *p;
18082 dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	497 /* Compute correction for 2's comp, if needed. */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	498 if (is_signed) {
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	499 thisbyte = (0xff ^ thisbyte) + carry;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	500 carry = thisbyte >> 8;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	501 thisbyte &= 0xff;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	502 }
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	503 /* Because we're going LSB to MSB, thisbyte is
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	504 more significant than what's already in accum,
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	505 so needs to be prepended to accum. */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	506 accum \|= thisbyte << accumbits;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	507 accumbits += 8;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	508 if (accumbits >= PyLong_SHIFT) {
18082 dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	509 /* There's enough to fill a Python digit. */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	510 assert(idigit < (int)ndigits);
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	511 v->ob_digit[idigit] = (digit)(accum & PyLong_MASK);
18082 dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	512 ++idigit;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	513 accum >>= PyLong_SHIFT;
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	514 accumbits -= PyLong_SHIFT;
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	515 assert(accumbits < PyLong_SHIFT);
18082 dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	516 }
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	517 }
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	518 assert(accumbits < PyLong_SHIFT);
18082 dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	519 if (accumbits) {
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	520 assert(idigit < (int)ndigits);
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	521 v->ob_digit[idigit] = (digit)accum;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	522 ++idigit;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	523 }
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	524 }
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	525
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	526 Py_SIZE(v) = is_signed ? -idigit : idigit;
18082 dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	527 return (PyObject *)long_normalize(v);
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	528 }
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	529
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	530 int
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	531 _PyLong_AsByteArray(PyLongObject* v,
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	532 unsigned char* bytes, size_t n,
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	533 int little_endian, int is_signed)
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	534 {
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	535 int i; /* index into v->ob_digit */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	536 Py_ssize_t ndigits; /* \|v->ob_size\| */
18082 dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	537 twodigits accum; /* sliding register */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	538 unsigned int accumbits; /* # bits in accum */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	539 int do_twos_comp; /* store 2's-comp? is_signed and v < 0 */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	540 twodigits carry; /* for computing 2's-comp */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	541 size_t j; /* # bytes filled */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	542 unsigned char* p; /* pointer to next byte in bytes */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	543 int pincr; /* direction to move p */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	544
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	545 assert(v != NULL && PyLong_Check(v));
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	546
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	547 if (Py_SIZE(v) < 0) {
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	548 ndigits = -(Py_SIZE(v));
18082 dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	549 if (!is_signed) {
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	550 PyErr_SetString(PyExc_TypeError,
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	551 "can't convert negative long to unsigned");
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	552 return -1;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	553 }
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	554 do_twos_comp = 1;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	555 }
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	556 else {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	557 ndigits = Py_SIZE(v);
18082 dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	558 do_twos_comp = 0;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	559 }
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	560
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	561 if (little_endian) {
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	562 p = bytes;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	563 pincr = 1;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	564 }
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	565 else {
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	566 p = bytes + n - 1;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	567 pincr = -1;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	568 }
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	569
18108 8cf72b187b3a _PyLong_AsByteArray: added assert that the input is normalized. This is Tim Peters <tim.peters@gmail.com> parents: 18107 diff changeset	570 /* Copy over all the Python digits.
8cf72b187b3a _PyLong_AsByteArray: added assert that the input is normalized. This is Tim Peters <tim.peters@gmail.com> parents: 18107 diff changeset	571 It's crucial that every Python digit except for the MSD contribute
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	572 exactly PyLong_SHIFT bits to the total, so first assert that the long is
18108 8cf72b187b3a _PyLong_AsByteArray: added assert that the input is normalized. This is Tim Peters <tim.peters@gmail.com> parents: 18107 diff changeset	573 normalized. */
8cf72b187b3a _PyLong_AsByteArray: added assert that the input is normalized. This is Tim Peters <tim.peters@gmail.com> parents: 18107 diff changeset	574 assert(ndigits == 0 \|\| v->ob_digit[ndigits - 1] != 0);
18082 dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	575 j = 0;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	576 accum = 0;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	577 accumbits = 0;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	578 carry = do_twos_comp ? 1 : 0;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	579 for (i = 0; i < ndigits; ++i) {
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	580 twodigits thisdigit = v->ob_digit[i];
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	581 if (do_twos_comp) {
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	582 thisdigit = (thisdigit ^ PyLong_MASK) + carry;
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	583 carry = thisdigit >> PyLong_SHIFT;
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	584 thisdigit &= PyLong_MASK;
18082 dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	585 }
18091 a001fcb76177 _PyLong_{As,From}ByteArray: Minor code rearrangement aimed at improving Tim Peters <tim.peters@gmail.com> parents: 18084 diff changeset	586 /* Because we're going LSB to MSB, thisdigit is more
a001fcb76177 _PyLong_{As,From}ByteArray: Minor code rearrangement aimed at improving Tim Peters <tim.peters@gmail.com> parents: 18084 diff changeset	587 significant than what's already in accum, so needs to be
a001fcb76177 _PyLong_{As,From}ByteArray: Minor code rearrangement aimed at improving Tim Peters <tim.peters@gmail.com> parents: 18084 diff changeset	588 prepended to accum. */
a001fcb76177 _PyLong_{As,From}ByteArray: Minor code rearrangement aimed at improving Tim Peters <tim.peters@gmail.com> parents: 18084 diff changeset	589 accum \|= thisdigit << accumbits;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	590 accumbits += PyLong_SHIFT;
18091 a001fcb76177 _PyLong_{As,From}ByteArray: Minor code rearrangement aimed at improving Tim Peters <tim.peters@gmail.com> parents: 18084 diff changeset	591
18115 2ecaf9e21a04 _PyLong_AsByteArray: simplify the logic for dealing with the most- Tim Peters <tim.peters@gmail.com> parents: 18114 diff changeset	592 /* The most-significant digit may be (probably is) at least
2ecaf9e21a04 _PyLong_AsByteArray: simplify the logic for dealing with the most- Tim Peters <tim.peters@gmail.com> parents: 18114 diff changeset	593 partly empty. */
18091 a001fcb76177 _PyLong_{As,From}ByteArray: Minor code rearrangement aimed at improving Tim Peters <tim.peters@gmail.com> parents: 18084 diff changeset	594 if (i == ndigits - 1) {
18115 2ecaf9e21a04 _PyLong_AsByteArray: simplify the logic for dealing with the most- Tim Peters <tim.peters@gmail.com> parents: 18114 diff changeset	595 /* Count # of sign bits -- they needn't be stored,
2ecaf9e21a04 _PyLong_AsByteArray: simplify the logic for dealing with the most- Tim Peters <tim.peters@gmail.com> parents: 18114 diff changeset	596 * although for signed conversion we need later to
2ecaf9e21a04 _PyLong_AsByteArray: simplify the logic for dealing with the most- Tim Peters <tim.peters@gmail.com> parents: 18114 diff changeset	597 * make sure at least one sign bit gets stored.
2ecaf9e21a04 _PyLong_AsByteArray: simplify the logic for dealing with the most- Tim Peters <tim.peters@gmail.com> parents: 18114 diff changeset	598 * First shift conceptual sign bit to real sign bit.
2ecaf9e21a04 _PyLong_AsByteArray: simplify the logic for dealing with the most- Tim Peters <tim.peters@gmail.com> parents: 18114 diff changeset	599 */
2ecaf9e21a04 _PyLong_AsByteArray: simplify the logic for dealing with the most- Tim Peters <tim.peters@gmail.com> parents: 18114 diff changeset	600 stwodigits s = (stwodigits)(thisdigit <<
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	601 (8*sizeof(stwodigits) - PyLong_SHIFT));
18084 bbcdbd8f4469 Added q/Q standard (x-platform 8-byte ints) mode in struct module. Tim Peters <tim.peters@gmail.com> parents: 18082 diff changeset	602 unsigned int nsignbits = 0;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	603 while ((s < 0) == do_twos_comp && nsignbits < PyLong_SHIFT) {
18084 bbcdbd8f4469 Added q/Q standard (x-platform 8-byte ints) mode in struct module. Tim Peters <tim.peters@gmail.com> parents: 18082 diff changeset	604 ++nsignbits;
18115 2ecaf9e21a04 _PyLong_AsByteArray: simplify the logic for dealing with the most- Tim Peters <tim.peters@gmail.com> parents: 18114 diff changeset	605 s <<= 1;
18084 bbcdbd8f4469 Added q/Q standard (x-platform 8-byte ints) mode in struct module. Tim Peters <tim.peters@gmail.com> parents: 18082 diff changeset	606 }
18115 2ecaf9e21a04 _PyLong_AsByteArray: simplify the logic for dealing with the most- Tim Peters <tim.peters@gmail.com> parents: 18114 diff changeset	607 accumbits -= nsignbits;
18084 bbcdbd8f4469 Added q/Q standard (x-platform 8-byte ints) mode in struct module. Tim Peters <tim.peters@gmail.com> parents: 18082 diff changeset	608 }
18091 a001fcb76177 _PyLong_{As,From}ByteArray: Minor code rearrangement aimed at improving Tim Peters <tim.peters@gmail.com> parents: 18084 diff changeset	609
18082 dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	610 /* Store as many bytes as possible. */
18084 bbcdbd8f4469 Added q/Q standard (x-platform 8-byte ints) mode in struct module. Tim Peters <tim.peters@gmail.com> parents: 18082 diff changeset	611 while (accumbits >= 8) {
18082 dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	612 if (j >= n)
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	613 goto Overflow;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	614 ++j;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	615 *p = (unsigned char)(accum & 0xff);
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	616 p += pincr;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	617 accumbits -= 8;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	618 accum >>= 8;
18084 bbcdbd8f4469 Added q/Q standard (x-platform 8-byte ints) mode in struct module. Tim Peters <tim.peters@gmail.com> parents: 18082 diff changeset	619 }
18082 dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	620 }
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	621
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	622 /* Store the straggler (if any). */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	623 assert(accumbits < 8);
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	624 assert(carry == 0); /* else do_twos_comp and every digit was 0 */
18084 bbcdbd8f4469 Added q/Q standard (x-platform 8-byte ints) mode in struct module. Tim Peters <tim.peters@gmail.com> parents: 18082 diff changeset	625 if (accumbits > 0) {
18082 dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	626 if (j >= n)
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	627 goto Overflow;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	628 ++j;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	629 if (do_twos_comp) {
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	630 /* Fill leading bits of the byte with sign bits
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	631 (appropriately pretending that the long had an
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	632 infinite supply of sign bits). */
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	633 accum \|= (~(twodigits)0) << accumbits;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	634 }
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	635 *p = (unsigned char)(accum & 0xff);
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	636 p += pincr;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	637 }
18109 be2ddb25b698 _PyLong_AsByteArray: Don't do the "delicate overflow" check unless it's Tim Peters <tim.peters@gmail.com> parents: 18108 diff changeset	638 else if (j == n && n > 0 && is_signed) {
be2ddb25b698 _PyLong_AsByteArray: Don't do the "delicate overflow" check unless it's Tim Peters <tim.peters@gmail.com> parents: 18108 diff changeset	639 /* The main loop filled the byte array exactly, so the code
be2ddb25b698 _PyLong_AsByteArray: Don't do the "delicate overflow" check unless it's Tim Peters <tim.peters@gmail.com> parents: 18108 diff changeset	640 just above didn't get to ensure there's a sign bit, and the
be2ddb25b698 _PyLong_AsByteArray: Don't do the "delicate overflow" check unless it's Tim Peters <tim.peters@gmail.com> parents: 18108 diff changeset	641 loop below wouldn't add one either. Make sure a sign bit
be2ddb25b698 _PyLong_AsByteArray: Don't do the "delicate overflow" check unless it's Tim Peters <tim.peters@gmail.com> parents: 18108 diff changeset	642 exists. */
be2ddb25b698 _PyLong_AsByteArray: Don't do the "delicate overflow" check unless it's Tim Peters <tim.peters@gmail.com> parents: 18108 diff changeset	643 unsigned char msb = *(p - pincr);
be2ddb25b698 _PyLong_AsByteArray: Don't do the "delicate overflow" check unless it's Tim Peters <tim.peters@gmail.com> parents: 18108 diff changeset	644 int sign_bit_set = msb >= 0x80;
be2ddb25b698 _PyLong_AsByteArray: Don't do the "delicate overflow" check unless it's Tim Peters <tim.peters@gmail.com> parents: 18108 diff changeset	645 assert(accumbits == 0);
be2ddb25b698 _PyLong_AsByteArray: Don't do the "delicate overflow" check unless it's Tim Peters <tim.peters@gmail.com> parents: 18108 diff changeset	646 if (sign_bit_set == do_twos_comp)
be2ddb25b698 _PyLong_AsByteArray: Don't do the "delicate overflow" check unless it's Tim Peters <tim.peters@gmail.com> parents: 18108 diff changeset	647 return 0;
be2ddb25b698 _PyLong_AsByteArray: Don't do the "delicate overflow" check unless it's Tim Peters <tim.peters@gmail.com> parents: 18108 diff changeset	648 else
be2ddb25b698 _PyLong_AsByteArray: Don't do the "delicate overflow" check unless it's Tim Peters <tim.peters@gmail.com> parents: 18108 diff changeset	649 goto Overflow;
be2ddb25b698 _PyLong_AsByteArray: Don't do the "delicate overflow" check unless it's Tim Peters <tim.peters@gmail.com> parents: 18108 diff changeset	650 }
18082 dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	651
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	652 /* Fill remaining bytes with copies of the sign bit. */
18109 be2ddb25b698 _PyLong_AsByteArray: Don't do the "delicate overflow" check unless it's Tim Peters <tim.peters@gmail.com> parents: 18108 diff changeset	653 {
be2ddb25b698 _PyLong_AsByteArray: Don't do the "delicate overflow" check unless it's Tim Peters <tim.peters@gmail.com> parents: 18108 diff changeset	654 unsigned char signbyte = do_twos_comp ? 0xffU : 0U;
be2ddb25b698 _PyLong_AsByteArray: Don't do the "delicate overflow" check unless it's Tim Peters <tim.peters@gmail.com> parents: 18108 diff changeset	655 for ( ; j < n; ++j, p += pincr)
be2ddb25b698 _PyLong_AsByteArray: Don't do the "delicate overflow" check unless it's Tim Peters <tim.peters@gmail.com> parents: 18108 diff changeset	656 *p = signbyte;
be2ddb25b698 _PyLong_AsByteArray: Don't do the "delicate overflow" check unless it's Tim Peters <tim.peters@gmail.com> parents: 18108 diff changeset	657 }
18082 dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	658
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	659 return 0;
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	660
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	661 Overflow:
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	662 PyErr_SetString(PyExc_OverflowError, "long too big to convert");
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	663 return -1;
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	664
18082 dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	665 }
dd09f11fa40d Two new private longobject API functions, Tim Peters <tim.peters@gmail.com> parents: 15946 diff changeset	666
19671 7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	667 double
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	668 _PyLong_AsScaledDouble(PyObject vv, int exponent)
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	669 {
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	670 /* NBITS_WANTED should be > the number of bits in a double's precision,
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	671 but small enough so that 2**NBITS_WANTED is within the normal double
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	672 range. nbitsneeded is set to 1 less than that because the most-significant
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	673 Python digit contains at least 1 significant bit, but we don't want to
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	674 bother counting them (catering to the worst case cheaply).
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	675
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	676 57 is one more than VAX-D double precision; I (Tim) don't know of a double
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	677 format with more precision than that; it's 1 larger so that we add in at
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	678 least one round bit to stand in for the ignored least-significant bits.
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	679 */
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	680 #define NBITS_WANTED 57
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	681 PyLongObject *v;
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	682 double x;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	683 const double multiplier = (double)(1L << PyLong_SHIFT);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	684 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	685 int sign;
19671 7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	686 int nbitsneeded;
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	687
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	688 if (vv == NULL \|\| !PyLong_Check(vv)) {
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	689 PyErr_BadInternalCall();
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	690 return -1;
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	691 }
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	692 v = (PyLongObject *)vv;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	693 i = Py_SIZE(v);
19671 7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	694 sign = 1;
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	695 if (i < 0) {
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	696 sign = -1;
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	697 i = -(i);
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	698 }
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	699 else if (i == 0) {
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	700 *exponent = 0;
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	701 return 0.0;
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	702 }
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	703 --i;
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	704 x = (double)v->ob_digit[i];
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	705 nbitsneeded = NBITS_WANTED - 1;
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	706 /* Invariant: i Python digits remain unaccounted for. */
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	707 while (i > 0 && nbitsneeded > 0) {
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	708 --i;
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	709 x = x * multiplier + (double)v->ob_digit[i];
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	710 nbitsneeded -= PyLong_SHIFT;
19671 7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	711 }
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	712 /* There are i digits we didn't shift in. Pretending they're all
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	713 zeroes, the true value is x * 2*(iPyLong_SHIFT). */
19671 7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	714 *exponent = i;
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	715 assert(x > 0.0);
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	716 return x * sign;
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	717 #undef NBITS_WANTED
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	718 }
7df300d284c6 Introduce new private API function _PyLong_AsScaledDouble. Not used yet, Tim Peters <tim.peters@gmail.com> parents: 19666 diff changeset	719
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4870 diff changeset	720 /* Get a C double from a long int object. */
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	721
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	722 double
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	723 PyLong_AsDouble(PyObject *vv)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	724 {
36430 81942fc9a20d As discussed on python-dev, silence three gcc-4.0.x warnings, using assert() Thomas Wouters <thomas@python.org> parents: 35999 diff changeset	725 int e = -1;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	726 double x;
19674 715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19671 diff changeset	727
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	728 if (vv == NULL \|\| !PyLong_Check(vv)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	729 PyErr_BadInternalCall();
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	730 return -1;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	731 }
19674 715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19671 diff changeset	732 x = _PyLong_AsScaledDouble(vv, &e);
715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19671 diff changeset	733 if (x == -1.0 && PyErr_Occurred())
715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19671 diff changeset	734 return -1.0;
36430 81942fc9a20d As discussed on python-dev, silence three gcc-4.0.x warnings, using assert() Thomas Wouters <thomas@python.org> parents: 35999 diff changeset	735 /* 'e' initialized to -1 to silence gcc-4.0.x, but it should be
81942fc9a20d As discussed on python-dev, silence three gcc-4.0.x warnings, using assert() Thomas Wouters <thomas@python.org> parents: 35999 diff changeset	736 set correctly after a successful _PyLong_AsScaledDouble() call */
81942fc9a20d As discussed on python-dev, silence three gcc-4.0.x warnings, using assert() Thomas Wouters <thomas@python.org> parents: 35999 diff changeset	737 assert(e >= 0);
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	738 if (e > INT_MAX / PyLong_SHIFT)
19674 715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19671 diff changeset	739 goto overflow;
715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19671 diff changeset	740 errno = 0;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	741 x = ldexp(x, e * PyLong_SHIFT);
19717 01de0a703069 Try to recover from that glibc's ldexp apparently doesn't set errno on Tim Peters <tim.peters@gmail.com> parents: 19677 diff changeset	742 if (Py_OVERFLOWED(x))
19674 715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19671 diff changeset	743 goto overflow;
715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19671 diff changeset	744 return x;
715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19671 diff changeset	745
715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19671 diff changeset	746 overflow:
715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19671 diff changeset	747 PyErr_SetString(PyExc_OverflowError,
715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19671 diff changeset	748 "long int too large to convert to float");
715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19671 diff changeset	749 return -1.0;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	750 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	751
9123 17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	752 /* Create a new long (or int) object from a C pointer */
17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	753
17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	754 PyObject *
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	755 PyLong_FromVoidPtr(void *p)
9123 17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	756 {
18134 eff8da7c3dcb PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with Tim Peters <tim.peters@gmail.com> parents: 18121 diff changeset	757 #if SIZEOF_VOID_P <= SIZEOF_LONG
37568 213c4198fe23 Patch #837242: id() for large ptr should return a long. Martin v. Löwis <martin@v.loewis.de> parents: 37494 diff changeset	758 if ((long)p < 0)
213c4198fe23 Patch #837242: id() for large ptr should return a long. Martin v. Löwis <martin@v.loewis.de> parents: 37494 diff changeset	759 return PyLong_FromUnsignedLong((unsigned long)p);
9123 17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	760 return PyInt_FromLong((long)p);
17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	761 #else
17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	762
18134 eff8da7c3dcb PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with Tim Peters <tim.peters@gmail.com> parents: 18121 diff changeset	763 #ifndef HAVE_LONG_LONG
eff8da7c3dcb PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with Tim Peters <tim.peters@gmail.com> parents: 18121 diff changeset	764 # error "PyLong_FromVoidPtr: sizeof(void*) > sizeof(long), but no long long"
eff8da7c3dcb PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with Tim Peters <tim.peters@gmail.com> parents: 18121 diff changeset	765 #endif
eff8da7c3dcb PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with Tim Peters <tim.peters@gmail.com> parents: 18121 diff changeset	766 #if SIZEOF_LONG_LONG < SIZEOF_VOID_P
28437 871da703e4c0 Rename LONG_LONG to PY_LONG_LONG. Fixes #710285. Martin v. Löwis <martin@v.loewis.de> parents: 28032 diff changeset	767 # error "PyLong_FromVoidPtr: sizeof(PY_LONG_LONG) < sizeof(void*)"
18134 eff8da7c3dcb PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with Tim Peters <tim.peters@gmail.com> parents: 18121 diff changeset	768 #endif
eff8da7c3dcb PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with Tim Peters <tim.peters@gmail.com> parents: 18121 diff changeset	769 /* optimize null pointers */
eff8da7c3dcb PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with Tim Peters <tim.peters@gmail.com> parents: 18121 diff changeset	770 if (p == NULL)
eff8da7c3dcb PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with Tim Peters <tim.peters@gmail.com> parents: 18121 diff changeset	771 return PyInt_FromLong(0);
37568 213c4198fe23 Patch #837242: id() for large ptr should return a long. Martin v. Löwis <martin@v.loewis.de> parents: 37494 diff changeset	772 return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)p);
18134 eff8da7c3dcb PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with Tim Peters <tim.peters@gmail.com> parents: 18121 diff changeset	773
eff8da7c3dcb PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with Tim Peters <tim.peters@gmail.com> parents: 18121 diff changeset	774 #endif /* SIZEOF_VOID_P <= SIZEOF_LONG */
9123 17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	775 }
17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	776
17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	777 /* Get a C pointer from a long object (or an int object in some cases) */
17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	778
17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	779 void *
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	780 PyLong_AsVoidPtr(PyObject *vv)
9123 17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	781 {
17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	782 /* This function will allow int or long objects. If vv is neither,
17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	783 then the PyLong_AsLong*() functions will raise the exception:
17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	784 PyExc_SystemError, "bad argument to internal function"
17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	785 */
18134 eff8da7c3dcb PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with Tim Peters <tim.peters@gmail.com> parents: 18121 diff changeset	786 #if SIZEOF_VOID_P <= SIZEOF_LONG
9123 17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	787 long x;
17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	788
18134 eff8da7c3dcb PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with Tim Peters <tim.peters@gmail.com> parents: 18121 diff changeset	789 if (PyInt_Check(vv))
9123 17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	790 x = PyInt_AS_LONG(vv);
37568 213c4198fe23 Patch #837242: id() for large ptr should return a long. Martin v. Löwis <martin@v.loewis.de> parents: 37494 diff changeset	791 else if (PyLong_Check(vv) && _PyLong_Sign(vv) < 0)
213c4198fe23 Patch #837242: id() for large ptr should return a long. Martin v. Löwis <martin@v.loewis.de> parents: 37494 diff changeset	792 x = PyLong_AsLong(vv);
9123 17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	793 else
37568 213c4198fe23 Patch #837242: id() for large ptr should return a long. Martin v. Löwis <martin@v.loewis.de> parents: 37494 diff changeset	794 x = PyLong_AsUnsignedLong(vv);
9123 17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	795 #else
18134 eff8da7c3dcb PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with Tim Peters <tim.peters@gmail.com> parents: 18121 diff changeset	796
eff8da7c3dcb PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with Tim Peters <tim.peters@gmail.com> parents: 18121 diff changeset	797 #ifndef HAVE_LONG_LONG
eff8da7c3dcb PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with Tim Peters <tim.peters@gmail.com> parents: 18121 diff changeset	798 # error "PyLong_AsVoidPtr: sizeof(void*) > sizeof(long), but no long long"
eff8da7c3dcb PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with Tim Peters <tim.peters@gmail.com> parents: 18121 diff changeset	799 #endif
eff8da7c3dcb PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with Tim Peters <tim.peters@gmail.com> parents: 18121 diff changeset	800 #if SIZEOF_LONG_LONG < SIZEOF_VOID_P
28437 871da703e4c0 Rename LONG_LONG to PY_LONG_LONG. Fixes #710285. Martin v. Löwis <martin@v.loewis.de> parents: 28032 diff changeset	801 # error "PyLong_AsVoidPtr: sizeof(PY_LONG_LONG) < sizeof(void*)"
18134 eff8da7c3dcb PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with Tim Peters <tim.peters@gmail.com> parents: 18121 diff changeset	802 #endif
28437 871da703e4c0 Rename LONG_LONG to PY_LONG_LONG. Fixes #710285. Martin v. Löwis <martin@v.loewis.de> parents: 28032 diff changeset	803 PY_LONG_LONG x;
9123 17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	804
18134 eff8da7c3dcb PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with Tim Peters <tim.peters@gmail.com> parents: 18121 diff changeset	805 if (PyInt_Check(vv))
9123 17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	806 x = PyInt_AS_LONG(vv);
37568 213c4198fe23 Patch #837242: id() for large ptr should return a long. Martin v. Löwis <martin@v.loewis.de> parents: 37494 diff changeset	807 else if (PyLong_Check(vv) && _PyLong_Sign(vv) < 0)
213c4198fe23 Patch #837242: id() for large ptr should return a long. Martin v. Löwis <martin@v.loewis.de> parents: 37494 diff changeset	808 x = PyLong_AsLongLong(vv);
9123 17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	809 else
37568 213c4198fe23 Patch #837242: id() for large ptr should return a long. Martin v. Löwis <martin@v.loewis.de> parents: 37494 diff changeset	810 x = PyLong_AsUnsignedLongLong(vv);
18134 eff8da7c3dcb PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with Tim Peters <tim.peters@gmail.com> parents: 18121 diff changeset	811
eff8da7c3dcb PyLong_{As, From}VoidPtr: cleanup, replacing assumptions in comments with Tim Peters <tim.peters@gmail.com> parents: 18121 diff changeset	812 #endif /* SIZEOF_VOID_P <= SIZEOF_LONG */
9123 17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	813
17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	814 if (x == -1 && PyErr_Occurred())
17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	815 return NULL;
17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	816 return (void *)x;
17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	817 }
17d0c51e0887 Patches from Greg Stein to support 'P' format in struct module's Guido van Rossum <guido@python.org> parents: 9094 diff changeset	818
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	819 #ifdef HAVE_LONG_LONG
18093 6ea366a2b2a6 longobject.c: Tim Peters <tim.peters@gmail.com> parents: 18091 diff changeset	820
28437 871da703e4c0 Rename LONG_LONG to PY_LONG_LONG. Fixes #710285. Martin v. Löwis <martin@v.loewis.de> parents: 28032 diff changeset	821 /* Initial PY_LONG_LONG support by Chris Herborth (chrish@qnx.com), later
18093 6ea366a2b2a6 longobject.c: Tim Peters <tim.peters@gmail.com> parents: 18091 diff changeset	822 * rewritten to use the newer PyLong_{As,From}ByteArray API.
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	823 */
bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	824
18121 166b7b365851 Change IS_LITTLE_ENDIAN macro -- a little faster now. Tim Peters <tim.peters@gmail.com> parents: 18115 diff changeset	825 #define IS_LITTLE_ENDIAN (int)(unsigned char)&one
18093 6ea366a2b2a6 longobject.c: Tim Peters <tim.peters@gmail.com> parents: 18091 diff changeset	826
28437 871da703e4c0 Rename LONG_LONG to PY_LONG_LONG. Fixes #710285. Martin v. Löwis <martin@v.loewis.de> parents: 28032 diff changeset	827 /* Create a new long int object from a C PY_LONG_LONG int. */
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	828
bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	829 PyObject *
28437 871da703e4c0 Rename LONG_LONG to PY_LONG_LONG. Fixes #710285. Martin v. Löwis <martin@v.loewis.de> parents: 28032 diff changeset	830 PyLong_FromLongLong(PY_LONG_LONG ival)
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	831 {
38307 5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	832 PyLongObject *v;
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	833 unsigned PY_LONG_LONG t; /* unsigned so >> doesn't propagate sign bit */
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	834 int ndigits = 0;
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	835 int negative = 0;
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	836
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	837 if (ival < 0) {
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	838 ival = -ival;
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	839 negative = 1;
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	840 }
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	841
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	842 /* Count the number of Python digits.
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	843 We used to pick 5 ("big enough for anything"), but that's a
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	844 waste of time and space given that 5*15 = 75 bits are rarely
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	845 needed. */
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	846 t = (unsigned PY_LONG_LONG)ival;
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	847 while (t) {
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	848 ++ndigits;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	849 t >>= PyLong_SHIFT;
38307 5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	850 }
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	851 v = _PyLong_New(ndigits);
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	852 if (v != NULL) {
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	853 digit *p = v->ob_digit;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	854 Py_SIZE(v) = negative ? -ndigits : ndigits;
38307 5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	855 t = (unsigned PY_LONG_LONG)ival;
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	856 while (t) {
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	857 *p++ = (digit)(t & PyLong_MASK);
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	858 t >>= PyLong_SHIFT;
38307 5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	859 }
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	860 }
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	861 return (PyObject *)v;
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	862 }
bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	863
28437 871da703e4c0 Rename LONG_LONG to PY_LONG_LONG. Fixes #710285. Martin v. Löwis <martin@v.loewis.de> parents: 28032 diff changeset	864 /* Create a new long int object from a C unsigned PY_LONG_LONG int. */
18093 6ea366a2b2a6 longobject.c: Tim Peters <tim.peters@gmail.com> parents: 18091 diff changeset	865
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	866 PyObject *
28437 871da703e4c0 Rename LONG_LONG to PY_LONG_LONG. Fixes #710285. Martin v. Löwis <martin@v.loewis.de> parents: 28032 diff changeset	867 PyLong_FromUnsignedLongLong(unsigned PY_LONG_LONG ival)
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	868 {
38307 5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	869 PyLongObject *v;
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	870 unsigned PY_LONG_LONG t;
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	871 int ndigits = 0;
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	872
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	873 /* Count the number of Python digits. */
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	874 t = (unsigned PY_LONG_LONG)ival;
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	875 while (t) {
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	876 ++ndigits;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	877 t >>= PyLong_SHIFT;
38307 5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	878 }
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	879 v = _PyLong_New(ndigits);
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	880 if (v != NULL) {
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	881 digit *p = v->ob_digit;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	882 Py_SIZE(v) = ndigits;
38307 5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	883 while (ival) {
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	884 *p++ = (digit)(ival & PyLong_MASK);
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	885 ival >>= PyLong_SHIFT;
38307 5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	886 }
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	887 }
5a63369056a7 Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm Bob Ippolito <bob@redivi.com> parents: 38301 diff changeset	888 return (PyObject *)v;
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	889 }
bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	890
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	891 /* Create a new long int object from a C Py_ssize_t. */
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	892
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	893 PyObject *
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	894 PyLong_FromSsize_t(Py_ssize_t ival)
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	895 {
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	896 Py_ssize_t bytes = ival;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	897 int one = 1;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	898 return _PyLong_FromByteArray(
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	899 (unsigned char *)&bytes,
41590 1c1705bf36b8 Fix problems in x64 build that were discovered by the testsuite: Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 41435 diff changeset	900 SIZEOF_SIZE_T, IS_LITTLE_ENDIAN, 1);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	901 }
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	902
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	903 /* Create a new long int object from a C size_t. */
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	904
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	905 PyObject *
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	906 PyLong_FromSize_t(size_t ival)
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	907 {
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	908 size_t bytes = ival;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	909 int one = 1;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	910 return _PyLong_FromByteArray(
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	911 (unsigned char *)&bytes,
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	912 SIZEOF_SIZE_T, IS_LITTLE_ENDIAN, 0);
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	913 }
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	914
28437 871da703e4c0 Rename LONG_LONG to PY_LONG_LONG. Fixes #710285. Martin v. Löwis <martin@v.loewis.de> parents: 28032 diff changeset	915 /* Get a C PY_LONG_LONG int from a long int object.
18093 6ea366a2b2a6 longobject.c: Tim Peters <tim.peters@gmail.com> parents: 18091 diff changeset	916 Return -1 and set an error if overflow occurs. */
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	917
28437 871da703e4c0 Rename LONG_LONG to PY_LONG_LONG. Fixes #710285. Martin v. Löwis <martin@v.loewis.de> parents: 28032 diff changeset	918 PY_LONG_LONG
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	919 PyLong_AsLongLong(PyObject *vv)
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	920 {
28437 871da703e4c0 Rename LONG_LONG to PY_LONG_LONG. Fixes #710285. Martin v. Löwis <martin@v.loewis.de> parents: 28032 diff changeset	921 PY_LONG_LONG bytes;
18093 6ea366a2b2a6 longobject.c: Tim Peters <tim.peters@gmail.com> parents: 18091 diff changeset	922 int one = 1;
6ea366a2b2a6 longobject.c: Tim Peters <tim.peters@gmail.com> parents: 18091 diff changeset	923 int res;
6ea366a2b2a6 longobject.c: Tim Peters <tim.peters@gmail.com> parents: 18091 diff changeset	924
20182 6d73b54d9205 SF [#466125] PyLong_AsLongLong works for any integer. Tim Peters <tim.peters@gmail.com> parents: 19976 diff changeset	925 if (vv == NULL) {
6d73b54d9205 SF [#466125] PyLong_AsLongLong works for any integer. Tim Peters <tim.peters@gmail.com> parents: 19976 diff changeset	926 PyErr_BadInternalCall();
6d73b54d9205 SF [#466125] PyLong_AsLongLong works for any integer. Tim Peters <tim.peters@gmail.com> parents: 19976 diff changeset	927 return -1;
6d73b54d9205 SF [#466125] PyLong_AsLongLong works for any integer. Tim Peters <tim.peters@gmail.com> parents: 19976 diff changeset	928 }
6d73b54d9205 SF [#466125] PyLong_AsLongLong works for any integer. Tim Peters <tim.peters@gmail.com> parents: 19976 diff changeset	929 if (!PyLong_Check(vv)) {
34666 4812f6a7f735 Revert previous checkin on getargs 'L' code. Try to convert all Martin v. Löwis <martin@v.loewis.de> parents: 33524 diff changeset	930 PyNumberMethods *nb;
4812f6a7f735 Revert previous checkin on getargs 'L' code. Try to convert all Martin v. Löwis <martin@v.loewis.de> parents: 33524 diff changeset	931 PyObject *io;
20182 6d73b54d9205 SF [#466125] PyLong_AsLongLong works for any integer. Tim Peters <tim.peters@gmail.com> parents: 19976 diff changeset	932 if (PyInt_Check(vv))
28437 871da703e4c0 Rename LONG_LONG to PY_LONG_LONG. Fixes #710285. Martin v. Löwis <martin@v.loewis.de> parents: 28032 diff changeset	933 return (PY_LONG_LONG)PyInt_AsLong(vv);
34666 4812f6a7f735 Revert previous checkin on getargs 'L' code. Try to convert all Martin v. Löwis <martin@v.loewis.de> parents: 33524 diff changeset	934 if ((nb = vv->ob_type->tp_as_number) == NULL \|\|
4812f6a7f735 Revert previous checkin on getargs 'L' code. Try to convert all Martin v. Löwis <martin@v.loewis.de> parents: 33524 diff changeset	935 nb->nb_int == NULL) {
4812f6a7f735 Revert previous checkin on getargs 'L' code. Try to convert all Martin v. Löwis <martin@v.loewis.de> parents: 33524 diff changeset	936 PyErr_SetString(PyExc_TypeError, "an integer is required");
4812f6a7f735 Revert previous checkin on getargs 'L' code. Try to convert all Martin v. Löwis <martin@v.loewis.de> parents: 33524 diff changeset	937 return -1;
4812f6a7f735 Revert previous checkin on getargs 'L' code. Try to convert all Martin v. Löwis <martin@v.loewis.de> parents: 33524 diff changeset	938 }
4812f6a7f735 Revert previous checkin on getargs 'L' code. Try to convert all Martin v. Löwis <martin@v.loewis.de> parents: 33524 diff changeset	939 io = (*nb->nb_int) (vv);
4812f6a7f735 Revert previous checkin on getargs 'L' code. Try to convert all Martin v. Löwis <martin@v.loewis.de> parents: 33524 diff changeset	940 if (io == NULL)
4812f6a7f735 Revert previous checkin on getargs 'L' code. Try to convert all Martin v. Löwis <martin@v.loewis.de> parents: 33524 diff changeset	941 return -1;
4812f6a7f735 Revert previous checkin on getargs 'L' code. Try to convert all Martin v. Löwis <martin@v.loewis.de> parents: 33524 diff changeset	942 if (PyInt_Check(io)) {
4812f6a7f735 Revert previous checkin on getargs 'L' code. Try to convert all Martin v. Löwis <martin@v.loewis.de> parents: 33524 diff changeset	943 bytes = PyInt_AsLong(io);
4812f6a7f735 Revert previous checkin on getargs 'L' code. Try to convert all Martin v. Löwis <martin@v.loewis.de> parents: 33524 diff changeset	944 Py_DECREF(io);
4812f6a7f735 Revert previous checkin on getargs 'L' code. Try to convert all Martin v. Löwis <martin@v.loewis.de> parents: 33524 diff changeset	945 return bytes;
4812f6a7f735 Revert previous checkin on getargs 'L' code. Try to convert all Martin v. Löwis <martin@v.loewis.de> parents: 33524 diff changeset	946 }
4812f6a7f735 Revert previous checkin on getargs 'L' code. Try to convert all Martin v. Löwis <martin@v.loewis.de> parents: 33524 diff changeset	947 if (PyLong_Check(io)) {
4812f6a7f735 Revert previous checkin on getargs 'L' code. Try to convert all Martin v. Löwis <martin@v.loewis.de> parents: 33524 diff changeset	948 bytes = PyLong_AsLongLong(io);
4812f6a7f735 Revert previous checkin on getargs 'L' code. Try to convert all Martin v. Löwis <martin@v.loewis.de> parents: 33524 diff changeset	949 Py_DECREF(io);
4812f6a7f735 Revert previous checkin on getargs 'L' code. Try to convert all Martin v. Löwis <martin@v.loewis.de> parents: 33524 diff changeset	950 return bytes;
4812f6a7f735 Revert previous checkin on getargs 'L' code. Try to convert all Martin v. Löwis <martin@v.loewis.de> parents: 33524 diff changeset	951 }
4812f6a7f735 Revert previous checkin on getargs 'L' code. Try to convert all Martin v. Löwis <martin@v.loewis.de> parents: 33524 diff changeset	952 Py_DECREF(io);
4812f6a7f735 Revert previous checkin on getargs 'L' code. Try to convert all Martin v. Löwis <martin@v.loewis.de> parents: 33524 diff changeset	953 PyErr_SetString(PyExc_TypeError, "integer conversion failed");
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	954 return -1;
bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	955 }
bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	956
18093 6ea366a2b2a6 longobject.c: Tim Peters <tim.peters@gmail.com> parents: 18091 diff changeset	957 res = _PyLong_AsByteArray(
6ea366a2b2a6 longobject.c: Tim Peters <tim.peters@gmail.com> parents: 18091 diff changeset	958 (PyLongObject )vv, (unsigned char )&bytes,
6ea366a2b2a6 longobject.c: Tim Peters <tim.peters@gmail.com> parents: 18091 diff changeset	959 SIZEOF_LONG_LONG, IS_LITTLE_ENDIAN, 1);
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	960
28437 871da703e4c0 Rename LONG_LONG to PY_LONG_LONG. Fixes #710285. Martin v. Löwis <martin@v.loewis.de> parents: 28032 diff changeset	961 /* Plan 9 can't handle PY_LONG_LONG in ? : expressions */
22204 928c1282e5e2 Patch #494047: removes 64-bit ?: to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22147 diff changeset	962 if (res < 0)
28437 871da703e4c0 Rename LONG_LONG to PY_LONG_LONG. Fixes #710285. Martin v. Löwis <martin@v.loewis.de> parents: 28032 diff changeset	963 return (PY_LONG_LONG)-1;
22204 928c1282e5e2 Patch #494047: removes 64-bit ?: to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22147 diff changeset	964 else
928c1282e5e2 Patch #494047: removes 64-bit ?: to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22147 diff changeset	965 return bytes;
18093 6ea366a2b2a6 longobject.c: Tim Peters <tim.peters@gmail.com> parents: 18091 diff changeset	966 }
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	967
28437 871da703e4c0 Rename LONG_LONG to PY_LONG_LONG. Fixes #710285. Martin v. Löwis <martin@v.loewis.de> parents: 28032 diff changeset	968 /* Get a C unsigned PY_LONG_LONG int from a long int object.
18093 6ea366a2b2a6 longobject.c: Tim Peters <tim.peters@gmail.com> parents: 18091 diff changeset	969 Return -1 and set an error if overflow occurs. */
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	970
28437 871da703e4c0 Rename LONG_LONG to PY_LONG_LONG. Fixes #710285. Martin v. Löwis <martin@v.loewis.de> parents: 28032 diff changeset	971 unsigned PY_LONG_LONG
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	972 PyLong_AsUnsignedLongLong(PyObject *vv)
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	973 {
28437 871da703e4c0 Rename LONG_LONG to PY_LONG_LONG. Fixes #710285. Martin v. Löwis <martin@v.loewis.de> parents: 28032 diff changeset	974 unsigned PY_LONG_LONG bytes;
18093 6ea366a2b2a6 longobject.c: Tim Peters <tim.peters@gmail.com> parents: 18091 diff changeset	975 int one = 1;
6ea366a2b2a6 longobject.c: Tim Peters <tim.peters@gmail.com> parents: 18091 diff changeset	976 int res;
6ea366a2b2a6 longobject.c: Tim Peters <tim.peters@gmail.com> parents: 18091 diff changeset	977
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	978 if (vv == NULL \|\| !PyLong_Check(vv)) {
bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	979 PyErr_BadInternalCall();
37815 20cb13bdf1f0 C++ compiler cleanup: bunch-o-casts, plus use of unsigned loop index var in a couple places Skip Montanaro <skip@pobox.com> parents: 37611 diff changeset	980 return (unsigned PY_LONG_LONG)-1;
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	981 }
bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	982
18093 6ea366a2b2a6 longobject.c: Tim Peters <tim.peters@gmail.com> parents: 18091 diff changeset	983 res = _PyLong_AsByteArray(
6ea366a2b2a6 longobject.c: Tim Peters <tim.peters@gmail.com> parents: 18091 diff changeset	984 (PyLongObject )vv, (unsigned char )&bytes,
6ea366a2b2a6 longobject.c: Tim Peters <tim.peters@gmail.com> parents: 18091 diff changeset	985 SIZEOF_LONG_LONG, IS_LITTLE_ENDIAN, 0);
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	986
28437 871da703e4c0 Rename LONG_LONG to PY_LONG_LONG. Fixes #710285. Martin v. Löwis <martin@v.loewis.de> parents: 28032 diff changeset	987 /* Plan 9 can't handle PY_LONG_LONG in ? : expressions */
22204 928c1282e5e2 Patch #494047: removes 64-bit ?: to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22147 diff changeset	988 if (res < 0)
28437 871da703e4c0 Rename LONG_LONG to PY_LONG_LONG. Fixes #710285. Martin v. Löwis <martin@v.loewis.de> parents: 28032 diff changeset	989 return (unsigned PY_LONG_LONG)res;
22204 928c1282e5e2 Patch #494047: removes 64-bit ?: to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22147 diff changeset	990 else
928c1282e5e2 Patch #494047: removes 64-bit ?: to cope on plan9. Martin v. Löwis <martin@v.loewis.de> parents: 22147 diff changeset	991 return bytes;
18093 6ea366a2b2a6 longobject.c: Tim Peters <tim.peters@gmail.com> parents: 18091 diff changeset	992 }
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	993
28652 28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	994 /* Get a C unsigned long int from a long int object, ignoring the high bits.
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	995 Returns -1 and sets an error condition if an error occurs. */
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	996
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	997 unsigned PY_LONG_LONG
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	998 PyLong_AsUnsignedLongLongMask(PyObject *vv)
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	999 {
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	1000 register PyLongObject *v;
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	1001 unsigned PY_LONG_LONG x;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	1002 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	1003 int sign;
28652 28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	1004
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	1005 if (vv == NULL \|\| !PyLong_Check(vv)) {
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	1006 PyErr_BadInternalCall();
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	1007 return (unsigned long) -1;
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	1008 }
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	1009 v = (PyLongObject *)vv;
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	1010 i = v->ob_size;
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	1011 sign = 1;
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	1012 x = 0;
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	1013 if (i < 0) {
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	1014 sign = -1;
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	1015 i = -i;
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	1016 }
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	1017 while (--i >= 0) {
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1018 x = (x << PyLong_SHIFT) + v->ob_digit[i];
28652 28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	1019 }
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	1020 return x * sign;
28a2975514cd SF # 595026: support for masks in getargs.c. Thomas Heller <theller@ctypes.org> parents: 28437 diff changeset	1021 }
18093 6ea366a2b2a6 longobject.c: Tim Peters <tim.peters@gmail.com> parents: 18091 diff changeset	1022 #undef IS_LITTLE_ENDIAN
6ea366a2b2a6 longobject.c: Tim Peters <tim.peters@gmail.com> parents: 18091 diff changeset	1023
8822 bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	1024 #endif /* HAVE_LONG_LONG */
bd47ee068b83 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8808 diff changeset	1025
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1026
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1027 static int
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1028 convert_binop(PyObject v, PyObject w, PyLongObject a, PyLongObject b) {
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	1029 if (PyLong_Check(v)) {
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1030 a = (PyLongObject ) v;
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1031 Py_INCREF(v);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1032 }
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1033 else if (PyInt_Check(v)) {
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1034 a = (PyLongObject ) PyLong_FromLong(PyInt_AS_LONG(v));
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1035 }
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1036 else {
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1037 return 0;
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1038 }
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	1039 if (PyLong_Check(w)) {
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1040 b = (PyLongObject ) w;
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1041 Py_INCREF(w);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1042 }
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1043 else if (PyInt_Check(w)) {
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1044 b = (PyLongObject ) PyLong_FromLong(PyInt_AS_LONG(w));
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1045 }
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1046 else {
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1047 Py_DECREF(*a);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1048 return 0;
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1049 }
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1050 return 1;
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1051 }
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1052
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1053 #define CONVERT_BINOP(v, w, a, b) \
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1054 if (!convert_binop(v, w, a, b)) { \
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1055 Py_INCREF(Py_NotImplemented); \
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1056 return Py_NotImplemented; \
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1057 }
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1058
24750 c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1059 /* x[0:m] and y[0:n] are digit vectors, LSD first, m >= n required. x[0:n]
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1060 * is modified in place, by adding y to it. Carries are propagated as far as
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1061 * x[m-1], and the remaining carry (0 or 1) is returned.
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1062 */
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1063 static digit
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	1064 v_iadd(digit x, Py_ssize_t m, digit y, Py_ssize_t n)
24750 c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1065 {
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1066 int i;
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1067 digit carry = 0;
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1068
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1069 assert(m >= n);
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1070 for (i = 0; i < n; ++i) {
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1071 carry += x[i] + y[i];
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1072 x[i] = carry & PyLong_MASK;
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1073 carry >>= PyLong_SHIFT;
24750 c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1074 assert((carry & 1) == carry);
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1075 }
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1076 for (; carry && i < m; ++i) {
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1077 carry += x[i];
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1078 x[i] = carry & PyLong_MASK;
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1079 carry >>= PyLong_SHIFT;
24750 c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1080 assert((carry & 1) == carry);
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1081 }
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1082 return carry;
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1083 }
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1084
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1085 /* x[0:m] and y[0:n] are digit vectors, LSD first, m >= n required. x[0:n]
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1086 * is modified in place, by subtracting y from it. Borrows are propagated as
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1087 * far as x[m-1], and the remaining borrow (0 or 1) is returned.
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1088 */
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1089 static digit
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	1090 v_isub(digit x, Py_ssize_t m, digit y, Py_ssize_t n)
24750 c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1091 {
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1092 int i;
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1093 digit borrow = 0;
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1094
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1095 assert(m >= n);
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1096 for (i = 0; i < n; ++i) {
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1097 borrow = x[i] - y[i] - borrow;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1098 x[i] = borrow & PyLong_MASK;
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1099 borrow >>= PyLong_SHIFT;
24750 c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1100 borrow &= 1; /* keep only 1 sign bit */
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1101 }
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1102 for (; borrow && i < m; ++i) {
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1103 borrow = x[i] - borrow;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1104 x[i] = borrow & PyLong_MASK;
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1105 borrow >>= PyLong_SHIFT;
24750 c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1106 borrow &= 1;
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1107 }
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1108 return borrow;
c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	1109 }
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	1110
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1111 /* Multiply by a single digit, ignoring the sign. */
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1112
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1113 static PyLongObject *
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	1114 mul1(PyLongObject *a, wdigit n)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1115 {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1116 return muladd1(a, n, (digit)0);
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1117 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1118
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1119 /* Multiply by a single digit and add a single digit, ignoring the sign. */
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1120
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1121 static PyLongObject *
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	1122 muladd1(PyLongObject *a, wdigit n, wdigit extra)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1123 {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	1124 Py_ssize_t size_a = ABS(Py_SIZE(a));
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1125 PyLongObject *z = _PyLong_New(size_a+1);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1126 twodigits carry = extra;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	1127 Py_ssize_t i;
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	1128
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1129 if (z == NULL)
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1130 return NULL;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1131 for (i = 0; i < size_a; ++i) {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1132 carry += (twodigits)a->ob_digit[i] * n;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1133 z->ob_digit[i] = (digit) (carry & PyLong_MASK);
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1134 carry >>= PyLong_SHIFT;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1135 }
5288 0f1711b7d367 Tweaks to keep the Microsoft compiler quiet. Guido van Rossum <guido@python.org> parents: 5199 diff changeset	1136 z->ob_digit[i] = (digit) carry;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1137 return long_normalize(z);
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1138 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1139
18594 19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1140 /* Divide long pin, w/ size digits, by non-zero digit n, storing quotient
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1141 in pout, and returning the remainder. pin and pout point at the LSD.
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1142 It's OK for pin == pout on entry, which saves oodles of mallocs/frees in
45262 86906a5ceca6 Added PyNumber_ToBase and supporting routines _PyInt_Format and Eric Smith <eric@trueblade.com> parents: 44945 diff changeset	1143 _PyLong_Format, but that should be done with great care since longs are
18594 19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1144 immutable. */
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1145
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1146 static digit
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	1147 inplace_divrem1(digit pout, digit pin, Py_ssize_t size, digit n)
18594 19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1148 {
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1149 twodigits rem = 0;
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1150
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1151 assert(n > 0 && n <= PyLong_MASK);
18594 19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1152 pin += size;
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1153 pout += size;
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1154 while (--size >= 0) {
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1155 digit hi;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1156 rem = (rem << PyLong_SHIFT) + *--pin;
18594 19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1157 *--pout = hi = (digit)(rem / n);
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1158 rem -= hi * n;
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1159 }
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1160 return (digit)rem;
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1161 }
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1162
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1163 /* Divide a long integer by a digit, returning both the quotient
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1164 (as function result) and the remainder (through *prem).
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1165 The sign of a is ignored; n should not be zero. */
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1166
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1167 static PyLongObject *
18594 19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1168 divrem1(PyLongObject a, digit n, digit prem)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1169 {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	1170 const Py_ssize_t size = ABS(Py_SIZE(a));
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1171 PyLongObject *z;
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	1172
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1173 assert(n > 0 && n <= PyLong_MASK);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1174 z = _PyLong_New(size);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1175 if (z == NULL)
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1176 return NULL;
18594 19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1177 *prem = inplace_divrem1(z->ob_digit, a->ob_digit, size, n);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1178 return long_normalize(z);
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1179 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1180
45262 86906a5ceca6 Added PyNumber_ToBase and supporting routines _PyInt_Format and Eric Smith <eric@trueblade.com> parents: 44945 diff changeset	1181 /* Convert the long to a string object with given base,
86906a5ceca6 Added PyNumber_ToBase and supporting routines _PyInt_Format and Eric Smith <eric@trueblade.com> parents: 44945 diff changeset	1182 appending a base prefix of 0[box] if base is 2, 8 or 16.
86906a5ceca6 Added PyNumber_ToBase and supporting routines _PyInt_Format and Eric Smith <eric@trueblade.com> parents: 44945 diff changeset	1183 Add a trailing "L" if addL is non-zero.
86906a5ceca6 Added PyNumber_ToBase and supporting routines _PyInt_Format and Eric Smith <eric@trueblade.com> parents: 44945 diff changeset	1184 If newstyle is zero, then use the pre-2.6 behavior of octal having
86906a5ceca6 Added PyNumber_ToBase and supporting routines _PyInt_Format and Eric Smith <eric@trueblade.com> parents: 44945 diff changeset	1185 a leading "0", instead of the prefix "0o" */
86906a5ceca6 Added PyNumber_ToBase and supporting routines _PyInt_Format and Eric Smith <eric@trueblade.com> parents: 44945 diff changeset	1186 PyAPI_FUNC(PyObject *)
86906a5ceca6 Added PyNumber_ToBase and supporting routines _PyInt_Format and Eric Smith <eric@trueblade.com> parents: 44945 diff changeset	1187 _PyLong_Format(PyObject *aa, int base, int addL, int newstyle)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1188 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1189 register PyLongObject a = (PyLongObject )aa;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1190 PyStringObject *str;
39995 6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	1191 Py_ssize_t i, j, sz;
39141 bc5d831f1dda Move the initialization of size_a down below the check for a being NULL. Neal Norwitz <nnorwitz@gmail.com> parents: 39095 diff changeset	1192 Py_ssize_t size_a;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1193 char *p;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1194 int bits;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1195 char sign = '\0';
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	1196
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1197 if (a == NULL \|\| !PyLong_Check(a)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1198 PyErr_BadInternalCall();
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	1199 return NULL;
405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	1200 }
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1201 assert(base >= 2 && base <= 36);
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	1202 size_a = ABS(Py_SIZE(a));
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	1203
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1204 /* Compute a rough upper bound for the length of the string */
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1205 i = base;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1206 bits = 0;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1207 while (i > 1) {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1208 ++bits;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1209 i >>= 1;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1210 }
39995 6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	1211 i = 5 + (addL ? 1 : 0);
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1212 j = size_a*PyLong_SHIFT + bits-1;
39995 6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	1213 sz = i + j / bits;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1214 if (j / PyLong_SHIFT < size_a \|\| sz < i) {
39995 6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	1215 PyErr_SetString(PyExc_OverflowError,
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	1216 "long is too large to format");
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	1217 return NULL;
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	1218 }
6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	1219 str = (PyStringObject ) PyString_FromStringAndSize((char )0, sz);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1220 if (str == NULL)
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1221 return NULL;
39995 6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	1222 p = PyString_AS_STRING(str) + sz;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1223 *p = '\0';
11628 47f93a969366 long_format(): Now takes a third parameter, addL; iff true, a Fred Drake <fdrake@acm.org> parents: 11380 diff changeset	1224 if (addL)
47f93a969366 long_format(): Now takes a third parameter, addL; iff true, a Fred Drake <fdrake@acm.org> parents: 11380 diff changeset	1225 *--p = 'L';
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	1226 if (a->ob_size < 0)
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	1227 sign = '-';
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	1228
8933 dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	1229 if (a->ob_size == 0) {
dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	1230 *--p = '0';
dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	1231 }
dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	1232 else if ((base & (base - 1)) == 0) {
dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	1233 /* JRH: special case for power-of-2 bases */
18605 0857fb489fa3 long_format: Simplify the overly elaborate base-is-a-power-of-2 code. Tim Peters <tim.peters@gmail.com> parents: 18594 diff changeset	1234 twodigits accum = 0;
0857fb489fa3 long_format: Simplify the overly elaborate base-is-a-power-of-2 code. Tim Peters <tim.peters@gmail.com> parents: 18594 diff changeset	1235 int accumbits = 0; /* # of bits in accum */
0857fb489fa3 long_format: Simplify the overly elaborate base-is-a-power-of-2 code. Tim Peters <tim.peters@gmail.com> parents: 18594 diff changeset	1236 int basebits = 1; /* # of bits in base-1 */
8933 dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	1237 i = base;
13423 a87803eb9dfb Cray J90 fixes for long ints. Tim Peters <tim.peters@gmail.com> parents: 13420 diff changeset	1238 while ((i >>= 1) > 1)
a87803eb9dfb Cray J90 fixes for long ints. Tim Peters <tim.peters@gmail.com> parents: 13420 diff changeset	1239 ++basebits;
18605 0857fb489fa3 long_format: Simplify the overly elaborate base-is-a-power-of-2 code. Tim Peters <tim.peters@gmail.com> parents: 18594 diff changeset	1240
0857fb489fa3 long_format: Simplify the overly elaborate base-is-a-power-of-2 code. Tim Peters <tim.peters@gmail.com> parents: 18594 diff changeset	1241 for (i = 0; i < size_a; ++i) {
24919 4cb253c556b1 long_format(), long_lshift(): Someone on c.l.py is trying to boost Tim Peters <tim.peters@gmail.com> parents: 24847 diff changeset	1242 accum \|= (twodigits)a->ob_digit[i] << accumbits;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1243 accumbits += PyLong_SHIFT;
18605 0857fb489fa3 long_format: Simplify the overly elaborate base-is-a-power-of-2 code. Tim Peters <tim.peters@gmail.com> parents: 18594 diff changeset	1244 assert(accumbits >= basebits);
0857fb489fa3 long_format: Simplify the overly elaborate base-is-a-power-of-2 code. Tim Peters <tim.peters@gmail.com> parents: 18594 diff changeset	1245 do {
21968 62741b25ed65 Patch #508038: Do not use a type as a variable name. Martin v. Löwis <martin@v.loewis.de> parents: 20868 diff changeset	1246 char cdigit = (char)(accum & (base - 1));
35177 27a718221e72 SF bug #1224347: int/long unification and hex() Raymond Hettinger <python@rcn.com> parents: 34931 diff changeset	1247 cdigit += (cdigit < 10) ? '0' : 'a'-10;
8933 dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	1248 assert(p > PyString_AS_STRING(str));
21968 62741b25ed65 Patch #508038: Do not use a type as a variable name. Martin v. Löwis <martin@v.loewis.de> parents: 20868 diff changeset	1249 *--p = cdigit;
18605 0857fb489fa3 long_format: Simplify the overly elaborate base-is-a-power-of-2 code. Tim Peters <tim.peters@gmail.com> parents: 18594 diff changeset	1250 accumbits -= basebits;
0857fb489fa3 long_format: Simplify the overly elaborate base-is-a-power-of-2 code. Tim Peters <tim.peters@gmail.com> parents: 18594 diff changeset	1251 accum >>= basebits;
0857fb489fa3 long_format: Simplify the overly elaborate base-is-a-power-of-2 code. Tim Peters <tim.peters@gmail.com> parents: 18594 diff changeset	1252 } while (i < size_a-1 ? accumbits >= basebits :
0857fb489fa3 long_format: Simplify the overly elaborate base-is-a-power-of-2 code. Tim Peters <tim.peters@gmail.com> parents: 18594 diff changeset	1253 accum > 0);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1254 }
8933 dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	1255 }
dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	1256 else {
18536 b287f2927db3 long_format(): Easy speedup for output bases that aren't a power of 2 (in Tim Peters <tim.peters@gmail.com> parents: 18500 diff changeset	1257 /* Not 0, and base not a power of 2. Divide repeatedly by
b287f2927db3 long_format(): Easy speedup for output bases that aren't a power of 2 (in Tim Peters <tim.peters@gmail.com> parents: 18500 diff changeset	1258 base, but for speed use the highest power of base that
b287f2927db3 long_format(): Easy speedup for output bases that aren't a power of 2 (in Tim Peters <tim.peters@gmail.com> parents: 18500 diff changeset	1259 fits in a digit. */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	1260 Py_ssize_t size = size_a;
18594 19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1261 digit *pin = a->ob_digit;
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1262 PyLongObject *scratch;
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1263 /* powbasw <- largest power of base that fits in a digit. */
18536 b287f2927db3 long_format(): Easy speedup for output bases that aren't a power of 2 (in Tim Peters <tim.peters@gmail.com> parents: 18500 diff changeset	1264 digit powbase = base; /* powbase == base ** power */
b287f2927db3 long_format(): Easy speedup for output bases that aren't a power of 2 (in Tim Peters <tim.peters@gmail.com> parents: 18500 diff changeset	1265 int power = 1;
b287f2927db3 long_format(): Easy speedup for output bases that aren't a power of 2 (in Tim Peters <tim.peters@gmail.com> parents: 18500 diff changeset	1266 for (;;) {
b287f2927db3 long_format(): Easy speedup for output bases that aren't a power of 2 (in Tim Peters <tim.peters@gmail.com> parents: 18500 diff changeset	1267 unsigned long newpow = powbase * (unsigned long)base;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1268 if (newpow >> PyLong_SHIFT) /* doesn't fit in a digit */
18536 b287f2927db3 long_format(): Easy speedup for output bases that aren't a power of 2 (in Tim Peters <tim.peters@gmail.com> parents: 18500 diff changeset	1269 break;
b287f2927db3 long_format(): Easy speedup for output bases that aren't a power of 2 (in Tim Peters <tim.peters@gmail.com> parents: 18500 diff changeset	1270 powbase = (digit)newpow;
b287f2927db3 long_format(): Easy speedup for output bases that aren't a power of 2 (in Tim Peters <tim.peters@gmail.com> parents: 18500 diff changeset	1271 ++power;
b287f2927db3 long_format(): Easy speedup for output bases that aren't a power of 2 (in Tim Peters <tim.peters@gmail.com> parents: 18500 diff changeset	1272 }
18594 19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1273
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1274 /* Get a scratch area for repeated division. */
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1275 scratch = _PyLong_New(size);
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1276 if (scratch == NULL) {
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1277 Py_DECREF(str);
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1278 return NULL;
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1279 }
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1280
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1281 /* Repeatedly divide by powbase. */
8933 dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	1282 do {
18536 b287f2927db3 long_format(): Easy speedup for output bases that aren't a power of 2 (in Tim Peters <tim.peters@gmail.com> parents: 18500 diff changeset	1283 int ntostore = power;
18594 19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1284 digit rem = inplace_divrem1(scratch->ob_digit,
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1285 pin, size, powbase);
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1286 pin = scratch->ob_digit; /* no need to use a again */
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1287 if (pin[size - 1] == 0)
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1288 --size;
8933 dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	1289 SIGCHECK({
18594 19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1290 Py_DECREF(scratch);
8933 dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	1291 Py_DECREF(str);
dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	1292 return NULL;
dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	1293 })
18594 19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1294
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1295 /* Break rem into digits. */
18593 9a373a143a13 long_format(): Simplify new code a bit. Tim Peters <tim.peters@gmail.com> parents: 18536 diff changeset	1296 assert(ntostore > 0);
9a373a143a13 long_format(): Simplify new code a bit. Tim Peters <tim.peters@gmail.com> parents: 18536 diff changeset	1297 do {
18536 b287f2927db3 long_format(): Easy speedup for output bases that aren't a power of 2 (in Tim Peters <tim.peters@gmail.com> parents: 18500 diff changeset	1298 digit nextrem = (digit)(rem / base);
b287f2927db3 long_format(): Easy speedup for output bases that aren't a power of 2 (in Tim Peters <tim.peters@gmail.com> parents: 18500 diff changeset	1299 char c = (char)(rem - nextrem * base);
b287f2927db3 long_format(): Easy speedup for output bases that aren't a power of 2 (in Tim Peters <tim.peters@gmail.com> parents: 18500 diff changeset	1300 assert(p > PyString_AS_STRING(str));
35177 27a718221e72 SF bug #1224347: int/long unification and hex() Raymond Hettinger <python@rcn.com> parents: 34931 diff changeset	1301 c += (c < 10) ? '0' : 'a'-10;
18536 b287f2927db3 long_format(): Easy speedup for output bases that aren't a power of 2 (in Tim Peters <tim.peters@gmail.com> parents: 18500 diff changeset	1302 *--p = c;
b287f2927db3 long_format(): Easy speedup for output bases that aren't a power of 2 (in Tim Peters <tim.peters@gmail.com> parents: 18500 diff changeset	1303 rem = nextrem;
18593 9a373a143a13 long_format(): Simplify new code a bit. Tim Peters <tim.peters@gmail.com> parents: 18536 diff changeset	1304 --ntostore;
9a373a143a13 long_format(): Simplify new code a bit. Tim Peters <tim.peters@gmail.com> parents: 18536 diff changeset	1305 /* Termination is a bit delicate: must not
9a373a143a13 long_format(): Simplify new code a bit. Tim Peters <tim.peters@gmail.com> parents: 18536 diff changeset	1306 store leading zeroes, so must get out if
18594 19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1307 remaining quotient and rem are both 0. */
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1308 } while (ntostore && (size \|\| rem));
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1309 } while (size != 0);
19250f9181dc divrem1 & long_format: found a clean way to factor divrem1 so that Tim Peters <tim.peters@gmail.com> parents: 18593 diff changeset	1310 Py_DECREF(scratch);
8933 dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	1311 }
dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	1312
45262 86906a5ceca6 Added PyNumber_ToBase and supporting routines _PyInt_Format and Eric Smith <eric@trueblade.com> parents: 44945 diff changeset	1313 if (base == 2) {
86906a5ceca6 Added PyNumber_ToBase and supporting routines _PyInt_Format and Eric Smith <eric@trueblade.com> parents: 44945 diff changeset	1314 *--p = 'b';
86906a5ceca6 Added PyNumber_ToBase and supporting routines _PyInt_Format and Eric Smith <eric@trueblade.com> parents: 44945 diff changeset	1315 *--p = '0';
86906a5ceca6 Added PyNumber_ToBase and supporting routines _PyInt_Format and Eric Smith <eric@trueblade.com> parents: 44945 diff changeset	1316 }
86906a5ceca6 Added PyNumber_ToBase and supporting routines _PyInt_Format and Eric Smith <eric@trueblade.com> parents: 44945 diff changeset	1317 else if (base == 8) {
86906a5ceca6 Added PyNumber_ToBase and supporting routines _PyInt_Format and Eric Smith <eric@trueblade.com> parents: 44945 diff changeset	1318 if (newstyle) {
86906a5ceca6 Added PyNumber_ToBase and supporting routines _PyInt_Format and Eric Smith <eric@trueblade.com> parents: 44945 diff changeset	1319 *--p = 'o';
958 a736ef1840a5 oct(0) should return '0', not '00' Guido van Rossum <guido@python.org> parents: 955 diff changeset	1320 *--p = '0';
45262 86906a5ceca6 Added PyNumber_ToBase and supporting routines _PyInt_Format and Eric Smith <eric@trueblade.com> parents: 44945 diff changeset	1321 }
86906a5ceca6 Added PyNumber_ToBase and supporting routines _PyInt_Format and Eric Smith <eric@trueblade.com> parents: 44945 diff changeset	1322 else
86906a5ceca6 Added PyNumber_ToBase and supporting routines _PyInt_Format and Eric Smith <eric@trueblade.com> parents: 44945 diff changeset	1323 if (size_a != 0)
86906a5ceca6 Added PyNumber_ToBase and supporting routines _PyInt_Format and Eric Smith <eric@trueblade.com> parents: 44945 diff changeset	1324 *--p = '0';
958 a736ef1840a5 oct(0) should return '0', not '00' Guido van Rossum <guido@python.org> parents: 955 diff changeset	1325 }
406 e628d09ce22f Changed convert to add '0' or '0x' prefix for oct/hex. Guido van Rossum <guido@python.org> parents: 284 diff changeset	1326 else if (base == 16) {
e628d09ce22f Changed convert to add '0' or '0x' prefix for oct/hex. Guido van Rossum <guido@python.org> parents: 284 diff changeset	1327 *--p = 'x';
e628d09ce22f Changed convert to add '0' or '0x' prefix for oct/hex. Guido van Rossum <guido@python.org> parents: 284 diff changeset	1328 *--p = '0';
e628d09ce22f Changed convert to add '0' or '0x' prefix for oct/hex. Guido van Rossum <guido@python.org> parents: 284 diff changeset	1329 }
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	1330 else if (base != 10) {
9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	1331 *--p = '#';
9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	1332 *--p = '0' + base%10;
9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	1333 if (base > 10)
9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	1334 *--p = '0' + base/10;
9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	1335 }
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1336 if (sign)
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1337 *--p = sign;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1338 if (p != PyString_AS_STRING(str)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1339 char *q = PyString_AS_STRING(str);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1340 assert(p > q);
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1341 do {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1342 } while ((q++ = p++) != '\0');
250 b9986009d7dc Fix off-by-one error in long_repr. Guido van Rossum <guido@python.org> parents: 242 diff changeset	1343 q--;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1344 _PyString_Resize((PyObject **)&str,
39995 6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	1345 (Py_ssize_t) (q - PyString_AS_STRING(str)));
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1346 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1347 return (PyObject *)str;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1348 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1349
38301 dccbcbbd6720 A new table to help string->integer conversion was added yesterday to Tim Peters <tim.peters@gmail.com> parents: 38283 diff changeset	1350 /* Table of digit values for 8-bit string -> integer conversion.
dccbcbbd6720 A new table to help string->integer conversion was added yesterday to Tim Peters <tim.peters@gmail.com> parents: 38283 diff changeset	1351 * '0' maps to 0, ..., '9' maps to 9.
dccbcbbd6720 A new table to help string->integer conversion was added yesterday to Tim Peters <tim.peters@gmail.com> parents: 38283 diff changeset	1352 * 'a' and 'A' map to 10, ..., 'z' and 'Z' map to 35.
dccbcbbd6720 A new table to help string->integer conversion was added yesterday to Tim Peters <tim.peters@gmail.com> parents: 38283 diff changeset	1353 * All other indices map to 37.
dccbcbbd6720 A new table to help string->integer conversion was added yesterday to Tim Peters <tim.peters@gmail.com> parents: 38283 diff changeset	1354 * Note that when converting a base B string, a char c is a legitimate
dccbcbbd6720 A new table to help string->integer conversion was added yesterday to Tim Peters <tim.peters@gmail.com> parents: 38283 diff changeset	1355 * base B digit iff _PyLong_DigitValue[Py_CHARMASK(c)] < B.
dccbcbbd6720 A new table to help string->integer conversion was added yesterday to Tim Peters <tim.peters@gmail.com> parents: 38283 diff changeset	1356 */
dccbcbbd6720 A new table to help string->integer conversion was added yesterday to Tim Peters <tim.peters@gmail.com> parents: 38283 diff changeset	1357 int _PyLong_DigitValue[256] = {
38283 88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1358 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1359 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1360 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1361 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 37, 37, 37, 37, 37, 37,
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1362 37, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1363 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 37, 37, 37, 37, 37,
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1364 37, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1365 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 37, 37, 37, 37, 37,
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1366 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1367 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1368 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1369 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1370 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1371 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1372 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1373 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1374 };
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1375
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1376 /* *str points to the first digit in a string of base `base` digits. base
27587 7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1377 * is a power of 2 (2, 4, 8, 16, or 32). *str is set to point to the first
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1378 * non-digit (which may be *str!). A normalized long is returned.
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1379 * The point to this routine is that it takes time linear in the number of
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1380 * string characters.
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1381 */
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1382 static PyLongObject *
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1383 long_from_binary_base(char **str, int base)
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1384 {
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1385 char p = str;
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1386 char *start = p;
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1387 int bits_per_char;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	1388 Py_ssize_t n;
27587 7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1389 PyLongObject *z;
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1390 twodigits accum;
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1391 int bits_in_accum;
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1392 digit *pdigit;
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1393
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1394 assert(base >= 2 && base <= 32 && (base & (base - 1)) == 0);
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1395 n = base;
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1396 for (bits_per_char = -1; n; ++bits_per_char)
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1397 n >>= 1;
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1398 /* n <- total # of bits needed, while setting p to end-of-string */
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1399 n = 0;
46149 7fdff02e6f45 Revert r61969 which added casts to Py_CHARMASK to avoid compiler warnings. Neal Norwitz <nnorwitz@gmail.com> parents: 46132 diff changeset	1400 while (_PyLong_DigitValue[Py_CHARMASK(*p)] < base)
27587 7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1401 ++p;
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1402 *str = p;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1403 /* n <- # of Python digits needed, = ceiling(n/PyLong_SHIFT). */
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1404 n = (p - start) * bits_per_char + PyLong_SHIFT - 1;
39995 6ba402b60041 Forward-port of r52136,52138: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	1405 if (n / bits_per_char < p - start) {
27597 8e60ec88ecb8 long_from_binary_base(): Sped this a little by computing the # of bits Tim Peters <tim.peters@gmail.com> parents: 27588 diff changeset	1406 PyErr_SetString(PyExc_ValueError,
8e60ec88ecb8 long_from_binary_base(): Sped this a little by computing the # of bits Tim Peters <tim.peters@gmail.com> parents: 27588 diff changeset	1407 "long string too large to convert");
8e60ec88ecb8 long_from_binary_base(): Sped this a little by computing the # of bits Tim Peters <tim.peters@gmail.com> parents: 27588 diff changeset	1408 return NULL;
8e60ec88ecb8 long_from_binary_base(): Sped this a little by computing the # of bits Tim Peters <tim.peters@gmail.com> parents: 27588 diff changeset	1409 }
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1410 n = n / PyLong_SHIFT;
27587 7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1411 z = _PyLong_New(n);
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1412 if (z == NULL)
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1413 return NULL;
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1414 /* Read string from right, and fill in long from left; i.e.,
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1415 * from least to most significant in both.
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1416 */
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1417 accum = 0;
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1418 bits_in_accum = 0;
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1419 pdigit = z->ob_digit;
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1420 while (--p >= start) {
46149 7fdff02e6f45 Revert r61969 which added casts to Py_CHARMASK to avoid compiler warnings. Neal Norwitz <nnorwitz@gmail.com> parents: 46132 diff changeset	1421 int k = _PyLong_DigitValue[Py_CHARMASK(*p)];
28981 815ff0ab24e7 SF patch 730594: assert from longobject.c, line 1215. Tim Peters <tim.peters@gmail.com> parents: 28920 diff changeset	1422 assert(k >= 0 && k < base);
815ff0ab24e7 SF patch 730594: assert from longobject.c, line 1215. Tim Peters <tim.peters@gmail.com> parents: 28920 diff changeset	1423 accum \|= (twodigits)(k << bits_in_accum);
27587 7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1424 bits_in_accum += bits_per_char;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1425 if (bits_in_accum >= PyLong_SHIFT) {
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1426 *pdigit++ = (digit)(accum & PyLong_MASK);
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	1427 assert(pdigit - z->ob_digit <= (int)n);
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1428 accum >>= PyLong_SHIFT;
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1429 bits_in_accum -= PyLong_SHIFT;
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1430 assert(bits_in_accum < PyLong_SHIFT);
27587 7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1431 }
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1432 }
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1433 if (bits_in_accum) {
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1434 assert(bits_in_accum <= PyLong_SHIFT);
27587 7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1435 *pdigit++ = (digit)accum;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	1436 assert(pdigit - z->ob_digit <= (int)n);
27587 7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1437 }
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1438 while (pdigit - z->ob_digit < n)
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1439 *pdigit++ = 0;
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1440 return long_normalize(z);
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1441 }
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1442
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1443 PyObject *
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	1444 PyLong_FromString(char str, char *pend, int base)
1837 87364d9e3444 New patches by Andrew to fix various problems Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1445 {
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1446 int sign = 1;
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11628 diff changeset	1447 char start, orig_str = str;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1448 PyLongObject *z;
37611 7afaa752c772 Fix int() and long() to repr() their argument when formatting the exception, Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	1449 PyObject strobj, strrepr;
7afaa752c772 Fix int() and long() to repr() their argument when formatting the exception, Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	1450 Py_ssize_t slen;
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	1451
4587 09d94e9eb101 Fix newlongobject so it will work for 64-bit as well as 32-bit hardware Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1452 if ((base != 0 && base < 2) \|\| base > 36) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1453 PyErr_SetString(PyExc_ValueError,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15041 diff changeset	1454 "long() arg 2 must be >= 2 and <= 36");
1837 87364d9e3444 New patches by Andrew to fix various problems Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1455 return NULL;
87364d9e3444 New patches by Andrew to fix various problems Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1456 }
2308 14b126d0b5be use Py_CHARMASK; and don't check for neg. float to the float power here Guido van Rossum <guido@python.org> parents: 2158 diff changeset	1457 while (str != '\0' && isspace(Py_CHARMASK(str)))
1837 87364d9e3444 New patches by Andrew to fix various problems Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1458 str++;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1459 if (*str == '+')
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1460 ++str;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1461 else if (*str == '-') {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1462 ++str;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1463 sign = -1;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1464 }
2308 14b126d0b5be use Py_CHARMASK; and don't check for neg. float to the float power here Guido van Rossum <guido@python.org> parents: 2158 diff changeset	1465 while (str != '\0' && isspace(Py_CHARMASK(str)))
1837 87364d9e3444 New patches by Andrew to fix various problems Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1466 str++;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1467 if (base == 0) {
45791 62ef0ea034f4 Finished backporting PEP 3127, Integer Literal Support and Syntax. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	1468 /* No base given. Deduce the base from the contents
62ef0ea034f4 Finished backporting PEP 3127, Integer Literal Support and Syntax. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	1469 of the string */
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1470 if (str[0] != '0')
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1471 base = 10;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1472 else if (str[1] == 'x' \|\| str[1] == 'X')
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1473 base = 16;
45791 62ef0ea034f4 Finished backporting PEP 3127, Integer Literal Support and Syntax. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	1474 else if (str[1] == 'o' \|\| str[1] == 'O')
62ef0ea034f4 Finished backporting PEP 3127, Integer Literal Support and Syntax. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	1475 base = 8;
62ef0ea034f4 Finished backporting PEP 3127, Integer Literal Support and Syntax. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	1476 else if (str[1] == 'b' \|\| str[1] == 'B')
62ef0ea034f4 Finished backporting PEP 3127, Integer Literal Support and Syntax. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	1477 base = 2;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1478 else
45791 62ef0ea034f4 Finished backporting PEP 3127, Integer Literal Support and Syntax. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	1479 /* "old" (C-style) octal literal, still valid in
62ef0ea034f4 Finished backporting PEP 3127, Integer Literal Support and Syntax. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	1480 2.x, although illegal in 3.x */
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1481 base = 8;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1482 }
45791 62ef0ea034f4 Finished backporting PEP 3127, Integer Literal Support and Syntax. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	1483 /* Whether or not we were deducing the base, skip leading chars
62ef0ea034f4 Finished backporting PEP 3127, Integer Literal Support and Syntax. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	1484 as needed */
62ef0ea034f4 Finished backporting PEP 3127, Integer Literal Support and Syntax. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	1485 if (str[0] == '0' &&
62ef0ea034f4 Finished backporting PEP 3127, Integer Literal Support and Syntax. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	1486 ((base == 16 && (str[1] == 'x' \|\| str[1] == 'X')) \|\|
62ef0ea034f4 Finished backporting PEP 3127, Integer Literal Support and Syntax. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	1487 (base == 8 && (str[1] == 'o' \|\| str[1] == 'O')) \|\|
62ef0ea034f4 Finished backporting PEP 3127, Integer Literal Support and Syntax. Eric Smith <eric@trueblade.com> parents: 45381 diff changeset	1488 (base == 2 && (str[1] == 'b' \|\| str[1] == 'B'))))
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1489 str += 2;
38283 88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1490
8533 e5d06a602469 Add check in long-to-int conversion for at least one digit. Guido van Rossum <guido@python.org> parents: 8425 diff changeset	1491 start = str;
27587 7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1492 if ((base & (base - 1)) == 0)
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1493 z = long_from_binary_base(&str, base);
7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1494 else {
38283 88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1495 /***
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1496 Binary bases can be converted in time linear in the number of digits, because
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1497 Python's representation base is binary. Other bases (including decimal!) use
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1498 the simple quadratic-time algorithm below, complicated by some speed tricks.
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1499
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1500 First some math: the largest integer that can be expressed in N base-B digits
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1501 is B**N-1. Consequently, if we have an N-digit input in base B, the worst-
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1502 case number of Python digits needed to hold it is the smallest integer n s.t.
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1503
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1504 PyLong_BASEn-1 >= BN-1 [or, adding 1 to both sides]
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1505 PyLong_BASEn >= BN [taking logs to base PyLong_BASE]
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1506 n >= log(B*N)/log(PyLong_BASE) = N log(B)/log(PyLong_BASE)
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1507
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1508 The static array log_base_PyLong_BASE[base] == log(base)/log(PyLong_BASE) so we can compute
38283 88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1509 this quickly. A Python long with that much space is reserved near the start,
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1510 and the result is computed into it.
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1511
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1512 The input string is actually treated as being in base base**i (i.e., i digits
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1513 are processed at a time), where two more static arrays hold:
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1514
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1515 convwidth_base[base] = the largest integer i such that base**i <= PyLong_BASE
38283 88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1516 convmultmax_base[base] = base ** convwidth_base[base]
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1517
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1518 The first of these is the largest i such that i consecutive input digits
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1519 must fit in a single Python digit. The second is effectively the input
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1520 base we're really using.
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1521
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1522 Viewing the input as a sequence <c0, c1, ..., c_n-1> of digits in base
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1523 convmultmax_base[base], the result is "simply"
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1524
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1525 (((c0B + c1)B + c2)B + c3)B + ... ))) + c_n-1
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1526
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1527 where B = convmultmax_base[base].
38513 7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1528
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1529 Error analysis: as above, the number of Python digits `n` needed is worst-
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1530 case
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1531
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1532 n >= N * log(B)/log(PyLong_BASE)
38513 7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1533
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1534 where `N` is the number of input digits in base `B`. This is computed via
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1535
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1536 size_z = (Py_ssize_t)((scan - str) * log_base_PyLong_BASE[base]) + 1;
38513 7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1537
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1538 below. Two numeric concerns are how much space this can waste, and whether
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1539 the computed result can be too small. To be concrete, assume PyLong_BASE = 2**15,
38513 7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1540 which is the default (and it's unlikely anyone changes that).
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1541
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1542 Waste isn't a problem: provided the first input digit isn't 0, the difference
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1543 between the worst-case input with N digits and the smallest input with N
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1544 digits is about a factor of B, but B is small compared to PyLong_BASE so at most
38513 7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1545 one allocated Python digit can remain unused on that count. If
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1546 N*log(B)/log(PyLong_BASE) is mathematically an exact integer, then truncating that
38513 7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1547 and adding 1 returns a result 1 larger than necessary. However, that can't
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1548 happen: whenever B is a power of 2, long_from_binary_base() is called
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1549 instead, and it's impossible for Bi to be an integer power of 215 when
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1550 B is not a power of 2 (i.e., it's impossible for N*log(B)/log(PyLong_BASE) to be
38513 7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1551 an exact integer when B is not a power of 2, since B**i has a prime factor
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1552 other than 2 in that case, but (215)j's only prime factor is 2).
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1553
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1554 The computed result can be too small if the true value of N*log(B)/log(PyLong_BASE)
38513 7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1555 is a little bit larger than an exact integer, but due to roundoff errors (in
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1556 computing log(B), log(PyLong_BASE), their quotient, and/or multiplying that by N)
38513 7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1557 yields a numeric result a little less than that integer. Unfortunately, "how
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1558 close can a transcendental function get to an integer over some range?"
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1559 questions are generally theoretically intractable. Computer analysis via
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1560 continued fractions is practical: expand log(B)/log(PyLong_BASE) via continued
38513 7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1561 fractions, giving a sequence i/j of "the best" rational approximations. Then
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1562 j*log(B)/log(PyLong_BASE) is approximately equal to (the integer) i. This shows that
38513 7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1563 we can get very close to being in trouble, but very rarely. For example,
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1564 76573 is a denominator in one of the continued-fraction approximations to
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1565 log(10)/log(2**15), and indeed:
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1566
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1567 >>> log(10)/log(2*15)76573
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1568 16958.000000654003
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1569
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1570 is very close to an integer. If we were working with IEEE single-precision,
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1571 rounding errors could kill us. Finding worst cases in IEEE double-precision
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1572 requires better-than-double-precision log() functions, and Tim didn't bother.
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1573 Instead the code checks to see whether the allocated space is enough as each
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1574 new Python digit is added, and copies the whole thing to a larger long if not.
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1575 This should happen extremely rarely, and in fact I don't have a test case
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1576 that triggers it(!). Instead the code was tested by artificially allocating
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1577 just 1 digit at the start, so that the copying code was exercised for every
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1578 digit beyond the first.
38283 88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1579 ***/
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1580 register twodigits c; /* current input character */
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1581 Py_ssize_t size_z;
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1582 int i;
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1583 int convwidth;
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1584 twodigits convmultmax, convmult;
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1585 digit pz, pzstop;
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1586 char* scan;
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1587
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1588 static double log_base_PyLong_BASE[37] = {0.0e0,};
38283 88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1589 static int convwidth_base[37] = {0,};
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1590 static twodigits convmultmax_base[37] = {0,};
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1591
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1592 if (log_base_PyLong_BASE[base] == 0.0) {
38283 88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1593 twodigits convmax = base;
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1594 int i = 1;
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1595
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1596 log_base_PyLong_BASE[base] = log((double)base) /
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1597 log((double)PyLong_BASE);
38283 88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1598 for (;;) {
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1599 twodigits next = convmax * base;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1600 if (next > PyLong_BASE)
38283 88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1601 break;
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1602 convmax = next;
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1603 ++i;
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1604 }
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1605 convmultmax_base[base] = convmax;
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1606 assert(i > 0);
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1607 convwidth_base[base] = i;
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1608 }
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1609
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1610 /* Find length of the string of numeric characters. */
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1611 scan = str;
46149 7fdff02e6f45 Revert r61969 which added casts to Py_CHARMASK to avoid compiler warnings. Neal Norwitz <nnorwitz@gmail.com> parents: 46132 diff changeset	1612 while (_PyLong_DigitValue[Py_CHARMASK(*scan)] < base)
38283 88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1613 ++scan;
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1614
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1615 /* Create a long object that can contain the largest possible
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1616 * integer with this base and length. Note that there's no
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1617 * need to initialize z->ob_digit -- no slot is read up before
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1618 * being stored into.
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1619 */
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1620 size_z = (Py_ssize_t)((scan - str) * log_base_PyLong_BASE[base]) + 1;
38513 7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1621 /* Uncomment next line to test exceedingly rare copy code */
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1622 /* size_z = 1; */
38283 88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1623 assert(size_z > 0);
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1624 z = _PyLong_New(size_z);
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1625 if (z == NULL)
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1626 return NULL;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	1627 Py_SIZE(z) = 0;
38283 88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1628
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1629 /* `convwidth` consecutive input digits are treated as a single
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1630 * digit in base `convmultmax`.
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1631 */
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1632 convwidth = convwidth_base[base];
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1633 convmultmax = convmultmax_base[base];
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1634
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1635 /* Work ;-) */
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1636 while (str < scan) {
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1637 /* grab up to convwidth digits from the input string */
46149 7fdff02e6f45 Revert r61969 which added casts to Py_CHARMASK to avoid compiler warnings. Neal Norwitz <nnorwitz@gmail.com> parents: 46132 diff changeset	1638 c = (digit)_PyLong_DigitValue[Py_CHARMASK(*str++)];
38283 88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1639 for (i = 1; i < convwidth && str != scan; ++i, ++str) {
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1640 c = (twodigits)(c * base +
46149 7fdff02e6f45 Revert r61969 which added casts to Py_CHARMASK to avoid compiler warnings. Neal Norwitz <nnorwitz@gmail.com> parents: 46132 diff changeset	1641 _PyLong_DigitValue[Py_CHARMASK(*str)]);
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1642 assert(c < PyLong_BASE);
38283 88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1643 }
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1644
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1645 convmult = convmultmax;
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1646 /* Calculate the shift only if we couldn't get
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1647 * convwidth digits.
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1648 */
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1649 if (i != convwidth) {
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1650 convmult = base;
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1651 for ( ; i > 1; --i)
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1652 convmult *= base;
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1653 }
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1654
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1655 /* Multiply z by convmult, and add c. */
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1656 pz = z->ob_digit;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	1657 pzstop = pz + Py_SIZE(z);
38283 88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1658 for (; pz < pzstop; ++pz) {
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1659 c += (twodigits)pz convmult;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1660 *pz = (digit)(c & PyLong_MASK);
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1661 c >>= PyLong_SHIFT;
38283 88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1662 }
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1663 /* carry off the current end? */
88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1664 if (c) {
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1665 assert(c < PyLong_BASE);
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	1666 if (Py_SIZE(z) < size_z) {
38513 7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1667 *pz = (digit)c;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	1668 ++Py_SIZE(z);
38513 7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1669 }
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1670 else {
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1671 PyLongObject *tmp;
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1672 /* Extremely rare. Get more space. */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	1673 assert(Py_SIZE(z) == size_z);
38513 7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1674 tmp = _PyLong_New(size_z + 1);
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1675 if (tmp == NULL) {
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1676 Py_DECREF(z);
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1677 return NULL;
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1678 }
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1679 memcpy(tmp->ob_digit,
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1680 z->ob_digit,
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1681 sizeof(digit) * size_z);
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1682 Py_DECREF(z);
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1683 z = tmp;
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1684 z->ob_digit[size_z] = (digit)c;
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1685 ++size_z;
7f1f36b3c9f9 PyLong_FromString(): Continued fraction analysis (explained in Tim Peters <tim.peters@gmail.com> parents: 38331 diff changeset	1686 }
38283 88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1687 }
27587 7283140d4319 long(string, base) now takes time linear in len(string) when base is a Tim Peters <tim.peters@gmail.com> parents: 27585 diff changeset	1688 }
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1689 }
8808 78785985a2ab Fix a potential problem in PyLong_FromString(): could fall through the Guido van Rossum <guido@python.org> parents: 8533 diff changeset	1690 if (z == NULL)
78785985a2ab Fix a potential problem in PyLong_FromString(): could fall through the Guido van Rossum <guido@python.org> parents: 8533 diff changeset	1691 return NULL;
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11628 diff changeset	1692 if (str == start)
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11628 diff changeset	1693 goto onError;
38283 88cc7e4f01ff Heavily fiddled variant of patch #1442927: PyLong_FromString optimization. Tim Peters <tim.peters@gmail.com> parents: 38139 diff changeset	1694 if (sign < 0)
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	1695 Py_SIZE(z) = -(Py_SIZE(z));
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11628 diff changeset	1696 if (str == 'L' \|\| str == 'l')
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11628 diff changeset	1697 str++;
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11628 diff changeset	1698 while (str && isspace(Py_CHARMASK(str)))
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11628 diff changeset	1699 str++;
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11628 diff changeset	1700 if (*str != '\0')
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11628 diff changeset	1701 goto onError;
1837 87364d9e3444 New patches by Andrew to fix various problems Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1702 if (pend)
87364d9e3444 New patches by Andrew to fix various problems Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1703 *pend = str;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1704 return (PyObject *) z;
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11628 diff changeset	1705
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11628 diff changeset	1706 onError:
37611 7afaa752c772 Fix int() and long() to repr() their argument when formatting the exception, Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	1707 Py_XDECREF(z);
7afaa752c772 Fix int() and long() to repr() their argument when formatting the exception, Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	1708 slen = strlen(orig_str) < 200 ? strlen(orig_str) : 200;
7afaa752c772 Fix int() and long() to repr() their argument when formatting the exception, Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	1709 strobj = PyString_FromStringAndSize(orig_str, slen);
7afaa752c772 Fix int() and long() to repr() their argument when formatting the exception, Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	1710 if (strobj == NULL)
7afaa752c772 Fix int() and long() to repr() their argument when formatting the exception, Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	1711 return NULL;
7afaa752c772 Fix int() and long() to repr() their argument when formatting the exception, Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	1712 strrepr = PyObject_Repr(strobj);
7afaa752c772 Fix int() and long() to repr() their argument when formatting the exception, Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	1713 Py_DECREF(strobj);
7afaa752c772 Fix int() and long() to repr() their argument when formatting the exception, Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	1714 if (strrepr == NULL)
7afaa752c772 Fix int() and long() to repr() their argument when formatting the exception, Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	1715 return NULL;
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	1716 PyErr_Format(PyExc_ValueError,
37611 7afaa752c772 Fix int() and long() to repr() their argument when formatting the exception, Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	1717 "invalid literal for long() with base %d: %s",
7afaa752c772 Fix int() and long() to repr() their argument when formatting the exception, Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	1718 base, PyString_AS_STRING(strrepr));
7afaa752c772 Fix int() and long() to repr() their argument when formatting the exception, Thomas Wouters <thomas@python.org> parents: 37589 diff changeset	1719 Py_DECREF(strrepr);
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11628 diff changeset	1720 return NULL;
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11628 diff changeset	1721 }
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11628 diff changeset	1722
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19051 diff changeset	1723 #ifdef Py_USING_UNICODE
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11628 diff changeset	1724 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	1725 PyLong_FromUnicode(Py_UNICODE *u, Py_ssize_t length, int base)
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11628 diff changeset	1726 {
26081 999accfa91c5 Make int("...") return a long if an int would overflow. Walter Dörwald <walter@livinglogic.de> parents: 25108 diff changeset	1727 PyObject *result;
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37568 diff changeset	1728 char buffer = (char )PyMem_MALLOC(length+1);
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11628 diff changeset	1729
26081 999accfa91c5 Make int("...") return a long if an int would overflow. Walter Dörwald <walter@livinglogic.de> parents: 25108 diff changeset	1730 if (buffer == NULL)
999accfa91c5 Make int("...") return a long if an int would overflow. Walter Dörwald <walter@livinglogic.de> parents: 25108 diff changeset	1731 return NULL;
999accfa91c5 Make int("...") return a long if an int would overflow. Walter Dörwald <walter@livinglogic.de> parents: 25108 diff changeset	1732
999accfa91c5 Make int("...") return a long if an int would overflow. Walter Dörwald <walter@livinglogic.de> parents: 25108 diff changeset	1733 if (PyUnicode_EncodeDecimal(u, length, buffer, NULL)) {
999accfa91c5 Make int("...") return a long if an int would overflow. Walter Dörwald <walter@livinglogic.de> parents: 25108 diff changeset	1734 PyMem_FREE(buffer);
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11628 diff changeset	1735 return NULL;
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11628 diff changeset	1736 }
26081 999accfa91c5 Make int("...") return a long if an int would overflow. Walter Dörwald <walter@livinglogic.de> parents: 25108 diff changeset	1737 result = PyLong_FromString(buffer, NULL, base);
999accfa91c5 Make int("...") return a long if an int would overflow. Walter Dörwald <walter@livinglogic.de> parents: 25108 diff changeset	1738 PyMem_FREE(buffer);
999accfa91c5 Make int("...") return a long if an int would overflow. Walter Dörwald <walter@livinglogic.de> parents: 25108 diff changeset	1739 return result;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1740 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19051 diff changeset	1741 #endif
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1742
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	1743 /* forward */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1744 static PyLongObject *x_divrem
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	1745 (PyLongObject , PyLongObject , PyLongObject **);
44432 4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1746 static PyObject long_long(PyObject v);
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	1747 static int long_divrem(PyLongObject , PyLongObject ,
a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	1748 PyLongObject , PyLongObject );
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1749
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1750 /* Long division with remainder, top-level routine */
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1751
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	1752 static int
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	1753 long_divrem(PyLongObject a, PyLongObject b,
a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	1754 PyLongObject pdiv, PyLongObject prem)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1755 {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	1756 Py_ssize_t size_a = ABS(Py_SIZE(a)), size_b = ABS(Py_SIZE(b));
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1757 PyLongObject *z;
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	1758
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1759 if (size_b == 0) {
8933 dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	1760 PyErr_SetString(PyExc_ZeroDivisionError,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15041 diff changeset	1761 "long division or modulo by zero");
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	1762 return -1;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1763 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1764 if (size_a < size_b \|\|
4587 09d94e9eb101 Fix newlongobject so it will work for 64-bit as well as 32-bit hardware Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1765 (size_a == size_b &&
09d94e9eb101 Fix newlongobject so it will work for 64-bit as well as 32-bit hardware Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1766 a->ob_digit[size_a-1] < b->ob_digit[size_b-1])) {
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1767 /* \|a\| < \|b\|. */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1768 *pdiv = _PyLong_New(0);
41435 46d0f4057705 Add some missing NULL checks which trigger crashes on low-memory conditions. Georg Brandl <georg@python.org> parents: 41032 diff changeset	1769 if (*pdiv == NULL)
46d0f4057705 Add some missing NULL checks which trigger crashes on low-memory conditions. Georg Brandl <georg@python.org> parents: 41032 diff changeset	1770 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1771 Py_INCREF(a);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1772 prem = (PyLongObject ) a;
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	1773 return 0;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1774 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1775 if (size_b == 1) {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1776 digit rem = 0;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1777 z = divrem1(a, b->ob_digit[0], &rem);
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	1778 if (z == NULL)
405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	1779 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1780 prem = (PyLongObject ) PyLong_FromLong((long)rem);
41435 46d0f4057705 Add some missing NULL checks which trigger crashes on low-memory conditions. Georg Brandl <georg@python.org> parents: 41032 diff changeset	1781 if (*prem == NULL) {
46d0f4057705 Add some missing NULL checks which trigger crashes on low-memory conditions. Georg Brandl <georg@python.org> parents: 41032 diff changeset	1782 Py_DECREF(z);
46d0f4057705 Add some missing NULL checks which trigger crashes on low-memory conditions. Georg Brandl <georg@python.org> parents: 41032 diff changeset	1783 return -1;
46d0f4057705 Add some missing NULL checks which trigger crashes on low-memory conditions. Georg Brandl <georg@python.org> parents: 41032 diff changeset	1784 }
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1785 }
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	1786 else {
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1787 z = x_divrem(a, b, prem);
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	1788 if (z == NULL)
405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	1789 return -1;
405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	1790 }
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1791 /* Set the signs.
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1792 The quotient z has the sign of a*b;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1793 the remainder r has the sign of a,
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1794 so a = bz + r. /
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	1795 if ((a->ob_size < 0) != (b->ob_size < 0))
405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	1796 z->ob_size = -(z->ob_size);
405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	1797 if (a->ob_size < 0 && (*prem)->ob_size != 0)
405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	1798 (prem)->ob_size = -((prem)->ob_size);
405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	1799 *pdiv = z;
405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	1800 return 0;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1801 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1802
242 316a0d9c0096 Many small changes Guido van Rossum <guido@python.org> parents: 230 diff changeset	1803 /* Unsigned long division with remainder -- the algorithm */
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1804
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1805 static PyLongObject *
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	1806 x_divrem(PyLongObject v1, PyLongObject w1, PyLongObject **prem)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1807 {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	1808 Py_ssize_t size_v = ABS(Py_SIZE(v1)), size_w = ABS(Py_SIZE(w1));
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1809 digit d = (digit) ((twodigits)PyLong_BASE / (w1->ob_digit[size_w-1] + 1));
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1810 PyLongObject *v = mul1(v1, d);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1811 PyLongObject *w = mul1(w1, d);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1812 PyLongObject *a;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	1813 Py_ssize_t j, k;
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	1814
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1815 if (v == NULL \|\| w == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1816 Py_XDECREF(v);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1817 Py_XDECREF(w);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1818 return NULL;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1819 }
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	1820
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1821 assert(size_v >= size_w && size_w > 1); /* Assert checks by div() */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	1822 assert(Py_REFCNT(v) == 1); /* Since v will be used as accumulator! */
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	1823 assert(size_w == ABS(Py_SIZE(w))); /* That's how d was calculated */
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	1824
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	1825 size_v = ABS(Py_SIZE(v));
38139 f1e24452dbba Fix problems found by Coverity. Neal Norwitz <nnorwitz@gmail.com> parents: 37815 diff changeset	1826 k = size_v - size_w;
f1e24452dbba Fix problems found by Coverity. Neal Norwitz <nnorwitz@gmail.com> parents: 37815 diff changeset	1827 a = _PyLong_New(k + 1);
f1e24452dbba Fix problems found by Coverity. Neal Norwitz <nnorwitz@gmail.com> parents: 37815 diff changeset	1828
f1e24452dbba Fix problems found by Coverity. Neal Norwitz <nnorwitz@gmail.com> parents: 37815 diff changeset	1829 for (j = size_v; a != NULL && k >= 0; --j, --k) {
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1830 digit vj = (j >= size_v) ? 0 : v->ob_digit[j];
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1831 twodigits q;
242 316a0d9c0096 Many small changes Guido van Rossum <guido@python.org> parents: 230 diff changeset	1832 stwodigits carry = 0;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1833 int i;
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	1834
1837 87364d9e3444 New patches by Andrew to fix various problems Guido van Rossum <guido@python.org> parents: 1391 diff changeset	1835 SIGCHECK({
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1836 Py_DECREF(a);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1837 a = NULL;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1838 break;
242 316a0d9c0096 Many small changes Guido van Rossum <guido@python.org> parents: 230 diff changeset	1839 })
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1840 if (vj == w->ob_digit[size_w-1])
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1841 q = PyLong_MASK;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1842 else
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1843 q = (((twodigits)vj << PyLong_SHIFT) + v->ob_digit[j-1]) /
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1844 w->ob_digit[size_w-1];
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	1845
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1846 while (w->ob_digit[size_w-2]*q >
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1847 ((
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1848 ((twodigits)vj << PyLong_SHIFT)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1849 + v->ob_digit[j-1]
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1850 - q*w->ob_digit[size_w-1]
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1851 ) << PyLong_SHIFT)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1852 + v->ob_digit[j-2])
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1853 --q;
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	1854
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1855 for (i = 0; i < size_w && i+k < size_v; ++i) {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1856 twodigits z = w->ob_digit[i] * q;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1857 digit zz = (digit) (z >> PyLong_SHIFT);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1858 carry += v->ob_digit[i+k] - z
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1859 + ((twodigits)zz << PyLong_SHIFT);
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1860 v->ob_digit[i+k] = (digit)(carry & PyLong_MASK);
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1861 carry = Py_ARITHMETIC_RIGHT_SHIFT(PyLong_BASE_TWODIGITS_TYPE,
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1862 carry, PyLong_SHIFT);
13423 a87803eb9dfb Cray J90 fixes for long ints. Tim Peters <tim.peters@gmail.com> parents: 13420 diff changeset	1863 carry -= zz;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1864 }
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	1865
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1866 if (i+k < size_v) {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1867 carry += v->ob_digit[i+k];
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1868 v->ob_digit[i+k] = 0;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1869 }
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	1870
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1871 if (carry == 0)
5288 0f1711b7d367 Tweaks to keep the Microsoft compiler quiet. Guido van Rossum <guido@python.org> parents: 5199 diff changeset	1872 a->ob_digit[k] = (digit) q;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1873 else {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1874 assert(carry == -1);
5288 0f1711b7d367 Tweaks to keep the Microsoft compiler quiet. Guido van Rossum <guido@python.org> parents: 5199 diff changeset	1875 a->ob_digit[k] = (digit) q-1;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1876 carry = 0;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1877 for (i = 0; i < size_w && i+k < size_v; ++i) {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1878 carry += v->ob_digit[i+k] + w->ob_digit[i];
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1879 v->ob_digit[i+k] = (digit)(carry & PyLong_MASK);
13423 a87803eb9dfb Cray J90 fixes for long ints. Tim Peters <tim.peters@gmail.com> parents: 13420 diff changeset	1880 carry = Py_ARITHMETIC_RIGHT_SHIFT(
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1881 PyLong_BASE_TWODIGITS_TYPE,
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1882 carry, PyLong_SHIFT);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1883 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1884 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1885 } /* for j, k */
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	1886
2111 30cbe024df40 fix memory leak and null pointer dereference Guido van Rossum <guido@python.org> parents: 2059 diff changeset	1887 if (a == NULL)
30cbe024df40 fix memory leak and null pointer dereference Guido van Rossum <guido@python.org> parents: 2059 diff changeset	1888 *prem = NULL;
30cbe024df40 fix memory leak and null pointer dereference Guido van Rossum <guido@python.org> parents: 2059 diff changeset	1889 else {
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1890 a = long_normalize(a);
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	1891 *prem = divrem1(v, d, &d);
405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	1892 /* d receives the (unused) remainder */
405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	1893 if (*prem == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1894 Py_DECREF(a);
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	1895 a = NULL;
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	1896 }
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1897 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1898 Py_DECREF(v);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1899 Py_DECREF(w);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1900 return a;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1901 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1902
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1903 /* Methods */
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1904
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1905 static void
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	1906 long_dealloc(PyObject *v)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1907 {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	1908 Py_TYPE(v)->tp_free(v);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1909 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1910
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1911 static PyObject *
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	1912 long_repr(PyObject *v)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1913 {
45262 86906a5ceca6 Added PyNumber_ToBase and supporting routines _PyInt_Format and Eric Smith <eric@trueblade.com> parents: 44945 diff changeset	1914 return _PyLong_Format(v, 10, 1, 0);
11628 47f93a969366 long_format(): Now takes a third parameter, addL; iff true, a Fred Drake <fdrake@acm.org> parents: 11380 diff changeset	1915 }
47f93a969366 long_format(): Now takes a third parameter, addL; iff true, a Fred Drake <fdrake@acm.org> parents: 11380 diff changeset	1916
47f93a969366 long_format(): Now takes a third parameter, addL; iff true, a Fred Drake <fdrake@acm.org> parents: 11380 diff changeset	1917 static PyObject *
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	1918 long_str(PyObject *v)
11628 47f93a969366 long_format(): Now takes a third parameter, addL; iff true, a Fred Drake <fdrake@acm.org> parents: 11380 diff changeset	1919 {
45262 86906a5ceca6 Added PyNumber_ToBase and supporting routines _PyInt_Format and Eric Smith <eric@trueblade.com> parents: 44945 diff changeset	1920 return _PyLong_Format(v, 10, 0, 0);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1921 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1922
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1923 static int
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	1924 long_compare(PyLongObject a, PyLongObject b)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1925 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	1926 Py_ssize_t sign;
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	1927
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	1928 if (Py_SIZE(a) != Py_SIZE(b)) {
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	1929 if (ABS(Py_SIZE(a)) == 0 && ABS(Py_SIZE(b)) == 0)
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	1930 sign = 0;
9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	1931 else
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	1932 sign = Py_SIZE(a) - Py_SIZE(b);
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	1933 }
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1934 else {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	1935 Py_ssize_t i = ABS(Py_SIZE(a));
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1936 while (--i >= 0 && a->ob_digit[i] == b->ob_digit[i])
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1937 ;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1938 if (i < 0)
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1939 sign = 0;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 1051 diff changeset	1940 else {
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1941 sign = (int)a->ob_digit[i] - (int)b->ob_digit[i];
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	1942 if (Py_SIZE(a) < 0)
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 1051 diff changeset	1943 sign = -sign;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 1051 diff changeset	1944 }
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1945 }
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	1946 return sign < 0 ? -1 : sign > 0 ? 1 : 0;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1947 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1948
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1949 static long
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	1950 long_hash(PyLongObject *v)
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1951 {
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1952 long x;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	1953 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	1954 int sign;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1955
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1956 /* This is designed so that Python ints and longs with the
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1957 same value hash to the same value, otherwise comparisons
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1958 of mapping keys will turn out weird */
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1959 i = v->ob_size;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1960 sign = 1;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1961 x = 0;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1962 if (i < 0) {
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1963 sign = -1;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1964 i = -(i);
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1965 }
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1966 #define LONG_BIT_PyLong_SHIFT (8*sizeof(long) - PyLong_SHIFT)
43406 357f54015a2d Issue #1772851. Alters long.__hash__ from being almost completely Facundo Batista <facundobatista@gmail.com> parents: 42333 diff changeset	1967 /* The following loop produces a C long x such that (unsigned long)x
357f54015a2d Issue #1772851. Alters long.__hash__ from being almost completely Facundo Batista <facundobatista@gmail.com> parents: 42333 diff changeset	1968 is congruent to the absolute value of v modulo ULONG_MAX. The
357f54015a2d Issue #1772851. Alters long.__hash__ from being almost completely Facundo Batista <facundobatista@gmail.com> parents: 42333 diff changeset	1969 resulting x is nonzero if and only if v is. */
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1970 while (--i >= 0) {
28032 53bef20f84cc Fix SF bug #689659, 64-bit int and long hash keys incompatible Neal Norwitz <nnorwitz@gmail.com> parents: 27639 diff changeset	1971 /* Force a native long #-bits (32 or 64) circular shift */
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1972 x = ((x << PyLong_SHIFT) & ~PyLong_MASK) \| ((x >> LONG_BIT_PyLong_SHIFT) & PyLong_MASK);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1973 x += v->ob_digit[i];
43406 357f54015a2d Issue #1772851. Alters long.__hash__ from being almost completely Facundo Batista <facundobatista@gmail.com> parents: 42333 diff changeset	1974 /* If the addition above overflowed (thinking of x as
357f54015a2d Issue #1772851. Alters long.__hash__ from being almost completely Facundo Batista <facundobatista@gmail.com> parents: 42333 diff changeset	1975 unsigned), we compensate by incrementing. This preserves
357f54015a2d Issue #1772851. Alters long.__hash__ from being almost completely Facundo Batista <facundobatista@gmail.com> parents: 42333 diff changeset	1976 the value modulo ULONG_MAX. */
357f54015a2d Issue #1772851. Alters long.__hash__ from being almost completely Facundo Batista <facundobatista@gmail.com> parents: 42333 diff changeset	1977 if ((unsigned long)x < v->ob_digit[i])
357f54015a2d Issue #1772851. Alters long.__hash__ from being almost completely Facundo Batista <facundobatista@gmail.com> parents: 42333 diff changeset	1978 x++;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1979 }
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	1980 #undef LONG_BIT_PyLong_SHIFT
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1981 x = x * sign;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1982 if (x == -1)
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1983 x = -2;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1984 return x;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1985 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1986
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	1987
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1988 /* Add the absolute values of two long integers. */
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1989
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1990 static PyLongObject *
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	1991 x_add(PyLongObject a, PyLongObject b)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1992 {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	1993 Py_ssize_t size_a = ABS(Py_SIZE(a)), size_b = ABS(Py_SIZE(b));
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	1994 PyLongObject *z;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1995 int i;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1996 digit carry = 0;
19880 d1cd4cd72271 More bug 460020. Disable a number of long optimizations for long subclasses. Tim Peters <tim.peters@gmail.com> parents: 19837 diff changeset	1997
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1998 /* Ensure a is the larger of the two: */
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1999 if (size_a < size_b) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2000 { PyLongObject *temp = a; a = b; b = temp; }
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	2001 { Py_ssize_t size_temp = size_a;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2002 size_a = size_b;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2003 size_b = size_temp; }
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2004 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2005 z = _PyLong_New(size_a+1);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2006 if (z == NULL)
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2007 return NULL;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2008 for (i = 0; i < size_b; ++i) {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2009 carry += a->ob_digit[i] + b->ob_digit[i];
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2010 z->ob_digit[i] = carry & PyLong_MASK;
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2011 carry >>= PyLong_SHIFT;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2012 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2013 for (; i < size_a; ++i) {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2014 carry += a->ob_digit[i];
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2015 z->ob_digit[i] = carry & PyLong_MASK;
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2016 carry >>= PyLong_SHIFT;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2017 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2018 z->ob_digit[i] = carry;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2019 return long_normalize(z);
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2020 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2021
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2022 /* Subtract the absolute values of two integers. */
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2023
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2024 static PyLongObject *
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	2025 x_sub(PyLongObject a, PyLongObject b)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2026 {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2027 Py_ssize_t size_a = ABS(Py_SIZE(a)), size_b = ABS(Py_SIZE(b));
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2028 PyLongObject *z;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	2029 Py_ssize_t i;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2030 int sign = 1;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2031 digit borrow = 0;
19880 d1cd4cd72271 More bug 460020. Disable a number of long optimizations for long subclasses. Tim Peters <tim.peters@gmail.com> parents: 19837 diff changeset	2032
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2033 /* Ensure a is the larger of the two: */
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2034 if (size_a < size_b) {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2035 sign = -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2036 { PyLongObject *temp = a; a = b; b = temp; }
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	2037 { Py_ssize_t size_temp = size_a;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2038 size_a = size_b;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2039 size_b = size_temp; }
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2040 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2041 else if (size_a == size_b) {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2042 /* Find highest digit where a and b differ: */
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2043 i = size_a;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2044 while (--i >= 0 && a->ob_digit[i] == b->ob_digit[i])
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2045 ;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2046 if (i < 0)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2047 return _PyLong_New(0);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2048 if (a->ob_digit[i] < b->ob_digit[i]) {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2049 sign = -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2050 { PyLongObject *temp = a; a = b; b = temp; }
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2051 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2052 size_a = size_b = i+1;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2053 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2054 z = _PyLong_New(size_a);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2055 if (z == NULL)
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2056 return NULL;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2057 for (i = 0; i < size_b; ++i) {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2058 /* The following assumes unsigned arithmetic
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2059 works module 2*N for some N>PyLong_SHIFT. /
1837 87364d9e3444 New patches by Andrew to fix various problems Guido van Rossum <guido@python.org> parents: 1391 diff changeset	2060 borrow = a->ob_digit[i] - b->ob_digit[i] - borrow;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2061 z->ob_digit[i] = borrow & PyLong_MASK;
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2062 borrow >>= PyLong_SHIFT;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2063 borrow &= 1; /* Keep only one sign bit */
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2064 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2065 for (; i < size_a; ++i) {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2066 borrow = a->ob_digit[i] - borrow;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2067 z->ob_digit[i] = borrow & PyLong_MASK;
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2068 borrow >>= PyLong_SHIFT;
13420 d3f1eefdcb3a The tail end of x_sub implicitly assumed that an unsigned short Tim Peters <tim.peters@gmail.com> parents: 13418 diff changeset	2069 borrow &= 1; /* Keep only one sign bit */
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2070 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2071 assert(borrow == 0);
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	2072 if (sign < 0)
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	2073 z->ob_size = -(z->ob_size);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2074 return long_normalize(z);
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2075 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2076
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2077 static PyObject *
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2078 long_add(PyLongObject v, PyLongObject w)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2079 {
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2080 PyLongObject a, b, *z;
19880 d1cd4cd72271 More bug 460020. Disable a number of long optimizations for long subclasses. Tim Peters <tim.peters@gmail.com> parents: 19837 diff changeset	2081
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2082 CONVERT_BINOP((PyObject )v, (PyObject )w, &a, &b);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2083
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2084 if (a->ob_size < 0) {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2085 if (b->ob_size < 0) {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2086 z = x_add(a, b);
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	2087 if (z != NULL && z->ob_size != 0)
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	2088 z->ob_size = -(z->ob_size);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2089 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2090 else
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2091 z = x_sub(b, a);
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2092 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2093 else {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2094 if (b->ob_size < 0)
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2095 z = x_sub(a, b);
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2096 else
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2097 z = x_add(a, b);
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2098 }
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2099 Py_DECREF(a);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2100 Py_DECREF(b);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2101 return (PyObject *)z;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2102 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2103
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2104 static PyObject *
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2105 long_sub(PyLongObject v, PyLongObject w)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2106 {
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2107 PyLongObject a, b, *z;
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2108
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2109 CONVERT_BINOP((PyObject )v, (PyObject )w, &a, &b);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2110
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2111 if (a->ob_size < 0) {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2112 if (b->ob_size < 0)
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2113 z = x_sub(a, b);
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2114 else
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2115 z = x_add(a, b);
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	2116 if (z != NULL && z->ob_size != 0)
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	2117 z->ob_size = -(z->ob_size);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2118 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2119 else {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2120 if (b->ob_size < 0)
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2121 z = x_add(a, b);
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2122 else
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2123 z = x_sub(a, b);
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2124 }
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2125 Py_DECREF(a);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2126 Py_DECREF(b);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2127 return (PyObject *)z;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2128 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2129
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2130 /* Grade school multiplication, ignoring the signs.
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2131 * Returns the absolute value of the product, or NULL if error.
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2132 */
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2133 static PyLongObject *
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2134 x_mul(PyLongObject a, PyLongObject b)
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2135 {
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2136 PyLongObject *z;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2137 Py_ssize_t size_a = ABS(Py_SIZE(a));
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2138 Py_ssize_t size_b = ABS(Py_SIZE(b));
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	2139 Py_ssize_t i;
19925 df409844b659 A fix for SF bug #461546 (bug in long_mul). Guido van Rossum <guido@python.org> parents: 19897 diff changeset	2140
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2141 z = _PyLong_New(size_a + size_b);
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2142 if (z == NULL)
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2143 return NULL;
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2144
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2145 memset(z->ob_digit, 0, Py_SIZE(z) * sizeof(digit));
33325 1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2146 if (a == b) {
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2147 /* Efficient squaring per HAC, Algorithm 14.16:
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2148 * http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2149 * Gives slightly less than a 2x speedup when a == b,
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2150 * via exploiting that each entry in the multiplication
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2151 * pyramid appears twice (except for the size_a squares).
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2152 */
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2153 for (i = 0; i < size_a; ++i) {
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2154 twodigits carry;
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2155 twodigits f = a->ob_digit[i];
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2156 digit *pz = z->ob_digit + (i << 1);
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2157 digit *pa = a->ob_digit + i + 1;
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2158 digit *paend = a->ob_digit + size_a;
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2159
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2160 SIGCHECK({
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2161 Py_DECREF(z);
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2162 return NULL;
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2163 })
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2164
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2165 carry = pz + f f;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2166 *pz++ = (digit)(carry & PyLong_MASK);
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2167 carry >>= PyLong_SHIFT;
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2168 assert(carry <= PyLong_MASK);
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2169
33325 1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2170 /* Now f is added in twice in each column of the
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2171 * pyramid it appears. Same as adding f<<1 once.
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2172 */
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2173 f <<= 1;
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2174 while (pa < paend) {
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2175 carry += pz + pa++ * f;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2176 *pz++ = (digit)(carry & PyLong_MASK);
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2177 carry >>= PyLong_SHIFT;
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2178 assert(carry <= (PyLong_MASK << 1));
33325 1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2179 }
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2180 if (carry) {
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2181 carry += *pz;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2182 *pz++ = (digit)(carry & PyLong_MASK);
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2183 carry >>= PyLong_SHIFT;
33325 1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2184 }
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2185 if (carry)
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2186 *pz += (digit)(carry & PyLong_MASK);
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2187 assert((carry >> PyLong_SHIFT) == 0);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2188 }
33325 1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2189 }
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2190 else { /* a is not the same as b -- gradeschool long mult */
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2191 for (i = 0; i < size_a; ++i) {
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2192 twodigits carry = 0;
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2193 twodigits f = a->ob_digit[i];
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2194 digit *pz = z->ob_digit + i;
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2195 digit *pb = b->ob_digit;
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2196 digit *pbend = b->ob_digit + size_b;
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2197
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2198 SIGCHECK({
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2199 Py_DECREF(z);
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2200 return NULL;
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2201 })
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2202
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2203 while (pb < pbend) {
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2204 carry += pz + pb++ * f;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2205 *pz++ = (digit)(carry & PyLong_MASK);
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2206 carry >>= PyLong_SHIFT;
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2207 assert(carry <= PyLong_MASK);
33325 1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2208 }
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2209 if (carry)
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2210 *pz += (digit)(carry & PyLong_MASK);
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2211 assert((carry >> PyLong_SHIFT) == 0);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2212 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2213 }
24751 dbf6e563023b x_mul(): This failed to normalize its result. Tim Peters <tim.peters@gmail.com> parents: 24750 diff changeset	2214 return long_normalize(z);
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2215 }
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2216
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2217 /* A helper for Karatsuba multiplication (k_mul).
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2218 Takes a long "n" and an integer "size" representing the place to
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2219 split, and sets low and high such that abs(n) == (high << size) + low,
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2220 viewing the shift as being by digits. The sign bit is ignored, and
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2221 the return values are >= 0.
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2222 Returns 0 on success, -1 on failure.
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2223 */
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2224 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	2225 kmul_split(PyLongObject n, Py_ssize_t size, PyLongObject high, PyLongObject *low)
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2226 {
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2227 PyLongObject hi, lo;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	2228 Py_ssize_t size_lo, size_hi;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2229 const Py_ssize_t size_n = ABS(Py_SIZE(n));
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2230
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2231 size_lo = MIN(size_n, size);
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2232 size_hi = size_n - size_lo;
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2233
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2234 if ((hi = _PyLong_New(size_hi)) == NULL)
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2235 return -1;
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2236 if ((lo = _PyLong_New(size_lo)) == NULL) {
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2237 Py_DECREF(hi);
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2238 return -1;
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2239 }
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2240
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2241 memcpy(lo->ob_digit, n->ob_digit, size_lo * sizeof(digit));
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2242 memcpy(hi->ob_digit, n->ob_digit + size_lo, size_hi * sizeof(digit));
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2243
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2244 *high = long_normalize(hi);
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2245 *low = long_normalize(lo);
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2246 return 0;
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2247 }
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2248
24773 801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2249 static PyLongObject k_lopsided_mul(PyLongObject a, PyLongObject *b);
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2250
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2251 /* Karatsuba multiplication. Ignores the input signs, and returns the
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2252 * absolute value of the product (or NULL if error).
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2253 * See Knuth Vol. 2 Chapter 4.3.3 (Pp. 294-295).
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2254 */
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2255 static PyLongObject *
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2256 k_mul(PyLongObject a, PyLongObject b)
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2257 {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2258 Py_ssize_t asize = ABS(Py_SIZE(a));
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2259 Py_ssize_t bsize = ABS(Py_SIZE(b));
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2260 PyLongObject *ah = NULL;
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2261 PyLongObject *al = NULL;
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2262 PyLongObject *bh = NULL;
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2263 PyLongObject *bl = NULL;
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2264 PyLongObject *ret = NULL;
24755 c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2265 PyLongObject t1, t2, *t3;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	2266 Py_ssize_t shift; /* the number of digits we split off */
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	2267 Py_ssize_t i;
24755 c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2268
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2269 /* (ahX+al)(bhX+bl) = ahbhXX + (ahbl + albh)X + al*bl
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2270 * Let k = (ah+al)(bh+bl) = ahbl + albh + ahbh + al*bl
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2271 * Then the original product is
24746 49169d00ab18 k_mul(): Repaired typo in comment. Tim Peters <tim.peters@gmail.com> parents: 24745 diff changeset	2272 * ahbhXX + (k - ahbh - albl)X + al*bl
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2273 * By picking X to be a power of 2, "*X" is just shifting, and it's
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2274 * been reduced to 3 multiplies on numbers half the size.
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2275 */
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2276
24747 19e010f792a3 k_mul(): Repaired another typo in another comment. Tim Peters <tim.peters@gmail.com> parents: 24746 diff changeset	2277 /* We want to split based on the larger number; fiddle so that b
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2278 * is largest.
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2279 */
24755 c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2280 if (asize > bsize) {
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2281 t1 = a;
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2282 a = b;
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2283 b = t1;
24755 c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2284
c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2285 i = asize;
c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2286 asize = bsize;
c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2287 bsize = i;
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2288 }
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2289
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2290 /* Use gradeschool math when either number is too small. */
33325 1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2291 i = a == b ? KARATSUBA_SQUARE_CUTOFF : KARATSUBA_CUTOFF;
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2292 if (asize <= i) {
24755 c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2293 if (asize == 0)
24751 dbf6e563023b x_mul(): This failed to normalize its result. Tim Peters <tim.peters@gmail.com> parents: 24750 diff changeset	2294 return _PyLong_New(0);
dbf6e563023b x_mul(): This failed to normalize its result. Tim Peters <tim.peters@gmail.com> parents: 24750 diff changeset	2295 else
dbf6e563023b x_mul(): This failed to normalize its result. Tim Peters <tim.peters@gmail.com> parents: 24750 diff changeset	2296 return x_mul(a, b);
dbf6e563023b x_mul(): This failed to normalize its result. Tim Peters <tim.peters@gmail.com> parents: 24750 diff changeset	2297 }
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2298
24773 801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2299 /* If a is small compared to b, splitting on b gives a degenerate
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2300 * case with ah==0, and Karatsuba may be (even much) less efficient
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2301 * than "grade school" then. However, we can still win, by viewing
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2302 * b as a string of "big digits", each of width a->ob_size. That
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2303 * leads to a sequence of balanced calls to k_mul.
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2304 */
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2305 if (2 * asize <= bsize)
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2306 return k_lopsided_mul(a, b);
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2307
24791 dbf4cc560898 k_mul(): The fix for (ah+al)(bh+bl) spilling 1 bit beyond the allocated Tim Peters <tim.peters@gmail.com>* parents: 24777 diff changeset	2308 /* Split a & b into hi & lo pieces. */
24755 c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2309 shift = bsize >> 1;
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2310 if (kmul_split(a, shift, &ah, &al) < 0) goto fail;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2311 assert(Py_SIZE(ah) > 0); /* the split isn't degenerate */
24791 dbf4cc560898 k_mul(): The fix for (ah+al)(bh+bl) spilling 1 bit beyond the allocated Tim Peters <tim.peters@gmail.com>* parents: 24777 diff changeset	2312
33325 1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2313 if (a == b) {
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2314 bh = ah;
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2315 bl = al;
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2316 Py_INCREF(bh);
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2317 Py_INCREF(bl);
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2318 }
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2319 else if (kmul_split(b, shift, &bh, &bl) < 0) goto fail;
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2320
24759 3d2335094b88 k_mul() and long_mul(): I'm confident that the Karatsuba algorithm is Tim Peters <tim.peters@gmail.com> parents: 24755 diff changeset	2321 /* The plan:
3d2335094b88 k_mul() and long_mul(): I'm confident that the Karatsuba algorithm is Tim Peters <tim.peters@gmail.com> parents: 24755 diff changeset	2322 * 1. Allocate result space (asize + bsize digits: that's always
3d2335094b88 k_mul() and long_mul(): I'm confident that the Karatsuba algorithm is Tim Peters <tim.peters@gmail.com> parents: 24755 diff changeset	2323 * enough).
3d2335094b88 k_mul() and long_mul(): I'm confident that the Karatsuba algorithm is Tim Peters <tim.peters@gmail.com> parents: 24755 diff changeset	2324 * 2. Compute ahbh, and copy into result at 2shift.
3d2335094b88 k_mul() and long_mul(): I'm confident that the Karatsuba algorithm is Tim Peters <tim.peters@gmail.com> parents: 24755 diff changeset	2325 * 3. Compute al*bl, and copy into result at 0. Note that this
3d2335094b88 k_mul() and long_mul(): I'm confident that the Karatsuba algorithm is Tim Peters <tim.peters@gmail.com> parents: 24755 diff changeset	2326 * can't overlap with #2.
3d2335094b88 k_mul() and long_mul(): I'm confident that the Karatsuba algorithm is Tim Peters <tim.peters@gmail.com> parents: 24755 diff changeset	2327 * 4. Subtract al*bl from the result, starting at shift. This may
3d2335094b88 k_mul() and long_mul(): I'm confident that the Karatsuba algorithm is Tim Peters <tim.peters@gmail.com> parents: 24755 diff changeset	2328 * underflow (borrow out of the high digit), but we don't care:
3d2335094b88 k_mul() and long_mul(): I'm confident that the Karatsuba algorithm is Tim Peters <tim.peters@gmail.com> parents: 24755 diff changeset	2329 * we're effectively doing unsigned arithmetic mod
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2330 * PyLong_BASE*(sizea + sizeb), and so long as the final* result fits,
24759 3d2335094b88 k_mul() and long_mul(): I'm confident that the Karatsuba algorithm is Tim Peters <tim.peters@gmail.com> parents: 24755 diff changeset	2331 * borrows and carries out of the high digit can be ignored.
3d2335094b88 k_mul() and long_mul(): I'm confident that the Karatsuba algorithm is Tim Peters <tim.peters@gmail.com> parents: 24755 diff changeset	2332 * 5. Subtract ah*bh from the result, starting at shift.
3d2335094b88 k_mul() and long_mul(): I'm confident that the Karatsuba algorithm is Tim Peters <tim.peters@gmail.com> parents: 24755 diff changeset	2333 * 6. Compute (ah+al)*(bh+bl), and add it into the result starting
3d2335094b88 k_mul() and long_mul(): I'm confident that the Karatsuba algorithm is Tim Peters <tim.peters@gmail.com> parents: 24755 diff changeset	2334 * at shift.
3d2335094b88 k_mul() and long_mul(): I'm confident that the Karatsuba algorithm is Tim Peters <tim.peters@gmail.com> parents: 24755 diff changeset	2335 */
3d2335094b88 k_mul() and long_mul(): I'm confident that the Karatsuba algorithm is Tim Peters <tim.peters@gmail.com> parents: 24755 diff changeset	2336
3d2335094b88 k_mul() and long_mul(): I'm confident that the Karatsuba algorithm is Tim Peters <tim.peters@gmail.com> parents: 24755 diff changeset	2337 /* 1. Allocate result space. */
24764 f0bd5cd4b170 k_mul(): Heh -- I checked in two fixes for the last problem. Only keep Tim Peters <tim.peters@gmail.com> parents: 24763 diff changeset	2338 ret = _PyLong_New(asize + bsize);
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2339 if (ret == NULL) goto fail;
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2340 #ifdef Py_DEBUG
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2341 /* Fill with trash, to catch reference to uninitialized digits. */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2342 memset(ret->ob_digit, 0xDF, Py_SIZE(ret) * sizeof(digit));
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2343 #endif
24751 dbf6e563023b x_mul(): This failed to normalize its result. Tim Peters <tim.peters@gmail.com> parents: 24750 diff changeset	2344
24759 3d2335094b88 k_mul() and long_mul(): I'm confident that the Karatsuba algorithm is Tim Peters <tim.peters@gmail.com> parents: 24755 diff changeset	2345 /* 2. t1 <- ahbh, and copy into high digits of result. /
24755 c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2346 if ((t1 = k_mul(ah, bh)) == NULL) goto fail;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2347 assert(Py_SIZE(t1) >= 0);
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2348 assert(2*shift + Py_SIZE(t1) <= Py_SIZE(ret));
24755 c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2349 memcpy(ret->ob_digit + 2*shift, t1->ob_digit,
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2350 Py_SIZE(t1) * sizeof(digit));
24755 c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2351
c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2352 /* Zero-out the digits higher than the ahbh copy. /
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2353 i = Py_SIZE(ret) - 2*shift - Py_SIZE(t1);
24751 dbf6e563023b x_mul(): This failed to normalize its result. Tim Peters <tim.peters@gmail.com> parents: 24750 diff changeset	2354 if (i)
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2355 memset(ret->ob_digit + 2*shift + Py_SIZE(t1), 0,
24751 dbf6e563023b x_mul(): This failed to normalize its result. Tim Peters <tim.peters@gmail.com> parents: 24750 diff changeset	2356 i * sizeof(digit));
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2357
24759 3d2335094b88 k_mul() and long_mul(): I'm confident that the Karatsuba algorithm is Tim Peters <tim.peters@gmail.com> parents: 24755 diff changeset	2358 /* 3. t2 <- albl, and copy into the low digits. /
24755 c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2359 if ((t2 = k_mul(al, bl)) == NULL) {
c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2360 Py_DECREF(t1);
c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2361 goto fail;
c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2362 }
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2363 assert(Py_SIZE(t2) >= 0);
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2364 assert(Py_SIZE(t2) <= 2shift); / no overlap with high digits */
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2365 memcpy(ret->ob_digit, t2->ob_digit, Py_SIZE(t2) * sizeof(digit));
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2366
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2367 /* Zero out remaining digits. */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2368 i = 2shift - Py_SIZE(t2); / number of uninitialized digits */
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2369 if (i)
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2370 memset(ret->ob_digit + Py_SIZE(t2), 0, i * sizeof(digit));
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2371
24759 3d2335094b88 k_mul() and long_mul(): I'm confident that the Karatsuba algorithm is Tim Peters <tim.peters@gmail.com> parents: 24755 diff changeset	2372 /* 4 & 5. Subtract ahbh (t1) and albl (t2). We do al*bl first
3d2335094b88 k_mul() and long_mul(): I'm confident that the Karatsuba algorithm is Tim Peters <tim.peters@gmail.com> parents: 24755 diff changeset	2373 * because it's fresher in cache.
3d2335094b88 k_mul() and long_mul(): I'm confident that the Karatsuba algorithm is Tim Peters <tim.peters@gmail.com> parents: 24755 diff changeset	2374 */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2375 i = Py_SIZE(ret) - shift; /* # digits after shift */
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2376 (void)v_isub(ret->ob_digit + shift, i, t2->ob_digit, Py_SIZE(t2));
24755 c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2377 Py_DECREF(t2);
c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2378
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2379 (void)v_isub(ret->ob_digit + shift, i, t1->ob_digit, Py_SIZE(t1));
24755 c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2380 Py_DECREF(t1);
c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2381
24759 3d2335094b88 k_mul() and long_mul(): I'm confident that the Karatsuba algorithm is Tim Peters <tim.peters@gmail.com> parents: 24755 diff changeset	2382 /* 6. t3 <- (ah+al)(bh+bl), and add into result. */
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2383 if ((t1 = x_add(ah, al)) == NULL) goto fail;
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2384 Py_DECREF(ah);
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2385 Py_DECREF(al);
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2386 ah = al = NULL;
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2387
33325 1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2388 if (a == b) {
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2389 t2 = t1;
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2390 Py_INCREF(t2);
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2391 }
1768aff92864 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 29641 diff changeset	2392 else if ((t2 = x_add(bh, bl)) == NULL) {
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2393 Py_DECREF(t1);
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2394 goto fail;
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2395 }
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2396 Py_DECREF(bh);
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2397 Py_DECREF(bl);
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2398 bh = bl = NULL;
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2399
24755 c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2400 t3 = k_mul(t1, t2);
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2401 Py_DECREF(t1);
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2402 Py_DECREF(t2);
24755 c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2403 if (t3 == NULL) goto fail;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2404 assert(Py_SIZE(t3) >= 0);
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2405
24791 dbf4cc560898 k_mul(): The fix for (ah+al)(bh+bl) spilling 1 bit beyond the allocated Tim Peters <tim.peters@gmail.com>* parents: 24777 diff changeset	2406 /* Add t3. It's not obvious why we can't run out of room here.
dbf4cc560898 k_mul(): The fix for (ah+al)(bh+bl) spilling 1 bit beyond the allocated Tim Peters <tim.peters@gmail.com>* parents: 24777 diff changeset	2407 * See the (*) comment after this function.
24763 5ed7c977d2a9 k_mul(): White-box testing turned up that (ah+al)(bh+bl) can, in rare Tim Peters <tim.peters@gmail.com>* parents: 24760 diff changeset	2408 */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2409 (void)v_iadd(ret->ob_digit + shift, i, t3->ob_digit, Py_SIZE(t3));
24755 c88d0848c5c9 k_mul: Rearranged computation for better cache use. Ignored overflow Tim Peters <tim.peters@gmail.com> parents: 24751 diff changeset	2410 Py_DECREF(t3);
24750 c248bee52dc6 Introduced helper functions v_iadd and v_isub, for in-place digit-vector Tim Peters <tim.peters@gmail.com> parents: 24747 diff changeset	2411
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2412 return long_normalize(ret);
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2413
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2414 fail:
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2415 Py_XDECREF(ret);
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2416 Py_XDECREF(ah);
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2417 Py_XDECREF(al);
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2418 Py_XDECREF(bh);
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2419 Py_XDECREF(bl);
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2420 return NULL;
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2421 }
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2422
24791 dbf4cc560898 k_mul(): The fix for (ah+al)(bh+bl) spilling 1 bit beyond the allocated Tim Peters <tim.peters@gmail.com>* parents: 24777 diff changeset	2423 /* (*) Why adding t3 can't "run out of room" above.
dbf4cc560898 k_mul(): The fix for (ah+al)(bh+bl) spilling 1 bit beyond the allocated Tim Peters <tim.peters@gmail.com>* parents: 24777 diff changeset	2424
24846 10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2425 Let f(x) mean the floor of x and c(x) mean the ceiling of x. Some facts
10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2426 to start with:
24791 dbf4cc560898 k_mul(): The fix for (ah+al)(bh+bl) spilling 1 bit beyond the allocated Tim Peters <tim.peters@gmail.com>* parents: 24777 diff changeset	2427
24846 10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2428 1. For any integer i, i = c(i/2) + f(i/2). In particular,
10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2429 bsize = c(bsize/2) + f(bsize/2).
10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2430 2. shift = f(bsize/2)
10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2431 3. asize <= bsize
10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2432 4. Since we call k_lopsided_mul if asize2 <= bsize, asize2 > bsize in this
10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2433 routine, so asize > bsize/2 >= f(bsize/2) in this routine.
24791 dbf4cc560898 k_mul(): The fix for (ah+al)(bh+bl) spilling 1 bit beyond the allocated Tim Peters <tim.peters@gmail.com>* parents: 24777 diff changeset	2434
24846 10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2435 We allocated asize + bsize result digits, and add t3 into them at an offset
10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2436 of shift. This leaves asize+bsize-shift allocated digit positions for t3
10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2437 to fit into, = (by #1 and #2) asize + f(bsize/2) + c(bsize/2) - f(bsize/2) =
10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2438 asize + c(bsize/2) available digit positions.
24791 dbf4cc560898 k_mul(): The fix for (ah+al)(bh+bl) spilling 1 bit beyond the allocated Tim Peters <tim.peters@gmail.com>* parents: 24777 diff changeset	2439
24846 10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2440 bh has c(bsize/2) digits, and bl at most f(size/2) digits. So bh+hl has
10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2441 at most c(bsize/2) digits + 1 bit.
24791 dbf4cc560898 k_mul(): The fix for (ah+al)(bh+bl) spilling 1 bit beyond the allocated Tim Peters <tim.peters@gmail.com>* parents: 24777 diff changeset	2442
24846 10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2443 If asize == bsize, ah has c(bsize/2) digits, else ah has at most f(bsize/2)
10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2444 digits, and al has at most f(bsize/2) digits in any case. So ah+al has at
10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2445 most (asize == bsize ? c(bsize/2) : f(bsize/2)) digits + 1 bit.
24791 dbf4cc560898 k_mul(): The fix for (ah+al)(bh+bl) spilling 1 bit beyond the allocated Tim Peters <tim.peters@gmail.com>* parents: 24777 diff changeset	2446
24846 10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2447 The product (ah+al)*(bh+bl) therefore has at most
10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2448
10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2449 c(bsize/2) + (asize == bsize ? c(bsize/2) : f(bsize/2)) digits + 2 bits
24791 dbf4cc560898 k_mul(): The fix for (ah+al)(bh+bl) spilling 1 bit beyond the allocated Tim Peters <tim.peters@gmail.com>* parents: 24777 diff changeset	2450
24846 10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2451 and we have asize + c(bsize/2) available digit positions. We need to show
10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2452 this is always enough. An instance of c(bsize/2) cancels out in both, so
10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2453 the question reduces to whether asize digits is enough to hold
10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2454 (asize == bsize ? c(bsize/2) : f(bsize/2)) digits + 2 bits. If asize < bsize,
10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2455 then we're asking whether asize digits >= f(bsize/2) digits + 2 bits. By #4,
10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2456 asize is at least f(bsize/2)+1 digits, so this in turn reduces to whether 1
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2457 digit is enough to hold 2 bits. This is so since PyLong_SHIFT=15 >= 2. If
24846 10a4ec45549d k_mul() comments: In honor of Dijkstra, made the proof that "t3 fits" Tim Peters <tim.peters@gmail.com> parents: 24845 diff changeset	2458 asize == bsize, then we're asking whether bsize digits is enough to hold
24847 873f12f68e3b Illustrating by example one good reason not to trust a proof <wink>. Tim Peters <tim.peters@gmail.com> parents: 24846 diff changeset	2459 c(bsize/2) digits + 2 bits, or equivalently (by #1) whether f(bsize/2) digits
873f12f68e3b Illustrating by example one good reason not to trust a proof <wink>. Tim Peters <tim.peters@gmail.com> parents: 24846 diff changeset	2460 is enough to hold 2 bits. This is so if bsize >= 2, which holds because
873f12f68e3b Illustrating by example one good reason not to trust a proof <wink>. Tim Peters <tim.peters@gmail.com> parents: 24846 diff changeset	2461 bsize >= KARATSUBA_CUTOFF >= 2.
24821 ae9c9f90b4b0 k_mul() comments: Explained why there's always enough room to subtract Tim Peters <tim.peters@gmail.com> parents: 24792 diff changeset	2462
24824 7c91d303c563 k_mul() comments: Simplified the simplified explanation of why ahbh and Tim Peters <tim.peters@gmail.com>* parents: 24821 diff changeset	2463 Note that since there's always enough room for (ah+al)*(bh+bl), and that's
7c91d303c563 k_mul() comments: Simplified the simplified explanation of why ahbh and Tim Peters <tim.peters@gmail.com>* parents: 24821 diff changeset	2464 clearly >= each of ahbh and albl, there's always enough room to subtract
7c91d303c563 k_mul() comments: Simplified the simplified explanation of why ahbh and Tim Peters <tim.peters@gmail.com>* parents: 24821 diff changeset	2465 ahbh and albl too.
24791 dbf4cc560898 k_mul(): The fix for (ah+al)(bh+bl) spilling 1 bit beyond the allocated Tim Peters <tim.peters@gmail.com>* parents: 24777 diff changeset	2466 */
dbf4cc560898 k_mul(): The fix for (ah+al)(bh+bl) spilling 1 bit beyond the allocated Tim Peters <tim.peters@gmail.com>* parents: 24777 diff changeset	2467
24773 801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2468 /* b has at least twice the digits of a, and a is big enough that Karatsuba
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2469 * would pay off if the inputs had balanced sizes. View b as a sequence
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2470 * of slices, each with a->ob_size digits, and multiply the slices by a,
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2471 * one at a time. This gives k_mul balanced inputs to work with, and is
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2472 * also cache-friendly (we compute one double-width slice of the result
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2473 * at a time, then move on, never bactracking except for the helpful
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2474 * single-width slice overlap between successive partial sums).
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2475 */
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2476 static PyLongObject *
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2477 k_lopsided_mul(PyLongObject a, PyLongObject b)
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2478 {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2479 const Py_ssize_t asize = ABS(Py_SIZE(a));
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2480 Py_ssize_t bsize = ABS(Py_SIZE(b));
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	2481 Py_ssize_t nbdone; /* # of b digits already multiplied */
24773 801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2482 PyLongObject *ret;
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2483 PyLongObject *bslice = NULL;
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2484
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2485 assert(asize > KARATSUBA_CUTOFF);
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2486 assert(2 * asize <= bsize);
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2487
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2488 /* Allocate result space, and zero it out. */
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2489 ret = _PyLong_New(asize + bsize);
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2490 if (ret == NULL)
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2491 return NULL;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2492 memset(ret->ob_digit, 0, Py_SIZE(ret) * sizeof(digit));
24773 801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2493
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2494 /* Successive slices of b are copied into bslice. */
24775 6c6df69236b1 k_lopsided_mul(): This allocated more space for bslice than necessary. Tim Peters <tim.peters@gmail.com> parents: 24773 diff changeset	2495 bslice = _PyLong_New(asize);
24773 801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2496 if (bslice == NULL)
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2497 goto fail;
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2498
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2499 nbdone = 0;
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2500 while (bsize > 0) {
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2501 PyLongObject *product;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	2502 const Py_ssize_t nbtouse = MIN(bsize, asize);
24773 801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2503
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2504 /* Multiply the next slice of b by a. */
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2505 memcpy(bslice->ob_digit, b->ob_digit + nbdone,
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2506 nbtouse * sizeof(digit));
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2507 Py_SIZE(bslice) = nbtouse;
24773 801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2508 product = k_mul(a, bslice);
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2509 if (product == NULL)
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2510 goto fail;
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2511
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2512 /* Add into result. */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2513 (void)v_iadd(ret->ob_digit + nbdone, Py_SIZE(ret) - nbdone,
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2514 product->ob_digit, Py_SIZE(product));
24773 801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2515 Py_DECREF(product);
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2516
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2517 bsize -= nbtouse;
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2518 nbdone += nbtouse;
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2519 }
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2520
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2521 Py_DECREF(bslice);
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2522 return long_normalize(ret);
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2523
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2524 fail:
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2525 Py_DECREF(ret);
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2526 Py_XDECREF(bslice);
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2527 return NULL;
801a44ab2aae Added new function k_lopsided_mul(), which is much more efficient than Tim Peters <tim.peters@gmail.com> parents: 24765 diff changeset	2528 }
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2529
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2530 static PyObject *
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2531 long_mul(PyLongObject v, PyLongObject w)
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2532 {
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2533 PyLongObject a, b, *z;
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2534
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2535 if (!convert_binop((PyObject )v, (PyObject )w, &a, &b)) {
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2536 Py_INCREF(Py_NotImplemented);
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2537 return Py_NotImplemented;
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2538 }
ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2539
24759 3d2335094b88 k_mul() and long_mul(): I'm confident that the Karatsuba algorithm is Tim Peters <tim.peters@gmail.com> parents: 24755 diff changeset	2540 z = k_mul(a, b);
24845 6939d72182e6 long_mul(): Simplified exit code. In particular, k_mul() returns a Tim Peters <tim.peters@gmail.com> parents: 24824 diff changeset	2541 /* Negate if exactly one of the inputs is negative. */
6939d72182e6 long_mul(): Simplified exit code. In particular, k_mul() returns a Tim Peters <tim.peters@gmail.com> parents: 24824 diff changeset	2542 if (((a->ob_size ^ b->ob_size) < 0) && z)
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	2543 z->ob_size = -(z->ob_size);
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2544 Py_DECREF(a);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2545 Py_DECREF(b);
24845 6939d72182e6 long_mul(): Simplified exit code. In particular, k_mul() returns a Tim Peters <tim.peters@gmail.com> parents: 24824 diff changeset	2546 return (PyObject *)z;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2547 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2548
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2549 /* The / and % operators are now defined in terms of divmod().
405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2550 The expression a mod b has the value a - b*floor(a/b).
405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2551 The long_divrem function gives the remainder after division of
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2552 \|a\| by \|b\|, with the sign of a. This is also expressed
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2553 as a - b*trunc(a/b), if trunc truncates towards zero.
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2554 Some examples:
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2555 a b a rem b a mod b
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2556 13 10 3 3
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2557 -13 10 -3 7
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2558 13 -10 3 -7
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2559 -13 -10 -3 -3
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2560 So, to get from rem to mod, we have to add b if a and b
242 316a0d9c0096 Many small changes Guido van Rossum <guido@python.org> parents: 230 diff changeset	2561 have different signs. We then subtract one from the 'div'
316a0d9c0096 Many small changes Guido van Rossum <guido@python.org> parents: 230 diff changeset	2562 part of the outcome to keep the invariant intact. */
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2563
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2564 /* Compute
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2565 * pdiv, pmod = divmod(v, w)
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2566 * NULL can be passed for pdiv or pmod, in which case that part of
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2567 * the result is simply thrown away. The caller owns a reference to
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2568 * each of these it requests (does not pass NULL for).
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2569 */
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2570 static int
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2571 l_divmod(PyLongObject v, PyLongObject w,
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	2572 PyLongObject pdiv, PyLongObject pmod)
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2573 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2574 PyLongObject div, mod;
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2575
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2576 if (long_divrem(v, w, &div, &mod) < 0)
405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2577 return -1;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2578 if ((Py_SIZE(mod) < 0 && Py_SIZE(w) > 0) \|\|
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2579 (Py_SIZE(mod) > 0 && Py_SIZE(w) < 0)) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2580 PyLongObject *temp;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2581 PyLongObject *one;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2582 temp = (PyLongObject *) long_add(mod, w);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2583 Py_DECREF(mod);
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2584 mod = temp;
405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2585 if (mod == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2586 Py_DECREF(div);
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2587 return -1;
405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2588 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2589 one = (PyLongObject *) PyLong_FromLong(1L);
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2590 if (one == NULL \|\|
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2591 (temp = (PyLongObject *) long_sub(div, one)) == NULL) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2592 Py_DECREF(mod);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2593 Py_DECREF(div);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2594 Py_XDECREF(one);
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2595 return -1;
405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2596 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2597 Py_DECREF(one);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2598 Py_DECREF(div);
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2599 div = temp;
405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2600 }
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2601 if (pdiv != NULL)
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2602 *pdiv = div;
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2603 else
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2604 Py_DECREF(div);
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2605
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2606 if (pmod != NULL)
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2607 *pmod = mod;
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2608 else
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2609 Py_DECREF(mod);
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2610
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2611 return 0;
405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2612 }
405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2613
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2614 static PyObject *
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2615 long_div(PyObject v, PyObject w)
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2616 {
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2617 PyLongObject a, b, *div;
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2618
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2619 CONVERT_BINOP(v, w, &a, &b);
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2620 if (l_divmod(a, b, &div, NULL) < 0)
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2621 div = NULL;
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2622 Py_DECREF(a);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2623 Py_DECREF(b);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2624 return (PyObject *)div;
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2625 }
405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2626
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2627 static PyObject *
19633 c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19610 diff changeset	2628 long_classic_div(PyObject v, PyObject w)
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19610 diff changeset	2629 {
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2630 PyLongObject a, b, *div;
19633 c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19610 diff changeset	2631
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19610 diff changeset	2632 CONVERT_BINOP(v, w, &a, &b);
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19610 diff changeset	2633 if (Py_DivisionWarningFlag &&
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19610 diff changeset	2634 PyErr_Warn(PyExc_DeprecationWarning, "classic long division") < 0)
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19610 diff changeset	2635 div = NULL;
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2636 else if (l_divmod(a, b, &div, NULL) < 0)
19633 c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19610 diff changeset	2637 div = NULL;
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19610 diff changeset	2638 Py_DECREF(a);
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19610 diff changeset	2639 Py_DECREF(b);
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19610 diff changeset	2640 return (PyObject *)div;
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19610 diff changeset	2641 }
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19610 diff changeset	2642
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19610 diff changeset	2643 static PyObject *
19675 685dcae5c123 Move long_true_divide next to the other division routines (for clarity!). Tim Peters <tim.peters@gmail.com> parents: 19674 diff changeset	2644 long_true_divide(PyObject v, PyObject w)
685dcae5c123 Move long_true_divide next to the other division routines (for clarity!). Tim Peters <tim.peters@gmail.com> parents: 19674 diff changeset	2645 {
19677 91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2646 PyLongObject a, b;
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2647 double ad, bd;
36430 81942fc9a20d As discussed on python-dev, silence three gcc-4.0.x warnings, using assert() Thomas Wouters <thomas@python.org> parents: 35999 diff changeset	2648 int failed, aexp = -1, bexp = -1;
19677 91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2649
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2650 CONVERT_BINOP(v, w, &a, &b);
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2651 ad = _PyLong_AsScaledDouble((PyObject *)a, &aexp);
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2652 bd = _PyLong_AsScaledDouble((PyObject *)b, &bexp);
20868 2d9e41a72a68 long_true_divide(): decref its converted arguments. test_long_future.py Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	2653 failed = (ad == -1.0 \|\| bd == -1.0) && PyErr_Occurred();
2d9e41a72a68 long_true_divide(): decref its converted arguments. test_long_future.py Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	2654 Py_DECREF(a);
2d9e41a72a68 long_true_divide(): decref its converted arguments. test_long_future.py Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	2655 Py_DECREF(b);
2d9e41a72a68 long_true_divide(): decref its converted arguments. test_long_future.py Tim Peters <tim.peters@gmail.com> parents: 20277 diff changeset	2656 if (failed)
19677 91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2657 return NULL;
36430 81942fc9a20d As discussed on python-dev, silence three gcc-4.0.x warnings, using assert() Thomas Wouters <thomas@python.org> parents: 35999 diff changeset	2658 /* 'aexp' and 'bexp' were initialized to -1 to silence gcc-4.0.x,
81942fc9a20d As discussed on python-dev, silence three gcc-4.0.x warnings, using assert() Thomas Wouters <thomas@python.org> parents: 35999 diff changeset	2659 but should really be set correctly after sucessful calls to
81942fc9a20d As discussed on python-dev, silence three gcc-4.0.x warnings, using assert() Thomas Wouters <thomas@python.org> parents: 35999 diff changeset	2660 _PyLong_AsScaledDouble() */
81942fc9a20d As discussed on python-dev, silence three gcc-4.0.x warnings, using assert() Thomas Wouters <thomas@python.org> parents: 35999 diff changeset	2661 assert(aexp >= 0 && bexp >= 0);
19677 91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2662
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2663 if (bd == 0.0) {
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2664 PyErr_SetString(PyExc_ZeroDivisionError,
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2665 "long division or modulo by zero");
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2666 return NULL;
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2667 }
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2668
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2669 /* True value is very close to ad/bd * 2*(PyLong_SHIFT(aexp-bexp)) */
19677 91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2670 ad /= bd; /* overflow/underflow impossible here */
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2671 aexp -= bexp;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2672 if (aexp > INT_MAX / PyLong_SHIFT)
19677 91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2673 goto overflow;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2674 else if (aexp < -(INT_MAX / PyLong_SHIFT))
19787 f814ea6bb667 long_true_divide: reliably force underflow to 0 when the denominator Tim Peters <tim.peters@gmail.com> parents: 19719 diff changeset	2675 return PyFloat_FromDouble(0.0); /* underflow to 0 */
19677 91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2676 errno = 0;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2677 ad = ldexp(ad, aexp * PyLong_SHIFT);
19717 01de0a703069 Try to recover from that glibc's ldexp apparently doesn't set errno on Tim Peters <tim.peters@gmail.com> parents: 19677 diff changeset	2678 if (Py_OVERFLOWED(ad)) /* ignore underflow to 0.0 */
19677 91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2679 goto overflow;
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2680 return PyFloat_FromDouble(ad);
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2681
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2682 overflow:
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2683 PyErr_SetString(PyExc_OverflowError,
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2684 "long/long too large for a float");
91533675d6cb Change long/long true division to return as many good bits as it can; Tim Peters <tim.peters@gmail.com> parents: 19675 diff changeset	2685 return NULL;
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2686
19675 685dcae5c123 Move long_true_divide next to the other division routines (for clarity!). Tim Peters <tim.peters@gmail.com> parents: 19674 diff changeset	2687 }
685dcae5c123 Move long_true_divide next to the other division routines (for clarity!). Tim Peters <tim.peters@gmail.com> parents: 19674 diff changeset	2688
685dcae5c123 Move long_true_divide next to the other division routines (for clarity!). Tim Peters <tim.peters@gmail.com> parents: 19674 diff changeset	2689 static PyObject *
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2690 long_mod(PyObject v, PyObject w)
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2691 {
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2692 PyLongObject a, b, *mod;
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2693
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2694 CONVERT_BINOP(v, w, &a, &b);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2695
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2696 if (l_divmod(a, b, NULL, &mod) < 0)
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2697 mod = NULL;
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2698 Py_DECREF(a);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2699 Py_DECREF(b);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2700 return (PyObject *)mod;
613 405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2701 }
405a2fec7454 Add prototypes. Guido van Rossum <guido@python.org> parents: 590 diff changeset	2702
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2703 static PyObject *
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2704 long_divmod(PyObject v, PyObject w)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2705 {
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2706 PyLongObject a, b, div, mod;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2707 PyObject *z;
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2708
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2709 CONVERT_BINOP(v, w, &a, &b);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2710
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2711 if (l_divmod(a, b, &div, &mod) < 0) {
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2712 Py_DECREF(a);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2713 Py_DECREF(b);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2714 return NULL;
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2715 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2716 z = PyTuple_New(2);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2717 if (z != NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2718 PyTuple_SetItem(z, 0, (PyObject *) div);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2719 PyTuple_SetItem(z, 1, (PyObject *) mod);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2720 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2721 else {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2722 Py_DECREF(div);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2723 Py_DECREF(mod);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2724 }
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2725 Py_DECREF(a);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2726 Py_DECREF(b);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2727 return z;
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2728 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2729
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2730 /* pow(v, w, x) */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2731 static PyObject *
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2732 long_pow(PyObject v, PyObject w, PyObject *x)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2733 {
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2734 PyLongObject a, b, c; / a,b,c = v,w,x */
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2735 int negativeOutput = 0; /* if x<0 return negative output */
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2736
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2737 PyLongObject z = NULL; / accumulated result */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	2738 Py_ssize_t i, j, k; /* counters */
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2739 PyLongObject *temp = NULL;
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2740
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2741 /* 5-ary values. If the exponent is large enough, table is
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2742 * precomputed so that table[i] == a**i % c for i in range(32).
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2743 */
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2744 PyLongObject *table[32] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2745 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2746
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2747 /* a, b, c = v, w, x */
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2748 CONVERT_BINOP(v, w, &a, &b);
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2749 if (PyLong_Check(x)) {
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2750 c = (PyLongObject *)x;
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2751 Py_INCREF(x);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2752 }
35254 d61efcd87c8e SF bug #1238681: freed pointer is used in longobject.c:long_pow(). Tim Peters <tim.peters@gmail.com> parents: 35177 diff changeset	2753 else if (PyInt_Check(x)) {
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2754 c = (PyLongObject *)PyLong_FromLong(PyInt_AS_LONG(x));
35254 d61efcd87c8e SF bug #1238681: freed pointer is used in longobject.c:long_pow(). Tim Peters <tim.peters@gmail.com> parents: 35177 diff changeset	2755 if (c == NULL)
d61efcd87c8e SF bug #1238681: freed pointer is used in longobject.c:long_pow(). Tim Peters <tim.peters@gmail.com> parents: 35177 diff changeset	2756 goto Error;
d61efcd87c8e SF bug #1238681: freed pointer is used in longobject.c:long_pow(). Tim Peters <tim.peters@gmail.com> parents: 35177 diff changeset	2757 }
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2758 else if (x == Py_None)
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2759 c = NULL;
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2760 else {
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2761 Py_DECREF(a);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2762 Py_DECREF(b);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2763 Py_INCREF(Py_NotImplemented);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2764 return Py_NotImplemented;
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2765 }
19719 cdfdd5359411 Make the error msgs in our pow() implementations consistent. Tim Peters <tim.peters@gmail.com> parents: 19717 diff changeset	2766
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2767 if (Py_SIZE(b) < 0) { /* if exponent is negative */
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2768 if (c) {
19719 cdfdd5359411 Make the error msgs in our pow() implementations consistent. Tim Peters <tim.peters@gmail.com> parents: 19717 diff changeset	2769 PyErr_SetString(PyExc_TypeError, "pow() 2nd argument "
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2770 "cannot be negative when 3rd argument specified");
33328 fee592fb5643 long_pow(): Fix more instances of leaks in error cases. Tim Peters <tim.peters@gmail.com> parents: 33327 diff changeset	2771 goto Error;
19666 cf65ebf87560 New restriction on pow(x, y, z): If z is not None, x and y must be of Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	2772 }
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2773 else {
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2774 /* else return a float. This works because we know
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2775 that this calls float_pow() which converts its
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2776 arguments to double. */
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2777 Py_DECREF(a);
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2778 Py_DECREF(b);
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2779 return PyFloat_Type.tp_as_number->nb_power(v, w, x);
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2780 }
250 b9986009d7dc Fix off-by-one error in long_repr. Guido van Rossum <guido@python.org> parents: 242 diff changeset	2781 }
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2782
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2783 if (c) {
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2784 /* if modulus == 0:
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2785 raise ValueError() */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2786 if (Py_SIZE(c) == 0) {
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2787 PyErr_SetString(PyExc_ValueError,
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2788 "pow() 3rd argument cannot be 0");
33328 fee592fb5643 long_pow(): Fix more instances of leaks in error cases. Tim Peters <tim.peters@gmail.com> parents: 33327 diff changeset	2789 goto Error;
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2790 }
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2791
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2792 /* if modulus < 0:
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2793 negativeOutput = True
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2794 modulus = -modulus */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2795 if (Py_SIZE(c) < 0) {
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2796 negativeOutput = 1;
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2797 temp = (PyLongObject *)_PyLong_Copy(c);
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2798 if (temp == NULL)
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2799 goto Error;
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2800 Py_DECREF(c);
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2801 c = temp;
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2802 temp = NULL;
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2803 c->ob_size = - c->ob_size;
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2804 }
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2805
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2806 /* if modulus == 1:
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2807 return 0 */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2808 if ((Py_SIZE(c) == 1) && (c->ob_digit[0] == 1)) {
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2809 z = (PyLongObject *)PyLong_FromLong(0L);
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2810 goto Done;
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2811 }
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2812
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2813 /* if base < 0:
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2814 base = base % modulus
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2815 Having the base positive just makes things easier. */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2816 if (Py_SIZE(a) < 0) {
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2817 if (l_divmod(a, c, NULL, &temp) < 0)
33328 fee592fb5643 long_pow(): Fix more instances of leaks in error cases. Tim Peters <tim.peters@gmail.com> parents: 33327 diff changeset	2818 goto Error;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2819 Py_DECREF(a);
250 b9986009d7dc Fix off-by-one error in long_repr. Guido van Rossum <guido@python.org> parents: 242 diff changeset	2820 a = temp;
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2821 temp = NULL;
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2822 }
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2823 }
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2824
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2825 /* At this point a, b, and c are guaranteed non-negative UNLESS
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2826 c is NULL, in which case a may be negative. */
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2827
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2828 z = (PyLongObject *)PyLong_FromLong(1L);
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2829 if (z == NULL)
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2830 goto Error;
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2831
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2832 /* Perform a modular reduction, X = X % c, but leave X alone if c
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2833 * is NULL.
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2834 */
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2835 #define REDUCE(X) \
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2836 if (c != NULL) { \
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2837 if (l_divmod(X, c, NULL, &temp) < 0) \
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2838 goto Error; \
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2839 Py_XDECREF(X); \
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2840 X = temp; \
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2841 temp = NULL; \
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2842 }
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2843
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2844 /* Multiply two values, then reduce the result:
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2845 result = XY % c. If c is NULL, skip the mod. /
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2846 #define MULT(X, Y, result) \
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2847 { \
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2848 temp = (PyLongObject *)long_mul(X, Y); \
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2849 if (temp == NULL) \
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2850 goto Error; \
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2851 Py_XDECREF(result); \
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2852 result = temp; \
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2853 temp = NULL; \
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2854 REDUCE(result) \
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2855 }
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2856
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2857 if (Py_SIZE(b) <= FIVEARY_CUTOFF) {
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2858 /* Left-to-right binary exponentiation (HAC Algorithm 14.79) */
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2859 /* http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf */
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2860 for (i = Py_SIZE(b) - 1; i >= 0; --i) {
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2861 digit bi = b->ob_digit[i];
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2862
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2863 for (j = 1 << (PyLong_SHIFT-1); j != 0; j >>= 1) {
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2864 MULT(z, z, z)
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2865 if (bi & j)
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2866 MULT(z, a, z)
250 b9986009d7dc Fix off-by-one error in long_repr. Guido van Rossum <guido@python.org> parents: 242 diff changeset	2867 }
b9986009d7dc Fix off-by-one error in long_repr. Guido van Rossum <guido@python.org> parents: 242 diff changeset	2868 }
b9986009d7dc Fix off-by-one error in long_repr. Guido van Rossum <guido@python.org> parents: 242 diff changeset	2869 }
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2870 else {
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2871 /* Left-to-right 5-ary exponentiation (HAC Algorithm 14.82) */
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2872 Py_INCREF(z); /* still holds 1L */
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2873 table[0] = z;
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2874 for (i = 1; i < 32; ++i)
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2875 MULT(table[i-1], a, table[i])
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2876
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2877 for (i = Py_SIZE(b) - 1; i >= 0; --i) {
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2878 const digit bi = b->ob_digit[i];
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2879
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2880 for (j = PyLong_SHIFT - 5; j >= 0; j -= 5) {
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2881 const int index = (bi >> j) & 0x1f;
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2882 for (k = 0; k < 5; ++k)
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2883 MULT(z, z, z)
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2884 if (index)
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2885 MULT(z, table[index], z)
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2886 }
11380 3e3c71f4d2de Fix PR#66. Solution: add error checking around l_divmod() calls in Guido van Rossum <guido@python.org> parents: 11331 diff changeset	2887 }
1837 87364d9e3444 New patches by Andrew to fix various problems Guido van Rossum <guido@python.org> parents: 1391 diff changeset	2888 }
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2889
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2890 if (negativeOutput && (Py_SIZE(z) != 0)) {
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2891 temp = (PyLongObject *)long_sub(z, c);
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2892 if (temp == NULL)
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2893 goto Error;
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2894 Py_DECREF(z);
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2895 z = temp;
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2896 temp = NULL;
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2897 }
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2898 goto Done;
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2899
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2900 Error:
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2901 if (z != NULL) {
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2902 Py_DECREF(z);
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2903 z = NULL;
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2904 }
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2905 /* fall through */
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2906 Done:
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2907 if (Py_SIZE(b) > FIVEARY_CUTOFF) {
33327 5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2908 for (i = 0; i < 32; ++i)
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2909 Py_XDECREF(table[i]);
5452d4ecddd0 SF patch 936813: fast modular exponentiation Tim Peters <tim.peters@gmail.com> parents: 33325 diff changeset	2910 }
35254 d61efcd87c8e SF bug #1238681: freed pointer is used in longobject.c:long_pow(). Tim Peters <tim.peters@gmail.com> parents: 35177 diff changeset	2911 Py_DECREF(a);
d61efcd87c8e SF bug #1238681: freed pointer is used in longobject.c:long_pow(). Tim Peters <tim.peters@gmail.com> parents: 35177 diff changeset	2912 Py_DECREF(b);
d61efcd87c8e SF bug #1238681: freed pointer is used in longobject.c:long_pow(). Tim Peters <tim.peters@gmail.com> parents: 35177 diff changeset	2913 Py_XDECREF(c);
d61efcd87c8e SF bug #1238681: freed pointer is used in longobject.c:long_pow(). Tim Peters <tim.peters@gmail.com> parents: 35177 diff changeset	2914 Py_XDECREF(temp);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2915 return (PyObject *)z;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2916 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2917
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2918 static PyObject *
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	2919 long_invert(PyLongObject *v)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2920 {
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	2921 /* Implement ~x as -(x+1) */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2922 PyLongObject *x;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2923 PyLongObject *w;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2924 w = (PyLongObject *)PyLong_FromLong(1L);
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	2925 if (w == NULL)
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	2926 return NULL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2927 x = (PyLongObject *) long_add(v, w);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2928 Py_DECREF(w);
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	2929 if (x == NULL)
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	2930 return NULL;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2931 Py_SIZE(x) = -(Py_SIZE(x));
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2932 return (PyObject *)x;
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2933 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2934
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2935 static PyObject *
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	2936 long_neg(PyLongObject *v)
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	2937 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2938 PyLongObject *z;
19880 d1cd4cd72271 More bug 460020. Disable a number of long optimizations for long subclasses. Tim Peters <tim.peters@gmail.com> parents: 19837 diff changeset	2939 if (v->ob_size == 0 && PyLong_CheckExact(v)) {
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	2940 /* -0 == 0 */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2941 Py_INCREF(v);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2942 return (PyObject *) v;
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	2943 }
19880 d1cd4cd72271 More bug 460020. Disable a number of long optimizations for long subclasses. Tim Peters <tim.peters@gmail.com> parents: 19837 diff changeset	2944 z = (PyLongObject *)_PyLong_Copy(v);
d1cd4cd72271 More bug 460020. Disable a number of long optimizations for long subclasses. Tim Peters <tim.peters@gmail.com> parents: 19837 diff changeset	2945 if (z != NULL)
d1cd4cd72271 More bug 460020. Disable a number of long optimizations for long subclasses. Tim Peters <tim.peters@gmail.com> parents: 19837 diff changeset	2946 z->ob_size = -(v->ob_size);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2947 return (PyObject *)z;
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	2948 }
9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	2949
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2950 static PyObject *
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	2951 long_abs(PyLongObject *v)
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2952 {
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2953 if (v->ob_size < 0)
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	2954 return long_neg(v);
19880 d1cd4cd72271 More bug 460020. Disable a number of long optimizations for long subclasses. Tim Peters <tim.peters@gmail.com> parents: 19837 diff changeset	2955 else
44432 4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	2956 return long_long((PyObject *)v);
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2957 }
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2958
242 316a0d9c0096 Many small changes Guido van Rossum <guido@python.org> parents: 230 diff changeset	2959 static int
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	2960 long_nonzero(PyLongObject *v)
242 316a0d9c0096 Many small changes Guido van Rossum <guido@python.org> parents: 230 diff changeset	2961 {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2962 return ABS(Py_SIZE(v)) != 0;
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	2963 }
9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	2964
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2965 static PyObject *
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2966 long_rshift(PyLongObject v, PyLongObject w)
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	2967 {
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2968 PyLongObject a, b;
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2969 PyLongObject *z = NULL;
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	2970 long shiftby;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	2971 Py_ssize_t newsize, wordshift, loshift, hishift, i, j;
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	2972 digit lomask, himask;
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2973
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2974 CONVERT_BINOP((PyObject )v, (PyObject )w, &a, &b);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2975
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	2976 if (Py_SIZE(a) < 0) {
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	2977 /* Right shifting negative numbers is harder */
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2978 PyLongObject a1, a2;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2979 a1 = (PyLongObject *) long_invert(a);
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2980 if (a1 == NULL)
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2981 goto rshift_error;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2982 a2 = (PyLongObject *) long_rshift(a1, b);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2983 Py_DECREF(a1);
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2984 if (a2 == NULL)
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2985 goto rshift_error;
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2986 z = (PyLongObject *) long_invert(a2);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2987 Py_DECREF(a2);
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	2988 }
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2989 else {
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	2990
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2991 shiftby = PyLong_AsLong((PyObject *)b);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2992 if (shiftby == -1L && PyErr_Occurred())
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2993 goto rshift_error;
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2994 if (shiftby < 0) {
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2995 PyErr_SetString(PyExc_ValueError,
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2996 "negative shift count");
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2997 goto rshift_error;
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	2998 }
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	2999 wordshift = shiftby / PyLong_SHIFT;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	3000 newsize = ABS(Py_SIZE(a)) - wordshift;
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3001 if (newsize <= 0) {
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3002 z = _PyLong_New(0);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3003 Py_DECREF(a);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3004 Py_DECREF(b);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3005 return (PyObject *)z;
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3006 }
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	3007 loshift = shiftby % PyLong_SHIFT;
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	3008 hishift = PyLong_SHIFT - loshift;
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3009 lomask = ((digit)1 << hishift) - 1;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	3010 himask = PyLong_MASK ^ lomask;
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3011 z = _PyLong_New(newsize);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3012 if (z == NULL)
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3013 goto rshift_error;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	3014 if (Py_SIZE(a) < 0)
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	3015 Py_SIZE(z) = -(Py_SIZE(z));
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3016 for (i = 0, j = wordshift; i < newsize; i++, j++) {
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3017 z->ob_digit[i] = (a->ob_digit[j] >> loshift) & lomask;
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3018 if (i+1 < newsize)
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3019 z->ob_digit[i] \|=
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3020 (a->ob_digit[j+1] << hishift) & himask;
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3021 }
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3022 z = long_normalize(z);
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3023 }
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3024 rshift_error:
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3025 Py_DECREF(a);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3026 Py_DECREF(b);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3027 return (PyObject *) z;
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3028
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3029 }
9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3030
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3031 static PyObject *
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3032 long_lshift(PyObject v, PyObject w)
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3033 {
5199 7e380df00d00 New long_lshift, without restriction on size of shift count, by Tim Peters. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3034 /* This version due to Tim Peters */
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3035 PyLongObject a, b;
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3036 PyLongObject *z = NULL;
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3037 long shiftby;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	3038 Py_ssize_t oldsize, newsize, wordshift, remshift, i, j;
5199 7e380df00d00 New long_lshift, without restriction on size of shift count, by Tim Peters. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3039 twodigits accum;
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	3040
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3041 CONVERT_BINOP(v, w, &a, &b);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3042
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3043 shiftby = PyLong_AsLong((PyObject *)b);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3044 if (shiftby == -1L && PyErr_Occurred())
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3045 goto lshift_error;
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3046 if (shiftby < 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3047 PyErr_SetString(PyExc_ValueError, "negative shift count");
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3048 goto lshift_error;
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3049 }
5199 7e380df00d00 New long_lshift, without restriction on size of shift count, by Tim Peters. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3050 if ((long)(int)shiftby != shiftby) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3051 PyErr_SetString(PyExc_ValueError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3052 "outrageous left shift count");
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3053 goto lshift_error;
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3054 }
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	3055 /* wordshift, remshift = divmod(shiftby, PyLong_SHIFT) */
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	3056 wordshift = (int)shiftby / PyLong_SHIFT;
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	3057 remshift = (int)shiftby - wordshift * PyLong_SHIFT;
5199 7e380df00d00 New long_lshift, without restriction on size of shift count, by Tim Peters. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3058
7e380df00d00 New long_lshift, without restriction on size of shift count, by Tim Peters. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3059 oldsize = ABS(a->ob_size);
7e380df00d00 New long_lshift, without restriction on size of shift count, by Tim Peters. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3060 newsize = oldsize + wordshift;
7e380df00d00 New long_lshift, without restriction on size of shift count, by Tim Peters. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3061 if (remshift)
7e380df00d00 New long_lshift, without restriction on size of shift count, by Tim Peters. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3062 ++newsize;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3063 z = _PyLong_New(newsize);
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3064 if (z == NULL)
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3065 goto lshift_error;
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3066 if (a->ob_size < 0)
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3067 z->ob_size = -(z->ob_size);
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3068 for (i = 0; i < wordshift; i++)
9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3069 z->ob_digit[i] = 0;
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	3070 accum = 0;
5199 7e380df00d00 New long_lshift, without restriction on size of shift count, by Tim Peters. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3071 for (i = wordshift, j = 0; j < oldsize; i++, j++) {
24919 4cb253c556b1 long_format(), long_lshift(): Someone on c.l.py is trying to boost Tim Peters <tim.peters@gmail.com> parents: 24847 diff changeset	3072 accum \|= (twodigits)a->ob_digit[j] << remshift;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	3073 z->ob_digit[i] = (digit)(accum & PyLong_MASK);
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	3074 accum >>= PyLong_SHIFT;
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3075 }
5199 7e380df00d00 New long_lshift, without restriction on size of shift count, by Tim Peters. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3076 if (remshift)
7e380df00d00 New long_lshift, without restriction on size of shift count, by Tim Peters. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3077 z->ob_digit[newsize-1] = (digit)accum;
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	3078 else
5199 7e380df00d00 New long_lshift, without restriction on size of shift count, by Tim Peters. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	3079 assert(!accum);
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3080 z = long_normalize(z);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3081 lshift_error:
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3082 Py_DECREF(a);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3083 Py_DECREF(b);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3084 return (PyObject *) z;
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3085 }
9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3086
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3087
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3088 /* Bitwise and/xor/or operations */
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3089
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3090 static PyObject *
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	3091 long_bitwise(PyLongObject *a,
a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	3092 int op, /* '&', '\|', '^' */
a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	3093 PyLongObject *b)
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3094 {
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	3095 digit maska, maskb; /* 0 or PyLong_MASK */
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3096 int negz;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	3097 Py_ssize_t size_a, size_b, size_z;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3098 PyLongObject *z;
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3099 int i;
743 dbcb49d742a0 Lint stuff (involves casts, yuck!) Guido van Rossum <guido@python.org> parents: 613 diff changeset	3100 digit diga, digb;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3101 PyObject *v;
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	3102
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	3103 if (Py_SIZE(a) < 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3104 a = (PyLongObject *) long_invert(a);
36877 e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36675 diff changeset	3105 if (a == NULL)
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36675 diff changeset	3106 return NULL;
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	3107 maska = PyLong_MASK;
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3108 }
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3109 else {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3110 Py_INCREF(a);
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3111 maska = 0;
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3112 }
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	3113 if (Py_SIZE(b) < 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3114 b = (PyLongObject *) long_invert(b);
36877 e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36675 diff changeset	3115 if (b == NULL) {
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36675 diff changeset	3116 Py_DECREF(a);
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36675 diff changeset	3117 return NULL;
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36675 diff changeset	3118 }
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	3119 maskb = PyLong_MASK;
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3120 }
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3121 else {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3122 Py_INCREF(b);
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3123 maskb = 0;
546 937cbc0be6ec Fixed bug in long masking ops. Guido van Rossum <guido@python.org> parents: 475 diff changeset	3124 }
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	3125
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3126 negz = 0;
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3127 switch (op) {
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3128 case '^':
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3129 if (maska != maskb) {
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	3130 maska ^= PyLong_MASK;
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3131 negz = -1;
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3132 }
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3133 break;
1837 87364d9e3444 New patches by Andrew to fix various problems Guido van Rossum <guido@python.org> parents: 1391 diff changeset	3134 case '&':
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3135 if (maska && maskb) {
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3136 op = '\|';
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	3137 maska ^= PyLong_MASK;
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	3138 maskb ^= PyLong_MASK;
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3139 negz = -1;
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3140 }
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3141 break;
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3142 case '\|':
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3143 if (maska \|\| maskb) {
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3144 op = '&';
44945 bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	3145 maska ^= PyLong_MASK;
bbc719a8b58b Backport of several functions from Python 3.0 to 2.6 including PyUnicode_FromString, PyUnicode_Format and PyLong_From/AsSsize_t. The functions are partly required for the backport of the bytearray type and _fileio module. They should also make it easier to port C to 3.0. Christian Heimes <christian@cheimes.de> parents: 44749 diff changeset	3146 maskb ^= PyLong_MASK;
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3147 negz = -1;
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3148 }
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3149 break;
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3150 }
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	3151
8933 dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	3152 /* JRH: The original logic here was to allocate the result value (z)
dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	3153 as the longer of the two operands. However, there are some cases
dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	3154 where the result is guaranteed to be shorter than that: AND of two
dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	3155 positives, OR of two negatives: use the shorter number. AND with
dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	3156 mixed signs: use the positive number. OR with mixed signs: use the
dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	3157 negative number. After the transformations above, op will be '&'
dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	3158 iff one of these cases applies, and mask will be non-0 for operands
dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	3159 whose length should be ignored.
dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	3160 */
dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	3161
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	3162 size_a = Py_SIZE(a);
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	3163 size_b = Py_SIZE(b);
8933 dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	3164 size_z = op == '&'
dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	3165 ? (maska
dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	3166 ? size_b
dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	3167 : (maskb ? size_a : MIN(size_a, size_b)))
dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	3168 : MAX(size_a, size_b);
dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	3169 z = _PyLong_New(size_z);
36877 e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36675 diff changeset	3170 if (z == NULL) {
39095 bda93b45ca41 a & b were dereffed above, so they are known to be valid pointers. Neal Norwitz <nnorwitz@gmail.com> parents: 38513 diff changeset	3171 Py_DECREF(a);
bda93b45ca41 a & b were dereffed above, so they are known to be valid pointers. Neal Norwitz <nnorwitz@gmail.com> parents: 38513 diff changeset	3172 Py_DECREF(b);
8933 dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	3173 return NULL;
dc6edfd4bae5 Two patches by Jason Harper: Guido van Rossum <guido@python.org> parents: 8822 diff changeset	3174 }
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	3175
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3176 for (i = 0; i < size_z; ++i) {
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3177 diga = (i < size_a ? a->ob_digit[i] : 0) ^ maska;
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3178 digb = (i < size_b ? b->ob_digit[i] : 0) ^ maskb;
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3179 switch (op) {
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3180 case '&': z->ob_digit[i] = diga & digb; break;
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3181 case '\|': z->ob_digit[i] = diga \| digb; break;
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3182 case '^': z->ob_digit[i] = diga ^ digb; break;
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3183 }
546 937cbc0be6ec Fixed bug in long masking ops. Guido van Rossum <guido@python.org> parents: 475 diff changeset	3184 }
24745 ba035f4b47c1 Cautious introduction of a patch that started from Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	3185
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3186 Py_DECREF(a);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3187 Py_DECREF(b);
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3188 z = long_normalize(z);
f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3189 if (negz == 0)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3190 return (PyObject *) z;
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3191 v = long_invert(z);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3192 Py_DECREF(z);
590 f11fae8ee1e4 Changed to 2's complement bitwise ops. Got rid of ZABS etc. Guido van Rossum <guido@python.org> parents: 546 diff changeset	3193 return v;
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3194 }
9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3195
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3196 static PyObject *
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3197 long_and(PyObject v, PyObject w)
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3198 {
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3199 PyLongObject a, b;
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3200 PyObject *c;
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3201 CONVERT_BINOP(v, w, &a, &b);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3202 c = long_bitwise(a, '&', b);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3203 Py_DECREF(a);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3204 Py_DECREF(b);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3205 return c;
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3206 }
9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3207
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3208 static PyObject *
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3209 long_xor(PyObject v, PyObject w)
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3210 {
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3211 PyLongObject a, b;
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3212 PyObject *c;
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3213 CONVERT_BINOP(v, w, &a, &b);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3214 c = long_bitwise(a, '^', b);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3215 Py_DECREF(a);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3216 Py_DECREF(b);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3217 return c;
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3218 }
9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3219
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3220 static PyObject *
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3221 long_or(PyObject v, PyObject w)
443 9f85beb1f7c8 Made the sign use one's complement; implemented shifting and masking operators. Guido van Rossum <guido@python.org> parents: 406 diff changeset	3222 {
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3223 PyLongObject a, b;
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3224 PyObject *c;
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3225 CONVERT_BINOP(v, w, &a, &b);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3226 c = long_bitwise(a, '\|', b);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3227 Py_DECREF(a);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3228 Py_DECREF(b);
8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3229 return c;
242 316a0d9c0096 Many small changes Guido van Rossum <guido@python.org> parents: 230 diff changeset	3230 }
316a0d9c0096 Many small changes Guido van Rossum <guido@python.org> parents: 230 diff changeset	3231
1313 6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	3232 static int
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	3233 long_coerce(PyObject pv, PyObject pw)
955 03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 795 diff changeset	3234 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3235 if (PyInt_Check(*pw)) {
15725 8e402aeca0a3 Make long a new style number type. Sequence repeat is now done here Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	3236 pw = PyLong_FromLong(PyInt_AS_LONG(pw));
41435 46d0f4057705 Add some missing NULL checks which trigger crashes on low-memory conditions. Georg Brandl <georg@python.org> parents: 41032 diff changeset	3237 if (*pw == NULL)
46d0f4057705 Add some missing NULL checks which trigger crashes on low-memory conditions. Georg Brandl <georg@python.org> parents: 41032 diff changeset	3238 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3239 Py_INCREF(*pv);
955 03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 795 diff changeset	3240 return 0;
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 795 diff changeset	3241 }
19976 da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19925 diff changeset	3242 else if (PyLong_Check(*pw)) {
da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19925 diff changeset	3243 Py_INCREF(*pv);
da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19925 diff changeset	3244 Py_INCREF(*pw);
da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19925 diff changeset	3245 return 0;
da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19925 diff changeset	3246 }
955 03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 795 diff changeset	3247 return 1; /* Can't do it */
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 795 diff changeset	3248 }
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 795 diff changeset	3249
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3250 static PyObject *
26291 d31ddc66b1b5 Change int() so that passing a string, unicode, float or long argument Walter Dörwald <walter@livinglogic.de> parents: 26081 diff changeset	3251 long_long(PyObject *v)
d31ddc66b1b5 Change int() so that passing a string, unicode, float or long argument Walter Dörwald <walter@livinglogic.de> parents: 26081 diff changeset	3252 {
34931 9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34666 diff changeset	3253 if (PyLong_CheckExact(v))
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34666 diff changeset	3254 Py_INCREF(v);
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34666 diff changeset	3255 else
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 34666 diff changeset	3256 v = _PyLong_Copy((PyLongObject *)v);
26291 d31ddc66b1b5 Change int() so that passing a string, unicode, float or long argument Walter Dörwald <walter@livinglogic.de> parents: 26081 diff changeset	3257 return v;
d31ddc66b1b5 Change int() so that passing a string, unicode, float or long argument Walter Dörwald <walter@livinglogic.de> parents: 26081 diff changeset	3258 }
d31ddc66b1b5 Change int() so that passing a string, unicode, float or long argument Walter Dörwald <walter@livinglogic.de> parents: 26081 diff changeset	3259
d31ddc66b1b5 Change int() so that passing a string, unicode, float or long argument Walter Dörwald <walter@livinglogic.de> parents: 26081 diff changeset	3260 static PyObject *
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	3261 long_int(PyObject *v)
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 958 diff changeset	3262 {
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 958 diff changeset	3263 long x;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3264 x = PyLong_AsLong(v);
26291 d31ddc66b1b5 Change int() so that passing a string, unicode, float or long argument Walter Dörwald <walter@livinglogic.de> parents: 26081 diff changeset	3265 if (PyErr_Occurred()) {
d31ddc66b1b5 Change int() so that passing a string, unicode, float or long argument Walter Dörwald <walter@livinglogic.de> parents: 26081 diff changeset	3266 if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
d31ddc66b1b5 Change int() so that passing a string, unicode, float or long argument Walter Dörwald <walter@livinglogic.de> parents: 26081 diff changeset	3267 PyErr_Clear();
d31ddc66b1b5 Change int() so that passing a string, unicode, float or long argument Walter Dörwald <walter@livinglogic.de> parents: 26081 diff changeset	3268 if (PyLong_CheckExact(v)) {
d31ddc66b1b5 Change int() so that passing a string, unicode, float or long argument Walter Dörwald <walter@livinglogic.de> parents: 26081 diff changeset	3269 Py_INCREF(v);
d31ddc66b1b5 Change int() so that passing a string, unicode, float or long argument Walter Dörwald <walter@livinglogic.de> parents: 26081 diff changeset	3270 return v;
d31ddc66b1b5 Change int() so that passing a string, unicode, float or long argument Walter Dörwald <walter@livinglogic.de> parents: 26081 diff changeset	3271 }
d31ddc66b1b5 Change int() so that passing a string, unicode, float or long argument Walter Dörwald <walter@livinglogic.de> parents: 26081 diff changeset	3272 else
d31ddc66b1b5 Change int() so that passing a string, unicode, float or long argument Walter Dörwald <walter@livinglogic.de> parents: 26081 diff changeset	3273 return _PyLong_Copy((PyLongObject *)v);
d31ddc66b1b5 Change int() so that passing a string, unicode, float or long argument Walter Dörwald <walter@livinglogic.de> parents: 26081 diff changeset	3274 }
d31ddc66b1b5 Change int() so that passing a string, unicode, float or long argument Walter Dörwald <walter@livinglogic.de> parents: 26081 diff changeset	3275 else
d31ddc66b1b5 Change int() so that passing a string, unicode, float or long argument Walter Dörwald <walter@livinglogic.de> parents: 26081 diff changeset	3276 return NULL;
d31ddc66b1b5 Change int() so that passing a string, unicode, float or long argument Walter Dörwald <walter@livinglogic.de> parents: 26081 diff changeset	3277 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3278 return PyInt_FromLong(x);
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 958 diff changeset	3279 }
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 958 diff changeset	3280
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3281 static PyObject *
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	3282 long_float(PyObject *v)
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 958 diff changeset	3283 {
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4870 diff changeset	3284 double result;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3285 result = PyLong_AsDouble(v);
19674 715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19671 diff changeset	3286 if (result == -1.0 && PyErr_Occurred())
715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19671 diff changeset	3287 return NULL;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3288 return PyFloat_FromDouble(result);
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 958 diff changeset	3289 }
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 958 diff changeset	3290
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3291 static PyObject *
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	3292 long_oct(PyObject *v)
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 958 diff changeset	3293 {
45262 86906a5ceca6 Added PyNumber_ToBase and supporting routines _PyInt_Format and Eric Smith <eric@trueblade.com> parents: 44945 diff changeset	3294 return _PyLong_Format(v, 8, 1, 0);
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 958 diff changeset	3295 }
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 958 diff changeset	3296
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3297 static PyObject *
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	3298 long_hex(PyObject *v)
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 958 diff changeset	3299 {
45262 86906a5ceca6 Added PyNumber_ToBase and supporting routines _PyInt_Format and Eric Smith <eric@trueblade.com> parents: 44945 diff changeset	3300 return _PyLong_Format(v, 16, 1, 0);
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 958 diff changeset	3301 }
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24231 diff changeset	3302
1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24231 diff changeset	3303 static PyObject *
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3304 long_subtype_new(PyTypeObject type, PyObject args, PyObject *kwds);
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 958 diff changeset	3305
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3306 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3307 long_new(PyTypeObject type, PyObject args, PyObject *kwds)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3308 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3309 PyObject *x = NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3310 int base = -909; /* unlikely! */
36675 dba6494735d0 Revert backwards-incompatible const changes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	3311 static char *kwlist[] = {"x", "base", 0};
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3312
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3313 if (type != &PyLong_Type)
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3314 return long_subtype_new(type, args, kwds); /* Wimp out */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3315 if (!PyArg_ParseTupleAndKeywords(args, kwds, "\|Oi:long", kwlist,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3316 &x, &base))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3317 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3318 if (x == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3319 return PyLong_FromLong(0L);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3320 if (base == -909)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3321 return PyNumber_Long(x);
41032 6a599aee7ca4 Patch #1638879: don't accept strings with embedded NUL bytes in long(). Georg Brandl <georg@python.org> parents: 40908 diff changeset	3322 else if (PyString_Check(x)) {
6a599aee7ca4 Patch #1638879: don't accept strings with embedded NUL bytes in long(). Georg Brandl <georg@python.org> parents: 40908 diff changeset	3323 /* Since PyLong_FromString doesn't have a length parameter,
6a599aee7ca4 Patch #1638879: don't accept strings with embedded NUL bytes in long(). Georg Brandl <georg@python.org> parents: 40908 diff changeset	3324 * check here for possible NULs in the string. */
6a599aee7ca4 Patch #1638879: don't accept strings with embedded NUL bytes in long(). Georg Brandl <georg@python.org> parents: 40908 diff changeset	3325 char *string = PyString_AS_STRING(x);
6a599aee7ca4 Patch #1638879: don't accept strings with embedded NUL bytes in long(). Georg Brandl <georg@python.org> parents: 40908 diff changeset	3326 if (strlen(string) != PyString_Size(x)) {
6a599aee7ca4 Patch #1638879: don't accept strings with embedded NUL bytes in long(). Georg Brandl <georg@python.org> parents: 40908 diff changeset	3327 /* create a repr() of the input string,
6a599aee7ca4 Patch #1638879: don't accept strings with embedded NUL bytes in long(). Georg Brandl <georg@python.org> parents: 40908 diff changeset	3328 * just like PyLong_FromString does. */
6a599aee7ca4 Patch #1638879: don't accept strings with embedded NUL bytes in long(). Georg Brandl <georg@python.org> parents: 40908 diff changeset	3329 PyObject *srepr;
6a599aee7ca4 Patch #1638879: don't accept strings with embedded NUL bytes in long(). Georg Brandl <georg@python.org> parents: 40908 diff changeset	3330 srepr = PyObject_Repr(x);
6a599aee7ca4 Patch #1638879: don't accept strings with embedded NUL bytes in long(). Georg Brandl <georg@python.org> parents: 40908 diff changeset	3331 if (srepr == NULL)
6a599aee7ca4 Patch #1638879: don't accept strings with embedded NUL bytes in long(). Georg Brandl <georg@python.org> parents: 40908 diff changeset	3332 return NULL;
6a599aee7ca4 Patch #1638879: don't accept strings with embedded NUL bytes in long(). Georg Brandl <georg@python.org> parents: 40908 diff changeset	3333 PyErr_Format(PyExc_ValueError,
6a599aee7ca4 Patch #1638879: don't accept strings with embedded NUL bytes in long(). Georg Brandl <georg@python.org> parents: 40908 diff changeset	3334 "invalid literal for long() with base %d: %s",
6a599aee7ca4 Patch #1638879: don't accept strings with embedded NUL bytes in long(). Georg Brandl <georg@python.org> parents: 40908 diff changeset	3335 base, PyString_AS_STRING(srepr));
6a599aee7ca4 Patch #1638879: don't accept strings with embedded NUL bytes in long(). Georg Brandl <georg@python.org> parents: 40908 diff changeset	3336 Py_DECREF(srepr);
6a599aee7ca4 Patch #1638879: don't accept strings with embedded NUL bytes in long(). Georg Brandl <georg@python.org> parents: 40908 diff changeset	3337 return NULL;
6a599aee7ca4 Patch #1638879: don't accept strings with embedded NUL bytes in long(). Georg Brandl <georg@python.org> parents: 40908 diff changeset	3338 }
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3339 return PyLong_FromString(PyString_AS_STRING(x), NULL, base);
41032 6a599aee7ca4 Patch #1638879: don't accept strings with embedded NUL bytes in long(). Georg Brandl <georg@python.org> parents: 40908 diff changeset	3340 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19051 diff changeset	3341 #ifdef Py_USING_UNICODE
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3342 else if (PyUnicode_Check(x))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3343 return PyLong_FromUnicode(PyUnicode_AS_UNICODE(x),
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3344 PyUnicode_GET_SIZE(x),
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3345 base);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19051 diff changeset	3346 #endif
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3347 else {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3348 PyErr_SetString(PyExc_TypeError,
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3349 "long() can't convert non-string with explicit base");
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3350 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3351 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3352 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3353
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3354 /* Wimpy, slow approach to tp_new calls for subtypes of long:
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3355 first create a regular long from whatever arguments we got,
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3356 then allocate a subtype instance and initialize it from
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3357 the regular long. The regular long is then thrown away.
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3358 */
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3359 static PyObject *
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3360 long_subtype_new(PyTypeObject type, PyObject args, PyObject *kwds)
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3361 {
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37568 diff changeset	3362 PyLongObject tmp, newobj;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36430 diff changeset	3363 Py_ssize_t i, n;
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3364
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3365 assert(PyType_IsSubtype(type, &PyLong_Type));
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3366 tmp = (PyLongObject *)long_new(&PyLong_Type, args, kwds);
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3367 if (tmp == NULL)
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3368 return NULL;
19837 5158e4789459 SF bug #460020: bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19787 diff changeset	3369 assert(PyLong_CheckExact(tmp));
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	3370 n = Py_SIZE(tmp);
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3371 if (n < 0)
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3372 n = -n;
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37568 diff changeset	3373 newobj = (PyLongObject *)type->tp_alloc(type, n);
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37568 diff changeset	3374 if (newobj == NULL) {
29641 4909aa64405f SF patch 703666: Several objects don't decref tmp on failure in subtype_new Raymond Hettinger <python@rcn.com> parents: 28981 diff changeset	3375 Py_DECREF(tmp);
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3376 return NULL;
29641 4909aa64405f SF patch 703666: Several objects don't decref tmp on failure in subtype_new Raymond Hettinger <python@rcn.com> parents: 28981 diff changeset	3377 }
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37568 diff changeset	3378 assert(PyLong_Check(newobj));
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 43406 diff changeset	3379 Py_SIZE(newobj) = Py_SIZE(tmp);
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3380 for (i = 0; i < n; i++)
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37568 diff changeset	3381 newobj->ob_digit[i] = tmp->ob_digit[i];
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3382 Py_DECREF(tmp);
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37568 diff changeset	3383 return (PyObject *)newobj;
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3384 }
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3385
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27487 diff changeset	3386 static PyObject *
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27487 diff changeset	3387 long_getnewargs(PyLongObject *v)
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27487 diff changeset	3388 {
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27487 diff changeset	3389 return Py_BuildValue("(N)", _PyLong_Copy(v));
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27487 diff changeset	3390 }
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27487 diff changeset	3391
44432 4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3392 static PyObject *
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3393 long_getN(PyLongObject v, void context) {
45815 8a3fa86c30a6 Fix build on platforms that don't have intptr_t. Patch by Joseph Armbruster. Jeffrey Yasskin <jyasskin@gmail.com> parents: 45791 diff changeset	3394 return PyLong_FromLong((Py_intptr_t)context);
44432 4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3395 }
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3396
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3397 static PyObject *
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3398 long__format__(PyObject self, PyObject args)
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3399 {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3400 PyObject *format_spec;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3401
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3402 if (!PyArg_ParseTuple(args, "O:__format__", &format_spec))
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3403 return NULL;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3404 if (PyString_Check(format_spec))
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3405 return string_long__format__(self, args);
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3406 if (PyUnicode_Check(format_spec)) {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3407 /* Convert format_spec to a str */
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3408 PyObject *result = NULL;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3409 PyObject *newargs = NULL;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3410 PyObject *string_format_spec = NULL;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3411
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3412 string_format_spec = PyObject_Str(format_spec);
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3413 if (string_format_spec == NULL)
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3414 goto done;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3415
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3416 newargs = Py_BuildValue("(O)", string_format_spec);
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3417 if (newargs == NULL)
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3418 goto done;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3419
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3420 result = string_long__format__(self, newargs);
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3421
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3422 done:
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3423 Py_XDECREF(string_format_spec);
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3424 Py_XDECREF(newargs);
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3425 return result;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3426 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3427 PyErr_SetString(PyExc_TypeError, "__format__ requires str or unicode");
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3428 return NULL;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3429 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3430
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27487 diff changeset	3431 static PyMethodDef long_methods[] = {
44432 4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3432 {"conjugate", (PyCFunction)long_long, METH_NOARGS,
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3433 "Returns self, the complex conjugate of any long."},
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3434 {"__trunc__", (PyCFunction)long_long, METH_NOARGS,
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3435 "Truncating an Integral returns itself."},
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27487 diff changeset	3436 {"__getnewargs__", (PyCFunction)long_getnewargs, METH_NOARGS},
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45262 diff changeset	3437 {"__format__", (PyCFunction)long__format__, METH_VARARGS},
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27487 diff changeset	3438 {NULL, NULL} /* sentinel */
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27487 diff changeset	3439 };
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27487 diff changeset	3440
44432 4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3441 static PyGetSetDef long_getset[] = {
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3442 {"real",
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3443 (getter)long_long, (setter)NULL,
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3444 "the real part of a complex number",
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3445 NULL},
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3446 {"imag",
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3447 (getter)long_getN, (setter)NULL,
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3448 "the imaginary part of a complex number",
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3449 (void*)0},
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3450 {"numerator",
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3451 (getter)long_long, (setter)NULL,
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3452 "the numerator of a rational number in lowest terms",
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3453 NULL},
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3454 {"denominator",
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3455 (getter)long_getN, (setter)NULL,
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3456 "the denominator of a rational number in lowest terms",
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3457 (void*)1},
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3458 {NULL} /* Sentinel */
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3459 };
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3460
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23248 diff changeset	3461 PyDoc_STRVAR(long_doc,
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3462 "long(x[, base]) -> integer\n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3463 \n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3464 Convert a string or number to a long integer, if possible. A floating\n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3465 point argument will be truncated towards zero (this does not include a\n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3466 string representation of a floating point number!) When converting a\n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3467 string, use the optional base. It is an error to supply a base when\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23248 diff changeset	3468 converting a non-string.");
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3469
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3470 static PyNumberMethods long_as_number = {
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	3471 (binaryfunc) long_add, /nb_add/
a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	3472 (binaryfunc) long_sub, /nb_subtract/
a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	3473 (binaryfunc) long_mul, /nb_multiply/
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37288 diff changeset	3474 long_classic_div, /nb_divide/
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37288 diff changeset	3475 long_mod, /nb_remainder/
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37288 diff changeset	3476 long_divmod, /nb_divmod/
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37288 diff changeset	3477 long_pow, /nb_power/
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	3478 (unaryfunc) long_neg, /nb_negative/
44432 4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3479 (unaryfunc) long_long, /tp_positive/
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	3480 (unaryfunc) long_abs, /tp_absolute/
a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	3481 (inquiry) long_nonzero, /tp_nonzero/
a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	3482 (unaryfunc) long_invert, /nb_invert/
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37288 diff changeset	3483 long_lshift, /nb_lshift/
13406 a503af7e7fb7 Some cleanup of longs in prepartion for Cray J90 fixes: got Tim Peters <tim.peters@gmail.com> parents: 13256 diff changeset	3484 (binaryfunc) long_rshift, /nb_rshift/
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37288 diff changeset	3485 long_and, /nb_and/
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37288 diff changeset	3486 long_xor, /nb_xor/
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37288 diff changeset	3487 long_or, /nb_or/
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37288 diff changeset	3488 long_coerce, /nb_coerce/
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37288 diff changeset	3489 long_int, /nb_int/
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37288 diff changeset	3490 long_long, /nb_long/
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37288 diff changeset	3491 long_float, /nb_float/
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37288 diff changeset	3492 long_oct, /nb_oct/
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37288 diff changeset	3493 long_hex, /nb_hex/
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3494 0, /* nb_inplace_add */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3495 0, /* nb_inplace_subtract */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3496 0, /* nb_inplace_multiply */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3497 0, /* nb_inplace_divide */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3498 0, /* nb_inplace_remainder */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3499 0, /* nb_inplace_power */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3500 0, /* nb_inplace_lshift */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3501 0, /* nb_inplace_rshift */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3502 0, /* nb_inplace_and */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3503 0, /* nb_inplace_xor */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3504 0, /* nb_inplace_or */
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37288 diff changeset	3505 long_div, /* nb_floor_divide */
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3506 long_true_divide, /* nb_true_divide */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3507 0, /* nb_inplace_floor_divide */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	3508 0, /* nb_inplace_true_divide */
39463 6cafdc81cfde Patch #1538606, Patch to fix __index__() clipping. Neal Norwitz <nnorwitz@gmail.com> parents: 39141 diff changeset	3509 long_long, /* nb_index */
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3510 };
7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3511
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3512 PyTypeObject PyLong_Type = {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3513 PyObject_HEAD_INIT(&PyType_Type)
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3514 0, /* ob_size */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3515 "long", /* tp_name */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3516 sizeof(PyLongObject) - sizeof(digit), /* tp_basicsize */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3517 sizeof(digit), /* tp_itemsize */
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37288 diff changeset	3518 long_dealloc, /* tp_dealloc */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3519 0, /* tp_print */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3520 0, /* tp_getattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3521 0, /* tp_setattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3522 (cmpfunc)long_compare, /* tp_compare */
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37288 diff changeset	3523 long_repr, /* tp_repr */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3524 &long_as_number, /* tp_as_number */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3525 0, /* tp_as_sequence */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3526 0, /* tp_as_mapping */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3527 (hashfunc)long_hash, /* tp_hash */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3528 0, /* tp_call */
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37288 diff changeset	3529 long_str, /* tp_str */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3530 PyObject_GenericGetAttr, /* tp_getattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3531 0, /* tp_setattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3532 0, /* tp_as_buffer */
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19343 diff changeset	3533 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_CHECKTYPES \|
40908 d01bd37bf5ce Variation of patch # 1624059 to speed up checking if an object is a subclass Neal Norwitz <nnorwitz@gmail.com> parents: 39995 diff changeset	3534 Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_LONG_SUBCLASS, /* tp_flags */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3535 long_doc, /* tp_doc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3536 0, /* tp_traverse */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3537 0, /* tp_clear */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3538 0, /* tp_richcompare */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3539 0, /* tp_weaklistoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3540 0, /* tp_iter */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3541 0, /* tp_iternext */
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27487 diff changeset	3542 long_methods, /* tp_methods */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3543 0, /* tp_members */
44432 4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	3544 long_getset, /* tp_getset */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3545 0, /* tp_base */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3546 0, /* tp_dict */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3547 0, /* tp_descr_get */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3548 0, /* tp_descr_set */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3549 0, /* tp_dictoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3550 0, /* tp_init */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3551 0, /* tp_alloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18607 diff changeset	3552 long_new, /* tp_new */
22974 72778ec94dec PyObject_Del can now be used as a function designator. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22204 diff changeset	3553 PyObject_Del, /* tp_free */
230 7ba9612058a4 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3554 };

Mercurial > cpython-lru_cache-weakref

annotate Objects/longobject.c @ 46149:7fdff02e6f45 legacy-trunk