cpython-lru_cache-weakref: Modules/

annotate Modules/_struct.c @ 39042:c02fa187e0f4 legacy-trunk

Part of SF patch #1484695. This removes dead code. The chksum was already verified in .frombuf() on the lines above. If there was a problem an exception is raised, so there was no way this condition could have been true.

author	Neal Norwitz <nnorwitz@gmail.com>
date	Mon, 10 Jul 2006 00:23:17 +0000
parents	e80097bf73b6
children	7dc5f3ede4cd

rev	line source
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1 /* struct module -- pack values into and (out of) strings */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	2
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	3 /* New version supporting byte order, alignment and size options,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	4 character strings, and unsigned numbers */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	5
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	6 #define PY_SSIZE_T_CLEAN
631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	7
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	8 #include "Python.h"
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	9 #include "structseq.h"
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	10 #include "structmember.h"
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	11 #include <ctype.h>
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	12
38266 74c82ebc4e44 forward declaration for PyStructType Bob Ippolito <bob@redivi.com> parents: 38264 diff changeset	13 static PyTypeObject PyStructType;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	14
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	15 /* compatibility macros */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	16 #if (PY_VERSION_HEX < 0x02050000)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	17 typedef int Py_ssize_t;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	18 #endif
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	19
38515 bb0d2b955439 Change wrapping terminology to overflow masking Bob Ippolito <bob@redivi.com> parents: 38493 diff changeset	20 /* If PY_STRUCT_OVERFLOW_MASKING is defined, the struct module will wrap all input
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	21 numbers for explicit endians such that they fit in the given type, much
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	22 like explicit casting in C. A warning will be raised if the number did
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	23 not originally fit within the range of the requested type. If it is
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	24 not defined, then all range errors and overflow will be struct.error
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	25 exceptions. */
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	26
38515 bb0d2b955439 Change wrapping terminology to overflow masking Bob Ippolito <bob@redivi.com> parents: 38493 diff changeset	27 #define PY_STRUCT_OVERFLOW_MASKING 1
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	28
38515 bb0d2b955439 Change wrapping terminology to overflow masking Bob Ippolito <bob@redivi.com> parents: 38493 diff changeset	29 #ifdef PY_STRUCT_OVERFLOW_MASKING
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	30 static PyObject *pylong_ulong_mask = NULL;
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	31 static PyObject *pyint_zero = NULL;
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	32 #endif
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	33
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	34 /* The translation function for each format character is table driven */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	35 typedef struct _formatdef {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	36 char format;
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	37 Py_ssize_t size;
631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	38 Py_ssize_t alignment;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	39 PyObject* (unpack)(const char ,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	40 const struct _formatdef *);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	41 int (pack)(char , PyObject *,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	42 const struct _formatdef *);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	43 } formatdef;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	44
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	45 typedef struct _formatcode {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	46 const struct _formatdef *fmtdef;
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	47 Py_ssize_t offset;
631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	48 Py_ssize_t size;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	49 } formatcode;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	50
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	51 /* Struct object interface */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	52
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	53 typedef struct {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	54 PyObject_HEAD
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	55 Py_ssize_t s_size;
631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	56 Py_ssize_t s_len;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	57 formatcode *s_codes;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	58 PyObject *s_format;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	59 PyObject weakreflist; / List of weak references */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	60 } PyStructObject;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	61
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	62
38267 cf5a9057ed3a fix typo in _struct Bob Ippolito <bob@redivi.com> parents: 38266 diff changeset	63 #define PyStruct_Check(op) PyObject_TypeCheck(op, &PyStructType)
cf5a9057ed3a fix typo in _struct Bob Ippolito <bob@redivi.com> parents: 38266 diff changeset	64 #define PyStruct_CheckExact(op) ((op)->ob_type == &PyStructType)
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	65
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	66
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	67 /* Exception */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	68
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	69 static PyObject *StructError;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	70
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	71
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	72 /* Define various structs to figure out the alignments of types */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	73
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	74
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	75 typedef struct { char c; short x; } st_short;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	76 typedef struct { char c; int x; } st_int;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	77 typedef struct { char c; long x; } st_long;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	78 typedef struct { char c; float x; } st_float;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	79 typedef struct { char c; double x; } st_double;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	80 typedef struct { char c; void *x; } st_void_p;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	81
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	82 #define SHORT_ALIGN (sizeof(st_short) - sizeof(short))
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	83 #define INT_ALIGN (sizeof(st_int) - sizeof(int))
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	84 #define LONG_ALIGN (sizeof(st_long) - sizeof(long))
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	85 #define FLOAT_ALIGN (sizeof(st_float) - sizeof(float))
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	86 #define DOUBLE_ALIGN (sizeof(st_double) - sizeof(double))
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	87 #define VOID_P_ALIGN (sizeof(st_void_p) - sizeof(void *))
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	88
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	89 /* We can't support q and Q in native mode unless the compiler does;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	90 in std mode, they're 8 bytes on all platforms. */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	91 #ifdef HAVE_LONG_LONG
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	92 typedef struct { char c; PY_LONG_LONG x; } s_long_long;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	93 #define LONG_LONG_ALIGN (sizeof(s_long_long) - sizeof(PY_LONG_LONG))
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	94 #endif
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	95
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	96 #define STRINGIFY(x) #x
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	97
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	98 #ifdef __powerc
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	99 #pragma options align=reset
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	100 #endif
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	101
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	102 /* Helper to get a PyLongObject by hook or by crook. Caller should decref. */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	103
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	104 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	105 get_pylong(PyObject *v)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	106 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	107 PyNumberMethods *m;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	108
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	109 assert(v != NULL);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	110 if (PyInt_Check(v))
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	111 return PyLong_FromLong(PyInt_AS_LONG(v));
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	112 if (PyLong_Check(v)) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	113 Py_INCREF(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	114 return v;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	115 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	116 m = v->ob_type->tp_as_number;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	117 if (m != NULL && m->nb_long != NULL) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	118 v = m->nb_long(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	119 if (v == NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	120 return NULL;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	121 if (PyLong_Check(v))
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	122 return v;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	123 Py_DECREF(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	124 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	125 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	126 "cannot convert argument to long");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	127 return NULL;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	128 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	129
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	130 /* Helper routine to get a Python integer and raise the appropriate error
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	131 if it isn't one */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	132
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	133 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	134 get_long(PyObject v, long p)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	135 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	136 long x = PyInt_AsLong(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	137 if (x == -1 && PyErr_Occurred()) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	138 if (PyErr_ExceptionMatches(PyExc_TypeError))
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	139 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	140 "required argument is not an integer");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	141 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	142 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	143 *p = x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	144 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	145 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	146
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	147
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	148 /* Same, but handling unsigned long */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	149
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	150 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	151 get_ulong(PyObject v, unsigned long p)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	152 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	153 if (PyLong_Check(v)) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	154 unsigned long x = PyLong_AsUnsignedLong(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	155 if (x == (unsigned long)(-1) && PyErr_Occurred())
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	156 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	157 *p = x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	158 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	159 }
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	160 if (get_long(v, (long *)p) < 0)
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	161 return -1;
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	162 if (((long)*p) < 0) {
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	163 PyErr_SetString(StructError,
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	164 "unsigned argument is < 0");
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	165 return -1;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	166 }
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	167 return 0;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	168 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	169
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	170 #ifdef HAVE_LONG_LONG
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	171
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	172 /* Same, but handling native long long. */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	173
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	174 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	175 get_longlong(PyObject v, PY_LONG_LONG p)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	176 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	177 PY_LONG_LONG x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	178
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	179 v = get_pylong(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	180 if (v == NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	181 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	182 assert(PyLong_Check(v));
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	183 x = PyLong_AsLongLong(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	184 Py_DECREF(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	185 if (x == (PY_LONG_LONG)-1 && PyErr_Occurred())
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	186 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	187 *p = x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	188 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	189 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	190
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	191 /* Same, but handling native unsigned long long. */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	192
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	193 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	194 get_ulonglong(PyObject v, unsigned PY_LONG_LONG p)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	195 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	196 unsigned PY_LONG_LONG x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	197
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	198 v = get_pylong(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	199 if (v == NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	200 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	201 assert(PyLong_Check(v));
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	202 x = PyLong_AsUnsignedLongLong(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	203 Py_DECREF(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	204 if (x == (unsigned PY_LONG_LONG)-1 && PyErr_Occurred())
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	205 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	206 *p = x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	207 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	208 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	209
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	210 #endif
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	211
38515 bb0d2b955439 Change wrapping terminology to overflow masking Bob Ippolito <bob@redivi.com> parents: 38493 diff changeset	212 #ifdef PY_STRUCT_OVERFLOW_MASKING
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	213
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	214 /* Helper routine to get a Python integer and raise the appropriate error
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	215 if it isn't one */
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	216
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	217 static int
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	218 get_wrapped_long(PyObject v, long p)
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	219 {
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	220 if (get_long(v, p) < 0) {
38736 e80097bf73b6 Wrap some long lines Neal Norwitz <nnorwitz@gmail.com> parents: 38583 diff changeset	221 if (PyLong_Check(v) &&
e80097bf73b6 Wrap some long lines Neal Norwitz <nnorwitz@gmail.com> parents: 38583 diff changeset	222 PyErr_ExceptionMatches(PyExc_OverflowError)) {
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	223 PyObject *wrapped;
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	224 long x;
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	225 PyErr_Clear();
38515 bb0d2b955439 Change wrapping terminology to overflow masking Bob Ippolito <bob@redivi.com> parents: 38493 diff changeset	226 if (PyErr_Warn(PyExc_DeprecationWarning, "struct integer overflow masking is deprecated") < 0)
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	227 return -1;
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	228 wrapped = PyNumber_And(v, pylong_ulong_mask);
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	229 if (wrapped == NULL)
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	230 return -1;
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	231 x = (long)PyLong_AsUnsignedLong(wrapped);
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	232 Py_DECREF(wrapped);
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	233 if (x == -1 && PyErr_Occurred())
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	234 return -1;
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	235 *p = x;
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	236 } else {
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	237 return -1;
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	238 }
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	239 }
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	240 return 0;
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	241 }
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	242
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	243 static int
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	244 get_wrapped_ulong(PyObject v, unsigned long p)
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	245 {
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	246 long x = (long)PyLong_AsUnsignedLong(v);
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	247 if (x == -1 && PyErr_Occurred()) {
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	248 PyObject *wrapped;
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	249 PyErr_Clear();
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	250 wrapped = PyNumber_And(v, pylong_ulong_mask);
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	251 if (wrapped == NULL)
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	252 return -1;
38515 bb0d2b955439 Change wrapping terminology to overflow masking Bob Ippolito <bob@redivi.com> parents: 38493 diff changeset	253 if (PyErr_Warn(PyExc_DeprecationWarning, "struct integer overflow masking is deprecated") < 0) {
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	254 Py_DECREF(wrapped);
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	255 return -1;
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	256 }
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	257 x = (long)PyLong_AsUnsignedLong(wrapped);
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	258 Py_DECREF(wrapped);
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	259 if (x == -1 && PyErr_Occurred())
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	260 return -1;
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	261 }
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	262 *p = (unsigned long)x;
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	263 return 0;
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	264 }
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	265
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	266 #define RANGE_ERROR(x, f, flag, mask) \
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	267 do { \
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	268 if (_range_error(f, flag) < 0) \
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	269 return -1; \
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	270 else \
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	271 (x) &= (mask); \
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	272 } while (0)
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	273
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	274 #else
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	275
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	276 #define get_wrapped_long get_long
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	277 #define get_wrapped_ulong get_ulong
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	278 #define RANGE_ERROR(x, f, flag, mask) return _range_error(f, flag)
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	279
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	280 #endif
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	281
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	282 /* Floating point helpers */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	283
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	284 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	285 unpack_float(const char p, / start of 4-byte string */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	286 int le) /* true for little-endian, false for big-endian */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	287 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	288 double x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	289
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	290 x = _PyFloat_Unpack4((unsigned char *)p, le);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	291 if (x == -1.0 && PyErr_Occurred())
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	292 return NULL;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	293 return PyFloat_FromDouble(x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	294 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	295
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	296 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	297 unpack_double(const char p, / start of 8-byte string */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	298 int le) /* true for little-endian, false for big-endian */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	299 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	300 double x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	301
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	302 x = _PyFloat_Unpack8((unsigned char *)p, le);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	303 if (x == -1.0 && PyErr_Occurred())
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	304 return NULL;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	305 return PyFloat_FromDouble(x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	306 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	307
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	308 /* Helper to format the range error exceptions */
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	309 static int
38484 f64b13a00f33 Silence a warning. Armin Rigo <arigo@tunes.org> parents: 38483 diff changeset	310 _range_error(const formatdef *f, int is_unsigned)
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	311 {
38529 a7f2295a78ac _range_error(): Speed and simplify (there's no real need for Tim Peters <tim.peters@gmail.com> parents: 38528 diff changeset	312 /* ulargest is the largest unsigned value with f->size bytes.
a7f2295a78ac _range_error(): Speed and simplify (there's no real need for Tim Peters <tim.peters@gmail.com> parents: 38528 diff changeset	313 * Note that the simpler:
a7f2295a78ac _range_error(): Speed and simplify (there's no real need for Tim Peters <tim.peters@gmail.com> parents: 38528 diff changeset	314 * ((size_t)1 << (f->size * 8)) - 1
38530 447a94b039de Repaired error in new comment. Tim Peters <tim.peters@gmail.com> parents: 38529 diff changeset	315 * doesn't work when f->size == sizeof(size_t) because C doesn't
447a94b039de Repaired error in new comment. Tim Peters <tim.peters@gmail.com> parents: 38529 diff changeset	316 * define what happens when a left shift count is >= the number of
447a94b039de Repaired error in new comment. Tim Peters <tim.peters@gmail.com> parents: 38529 diff changeset	317 * bits in the integer being shifted; e.g., on some boxes it doesn't
447a94b039de Repaired error in new comment. Tim Peters <tim.peters@gmail.com> parents: 38529 diff changeset	318 * shift at all when they're equal.
38529 a7f2295a78ac _range_error(): Speed and simplify (there's no real need for Tim Peters <tim.peters@gmail.com> parents: 38528 diff changeset	319 */
a7f2295a78ac _range_error(): Speed and simplify (there's no real need for Tim Peters <tim.peters@gmail.com> parents: 38528 diff changeset	320 const size_t ulargest = (size_t)-1 >> ((SIZEOF_SIZE_T - f->size)*8);
a7f2295a78ac _range_error(): Speed and simplify (there's no real need for Tim Peters <tim.peters@gmail.com> parents: 38528 diff changeset	321 assert(f->size >= 1 && f->size <= SIZEOF_SIZE_T);
a7f2295a78ac _range_error(): Speed and simplify (there's no real need for Tim Peters <tim.peters@gmail.com> parents: 38528 diff changeset	322 if (is_unsigned)
a7f2295a78ac _range_error(): Speed and simplify (there's no real need for Tim Peters <tim.peters@gmail.com> parents: 38528 diff changeset	323 PyErr_Format(StructError,
a7f2295a78ac _range_error(): Speed and simplify (there's no real need for Tim Peters <tim.peters@gmail.com> parents: 38528 diff changeset	324 "'%c' format requires 0 <= number <= %zu",
a7f2295a78ac _range_error(): Speed and simplify (there's no real need for Tim Peters <tim.peters@gmail.com> parents: 38528 diff changeset	325 f->format,
a7f2295a78ac _range_error(): Speed and simplify (there's no real need for Tim Peters <tim.peters@gmail.com> parents: 38528 diff changeset	326 ulargest);
a7f2295a78ac _range_error(): Speed and simplify (there's no real need for Tim Peters <tim.peters@gmail.com> parents: 38528 diff changeset	327 else {
a7f2295a78ac _range_error(): Speed and simplify (there's no real need for Tim Peters <tim.peters@gmail.com> parents: 38528 diff changeset	328 const Py_ssize_t largest = (Py_ssize_t)(ulargest >> 1);
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	329 PyErr_Format(StructError,
38520 1a56da86c11a Calculate smallest properly (it was off by one) and use proper ssize_t types for Win64 Neal Norwitz <nnorwitz@gmail.com> parents: 38515 diff changeset	330 "'%c' format requires %zd <= number <= %zd",
38483 fb56a3992604 simplify the struct code a bit (no functional changes) Bob Ippolito <bob@redivi.com> parents: 38470 diff changeset	331 f->format,
38529 a7f2295a78ac _range_error(): Speed and simplify (there's no real need for Tim Peters <tim.peters@gmail.com> parents: 38528 diff changeset	332 ~ largest,
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	333 largest);
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	334 }
38515 bb0d2b955439 Change wrapping terminology to overflow masking Bob Ippolito <bob@redivi.com> parents: 38493 diff changeset	335 #ifdef PY_STRUCT_OVERFLOW_MASKING
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	336 {
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	337 PyObject ptype, pvalue, *ptraceback;
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	338 PyObject *msg;
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	339 int rval;
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	340 PyErr_Fetch(&ptype, &pvalue, &ptraceback);
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	341 assert(pvalue != NULL);
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	342 msg = PyObject_Str(pvalue);
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	343 Py_XDECREF(ptype);
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	344 Py_XDECREF(pvalue);
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	345 Py_XDECREF(ptraceback);
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	346 if (msg == NULL)
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	347 return -1;
38529 a7f2295a78ac _range_error(): Speed and simplify (there's no real need for Tim Peters <tim.peters@gmail.com> parents: 38528 diff changeset	348 rval = PyErr_Warn(PyExc_DeprecationWarning,
a7f2295a78ac _range_error(): Speed and simplify (there's no real need for Tim Peters <tim.peters@gmail.com> parents: 38528 diff changeset	349 PyString_AS_STRING(msg));
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	350 Py_DECREF(msg);
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	351 if (rval == 0)
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	352 return 0;
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	353 }
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	354 #endif
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	355 return -1;
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	356 }
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	357
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	358
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	359
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	360 /* A large number of small routines follow, with names of the form
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	361
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	362 [bln][up]_TYPE
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	363
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	364 [bln] distiguishes among big-endian, little-endian and native.
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	365 [pu] distiguishes between pack (to struct) and unpack (from struct).
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	366 TYPE is one of char, byte, ubyte, etc.
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	367 */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	368
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	369 /* Native mode routines. ****************************************************/
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	370 /* NOTE:
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	371 In all n[up]_<type> routines handling types larger than 1 byte, there is
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	372 no guarantee that the p pointer is properly aligned for each type,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	373 therefore memcpy is called. An intermediate variable is used to
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	374 compensate for big-endian architectures.
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	375 Normally both the intermediate variable and the memcpy call will be
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	376 skipped by C optimisation in little-endian architectures (gcc >= 2.91
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	377 does this). */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	378
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	379 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	380 nu_char(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	381 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	382 return PyString_FromStringAndSize(p, 1);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	383 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	384
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	385 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	386 nu_byte(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	387 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	388 return PyInt_FromLong((long) (signed char )p);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	389 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	390
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	391 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	392 nu_ubyte(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	393 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	394 return PyInt_FromLong((long) (unsigned char )p);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	395 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	396
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	397 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	398 nu_short(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	399 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	400 short x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	401 memcpy((char *)&x, p, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	402 return PyInt_FromLong((long)x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	403 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	404
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	405 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	406 nu_ushort(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	407 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	408 unsigned short x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	409 memcpy((char *)&x, p, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	410 return PyInt_FromLong((long)x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	411 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	412
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	413 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	414 nu_int(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	415 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	416 int x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	417 memcpy((char *)&x, p, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	418 return PyInt_FromLong((long)x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	419 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	420
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	421 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	422 nu_uint(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	423 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	424 unsigned int x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	425 memcpy((char *)&x, p, sizeof x);
38445 8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	426 #if (SIZEOF_LONG > SIZEOF_INT)
8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	427 return PyInt_FromLong((long)x);
8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	428 #else
8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	429 if (x <= ((unsigned int)LONG_MAX))
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	430 return PyInt_FromLong((long)x);
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	431 return PyLong_FromUnsignedLong((unsigned long)x);
38445 8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	432 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	433 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	434
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	435 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	436 nu_long(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	437 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	438 long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	439 memcpy((char *)&x, p, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	440 return PyInt_FromLong(x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	441 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	442
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	443 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	444 nu_ulong(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	445 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	446 unsigned long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	447 memcpy((char *)&x, p, sizeof x);
38316 2f16e2715223 Use LONG_MIN and LONG_MAX to check Python integer bounds instead of the incorrect INT_MIN and INT_MAX Bob Ippolito <bob@redivi.com> parents: 38313 diff changeset	448 if (x <= LONG_MAX)
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	449 return PyInt_FromLong((long)x);
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	450 return PyLong_FromUnsignedLong(x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	451 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	452
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	453 /* Native mode doesn't support q or Q unless the platform C supports
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	454 long long (or, on Windows, __int64). */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	455
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	456 #ifdef HAVE_LONG_LONG
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	457
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	458 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	459 nu_longlong(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	460 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	461 PY_LONG_LONG x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	462 memcpy((char *)&x, p, sizeof x);
38316 2f16e2715223 Use LONG_MIN and LONG_MAX to check Python integer bounds instead of the incorrect INT_MIN and INT_MAX Bob Ippolito <bob@redivi.com> parents: 38313 diff changeset	463 if (x >= LONG_MIN && x <= LONG_MAX)
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	464 return PyInt_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long));
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	465 return PyLong_FromLongLong(x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	466 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	467
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	468 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	469 nu_ulonglong(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	470 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	471 unsigned PY_LONG_LONG x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	472 memcpy((char *)&x, p, sizeof x);
38316 2f16e2715223 Use LONG_MIN and LONG_MAX to check Python integer bounds instead of the incorrect INT_MIN and INT_MAX Bob Ippolito <bob@redivi.com> parents: 38313 diff changeset	473 if (x <= LONG_MAX)
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	474 return PyInt_FromLong(Py_SAFE_DOWNCAST(x, unsigned PY_LONG_LONG, long));
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	475 return PyLong_FromUnsignedLongLong(x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	476 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	477
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	478 #endif
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	479
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	480 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	481 nu_float(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	482 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	483 float x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	484 memcpy((char *)&x, p, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	485 return PyFloat_FromDouble((double)x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	486 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	487
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	488 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	489 nu_double(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	490 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	491 double x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	492 memcpy((char *)&x, p, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	493 return PyFloat_FromDouble(x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	494 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	495
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	496 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	497 nu_void_p(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	498 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	499 void *x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	500 memcpy((char *)&x, p, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	501 return PyLong_FromVoidPtr(x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	502 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	503
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	504 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	505 np_byte(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	506 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	507 long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	508 if (get_long(v, &x) < 0)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	509 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	510 if (x < -128 \|\| x > 127){
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	511 PyErr_SetString(StructError,
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	512 "byte format requires -128 <= number <= 127");
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	513 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	514 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	515 *p = (char)x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	516 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	517 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	518
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	519 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	520 np_ubyte(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	521 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	522 long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	523 if (get_long(v, &x) < 0)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	524 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	525 if (x < 0 \|\| x > 255){
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	526 PyErr_SetString(StructError,
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	527 "ubyte format requires 0 <= number <= 255");
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	528 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	529 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	530 *p = (char)x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	531 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	532 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	533
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	534 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	535 np_char(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	536 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	537 if (!PyString_Check(v) \|\| PyString_Size(v) != 1) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	538 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	539 "char format require string of length 1");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	540 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	541 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	542 p = PyString_AsString(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	543 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	544 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	545
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	546 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	547 np_short(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	548 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	549 long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	550 short y;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	551 if (get_long(v, &x) < 0)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	552 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	553 if (x < SHRT_MIN \|\| x > SHRT_MAX){
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	554 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	555 "short format requires " STRINGIFY(SHRT_MIN)
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	556 " <= number <= " STRINGIFY(SHRT_MAX));
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	557 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	558 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	559 y = (short)x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	560 memcpy(p, (char *)&y, sizeof y);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	561 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	562 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	563
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	564 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	565 np_ushort(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	566 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	567 long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	568 unsigned short y;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	569 if (get_long(v, &x) < 0)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	570 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	571 if (x < 0 \|\| x > USHRT_MAX){
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	572 PyErr_SetString(StructError,
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	573 "short format requires 0 <= number <= " STRINGIFY(USHRT_MAX));
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	574 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	575 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	576 y = (unsigned short)x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	577 memcpy(p, (char *)&y, sizeof y);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	578 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	579 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	580
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	581 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	582 np_int(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	583 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	584 long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	585 int y;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	586 if (get_long(v, &x) < 0)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	587 return -1;
38429 003433511e4d Remove the range checking and int usage #defines from _struct and strip out the now-dead code Bob Ippolito <bob@redivi.com> parents: 38411 diff changeset	588 #if (SIZEOF_LONG > SIZEOF_INT)
38445 8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	589 if ((x < ((long)INT_MIN)) \|\| (x > ((long)INT_MAX)))
38483 fb56a3992604 simplify the struct code a bit (no functional changes) Bob Ippolito <bob@redivi.com> parents: 38470 diff changeset	590 return _range_error(f, 0);
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	591 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	592 y = (int)x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	593 memcpy(p, (char *)&y, sizeof y);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	594 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	595 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	596
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	597 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	598 np_uint(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	599 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	600 unsigned long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	601 unsigned int y;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	602 if (get_ulong(v, &x) < 0)
38483 fb56a3992604 simplify the struct code a bit (no functional changes) Bob Ippolito <bob@redivi.com> parents: 38470 diff changeset	603 return _range_error(f, 1);
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	604 y = (unsigned int)x;
38429 003433511e4d Remove the range checking and int usage #defines from _struct and strip out the now-dead code Bob Ippolito <bob@redivi.com> parents: 38411 diff changeset	605 #if (SIZEOF_LONG > SIZEOF_INT)
38445 8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	606 if (x > ((unsigned long)UINT_MAX))
38483 fb56a3992604 simplify the struct code a bit (no functional changes) Bob Ippolito <bob@redivi.com> parents: 38470 diff changeset	607 return _range_error(f, 1);
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	608 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	609 memcpy(p, (char *)&y, sizeof y);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	610 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	611 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	612
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	613 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	614 np_long(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	615 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	616 long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	617 if (get_long(v, &x) < 0)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	618 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	619 memcpy(p, (char *)&x, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	620 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	621 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	622
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	623 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	624 np_ulong(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	625 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	626 unsigned long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	627 if (get_ulong(v, &x) < 0)
38483 fb56a3992604 simplify the struct code a bit (no functional changes) Bob Ippolito <bob@redivi.com> parents: 38470 diff changeset	628 return _range_error(f, 1);
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	629 memcpy(p, (char *)&x, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	630 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	631 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	632
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	633 #ifdef HAVE_LONG_LONG
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	634
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	635 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	636 np_longlong(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	637 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	638 PY_LONG_LONG x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	639 if (get_longlong(v, &x) < 0)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	640 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	641 memcpy(p, (char *)&x, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	642 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	643 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	644
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	645 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	646 np_ulonglong(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	647 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	648 unsigned PY_LONG_LONG x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	649 if (get_ulonglong(v, &x) < 0)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	650 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	651 memcpy(p, (char *)&x, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	652 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	653 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	654 #endif
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	655
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	656 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	657 np_float(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	658 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	659 float x = (float)PyFloat_AsDouble(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	660 if (x == -1 && PyErr_Occurred()) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	661 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	662 "required argument is not a float");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	663 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	664 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	665 memcpy(p, (char *)&x, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	666 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	667 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	668
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	669 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	670 np_double(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	671 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	672 double x = PyFloat_AsDouble(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	673 if (x == -1 && PyErr_Occurred()) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	674 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	675 "required argument is not a float");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	676 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	677 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	678 memcpy(p, (char *)&x, sizeof(double));
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	679 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	680 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	681
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	682 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	683 np_void_p(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	684 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	685 void *x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	686
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	687 v = get_pylong(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	688 if (v == NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	689 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	690 assert(PyLong_Check(v));
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	691 x = PyLong_AsVoidPtr(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	692 Py_DECREF(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	693 if (x == NULL && PyErr_Occurred())
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	694 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	695 memcpy(p, (char *)&x, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	696 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	697 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	698
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	699 static formatdef native_table[] = {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	700 {'x', sizeof(char), 0, NULL},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	701 {'b', sizeof(char), 0, nu_byte, np_byte},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	702 {'B', sizeof(char), 0, nu_ubyte, np_ubyte},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	703 {'c', sizeof(char), 0, nu_char, np_char},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	704 {'s', sizeof(char), 0, NULL},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	705 {'p', sizeof(char), 0, NULL},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	706 {'h', sizeof(short), SHORT_ALIGN, nu_short, np_short},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	707 {'H', sizeof(short), SHORT_ALIGN, nu_ushort, np_ushort},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	708 {'i', sizeof(int), INT_ALIGN, nu_int, np_int},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	709 {'I', sizeof(int), INT_ALIGN, nu_uint, np_uint},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	710 {'l', sizeof(long), LONG_ALIGN, nu_long, np_long},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	711 {'L', sizeof(long), LONG_ALIGN, nu_ulong, np_ulong},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	712 #ifdef HAVE_LONG_LONG
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	713 {'q', sizeof(PY_LONG_LONG), LONG_LONG_ALIGN, nu_longlong, np_longlong},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	714 {'Q', sizeof(PY_LONG_LONG), LONG_LONG_ALIGN, nu_ulonglong,np_ulonglong},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	715 #endif
38317 68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	716 {'f', sizeof(float), FLOAT_ALIGN, nu_float, np_float},
68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	717 {'d', sizeof(double), DOUBLE_ALIGN, nu_double, np_double},
68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	718 {'P', sizeof(void *), VOID_P_ALIGN, nu_void_p, np_void_p},
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	719 {0}
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	720 };
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	721
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	722 /* Big-endian routines. *****************************************************/
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	723
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	724 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	725 bu_int(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	726 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	727 long x = 0;
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	728 Py_ssize_t i = f->size;
38483 fb56a3992604 simplify the struct code a bit (no functional changes) Bob Ippolito <bob@redivi.com> parents: 38470 diff changeset	729 const unsigned char bytes = (const unsigned char )p;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	730 do {
38483 fb56a3992604 simplify the struct code a bit (no functional changes) Bob Ippolito <bob@redivi.com> parents: 38470 diff changeset	731 x = (x<<8) \| *bytes++;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	732 } while (--i > 0);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	733 /* Extend the sign bit. */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	734 if (SIZEOF_LONG > f->size)
38445 8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	735 x \|= -(x & (1L << ((8 * f->size) - 1)));
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	736 return PyInt_FromLong(x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	737 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	738
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	739 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	740 bu_uint(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	741 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	742 unsigned long x = 0;
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	743 Py_ssize_t i = f->size;
38483 fb56a3992604 simplify the struct code a bit (no functional changes) Bob Ippolito <bob@redivi.com> parents: 38470 diff changeset	744 const unsigned char bytes = (const unsigned char )p;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	745 do {
38483 fb56a3992604 simplify the struct code a bit (no functional changes) Bob Ippolito <bob@redivi.com> parents: 38470 diff changeset	746 x = (x<<8) \| *bytes++;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	747 } while (--i > 0);
38316 2f16e2715223 Use LONG_MIN and LONG_MAX to check Python integer bounds instead of the incorrect INT_MIN and INT_MAX Bob Ippolito <bob@redivi.com> parents: 38313 diff changeset	748 if (x <= LONG_MAX)
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	749 return PyInt_FromLong((long)x);
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	750 return PyLong_FromUnsignedLong(x);
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	751 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	752
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	753 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	754 bu_longlong(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	755 {
38429 003433511e4d Remove the range checking and int usage #defines from _struct and strip out the now-dead code Bob Ippolito <bob@redivi.com> parents: 38411 diff changeset	756 #ifdef HAVE_LONG_LONG
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	757 PY_LONG_LONG x = 0;
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	758 Py_ssize_t i = f->size;
38483 fb56a3992604 simplify the struct code a bit (no functional changes) Bob Ippolito <bob@redivi.com> parents: 38470 diff changeset	759 const unsigned char bytes = (const unsigned char )p;
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	760 do {
38483 fb56a3992604 simplify the struct code a bit (no functional changes) Bob Ippolito <bob@redivi.com> parents: 38470 diff changeset	761 x = (x<<8) \| *bytes++;
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	762 } while (--i > 0);
850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	763 /* Extend the sign bit. */
850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	764 if (SIZEOF_LONG_LONG > f->size)
38445 8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	765 x \|= -(x & (1L << ((8 * f->size) - 1)));
38316 2f16e2715223 Use LONG_MIN and LONG_MAX to check Python integer bounds instead of the incorrect INT_MIN and INT_MAX Bob Ippolito <bob@redivi.com> parents: 38313 diff changeset	766 if (x >= LONG_MIN && x <= LONG_MAX)
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	767 return PyInt_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long));
850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	768 return PyLong_FromLongLong(x);
850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	769 #else
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	770 return _PyLong_FromByteArray((const unsigned char *)p,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	771 8,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	772 0, /* little-endian */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	773 1 /* signed */);
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	774 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	775 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	776
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	777 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	778 bu_ulonglong(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	779 {
38429 003433511e4d Remove the range checking and int usage #defines from _struct and strip out the now-dead code Bob Ippolito <bob@redivi.com> parents: 38411 diff changeset	780 #ifdef HAVE_LONG_LONG
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	781 unsigned PY_LONG_LONG x = 0;
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	782 Py_ssize_t i = f->size;
38483 fb56a3992604 simplify the struct code a bit (no functional changes) Bob Ippolito <bob@redivi.com> parents: 38470 diff changeset	783 const unsigned char bytes = (const unsigned char )p;
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	784 do {
38483 fb56a3992604 simplify the struct code a bit (no functional changes) Bob Ippolito <bob@redivi.com> parents: 38470 diff changeset	785 x = (x<<8) \| *bytes++;
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	786 } while (--i > 0);
38316 2f16e2715223 Use LONG_MIN and LONG_MAX to check Python integer bounds instead of the incorrect INT_MIN and INT_MAX Bob Ippolito <bob@redivi.com> parents: 38313 diff changeset	787 if (x <= LONG_MAX)
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	788 return PyInt_FromLong(Py_SAFE_DOWNCAST(x, unsigned PY_LONG_LONG, long));
850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	789 return PyLong_FromUnsignedLongLong(x);
850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	790 #else
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	791 return _PyLong_FromByteArray((const unsigned char *)p,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	792 8,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	793 0, /* little-endian */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	794 0 /* signed */);
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	795 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	796 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	797
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	798 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	799 bu_float(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	800 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	801 return unpack_float(p, 0);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	802 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	803
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	804 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	805 bu_double(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	806 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	807 return unpack_double(p, 0);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	808 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	809
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	810 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	811 bp_int(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	812 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	813 long x;
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	814 Py_ssize_t i;
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	815 if (get_wrapped_long(v, &x) < 0)
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	816 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	817 i = f->size;
38445 8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	818 if (i != SIZEOF_LONG) {
8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	819 if ((i == 2) && (x < -32768 \|\| x > 32767))
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	820 RANGE_ERROR(x, f, 0, 0xffffL);
38429 003433511e4d Remove the range checking and int usage #defines from _struct and strip out the now-dead code Bob Ippolito <bob@redivi.com> parents: 38411 diff changeset	821 #if (SIZEOF_LONG != 4)
38445 8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	822 else if ((i == 4) && (x < -2147483648L \|\| x > 2147483647L))
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	823 RANGE_ERROR(x, f, 0, 0xffffffffL);
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	824 #endif
38515 bb0d2b955439 Change wrapping terminology to overflow masking Bob Ippolito <bob@redivi.com> parents: 38493 diff changeset	825 #ifdef PY_STRUCT_OVERFLOW_MASKING
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	826 else if ((i == 1) && (x < -128 \|\| x > 127))
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	827 RANGE_ERROR(x, f, 0, 0xffL);
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	828 #endif
38445 8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	829 }
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	830 do {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	831 p[--i] = (char)x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	832 x >>= 8;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	833 } while (i > 0);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	834 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	835 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	836
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	837 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	838 bp_uint(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	839 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	840 unsigned long x;
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	841 Py_ssize_t i;
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	842 if (get_wrapped_ulong(v, &x) < 0)
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	843 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	844 i = f->size;
38445 8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	845 if (i != SIZEOF_LONG) {
8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	846 unsigned long maxint = 1;
8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	847 maxint <<= (unsigned long)(i * 8);
8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	848 if (x >= maxint)
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	849 RANGE_ERROR(x, f, 1, maxint - 1);
38445 8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	850 }
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	851 do {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	852 p[--i] = (char)x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	853 x >>= 8;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	854 } while (i > 0);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	855 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	856 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	857
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	858 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	859 bp_longlong(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	860 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	861 int res;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	862 v = get_pylong(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	863 if (v == NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	864 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	865 res = _PyLong_AsByteArray((PyLongObject *)v,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	866 (unsigned char *)p,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	867 8,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	868 0, /* little_endian */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	869 1 /* signed */);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	870 Py_DECREF(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	871 return res;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	872 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	873
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	874 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	875 bp_ulonglong(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	876 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	877 int res;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	878 v = get_pylong(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	879 if (v == NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	880 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	881 res = _PyLong_AsByteArray((PyLongObject *)v,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	882 (unsigned char *)p,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	883 8,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	884 0, /* little_endian */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	885 0 /* signed */);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	886 Py_DECREF(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	887 return res;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	888 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	889
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	890 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	891 bp_float(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	892 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	893 double x = PyFloat_AsDouble(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	894 if (x == -1 && PyErr_Occurred()) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	895 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	896 "required argument is not a float");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	897 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	898 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	899 return _PyFloat_Pack4(x, (unsigned char *)p, 0);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	900 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	901
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	902 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	903 bp_double(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	904 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	905 double x = PyFloat_AsDouble(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	906 if (x == -1 && PyErr_Occurred()) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	907 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	908 "required argument is not a float");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	909 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	910 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	911 return _PyFloat_Pack8(x, (unsigned char *)p, 0);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	912 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	913
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	914 static formatdef bigendian_table[] = {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	915 {'x', 1, 0, NULL},
38515 bb0d2b955439 Change wrapping terminology to overflow masking Bob Ippolito <bob@redivi.com> parents: 38493 diff changeset	916 #ifdef PY_STRUCT_OVERFLOW_MASKING
bb0d2b955439 Change wrapping terminology to overflow masking Bob Ippolito <bob@redivi.com> parents: 38493 diff changeset	917 /* Native packers do range checking without overflow masking. */
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	918 {'b', 1, 0, nu_byte, bp_int},
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	919 {'B', 1, 0, nu_ubyte, bp_uint},
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	920 #else
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	921 {'b', 1, 0, nu_byte, np_byte},
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	922 {'B', 1, 0, nu_ubyte, np_ubyte},
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	923 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	924 {'c', 1, 0, nu_char, np_char},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	925 {'s', 1, 0, NULL},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	926 {'p', 1, 0, NULL},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	927 {'h', 2, 0, bu_int, bp_int},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	928 {'H', 2, 0, bu_uint, bp_uint},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	929 {'i', 4, 0, bu_int, bp_int},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	930 {'I', 4, 0, bu_uint, bp_uint},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	931 {'l', 4, 0, bu_int, bp_int},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	932 {'L', 4, 0, bu_uint, bp_uint},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	933 {'q', 8, 0, bu_longlong, bp_longlong},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	934 {'Q', 8, 0, bu_ulonglong, bp_ulonglong},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	935 {'f', 4, 0, bu_float, bp_float},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	936 {'d', 8, 0, bu_double, bp_double},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	937 {0}
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	938 };
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	939
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	940 /* Little-endian routines. *****************************************************/
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	941
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	942 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	943 lu_int(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	944 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	945 long x = 0;
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	946 Py_ssize_t i = f->size;
38483 fb56a3992604 simplify the struct code a bit (no functional changes) Bob Ippolito <bob@redivi.com> parents: 38470 diff changeset	947 const unsigned char bytes = (const unsigned char )p;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	948 do {
38483 fb56a3992604 simplify the struct code a bit (no functional changes) Bob Ippolito <bob@redivi.com> parents: 38470 diff changeset	949 x = (x<<8) \| bytes[--i];
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	950 } while (i > 0);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	951 /* Extend the sign bit. */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	952 if (SIZEOF_LONG > f->size)
38445 8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	953 x \|= -(x & (1L << ((8 * f->size) - 1)));
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	954 return PyInt_FromLong(x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	955 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	956
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	957 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	958 lu_uint(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	959 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	960 unsigned long x = 0;
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	961 Py_ssize_t i = f->size;
38483 fb56a3992604 simplify the struct code a bit (no functional changes) Bob Ippolito <bob@redivi.com> parents: 38470 diff changeset	962 const unsigned char bytes = (const unsigned char )p;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	963 do {
38483 fb56a3992604 simplify the struct code a bit (no functional changes) Bob Ippolito <bob@redivi.com> parents: 38470 diff changeset	964 x = (x<<8) \| bytes[--i];
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	965 } while (i > 0);
38316 2f16e2715223 Use LONG_MIN and LONG_MAX to check Python integer bounds instead of the incorrect INT_MIN and INT_MAX Bob Ippolito <bob@redivi.com> parents: 38313 diff changeset	966 if (x <= LONG_MAX)
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	967 return PyInt_FromLong((long)x);
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	968 return PyLong_FromUnsignedLong((long)x);
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	969 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	970
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	971 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	972 lu_longlong(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	973 {
38429 003433511e4d Remove the range checking and int usage #defines from _struct and strip out the now-dead code Bob Ippolito <bob@redivi.com> parents: 38411 diff changeset	974 #ifdef HAVE_LONG_LONG
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	975 PY_LONG_LONG x = 0;
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	976 Py_ssize_t i = f->size;
38483 fb56a3992604 simplify the struct code a bit (no functional changes) Bob Ippolito <bob@redivi.com> parents: 38470 diff changeset	977 const unsigned char bytes = (const unsigned char )p;
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	978 do {
38483 fb56a3992604 simplify the struct code a bit (no functional changes) Bob Ippolito <bob@redivi.com> parents: 38470 diff changeset	979 x = (x<<8) \| bytes[--i];
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	980 } while (i > 0);
850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	981 /* Extend the sign bit. */
850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	982 if (SIZEOF_LONG_LONG > f->size)
38445 8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	983 x \|= -(x & (1L << ((8 * f->size) - 1)));
38316 2f16e2715223 Use LONG_MIN and LONG_MAX to check Python integer bounds instead of the incorrect INT_MIN and INT_MAX Bob Ippolito <bob@redivi.com> parents: 38313 diff changeset	984 if (x >= LONG_MIN && x <= LONG_MAX)
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	985 return PyInt_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long));
850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	986 return PyLong_FromLongLong(x);
850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	987 #else
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	988 return _PyLong_FromByteArray((const unsigned char *)p,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	989 8,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	990 1, /* little-endian */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	991 1 /* signed */);
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	992 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	993 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	994
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	995 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	996 lu_ulonglong(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	997 {
38429 003433511e4d Remove the range checking and int usage #defines from _struct and strip out the now-dead code Bob Ippolito <bob@redivi.com> parents: 38411 diff changeset	998 #ifdef HAVE_LONG_LONG
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	999 unsigned PY_LONG_LONG x = 0;
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1000 Py_ssize_t i = f->size;
38483 fb56a3992604 simplify the struct code a bit (no functional changes) Bob Ippolito <bob@redivi.com> parents: 38470 diff changeset	1001 const unsigned char bytes = (const unsigned char )p;
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	1002 do {
38483 fb56a3992604 simplify the struct code a bit (no functional changes) Bob Ippolito <bob@redivi.com> parents: 38470 diff changeset	1003 x = (x<<8) \| bytes[--i];
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	1004 } while (i > 0);
38316 2f16e2715223 Use LONG_MIN and LONG_MAX to check Python integer bounds instead of the incorrect INT_MIN and INT_MAX Bob Ippolito <bob@redivi.com> parents: 38313 diff changeset	1005 if (x <= LONG_MAX)
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	1006 return PyInt_FromLong(Py_SAFE_DOWNCAST(x, unsigned PY_LONG_LONG, long));
850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	1007 return PyLong_FromUnsignedLongLong(x);
850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	1008 #else
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1009 return _PyLong_FromByteArray((const unsigned char *)p,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1010 8,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1011 1, /* little-endian */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1012 0 /* signed */);
38310 850d4f7717b8 Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change) Bob Ippolito <bob@redivi.com> parents: 38277 diff changeset	1013 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1014 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1015
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1016 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1017 lu_float(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1018 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1019 return unpack_float(p, 1);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1020 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1021
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1022 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1023 lu_double(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1024 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1025 return unpack_double(p, 1);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1026 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1027
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1028 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1029 lp_int(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1030 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1031 long x;
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1032 Py_ssize_t i;
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1033 if (get_wrapped_long(v, &x) < 0)
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1034 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1035 i = f->size;
38445 8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	1036 if (i != SIZEOF_LONG) {
8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	1037 if ((i == 2) && (x < -32768 \|\| x > 32767))
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1038 RANGE_ERROR(x, f, 0, 0xffffL);
38429 003433511e4d Remove the range checking and int usage #defines from _struct and strip out the now-dead code Bob Ippolito <bob@redivi.com> parents: 38411 diff changeset	1039 #if (SIZEOF_LONG != 4)
38445 8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	1040 else if ((i == 4) && (x < -2147483648L \|\| x > 2147483647L))
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1041 RANGE_ERROR(x, f, 0, 0xffffffffL);
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1042 #endif
38515 bb0d2b955439 Change wrapping terminology to overflow masking Bob Ippolito <bob@redivi.com> parents: 38493 diff changeset	1043 #ifdef PY_STRUCT_OVERFLOW_MASKING
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1044 else if ((i == 1) && (x < -128 \|\| x > 127))
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1045 RANGE_ERROR(x, f, 0, 0xffL);
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	1046 #endif
38445 8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	1047 }
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1048 do {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1049 *p++ = (char)x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1050 x >>= 8;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1051 } while (--i > 0);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1052 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1053 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1054
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1055 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1056 lp_uint(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1057 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1058 unsigned long x;
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1059 Py_ssize_t i;
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1060 if (get_wrapped_ulong(v, &x) < 0)
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1061 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1062 i = f->size;
38445 8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	1063 if (i != SIZEOF_LONG) {
8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	1064 unsigned long maxint = 1;
8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	1065 maxint <<= (unsigned long)(i * 8);
8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	1066 if (x >= maxint)
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1067 RANGE_ERROR(x, f, 1, maxint - 1);
38445 8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	1068 }
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1069 do {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1070 *p++ = (char)x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1071 x >>= 8;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1072 } while (--i > 0);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1073 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1074 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1075
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1076 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1077 lp_longlong(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1078 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1079 int res;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1080 v = get_pylong(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1081 if (v == NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1082 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1083 res = _PyLong_AsByteArray((PyLongObject*)v,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1084 (unsigned char *)p,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1085 8,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1086 1, /* little_endian */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1087 1 /* signed */);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1088 Py_DECREF(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1089 return res;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1090 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1091
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1092 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1093 lp_ulonglong(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1094 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1095 int res;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1096 v = get_pylong(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1097 if (v == NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1098 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1099 res = _PyLong_AsByteArray((PyLongObject*)v,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1100 (unsigned char *)p,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1101 8,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1102 1, /* little_endian */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1103 0 /* signed */);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1104 Py_DECREF(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1105 return res;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1106 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1107
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1108 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1109 lp_float(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1110 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1111 double x = PyFloat_AsDouble(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1112 if (x == -1 && PyErr_Occurred()) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1113 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1114 "required argument is not a float");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1115 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1116 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1117 return _PyFloat_Pack4(x, (unsigned char *)p, 1);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1118 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1119
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1120 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1121 lp_double(char p, PyObject v, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1122 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1123 double x = PyFloat_AsDouble(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1124 if (x == -1 && PyErr_Occurred()) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1125 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1126 "required argument is not a float");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1127 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1128 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1129 return _PyFloat_Pack8(x, (unsigned char *)p, 1);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1130 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1131
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1132 static formatdef lilendian_table[] = {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1133 {'x', 1, 0, NULL},
38515 bb0d2b955439 Change wrapping terminology to overflow masking Bob Ippolito <bob@redivi.com> parents: 38493 diff changeset	1134 #ifdef PY_STRUCT_OVERFLOW_MASKING
bb0d2b955439 Change wrapping terminology to overflow masking Bob Ippolito <bob@redivi.com> parents: 38493 diff changeset	1135 /* Native packers do range checking without overflow masking. */
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1136 {'b', 1, 0, nu_byte, lp_int},
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1137 {'B', 1, 0, nu_ubyte, lp_uint},
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1138 #else
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	1139 {'b', 1, 0, nu_byte, np_byte},
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	1140 {'B', 1, 0, nu_ubyte, np_ubyte},
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1141 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1142 {'c', 1, 0, nu_char, np_char},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1143 {'s', 1, 0, NULL},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1144 {'p', 1, 0, NULL},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1145 {'h', 2, 0, lu_int, lp_int},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1146 {'H', 2, 0, lu_uint, lp_uint},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1147 {'i', 4, 0, lu_int, lp_int},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1148 {'I', 4, 0, lu_uint, lp_uint},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1149 {'l', 4, 0, lu_int, lp_int},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1150 {'L', 4, 0, lu_uint, lp_uint},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1151 {'q', 8, 0, lu_longlong, lp_longlong},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1152 {'Q', 8, 0, lu_ulonglong, lp_ulonglong},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1153 {'f', 4, 0, lu_float, lp_float},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1154 {'d', 8, 0, lu_double, lp_double},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1155 {0}
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1156 };
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1157
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1158
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1159 static const formatdef *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1160 whichtable(char **pfmt)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1161 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1162 const char fmt = (pfmt)++; /* May be backed out of later */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1163 switch (*fmt) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1164 case '<':
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1165 return lilendian_table;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1166 case '>':
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1167 case '!': /* Network byte order is big-endian */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1168 return bigendian_table;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1169 case '=': { /* Host byte order -- different from native in aligment! */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1170 int n = 1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1171 char p = (char ) &n;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1172 if (*p == 1)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1173 return lilendian_table;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1174 else
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1175 return bigendian_table;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1176 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1177 default:
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1178 --pfmt; / Back out of pointer increment */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1179 /* Fall through */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1180 case '@':
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1181 return native_table;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1182 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1183 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1184
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1185
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1186 /* Get the table entry for a format code */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1187
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1188 static const formatdef *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1189 getentry(int c, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1190 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1191 for (; f->format != '\0'; f++) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1192 if (f->format == c) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1193 return f;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1194 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1195 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1196 PyErr_SetString(StructError, "bad char in struct format");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1197 return NULL;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1198 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1199
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1200
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1201 /* Align a size according to a format code */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1202
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1203 static int
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1204 align(Py_ssize_t size, char c, const formatdef *e)
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1205 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1206 if (e->format == c) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1207 if (e->alignment) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1208 size = ((size + e->alignment - 1)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1209 / e->alignment)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1210 * e->alignment;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1211 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1212 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1213 return size;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1214 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1215
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1216
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1217 /* calculate the size of a format string */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1218
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1219 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1220 prepare_s(PyStructObject *self)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1221 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1222 const formatdef *f;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1223 const formatdef *e;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1224 formatcode *codes;
38528 e0997ffa3572 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 38520 diff changeset	1225
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1226 const char *s;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1227 const char *fmt;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1228 char c;
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1229 Py_ssize_t size, len, num, itemsize, x;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1230
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1231 fmt = PyString_AS_STRING(self->s_format);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1232
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1233 f = whichtable((char **)&fmt);
38528 e0997ffa3572 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 38520 diff changeset	1234
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1235 s = fmt;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1236 size = 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1237 len = 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1238 while ((c = *s++) != '\0') {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1239 if (isspace(Py_CHARMASK(c)))
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1240 continue;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1241 if ('0' <= c && c <= '9') {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1242 num = c - '0';
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1243 while ('0' <= (c = *s++) && c <= '9') {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1244 x = num*10 + (c - '0');
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1245 if (x/10 != num) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1246 PyErr_SetString(
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1247 StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1248 "overflow in item count");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1249 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1250 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1251 num = x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1252 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1253 if (c == '\0')
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1254 break;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1255 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1256 else
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1257 num = 1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1258
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1259 e = getentry(c, f);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1260 if (e == NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1261 return -1;
38528 e0997ffa3572 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 38520 diff changeset	1262
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1263 switch (c) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1264 case 's': /* fall through */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1265 case 'p': len++; break;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1266 case 'x': break;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1267 default: len += num; break;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1268 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1269
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1270 itemsize = e->size;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1271 size = align(size, c, e);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1272 x = num * itemsize;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1273 size += x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1274 if (x/itemsize != num \|\| size < 0) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1275 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1276 "total struct size too long");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1277 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1278 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1279 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1280
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1281 self->s_size = size;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1282 self->s_len = len;
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1283 codes = PyMem_MALLOC((len + 1) * sizeof(formatcode));
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1284 if (codes == NULL) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1285 PyErr_NoMemory();
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1286 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1287 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1288 self->s_codes = codes;
38528 e0997ffa3572 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 38520 diff changeset	1289
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1290 s = fmt;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1291 size = 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1292 while ((c = *s++) != '\0') {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1293 if (isspace(Py_CHARMASK(c)))
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1294 continue;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1295 if ('0' <= c && c <= '9') {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1296 num = c - '0';
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1297 while ('0' <= (c = *s++) && c <= '9')
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1298 num = num*10 + (c - '0');
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1299 if (c == '\0')
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1300 break;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1301 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1302 else
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1303 num = 1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1304
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1305 e = getentry(c, f);
38528 e0997ffa3572 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 38520 diff changeset	1306
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1307 size = align(size, c, e);
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1308 if (c == 's' \|\| c == 'p') {
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1309 codes->offset = size;
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1310 codes->size = num;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1311 codes->fmtdef = e;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1312 codes++;
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1313 size += num;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1314 } else if (c == 'x') {
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1315 size += num;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1316 } else {
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1317 while (--num >= 0) {
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1318 codes->offset = size;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1319 codes->size = e->size;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1320 codes->fmtdef = e;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1321 codes++;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1322 size += e->size;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1323 }
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1324 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1325 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1326 codes->fmtdef = NULL;
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1327 codes->offset = size;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1328 codes->size = 0;
38528 e0997ffa3572 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 38520 diff changeset	1329
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1330 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1331 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1332
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1333 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1334 s_new(PyTypeObject type, PyObject args, PyObject *kwds)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1335 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1336 PyObject *self;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1337
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1338 assert(type != NULL && type->tp_alloc != NULL);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1339
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1340 self = type->tp_alloc(type, 0);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1341 if (self != NULL) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1342 PyStructObject s = (PyStructObject)self;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1343 Py_INCREF(Py_None);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1344 s->s_format = Py_None;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1345 s->s_codes = NULL;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1346 s->s_size = -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1347 s->s_len = -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1348 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1349 return self;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1350 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1351
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1352 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1353 s_init(PyObject self, PyObject args, PyObject *kwds)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1354 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1355 PyStructObject soself = (PyStructObject )self;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1356 PyObject *o_format = NULL;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1357 int ret = 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1358 static char *kwlist[] = {"format", 0};
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1359
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1360 assert(PyStruct_Check(self));
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1361
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1362 if (!PyArg_ParseTupleAndKeywords(args, kwds, "S:Struct", kwlist,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1363 &o_format))
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1364 return -1;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1365
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1366 Py_INCREF(o_format);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1367 Py_XDECREF(soself->s_format);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1368 soself->s_format = o_format;
38528 e0997ffa3572 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 38520 diff changeset	1369
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1370 ret = prepare_s(soself);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1371 return ret;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1372 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1373
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1374 static void
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1375 s_dealloc(PyStructObject *s)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1376 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1377 if (s->weakreflist != NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1378 PyObject_ClearWeakRefs((PyObject *)s);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1379 if (s->s_codes != NULL) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1380 PyMem_FREE(s->s_codes);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1381 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1382 Py_XDECREF(s->s_format);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1383 s->ob_type->tp_free((PyObject *)s);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1384 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1385
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1386 static PyObject *
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1387 s_unpack_internal(PyStructObject soself, char startfrom) {
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1388 formatcode *code;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1389 Py_ssize_t i = 0;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1390 PyObject *result = PyTuple_New(soself->s_len);
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1391 if (result == NULL)
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1392 return NULL;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1393
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1394 for (code = soself->s_codes; code->fmtdef != NULL; code++) {
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1395 PyObject *v;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1396 const formatdef *e = code->fmtdef;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1397 const char *res = startfrom + code->offset;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1398 if (e->format == 's') {
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1399 v = PyString_FromStringAndSize(res, code->size);
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1400 } else if (e->format == 'p') {
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1401 Py_ssize_t n = (unsigned char)res;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1402 if (n >= code->size)
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1403 n = code->size - 1;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1404 v = PyString_FromStringAndSize(res + 1, n);
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1405 } else {
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1406 v = e->unpack(res, e);
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1407 }
38736 e80097bf73b6 Wrap some long lines Neal Norwitz <nnorwitz@gmail.com> parents: 38583 diff changeset	1408 if (v == NULL)
e80097bf73b6 Wrap some long lines Neal Norwitz <nnorwitz@gmail.com> parents: 38583 diff changeset	1409 goto fail;
e80097bf73b6 Wrap some long lines Neal Norwitz <nnorwitz@gmail.com> parents: 38583 diff changeset	1410 PyTuple_SET_ITEM(result, i++, v);
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1411 }
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1412
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1413 return result;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1414 fail:
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1415 Py_DECREF(result);
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1416 return NULL;
38445 8daeb9af8422 fix struct regression on 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38430 diff changeset	1417 }
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1418
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1419
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1420 PyDoc_STRVAR(s_unpack__doc__,
38430 795d1cb1df01 Fix up struct docstrings, add struct.pack_to function for symmetry Bob Ippolito <bob@redivi.com> parents: 38429 diff changeset	1421 "S.unpack(str) -> (v1, v2, ...)\n\
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1422 \n\
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1423 Return tuple containing values unpacked according to this Struct's format.\n\
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1424 Requires len(str) == self.size. See struct.__doc__ for more on format\n\
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1425 strings.");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1426
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1427 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1428 s_unpack(PyObject self, PyObject inputstr)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1429 {
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1430 PyStructObject soself = (PyStructObject )self;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1431 assert(PyStruct_Check(self));
38528 e0997ffa3572 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 38520 diff changeset	1432 assert(soself->s_codes != NULL);
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1433 if (inputstr == NULL \|\| !PyString_Check(inputstr) \|\|
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1434 PyString_GET_SIZE(inputstr) != soself->s_size) {
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1435 PyErr_Format(StructError,
38736 e80097bf73b6 Wrap some long lines Neal Norwitz <nnorwitz@gmail.com> parents: 38583 diff changeset	1436 "unpack requires a string argument of length %zd",
e80097bf73b6 Wrap some long lines Neal Norwitz <nnorwitz@gmail.com> parents: 38583 diff changeset	1437 soself->s_size);
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1438 return NULL;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1439 }
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1440 return s_unpack_internal(soself, PyString_AS_STRING(inputstr));
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1441 }
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1442
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1443 PyDoc_STRVAR(s_unpack_from__doc__,
38430 795d1cb1df01 Fix up struct docstrings, add struct.pack_to function for symmetry Bob Ippolito <bob@redivi.com> parents: 38429 diff changeset	1444 "S.unpack_from(buffer[, offset]) -> (v1, v2, ...)\n\
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1445 \n\
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1446 Return tuple containing values unpacked according to this Struct's format.\n\
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1447 Unlike unpack, unpack_from can unpack values from any object supporting\n\
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1448 the buffer API, not just str. Requires len(buffer[offset:]) >= self.size.\n\
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1449 See struct.__doc__ for more on format strings.");
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1450
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1451 static PyObject *
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1452 s_unpack_from(PyObject self, PyObject args, PyObject *kwds)
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1453 {
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1454 static char *kwlist[] = {"buffer", "offset", 0};
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1455 #if (PY_VERSION_HEX < 0x02050000)
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1456 static char *fmt = "z#\|i:unpack_from";
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1457 #else
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1458 static char *fmt = "z#\|n:unpack_from";
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1459 #endif
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1460 Py_ssize_t buffer_len = 0, offset = 0;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1461 char *buffer = NULL;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1462 PyStructObject soself = (PyStructObject )self;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1463 assert(PyStruct_Check(self));
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1464 assert(soself->s_codes != NULL);
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1465
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1466 if (!PyArg_ParseTupleAndKeywords(args, kwds, fmt, kwlist,
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1467 &buffer, &buffer_len, &offset))
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1468 return NULL;
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1469
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1470 if (buffer == NULL) {
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1471 PyErr_Format(StructError,
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1472 "unpack_from requires a buffer argument");
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1473 return NULL;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1474 }
38528 e0997ffa3572 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 38520 diff changeset	1475
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1476 if (offset < 0)
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1477 offset += buffer_len;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1478
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1479 if (offset < 0 \|\| (buffer_len - offset) < soself->s_size) {
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1480 PyErr_Format(StructError,
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1481 "unpack_from requires a buffer of at least %zd bytes",
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1482 soself->s_size);
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1483 return NULL;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1484 }
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1485 return s_unpack_internal(soself, buffer + offset);
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1486 }
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1487
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1488
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1489 /*
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1490 * Guts of the pack function.
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1491 *
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1492 * Takes a struct object, a tuple of arguments, and offset in that tuple of
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1493 * argument for where to start processing the arguments for packing, and a
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1494 * character buffer for writing the packed string. The caller must insure
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1495 * that the buffer may contain the required length for packing the arguments.
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1496 * 0 is returned on success, 1 is returned if there is an error.
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1497 *
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1498 */
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1499 static int
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1500 s_pack_internal(PyStructObject soself, PyObject args, int offset, char* buf)
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1501 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1502 formatcode *code;
38736 e80097bf73b6 Wrap some long lines Neal Norwitz <nnorwitz@gmail.com> parents: 38583 diff changeset	1503 /* XXX(nnorwitz): why does i need to be a local? can we use
e80097bf73b6 Wrap some long lines Neal Norwitz <nnorwitz@gmail.com> parents: 38583 diff changeset	1504 the offset parameter or do we need the wider width? */
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1505 Py_ssize_t i;
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1506
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1507 memset(buf, '\0', soself->s_size);
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1508 i = offset;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1509 for (code = soself->s_codes; code->fmtdef != NULL; code++) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1510 Py_ssize_t n;
38736 e80097bf73b6 Wrap some long lines Neal Norwitz <nnorwitz@gmail.com> parents: 38583 diff changeset	1511 PyObject *v = PyTuple_GET_ITEM(args, i++);
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1512 const formatdef *e = code->fmtdef;
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1513 char *res = buf + code->offset;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1514 if (e->format == 's') {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1515 if (!PyString_Check(v)) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1516 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1517 "argument for 's' must be a string");
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1518 return -1;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1519 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1520 n = PyString_GET_SIZE(v);
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1521 if (n > code->size)
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1522 n = code->size;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1523 if (n > 0)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1524 memcpy(res, PyString_AS_STRING(v), n);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1525 } else if (e->format == 'p') {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1526 if (!PyString_Check(v)) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1527 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1528 "argument for 'p' must be a string");
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1529 return -1;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1530 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1531 n = PyString_GET_SIZE(v);
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1532 if (n > (code->size - 1))
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1533 n = code->size - 1;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1534 if (n > 0)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1535 memcpy(res + 1, PyString_AS_STRING(v), n);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1536 if (n > 255)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1537 n = 255;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1538 *res = Py_SAFE_DOWNCAST(n, Py_ssize_t, unsigned char);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1539 } else {
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1540 if (e->pack(res, v, e) < 0) {
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1541 if (PyLong_Check(v) && PyErr_ExceptionMatches(PyExc_OverflowError))
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1542 PyErr_SetString(StructError,
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1543 "long too large to convert to int");
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1544 return -1;
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1545 }
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1546 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1547 }
38528 e0997ffa3572 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 38520 diff changeset	1548
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1549 /* Success */
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1550 return 0;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1551 }
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1552
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1553
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1554 PyDoc_STRVAR(s_pack__doc__,
38430 795d1cb1df01 Fix up struct docstrings, add struct.pack_to function for symmetry Bob Ippolito <bob@redivi.com> parents: 38429 diff changeset	1555 "S.pack(v1, v2, ...) -> string\n\
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1556 \n\
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1557 Return a string containing values v1, v2, ... packed according to this\n\
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1558 Struct's format. See struct.__doc__ for more on format strings.");
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1559
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1560 static PyObject *
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1561 s_pack(PyObject self, PyObject args)
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1562 {
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1563 PyStructObject *soself;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1564 PyObject *result;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1565
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1566 /* Validate arguments. */
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1567 soself = (PyStructObject *)self;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1568 assert(PyStruct_Check(self));
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1569 assert(soself->s_codes != NULL);
38580 a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38530 diff changeset	1570 if (PyTuple_GET_SIZE(args) != soself->s_len)
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1571 {
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1572 PyErr_Format(StructError,
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1573 "pack requires exactly %zd arguments", soself->s_len);
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1574 return NULL;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1575 }
38528 e0997ffa3572 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 38520 diff changeset	1576
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1577 /* Allocate a new string */
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1578 result = PyString_FromStringAndSize((char *)NULL, soself->s_size);
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1579 if (result == NULL)
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1580 return NULL;
38528 e0997ffa3572 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 38520 diff changeset	1581
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1582 /* Call the guts */
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1583 if ( s_pack_internal(soself, args, 0, PyString_AS_STRING(result)) != 0 ) {
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1584 Py_DECREF(result);
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1585 return NULL;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1586 }
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1587
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1588 return result;
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1589 }
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1590
38580 a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38530 diff changeset	1591 PyDoc_STRVAR(s_pack_into__doc__,
a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38530 diff changeset	1592 "S.pack_into(buffer, offset, v1, v2, ...)\n\
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1593 \n\
38580 a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38530 diff changeset	1594 Pack the values v1, v2, ... according to this Struct's format, write \n\
38430 795d1cb1df01 Fix up struct docstrings, add struct.pack_to function for symmetry Bob Ippolito <bob@redivi.com> parents: 38429 diff changeset	1595 the packed bytes into the writable buffer buf starting at offset. Note\n\
795d1cb1df01 Fix up struct docstrings, add struct.pack_to function for symmetry Bob Ippolito <bob@redivi.com> parents: 38429 diff changeset	1596 that the offset is not an optional argument. See struct.__doc__ for \n\
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1597 more on format strings.");
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1598
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1599 static PyObject *
38580 a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38530 diff changeset	1600 s_pack_into(PyObject self, PyObject args)
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1601 {
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1602 PyStructObject *soself;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1603 char *buffer;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1604 Py_ssize_t buffer_len, offset;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1605
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1606 /* Validate arguments. +1 is for the first arg as buffer. */
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1607 soself = (PyStructObject *)self;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1608 assert(PyStruct_Check(self));
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1609 assert(soself->s_codes != NULL);
38580 a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38530 diff changeset	1610 if (PyTuple_GET_SIZE(args) != (soself->s_len + 2))
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1611 {
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1612 PyErr_Format(StructError,
38580 a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38530 diff changeset	1613 "pack_into requires exactly %zd arguments",
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1614 (soself->s_len + 2));
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1615 return NULL;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1616 }
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1617
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1618 /* Extract a writable memory buffer from the first argument */
38528 e0997ffa3572 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 38520 diff changeset	1619 if ( PyObject_AsWriteBuffer(PyTuple_GET_ITEM(args, 0),
e0997ffa3572 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 38520 diff changeset	1620 (void**)&buffer, &buffer_len) == -1 ) {
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1621 return NULL;
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1622 }
631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1623 assert( buffer_len >= 0 );
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1624
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1625 /* Extract the offset from the first argument */
38580 a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38530 diff changeset	1626 offset = PyInt_AsSsize_t(PyTuple_GET_ITEM(args, 1));
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1627
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1628 /* Support negative offsets. */
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1629 if (offset < 0)
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1630 offset += buffer_len;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1631
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1632 /* Check boundaries */
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1633 if (offset < 0 \|\| (buffer_len - offset) < soself->s_size) {
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1634 PyErr_Format(StructError,
38580 a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38530 diff changeset	1635 "pack_into requires a buffer of at least %zd bytes",
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1636 soself->s_size);
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1637 return NULL;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1638 }
38528 e0997ffa3572 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 38520 diff changeset	1639
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1640 /* Call the guts */
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1641 if ( s_pack_internal(soself, args, 2, buffer + offset) != 0 ) {
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1642 return NULL;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1643 }
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1644
38470 e0cea605417e Fix ref-antileak in _struct.c which eventually lead to deallocating None. Georg Brandl <georg@python.org> parents: 38445 diff changeset	1645 Py_RETURN_NONE;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1646 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1647
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1648 static PyObject *
631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1649 s_get_format(PyStructObject self, void unused)
631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1650 {
631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1651 Py_INCREF(self->s_format);
631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1652 return self->s_format;
631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1653 }
631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1654
631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1655 static PyObject *
631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1656 s_get_size(PyStructObject self, void unused)
631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1657 {
631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1658 return PyInt_FromSsize_t(self->s_size);
631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1659 }
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1660
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1661 /* List of functions */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1662
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1663 static struct PyMethodDef s_methods[] = {
38580 a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38530 diff changeset	1664 {"pack", s_pack, METH_VARARGS, s_pack__doc__},
a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38530 diff changeset	1665 {"pack_into", s_pack_into, METH_VARARGS, s_pack_into__doc__},
a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38530 diff changeset	1666 {"unpack", s_unpack, METH_O, s_unpack__doc__},
38583 e00e68dd1ddf s_methods[]: Stop compiler warnings by casting Tim Peters <tim.peters@gmail.com> parents: 38580 diff changeset	1667 {"unpack_from", (PyCFunction)s_unpack_from, METH_KEYWORDS,
e00e68dd1ddf s_methods[]: Stop compiler warnings by casting Tim Peters <tim.peters@gmail.com> parents: 38580 diff changeset	1668 s_unpack_from__doc__},
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1669 {NULL, NULL} /* sentinel */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1670 };
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1671
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1672 PyDoc_STRVAR(s__doc__, "Compiled struct object");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1673
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1674 #define OFF(x) offsetof(PyStructObject, x)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1675
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1676 static PyGetSetDef s_getsetlist[] = {
38430 795d1cb1df01 Fix up struct docstrings, add struct.pack_to function for symmetry Bob Ippolito <bob@redivi.com> parents: 38429 diff changeset	1677 {"format", (getter)s_get_format, (setter)NULL, "struct format string", NULL},
795d1cb1df01 Fix up struct docstrings, add struct.pack_to function for symmetry Bob Ippolito <bob@redivi.com> parents: 38429 diff changeset	1678 {"size", (getter)s_get_size, (setter)NULL, "struct size in bytes", NULL},
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1679 {NULL} /* sentinel */
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1680 };
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1681
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1682 static
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1683 PyTypeObject PyStructType = {
38312 05324aa444bd Fix Cygwin compiler issue Bob Ippolito <bob@redivi.com> parents: 38310 diff changeset	1684 PyObject_HEAD_INIT(NULL)
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1685 0,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1686 "Struct",
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1687 sizeof(PyStructObject),
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1688 0,
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1689 (destructor)s_dealloc, /* tp_dealloc */
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1690 0, /* tp_print */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1691 0, /* tp_getattr */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1692 0, /* tp_setattr */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1693 0, /* tp_compare */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1694 0, /* tp_repr */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1695 0, /* tp_as_number */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1696 0, /* tp_as_sequence */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1697 0, /* tp_as_mapping */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1698 0, /* tp_hash */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1699 0, /* tp_call */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1700 0, /* tp_str */
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1701 PyObject_GenericGetAttr, /* tp_getattro */
631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1702 PyObject_GenericSetAttr, /* tp_setattro */
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1703 0, /* tp_as_buffer */
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1704 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_HAVE_WEAKREFS,/* tp_flags */
631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1705 s__doc__, /* tp_doc */
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1706 0, /* tp_traverse */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1707 0, /* tp_clear */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1708 0, /* tp_richcompare */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1709 offsetof(PyStructObject, weakreflist), /* tp_weaklistoffset */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1710 0, /* tp_iter */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1711 0, /* tp_iternext */
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1712 s_methods, /* tp_methods */
631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1713 NULL, /* tp_members */
631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1714 s_getsetlist, /* tp_getset */
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1715 0, /* tp_base */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1716 0, /* tp_dict */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1717 0, /* tp_descr_get */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1718 0, /* tp_descr_set */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1719 0, /* tp_dictoffset */
38411 631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1720 s_init, /* tp_init */
631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1721 PyType_GenericAlloc,/* tp_alloc */
631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1722 s_new, /* tp_new */
631b6648fdf4 enable all of the struct tests, use ssize_t, fix some whitespace Bob Ippolito <bob@redivi.com> parents: 38378 diff changeset	1723 PyObject_Del, /* tp_free */
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1724 };
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1725
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1726 /* Module initialization */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1727
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1728 PyMODINIT_FUNC
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1729 init_struct(void)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1730 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1731 PyObject *m = Py_InitModule("_struct", NULL);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1732 if (m == NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1733 return;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1734
38312 05324aa444bd Fix Cygwin compiler issue Bob Ippolito <bob@redivi.com> parents: 38310 diff changeset	1735 PyStructType.ob_type = &PyType_Type;
05324aa444bd Fix Cygwin compiler issue Bob Ippolito <bob@redivi.com> parents: 38310 diff changeset	1736 if (PyType_Ready(&PyStructType) < 0)
05324aa444bd Fix Cygwin compiler issue Bob Ippolito <bob@redivi.com> parents: 38310 diff changeset	1737 return;
05324aa444bd Fix Cygwin compiler issue Bob Ippolito <bob@redivi.com> parents: 38310 diff changeset	1738
38515 bb0d2b955439 Change wrapping terminology to overflow masking Bob Ippolito <bob@redivi.com> parents: 38493 diff changeset	1739 #ifdef PY_STRUCT_OVERFLOW_MASKING
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1740 if (pyint_zero == NULL) {
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1741 pyint_zero = PyInt_FromLong(0);
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1742 if (pyint_zero == NULL)
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1743 return;
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1744 }
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1745 if (pylong_ulong_mask == NULL) {
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1746 #if (SIZEOF_LONG == 4)
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1747 pylong_ulong_mask = PyLong_FromString("FFFFFFFF", NULL, 16);
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1748 #else
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1749 pylong_ulong_mask = PyLong_FromString("FFFFFFFFFFFFFFFF", NULL, 16);
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1750 #endif
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1751 if (pylong_ulong_mask == NULL)
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1752 return;
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1753 }
7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1754
38528 e0997ffa3572 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 38520 diff changeset	1755 #else
38515 bb0d2b955439 Change wrapping terminology to overflow masking Bob Ippolito <bob@redivi.com> parents: 38493 diff changeset	1756 /* This speed trick can't be used until overflow masking goes away, because
bb0d2b955439 Change wrapping terminology to overflow masking Bob Ippolito <bob@redivi.com> parents: 38493 diff changeset	1757 native endian always raises exceptions instead of overflow masking. */
38528 e0997ffa3572 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 38520 diff changeset	1758
38317 68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	1759 /* Check endian and swap in faster functions */
68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	1760 {
68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	1761 int one = 1;
68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	1762 formatdef *native = native_table;
68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	1763 formatdef other, ptr;
68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	1764 if ((int)(unsigned char)&one)
68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	1765 other = lilendian_table;
68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	1766 else
68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	1767 other = bigendian_table;
38322 c77da2736fb2 fix test_float regression and 64-bit size mismatch issue Bob Ippolito <bob@redivi.com> parents: 38317 diff changeset	1768 /* Scan through the native table, find a matching
c77da2736fb2 fix test_float regression and 64-bit size mismatch issue Bob Ippolito <bob@redivi.com> parents: 38317 diff changeset	1769 entry in the endian table and swap in the
c77da2736fb2 fix test_float regression and 64-bit size mismatch issue Bob Ippolito <bob@redivi.com> parents: 38317 diff changeset	1770 native implementations whenever possible
c77da2736fb2 fix test_float regression and 64-bit size mismatch issue Bob Ippolito <bob@redivi.com> parents: 38317 diff changeset	1771 (64-bit platforms may not have "standard" sizes) */
38317 68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	1772 while (native->format != '\0' && other->format != '\0') {
68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	1773 ptr = other;
68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	1774 while (ptr->format != '\0') {
68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	1775 if (ptr->format == native->format) {
38322 c77da2736fb2 fix test_float regression and 64-bit size mismatch issue Bob Ippolito <bob@redivi.com> parents: 38317 diff changeset	1776 /* Match faster when formats are
c77da2736fb2 fix test_float regression and 64-bit size mismatch issue Bob Ippolito <bob@redivi.com> parents: 38317 diff changeset	1777 listed in the same order */
c77da2736fb2 fix test_float regression and 64-bit size mismatch issue Bob Ippolito <bob@redivi.com> parents: 38317 diff changeset	1778 if (ptr == other)
c77da2736fb2 fix test_float regression and 64-bit size mismatch issue Bob Ippolito <bob@redivi.com> parents: 38317 diff changeset	1779 other++;
38528 e0997ffa3572 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 38520 diff changeset	1780 /* Only use the trick if the
38322 c77da2736fb2 fix test_float regression and 64-bit size mismatch issue Bob Ippolito <bob@redivi.com> parents: 38317 diff changeset	1781 size matches */
c77da2736fb2 fix test_float regression and 64-bit size mismatch issue Bob Ippolito <bob@redivi.com> parents: 38317 diff changeset	1782 if (ptr->size != native->size)
c77da2736fb2 fix test_float regression and 64-bit size mismatch issue Bob Ippolito <bob@redivi.com> parents: 38317 diff changeset	1783 break;
c77da2736fb2 fix test_float regression and 64-bit size mismatch issue Bob Ippolito <bob@redivi.com> parents: 38317 diff changeset	1784 /* Skip float and double, could be
c77da2736fb2 fix test_float regression and 64-bit size mismatch issue Bob Ippolito <bob@redivi.com> parents: 38317 diff changeset	1785 "unknown" float format */
c77da2736fb2 fix test_float regression and 64-bit size mismatch issue Bob Ippolito <bob@redivi.com> parents: 38317 diff changeset	1786 if (ptr->format == 'd' \|\| ptr->format == 'f')
c77da2736fb2 fix test_float regression and 64-bit size mismatch issue Bob Ippolito <bob@redivi.com> parents: 38317 diff changeset	1787 break;
38317 68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	1788 ptr->pack = native->pack;
68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	1789 ptr->unpack = native->unpack;
68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	1790 break;
68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	1791 }
68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	1792 ptr++;
68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	1793 }
68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	1794 native++;
68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	1795 }
68a348c9868d Use faster struct pack/unpack functions for the endian table that matches the host's Bob Ippolito <bob@redivi.com> parents: 38316 diff changeset	1796 }
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1797 #endif
38528 e0997ffa3572 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 38520 diff changeset	1798
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1799 /* Add some symbolic constants to the module */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1800 if (StructError == NULL) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1801 StructError = PyErr_NewException("struct.error", NULL, NULL);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1802 if (StructError == NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1803 return;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1804 }
38316 2f16e2715223 Use LONG_MIN and LONG_MAX to check Python integer bounds instead of the incorrect INT_MIN and INT_MAX Bob Ippolito <bob@redivi.com> parents: 38313 diff changeset	1805
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1806 Py_INCREF(StructError);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1807 PyModule_AddObject(m, "error", StructError);
38316 2f16e2715223 Use LONG_MIN and LONG_MAX to check Python integer bounds instead of the incorrect INT_MIN and INT_MAX Bob Ippolito <bob@redivi.com> parents: 38313 diff changeset	1808
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1809 Py_INCREF((PyObject*)&PyStructType);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1810 PyModule_AddObject(m, "Struct", (PyObject*)&PyStructType);
38528 e0997ffa3572 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 38520 diff changeset	1811
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1812 PyModule_AddIntConstant(m, "_PY_STRUCT_RANGE_CHECKING", 1);
38515 bb0d2b955439 Change wrapping terminology to overflow masking Bob Ippolito <bob@redivi.com> parents: 38493 diff changeset	1813 #ifdef PY_STRUCT_OVERFLOW_MASKING
bb0d2b955439 Change wrapping terminology to overflow masking Bob Ippolito <bob@redivi.com> parents: 38493 diff changeset	1814 PyModule_AddIntConstant(m, "_PY_STRUCT_OVERFLOW_MASKING", 1);
38493 7d510e4f3c98 struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) Bob Ippolito <bob@redivi.com> parents: 38484 diff changeset	1815 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1816 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/_struct.c @ 39042:c02fa187e0f4 legacy-trunk