cpython-lru_cache-weakref: Modules/

annotate Modules/_struct.c @ 38370:fa98b8df0fe2 legacy-trunk

Fix _struct typo that broke some 64-bit platforms

author	Bob Ippolito <bob@redivi.com>
date	Fri, 26 May 2006 14:23:21 +0000
parents	5213b6065197
children	a4e433c136da

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
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	6 #include "Python.h"
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	7 #include "structseq.h"
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	8 #include "structmember.h"
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	9 #include <ctype.h>
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	10
38266 74c82ebc4e44 forward declaration for PyStructType Bob Ippolito <bob@redivi.com> parents: 38264 diff changeset	11 static PyTypeObject PyStructType;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	12
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	13 /* compatibility macros */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	14 #if (PY_VERSION_HEX < 0x02050000)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	15 typedef int Py_ssize_t;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	16 #endif
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	17
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	18
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	19 /* PY_USE_INT_WHEN_POSSIBLE is an experimental flag that changes the
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	20 struct API to return int instead of long when possible. This is
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	21 often a significant performance improvement. */
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	22 /*
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	23 #define PY_USE_INT_WHEN_POSSIBLE 1
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	24 */
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	25
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	26 /* PY_STRUCT_RANGE_CHECKING performs range checking on all arguments
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	27 to be packed. This will break some incorrect code that happened
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	28 to accidentally do the right thing anyway (such as binhex). */
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	29 #define PY_STRUCT_RANGE_CHECKING 1
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	30
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	31 /* 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	32 typedef struct _formatdef {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	33 char format;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	34 int size;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	35 int alignment;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	36 PyObject* (unpack)(const char ,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	37 const struct _formatdef *);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	38 int (pack)(char , PyObject *,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	39 const struct _formatdef *);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	40 } formatdef;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	41
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	42 typedef struct _formatcode {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	43 const struct _formatdef *fmtdef;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	44 int offset;
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	45 int size;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	46 } formatcode;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	47
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	48 /* Struct object interface */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	49
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	50 typedef struct {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	51 PyObject_HEAD
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	52 int s_size;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	53 int s_len;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	54 formatcode *s_codes;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	55 PyObject *s_format;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	56 PyObject weakreflist; / List of weak references */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	57 } PyStructObject;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	58
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	59
38267 cf5a9057ed3a fix typo in _struct Bob Ippolito <bob@redivi.com> parents: 38266 diff changeset	60 #define PyStruct_Check(op) PyObject_TypeCheck(op, &PyStructType)
cf5a9057ed3a fix typo in _struct Bob Ippolito <bob@redivi.com> parents: 38266 diff changeset	61 #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	62
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	63
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	64 /* Exception */
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 static PyObject *StructError;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	67
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 /* 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	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 typedef struct { char c; short x; } st_short;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	73 typedef struct { char c; int x; } st_int;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	74 typedef struct { char c; long x; } st_long;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	75 typedef struct { char c; float x; } st_float;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	76 typedef struct { char c; double x; } st_double;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	77 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	78
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	79 #define SHORT_ALIGN (sizeof(st_short) - sizeof(short))
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	80 #define INT_ALIGN (sizeof(st_int) - sizeof(int))
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	81 #define LONG_ALIGN (sizeof(st_long) - sizeof(long))
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	82 #define FLOAT_ALIGN (sizeof(st_float) - sizeof(float))
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	83 #define DOUBLE_ALIGN (sizeof(st_double) - sizeof(double))
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	84 #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	85
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	86 /* 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	87 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	88 #ifdef HAVE_LONG_LONG
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	89 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	90 #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	91 #endif
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	92
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	93 #define STRINGIFY(x) #x
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	94
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	95 #ifdef __powerc
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	96 #pragma options align=reset
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	97 #endif
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	98
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	99 /* 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	100
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	101 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	102 get_pylong(PyObject *v)
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 PyNumberMethods *m;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	105
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	106 assert(v != NULL);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	107 if (PyInt_Check(v))
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	108 return PyLong_FromLong(PyInt_AS_LONG(v));
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	109 if (PyLong_Check(v)) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	110 Py_INCREF(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	111 return v;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	112 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	113 m = v->ob_type->tp_as_number;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	114 if (m != NULL && m->nb_long != NULL) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	115 v = m->nb_long(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	116 if (v == NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	117 return NULL;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	118 if (PyLong_Check(v))
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	119 return v;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	120 Py_DECREF(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	121 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	122 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	123 "cannot convert argument to long");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	124 return NULL;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	125 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	126
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	127 /* 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	128 if it isn't one */
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 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	131 get_long(PyObject v, long p)
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 long x = PyInt_AsLong(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	134 if (x == -1 && PyErr_Occurred()) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	135 if (PyErr_ExceptionMatches(PyExc_TypeError))
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	136 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	137 "required argument is not an integer");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	138 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	139 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	140 *p = x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	141 return 0;
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
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	144
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	145 /* Same, but handling unsigned long */
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 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	148 get_ulong(PyObject v, unsigned long p)
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 if (PyLong_Check(v)) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	151 unsigned long x = PyLong_AsUnsignedLong(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	152 if (x == (unsigned long)(-1) && PyErr_Occurred())
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	153 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	154 *p = x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	155 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	156 }
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	157 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	158 return -1;
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	159 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	160 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	161 "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	162 return -1;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	163 }
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	164 return 0;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	165 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	166
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	167 #ifdef HAVE_LONG_LONG
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 /* Same, but handling native long long. */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	170
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	171 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	172 get_longlong(PyObject v, PY_LONG_LONG p)
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 PY_LONG_LONG x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	175
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	176 v = get_pylong(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	177 if (v == NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	178 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	179 assert(PyLong_Check(v));
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	180 x = PyLong_AsLongLong(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	181 Py_DECREF(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	182 if (x == (PY_LONG_LONG)-1 && PyErr_Occurred())
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	183 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	184 *p = x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	185 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	186 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	187
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	188 /* Same, but handling native unsigned long long. */
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 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	191 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	192 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	193 unsigned PY_LONG_LONG x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	194
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	195 v = get_pylong(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	196 if (v == NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	197 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	198 assert(PyLong_Check(v));
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	199 x = PyLong_AsUnsignedLongLong(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	200 Py_DECREF(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	201 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	202 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	203 *p = x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	204 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	205 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	206
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	207 #endif
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 /* Floating point helpers */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	210
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	211 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	212 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	213 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	214 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	215 double x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	216
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	217 x = _PyFloat_Unpack4((unsigned char *)p, le);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	218 if (x == -1.0 && PyErr_Occurred())
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	219 return NULL;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	220 return PyFloat_FromDouble(x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	221 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	222
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	223 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	224 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	225 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	226 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	227 double x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	228
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	229 x = _PyFloat_Unpack8((unsigned char *)p, le);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	230 if (x == -1.0 && PyErr_Occurred())
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	231 return NULL;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	232 return PyFloat_FromDouble(x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	233 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	234
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	235 #ifdef PY_STRUCT_RANGE_CHECKING
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	236 /* 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	237 static int
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	238 _range_error(char format, int size, int is_unsigned)
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	239 {
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	240 if (is_unsigned == 0) {
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	241 long smallest = 0, largest = 0;
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	242 int i = size * 8;
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	243 while (--i > 0) {
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	244 smallest = (smallest * 2) - 1;
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	245 largest = (largest * 2) + 1;
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	246 }
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	247 PyErr_Format(StructError,
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	248 "'%c' format requires %ld <= number <= %ld",
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	249 format,
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	250 smallest,
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	251 largest);
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	252 } else {
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	253 unsigned long largest = 0;
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	254 int i = size * 8;
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	255 while (--i >= 0)
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	256 largest = (largest * 2) + 1;
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	257 PyErr_Format(StructError,
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	258 "'%c' format requires 0 <= number <= %lu",
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	259 format,
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	260 largest);
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	261 }
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	262 return -1;
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	263 }
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	264 #endif
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	265
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	266
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	267
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	268 /* 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	269
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	270 [bln][up]_TYPE
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	271
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	272 [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	273 [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	274 TYPE is one of char, byte, ubyte, etc.
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	275 */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	276
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	277 /* Native mode routines. ****************************************************/
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	278 /* NOTE:
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	279 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	280 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	281 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	282 compensate for big-endian architectures.
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	283 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	284 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	285 does this). */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	286
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	287 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	288 nu_char(const char p, const formatdef f)
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 return PyString_FromStringAndSize(p, 1);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	291 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	292
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	293 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	294 nu_byte(const char p, const formatdef f)
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 return PyInt_FromLong((long) (signed char )p);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	297 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	298
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	299 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	300 nu_ubyte(const char p, const formatdef f)
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 return PyInt_FromLong((long) (unsigned char )p);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	303 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	304
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	305 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	306 nu_short(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	307 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	308 short x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	309 memcpy((char *)&x, p, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	310 return PyInt_FromLong((long)x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	311 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	312
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	313 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	314 nu_ushort(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	315 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	316 unsigned short x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	317 memcpy((char *)&x, p, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	318 return PyInt_FromLong((long)x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	319 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	320
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	321 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	322 nu_int(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	323 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	324 int x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	325 memcpy((char *)&x, p, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	326 return PyInt_FromLong((long)x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	327 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	328
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	329 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	330 nu_uint(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	331 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	332 unsigned int x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	333 memcpy((char *)&x, p, sizeof 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	334 #ifdef PY_USE_INT_WHEN_POSSIBLE
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	335 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	336 return PyInt_FromLong((long)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	337 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	338 return PyLong_FromUnsignedLong((unsigned long)x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	339 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	340
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	341 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	342 nu_long(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	343 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	344 long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	345 memcpy((char *)&x, p, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	346 return PyInt_FromLong(x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	347 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	348
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	349 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	350 nu_ulong(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	351 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	352 unsigned long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	353 memcpy((char *)&x, p, sizeof 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	354 #ifdef PY_USE_INT_WHEN_POSSIBLE
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	355 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	356 return PyInt_FromLong((long)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	357 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	358 return PyLong_FromUnsignedLong(x);
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
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	361 /* 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	362 long long (or, on Windows, __int64). */
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 #ifdef HAVE_LONG_LONG
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	365
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	366 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	367 nu_longlong(const char p, const formatdef f)
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 PY_LONG_LONG x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	370 memcpy((char *)&x, p, sizeof 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	371 #ifdef PY_USE_INT_WHEN_POSSIBLE
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	372 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	373 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	374 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	375 return PyLong_FromLongLong(x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	376 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	377
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	378 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	379 nu_ulonglong(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	380 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	381 unsigned PY_LONG_LONG x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	382 memcpy((char *)&x, p, sizeof 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	383 #ifdef PY_USE_INT_WHEN_POSSIBLE
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	384 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	385 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	386 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	387 return PyLong_FromUnsignedLongLong(x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	388 }
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 #endif
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	391
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	392 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	393 nu_float(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	394 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	395 float x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	396 memcpy((char *)&x, p, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	397 return PyFloat_FromDouble((double)x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	398 }
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 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	401 nu_double(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	402 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	403 double x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	404 memcpy((char *)&x, p, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	405 return PyFloat_FromDouble(x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	406 }
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 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	409 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	410 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	411 void *x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	412 memcpy((char *)&x, p, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	413 return PyLong_FromVoidPtr(x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	414 }
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 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	417 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	418 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	419 long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	420 if (get_long(v, &x) < 0)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	421 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	422 if (x < -128 \|\| x > 127){
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	423 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	424 "byte format requires -128 <= number <= 127");
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	425 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	426 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	427 *p = (char)x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	428 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	429 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	430
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	431 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	432 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	433 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	434 long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	435 if (get_long(v, &x) < 0)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	436 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	437 if (x < 0 \|\| x > 255){
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	438 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	439 "ubyte format requires 0 <= number <= 255");
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	440 return -1;
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 *p = (char)x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	443 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	444 }
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 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	447 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	448 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	449 if (!PyString_Check(v) \|\| PyString_Size(v) != 1) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	450 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	451 "char format require string of length 1");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	452 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	453 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	454 p = PyString_AsString(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	455 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	456 }
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 int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	459 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	460 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	461 long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	462 short y;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	463 if (get_long(v, &x) < 0)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	464 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	465 if (x < SHRT_MIN \|\| x > SHRT_MAX){
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	466 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	467 "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	468 " <= number <= " STRINGIFY(SHRT_MAX));
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	469 return -1;
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 y = (short)x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	472 memcpy(p, (char *)&y, sizeof y);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	473 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	474 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	475
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	476 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	477 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	478 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	479 long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	480 unsigned short y;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	481 if (get_long(v, &x) < 0)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	482 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	483 if (x < 0 \|\| x > USHRT_MAX){
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	484 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	485 "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	486 return -1;
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 y = (unsigned short)x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	489 memcpy(p, (char *)&y, sizeof y);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	490 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	491 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	492
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	493 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	494 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	495 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	496 long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	497 int y;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	498 if (get_long(v, &x) < 0)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	499 return -1;
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	500 #if defined(PY_STRUCT_RANGE_CHECKING) && (SIZEOF_LONG > SIZEOF_INT)
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	501 if (x < INT_MIN \|\| x > INT_MAX)
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	502 return _range_error(f->format, sizeof(y), 0);
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	503 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	504 y = (int)x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	505 memcpy(p, (char *)&y, sizeof y);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	506 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	507 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	508
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	509 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	510 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	511 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	512 unsigned long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	513 unsigned int y;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	514 if (get_ulong(v, &x) < 0)
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	515 #ifdef PY_STRUCT_RANGE_CHECKING
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	516 return _range_error(f->format, sizeof(y), 1);
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	517 #else
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	518 return -1;
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	519 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	520 y = (unsigned int)x;
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	521 #if defined(PY_STRUCT_RANGE_CHECKING) && (SIZEOF_LONG > SIZEOF_INT)
38370 fa98b8df0fe2 Fix _struct typo that broke some 64-bit platforms Bob Ippolito <bob@redivi.com> parents: 38363 diff changeset	522 if (x > UINT_MAX)
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	523 return _range_error(f->format, sizeof(y), 1);
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	524 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	525 memcpy(p, (char *)&y, sizeof y);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	526 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	527 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	528
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	529 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	530 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	531 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	532 long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	533 if (get_long(v, &x) < 0)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	534 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	535 memcpy(p, (char *)&x, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	536 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	537 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	538
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	539 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	540 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	541 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	542 unsigned long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	543 if (get_ulong(v, &x) < 0)
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	544 #ifdef PY_STRUCT_RANGE_CHECKING
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	545 return _range_error(f->format, sizeof(x), 1);
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	546 #else
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	547 return -1;
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	548 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	549 memcpy(p, (char *)&x, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	550 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	551 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	552
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	553 #ifdef HAVE_LONG_LONG
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	554
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	555 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	556 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	557 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	558 PY_LONG_LONG x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	559 if (get_longlong(v, &x) < 0)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	560 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	561 memcpy(p, (char *)&x, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	562 return 0;
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
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	565 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	566 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	567 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	568 unsigned PY_LONG_LONG x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	569 if (get_ulonglong(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 memcpy(p, (char *)&x, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	572 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	573 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	574 #endif
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 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	577 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	578 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	579 float x = (float)PyFloat_AsDouble(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	580 if (x == -1 && PyErr_Occurred()) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	581 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	582 "required argument is not a float");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	583 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	584 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	585 memcpy(p, (char *)&x, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	586 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	587 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	588
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	589 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	590 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	591 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	592 double x = PyFloat_AsDouble(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	593 if (x == -1 && PyErr_Occurred()) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	594 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	595 "required argument is not a float");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	596 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	597 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	598 memcpy(p, (char *)&x, sizeof(double));
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	599 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	600 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	601
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	602 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	603 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	604 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	605 void *x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	606
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	607 v = get_pylong(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	608 if (v == NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	609 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	610 assert(PyLong_Check(v));
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	611 x = PyLong_AsVoidPtr(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	612 Py_DECREF(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	613 if (x == NULL && PyErr_Occurred())
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	614 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	615 memcpy(p, (char *)&x, sizeof x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	616 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	617 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	618
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	619 static formatdef native_table[] = {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	620 {'x', sizeof(char), 0, NULL},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	621 {'b', sizeof(char), 0, nu_byte, np_byte},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	622 {'B', sizeof(char), 0, nu_ubyte, np_ubyte},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	623 {'c', sizeof(char), 0, nu_char, np_char},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	624 {'s', sizeof(char), 0, NULL},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	625 {'p', sizeof(char), 0, NULL},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	626 {'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	627 {'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	628 {'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	629 {'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	630 {'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	631 {'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	632 #ifdef HAVE_LONG_LONG
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	633 {'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	634 {'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	635 #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	636 {'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	637 {'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	638 {'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	639 {0}
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	640 };
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	641
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	642 /* Big-endian routines. *****************************************************/
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 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	645 bu_int(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	646 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	647 long x = 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	648 int i = f->size;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	649 do {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	650 x = (x<<8) \| (*p++ & 0xFF);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	651 } while (--i > 0);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	652 /* Extend the sign bit. */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	653 if (SIZEOF_LONG > f->size)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	654 x \|= -(x & (1L << (8*f->size - 1)));
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	655 return PyInt_FromLong(x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	656 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	657
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	658 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	659 bu_uint(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	660 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	661 unsigned long x = 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	662 int i = f->size;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	663 do {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	664 x = (x<<8) \| (*p++ & 0xFF);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	665 } while (--i > 0);
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	666 #ifdef PY_USE_INT_WHEN_POSSIBLE
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	667 if (x <= LONG_MAX)
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	668 return PyInt_FromLong((long)x);
38313 4a8c9f9b66e6 fix a struct regression where long would be returned for short unsigned integers Bob Ippolito <bob@redivi.com> parents: 38312 diff changeset	669 #else
4a8c9f9b66e6 fix a struct regression where long would be returned for short unsigned integers Bob Ippolito <bob@redivi.com> parents: 38312 diff changeset	670 if (SIZEOF_LONG > f->size)
4a8c9f9b66e6 fix a struct regression where long would be returned for short unsigned integers Bob Ippolito <bob@redivi.com> parents: 38312 diff changeset	671 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	672 #endif
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	673 return PyLong_FromUnsignedLong(x);
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	674 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	675
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	676 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	677 bu_longlong(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	678 {
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	679 #if HAVE_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	680 PY_LONG_LONG x = 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	681 int i = f->size;
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	682 do {
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	683 x = (x<<8) \| (*p++ & 0xFF);
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	684 } 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	685 /* 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	686 if (SIZEOF_LONG_LONG > f->size)
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	687 x \|= -(x & (1L << (8 * f->size - 1)));
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	688 #ifdef PY_USE_INT_WHEN_POSSIBLE
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	689 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	690 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	691 #endif
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	692 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	693 #else
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	694 return _PyLong_FromByteArray((const unsigned char *)p,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	695 8,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	696 0, /* little-endian */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	697 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	698 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	699 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	700
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	701 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	702 bu_ulonglong(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	703 {
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	704 #if HAVE_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	705 unsigned PY_LONG_LONG x = 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	706 int i = f->size;
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	707 do {
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	708 x = (x<<8) \| (*p++ & 0xFF);
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	709 } 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	710 #ifdef PY_USE_INT_WHEN_POSSIBLE
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	711 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	712 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	713 #endif
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	714 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	715 #else
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	716 return _PyLong_FromByteArray((const unsigned char *)p,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	717 8,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	718 0, /* little-endian */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	719 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	720 #endif
38259 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
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	723 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	724 bu_float(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	725 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	726 return unpack_float(p, 0);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	727 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	728
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	729 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	730 bu_double(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	731 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	732 return unpack_double(p, 0);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	733 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	734
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	735 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	736 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	737 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	738 long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	739 int i;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	740 if (get_long(v, &x) < 0)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	741 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	742 i = f->size;
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	743 #ifdef PY_STRUCT_RANGE_CHECKING
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	744 if (i != SIZEOF_LONG && (
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	745 (i == 2 && (x < -32768 \|\| x > 32767))
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	746 #if SIZEOF_LONG != 4
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	747 \|\| (i == 4) && (x < -2147483648L \|\| x > -2147483647L)
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	748 #endif
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	749 ))
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	750 return _range_error(f->format, i, 0);
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	751 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	752 do {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	753 p[--i] = (char)x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	754 x >>= 8;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	755 } while (i > 0);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	756 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	757 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	758
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	759 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	760 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	761 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	762 unsigned long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	763 int i;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	764 if (get_ulong(v, &x) < 0)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	765 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	766 i = f->size;
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	767 #ifdef PY_STRUCT_RANGE_CHECKING
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	768 if (i != SIZEOF_LONG && x >= (1 << (i * 8)))
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	769 return _range_error(f->format, f->size, 1);
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	770 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	771 do {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	772 p[--i] = (char)x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	773 x >>= 8;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	774 } while (i > 0);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	775 return 0;
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
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	778 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	779 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	780 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	781 int res;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	782 v = get_pylong(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	783 if (v == NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	784 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	785 res = _PyLong_AsByteArray((PyLongObject *)v,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	786 (unsigned char *)p,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	787 8,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	788 0, /* little_endian */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	789 1 /* signed */);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	790 Py_DECREF(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	791 return res;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	792 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	793
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	794 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	795 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	796 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	797 int res;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	798 v = get_pylong(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	799 if (v == NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	800 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	801 res = _PyLong_AsByteArray((PyLongObject *)v,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	802 (unsigned char *)p,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	803 8,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	804 0, /* little_endian */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	805 0 /* signed */);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	806 Py_DECREF(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	807 return res;
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_float(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 double x = PyFloat_AsDouble(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	814 if (x == -1 && PyErr_Occurred()) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	815 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	816 "required argument is not a float");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	817 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	818 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	819 return _PyFloat_Pack4(x, (unsigned char *)p, 0);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	820 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	821
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	822 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	823 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	824 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	825 double x = PyFloat_AsDouble(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	826 if (x == -1 && PyErr_Occurred()) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	827 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	828 "required argument is not a float");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	829 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	830 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	831 return _PyFloat_Pack8(x, (unsigned char *)p, 0);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	832 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	833
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	834 static formatdef bigendian_table[] = {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	835 {'x', 1, 0, NULL},
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	836 {'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	837 {'B', 1, 0, nu_ubyte, np_ubyte},
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	838 {'c', 1, 0, nu_char, np_char},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	839 {'s', 1, 0, NULL},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	840 {'p', 1, 0, NULL},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	841 {'h', 2, 0, bu_int, bp_int},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	842 {'H', 2, 0, bu_uint, bp_uint},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	843 {'i', 4, 0, bu_int, bp_int},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	844 {'I', 4, 0, bu_uint, bp_uint},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	845 {'l', 4, 0, bu_int, bp_int},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	846 {'L', 4, 0, bu_uint, bp_uint},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	847 {'q', 8, 0, bu_longlong, bp_longlong},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	848 {'Q', 8, 0, bu_ulonglong, bp_ulonglong},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	849 {'f', 4, 0, bu_float, bp_float},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	850 {'d', 8, 0, bu_double, bp_double},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	851 {0}
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	852 };
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	853
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	854 /* Little-endian routines. *****************************************************/
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	855
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	856 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	857 lu_int(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	858 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	859 long x = 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	860 int i = f->size;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	861 do {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	862 x = (x<<8) \| (p[--i] & 0xFF);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	863 } while (i > 0);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	864 /* Extend the sign bit. */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	865 if (SIZEOF_LONG > f->size)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	866 x \|= -(x & (1L << (8*f->size - 1)));
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	867 return PyInt_FromLong(x);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	868 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	869
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	870 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	871 lu_uint(const char p, const formatdef f)
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 unsigned long x = 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	874 int i = f->size;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	875 do {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	876 x = (x<<8) \| (p[--i] & 0xFF);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	877 } while (i > 0);
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	878 #ifdef PY_USE_INT_WHEN_POSSIBLE
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	879 if (x <= LONG_MAX)
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	880 return PyInt_FromLong((long)x);
38313 4a8c9f9b66e6 fix a struct regression where long would be returned for short unsigned integers Bob Ippolito <bob@redivi.com> parents: 38312 diff changeset	881 #else
4a8c9f9b66e6 fix a struct regression where long would be returned for short unsigned integers Bob Ippolito <bob@redivi.com> parents: 38312 diff changeset	882 if (SIZEOF_LONG > f->size)
4a8c9f9b66e6 fix a struct regression where long would be returned for short unsigned integers Bob Ippolito <bob@redivi.com> parents: 38312 diff changeset	883 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	884 #endif
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	885 return PyLong_FromUnsignedLong((long)x);
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	886 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	887
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	888 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	889 lu_longlong(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	890 {
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	891 #if HAVE_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	892 PY_LONG_LONG x = 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	893 int i = f->size;
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	894 do {
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	895 x = (x<<8) \| (p[--i] & 0xFF);
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	896 } 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	897 /* 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	898 if (SIZEOF_LONG_LONG > f->size)
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	899 x \|= -(x & (1L << (8 * f->size - 1)));
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	900 #ifdef PY_USE_INT_WHEN_POSSIBLE
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	901 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	902 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	903 #endif
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	904 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	905 #else
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	906 return _PyLong_FromByteArray((const unsigned char *)p,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	907 8,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	908 1, /* little-endian */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	909 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	910 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	911 }
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 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	914 lu_ulonglong(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	915 {
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	916 #if HAVE_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	917 unsigned PY_LONG_LONG x = 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	918 int i = f->size;
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	919 do {
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	920 x = (x<<8) \| (p[--i] & 0xFF);
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	921 } 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	922 #ifdef PY_USE_INT_WHEN_POSSIBLE
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	923 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	924 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	925 #endif
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	926 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	927 #else
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	928 return _PyLong_FromByteArray((const unsigned char *)p,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	929 8,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	930 1, /* little-endian */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	931 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	932 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	933 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	934
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	935 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	936 lu_float(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	937 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	938 return unpack_float(p, 1);
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
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	941 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	942 lu_double(const char p, const formatdef f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	943 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	944 return unpack_double(p, 1);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	945 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	946
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	947 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	948 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	949 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	950 long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	951 int i;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	952 if (get_long(v, &x) < 0)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	953 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	954 i = f->size;
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	955 #ifdef PY_STRUCT_RANGE_CHECKING
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	956 if (i != SIZEOF_LONG && (
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	957 (i == 2 && (x < -32768 \|\| x > 32767))
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	958 #if SIZEOF_LONG != 4
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	959 \|\| (i == 4) && (x < -2147483648L \|\| x > -2147483647L)
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	960 #endif
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	961 ))
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	962 return _range_error(f->format, i, 0);
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	963 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	964 do {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	965 *p++ = (char)x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	966 x >>= 8;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	967 } while (--i > 0);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	968 return 0;
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 int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	972 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	973 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	974 unsigned long x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	975 int i;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	976 if (get_ulong(v, &x) < 0)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	977 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	978 i = f->size;
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	979 #ifdef PY_STRUCT_RANGE_CHECKING
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	980 if (i != SIZEOF_LONG && x >= (1 << (i * 8)))
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	981 return _range_error(f->format, f->size, 1);
5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	982 #endif
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	983 do {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	984 *p++ = (char)x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	985 x >>= 8;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	986 } while (--i > 0);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	987 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	988 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	989
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	990 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	991 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	992 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	993 int res;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	994 v = get_pylong(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	995 if (v == NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	996 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	997 res = _PyLong_AsByteArray((PyLongObject*)v,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	998 (unsigned char *)p,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	999 8,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1000 1, /* little_endian */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1001 1 /* signed */);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1002 Py_DECREF(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1003 return res;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1004 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1005
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1006 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1007 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	1008 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1009 int res;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1010 v = get_pylong(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1011 if (v == NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1012 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1013 res = _PyLong_AsByteArray((PyLongObject*)v,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1014 (unsigned char *)p,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1015 8,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1016 1, /* little_endian */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1017 0 /* signed */);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1018 Py_DECREF(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1019 return res;
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 int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1023 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	1024 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1025 double x = PyFloat_AsDouble(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1026 if (x == -1 && PyErr_Occurred()) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1027 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1028 "required argument is not a float");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1029 return -1;
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 return _PyFloat_Pack4(x, (unsigned char *)p, 1);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1032 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1033
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1034 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1035 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	1036 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1037 double x = PyFloat_AsDouble(v);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1038 if (x == -1 && PyErr_Occurred()) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1039 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1040 "required argument is not a float");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1041 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1042 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1043 return _PyFloat_Pack8(x, (unsigned char *)p, 1);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1044 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1045
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1046 static formatdef lilendian_table[] = {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1047 {'x', 1, 0, NULL},
38363 5213b6065197 fix #1229380 No struct.pack exception for some out of range integers Bob Ippolito <bob@redivi.com> parents: 38353 diff changeset	1048 {'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	1049 {'B', 1, 0, nu_ubyte, np_ubyte},
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1050 {'c', 1, 0, nu_char, np_char},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1051 {'s', 1, 0, NULL},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1052 {'p', 1, 0, NULL},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1053 {'h', 2, 0, lu_int, lp_int},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1054 {'H', 2, 0, lu_uint, lp_uint},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1055 {'i', 4, 0, lu_int, lp_int},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1056 {'I', 4, 0, lu_uint, lp_uint},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1057 {'l', 4, 0, lu_int, lp_int},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1058 {'L', 4, 0, lu_uint, lp_uint},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1059 {'q', 8, 0, lu_longlong, lp_longlong},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1060 {'Q', 8, 0, lu_ulonglong, lp_ulonglong},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1061 {'f', 4, 0, lu_float, lp_float},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1062 {'d', 8, 0, lu_double, lp_double},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1063 {0}
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1064 };
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1065
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1066
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1067 static const formatdef *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1068 whichtable(char **pfmt)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1069 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1070 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	1071 switch (*fmt) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1072 case '<':
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1073 return lilendian_table;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1074 case '>':
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1075 case '!': /* Network byte order is big-endian */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1076 return bigendian_table;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1077 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	1078 int n = 1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1079 char p = (char ) &n;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1080 if (*p == 1)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1081 return lilendian_table;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1082 else
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1083 return bigendian_table;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1084 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1085 default:
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1086 --pfmt; / Back out of pointer increment */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1087 /* Fall through */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1088 case '@':
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1089 return native_table;
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
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1093
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1094 /* Get the table entry for a format code */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1095
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1096 static const formatdef *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1097 getentry(int c, const formatdef *f)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1098 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1099 for (; f->format != '\0'; f++) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1100 if (f->format == c) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1101 return f;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1102 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1103 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1104 PyErr_SetString(StructError, "bad char in struct format");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1105 return NULL;
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
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1109 /* Align a size according to a format code */
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 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1112 align(int size, int c, const formatdef *e)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1113 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1114 if (e->format == c) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1115 if (e->alignment) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1116 size = ((size + e->alignment - 1)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1117 / e->alignment)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1118 * e->alignment;
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 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1121 return size;
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
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1124
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1125 /* calculate the size of a format string */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1126
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1127 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1128 prepare_s(PyStructObject *self)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1129 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1130 const formatdef *f;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1131 const formatdef *e;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1132 formatcode *codes;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1133
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1134 const char *s;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1135 const char *fmt;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1136 char c;
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1137 int size, len, num, itemsize, x;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1138
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1139 fmt = PyString_AS_STRING(self->s_format);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1140
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1141 f = whichtable((char **)&fmt);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1142
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1143 s = fmt;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1144 size = 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1145 len = 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1146 while ((c = *s++) != '\0') {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1147 if (isspace(Py_CHARMASK(c)))
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1148 continue;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1149 if ('0' <= c && c <= '9') {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1150 num = c - '0';
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1151 while ('0' <= (c = *s++) && c <= '9') {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1152 x = num*10 + (c - '0');
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1153 if (x/10 != num) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1154 PyErr_SetString(
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1155 StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1156 "overflow in item count");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1157 return -1;
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 num = x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1160 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1161 if (c == '\0')
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1162 break;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1163 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1164 else
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1165 num = 1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1166
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1167 e = getentry(c, f);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1168 if (e == NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1169 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1170
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1171 switch (c) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1172 case 's': /* fall through */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1173 case 'p': len++; break;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1174 case 'x': break;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1175 default: len += num; break;
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
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1178 itemsize = e->size;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1179 size = align(size, c, e);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1180 x = num * itemsize;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1181 size += x;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1182 if (x/itemsize != num \|\| size < 0) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1183 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1184 "total struct size too long");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1185 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1186 }
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
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1189 self->s_size = size;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1190 self->s_len = len;
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1191 codes = PyMem_MALLOC((len + 1) * sizeof(formatcode));
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1192 if (codes == NULL) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1193 PyErr_NoMemory();
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1194 return -1;
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 self->s_codes = codes;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1197
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1198 s = fmt;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1199 size = 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1200 while ((c = *s++) != '\0') {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1201 if (isspace(Py_CHARMASK(c)))
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1202 continue;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1203 if ('0' <= c && c <= '9') {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1204 num = c - '0';
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1205 while ('0' <= (c = *s++) && c <= '9')
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1206 num = num*10 + (c - '0');
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1207 if (c == '\0')
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1208 break;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1209 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1210 else
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1211 num = 1;
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 e = getentry(c, f);
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 size = align(size, c, e);
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1216 if (c == 's' \|\| c == 'p') {
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1217 codes->offset = size;
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1218 codes->size = num;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1219 codes->fmtdef = e;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1220 codes++;
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1221 size += num;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1222 } else if (c == 'x') {
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1223 size += num;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1224 } else {
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1225 while (--num >= 0) {
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1226 codes->offset = size;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1227 codes->size = e->size;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1228 codes->fmtdef = e;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1229 codes++;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1230 size += e->size;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1231 }
38259 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 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1234 codes->fmtdef = NULL;
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1235 codes->offset = size;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1236 codes->size = 0;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1237
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1238 return 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1239 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1240
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1241 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1242 s_new(PyTypeObject type, PyObject args, PyObject *kwds)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1243 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1244 PyObject *self;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1245
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1246 assert(type != NULL && type->tp_alloc != NULL);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1247
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1248 self = type->tp_alloc(type, 0);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1249 if (self != NULL) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1250 PyStructObject s = (PyStructObject)self;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1251 Py_INCREF(Py_None);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1252 s->s_format = Py_None;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1253 s->s_codes = NULL;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1254 s->s_size = -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1255 s->s_len = -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1256 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1257 return self;
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
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1260 static int
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1261 s_init(PyObject self, PyObject args, PyObject *kwds)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1262 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1263 PyStructObject soself = (PyStructObject )self;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1264 PyObject *o_format = NULL;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1265 int ret = 0;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1266 static char *kwlist[] = {"format", 0};
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1267
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1268 assert(PyStruct_Check(self));
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 if (!PyArg_ParseTupleAndKeywords(args, kwds, "S:Struct", kwlist,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1271 &o_format))
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1272 return -1;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1273
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1274 Py_INCREF(o_format);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1275 Py_XDECREF(soself->s_format);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1276 soself->s_format = o_format;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1277
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1278 ret = prepare_s(soself);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1279 return ret;
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
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1282 static void
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1283 s_dealloc(PyStructObject *s)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1284 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1285 if (s->weakreflist != NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1286 PyObject_ClearWeakRefs((PyObject *)s);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1287 if (s->s_codes != NULL) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1288 PyMem_FREE(s->s_codes);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1289 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1290 Py_XDECREF(s->s_format);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1291 s->ob_type->tp_free((PyObject *)s);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1292 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1293
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1294 static PyObject *
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1295 s_unpack_internal(PyStructObject soself, char startfrom) {
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1296 formatcode *code;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1297 Py_ssize_t i = 0;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1298 PyObject *result = PyTuple_New(soself->s_len);
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1299 if (result == NULL)
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1300 return NULL;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1301
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1302 for (code = soself->s_codes; code->fmtdef != NULL; code++) {
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1303 PyObject *v;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1304 const formatdef *e = code->fmtdef;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1305 const char *res = startfrom + code->offset;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1306 if (e->format == 's') {
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1307 v = PyString_FromStringAndSize(res, code->size);
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1308 if (v == NULL)
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1309 goto fail;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1310 PyTuple_SET_ITEM(result, i++, v);
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1311 } else if (e->format == 'p') {
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1312 Py_ssize_t n = (unsigned char)res;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1313 if (n >= code->size)
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1314 n = code->size - 1;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1315 v = PyString_FromStringAndSize(res + 1, n);
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1316 if (v == NULL)
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1317 goto fail;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1318 PyTuple_SET_ITEM(result, i++, v);
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1319 } else {
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1320 v = e->unpack(res, e);
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1321 if (v == NULL)
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1322 goto fail;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1323 PyTuple_SET_ITEM(result, i++, v);
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1324 }
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1325 }
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1326
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1327 return result;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1328 fail:
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1329 Py_DECREF(result);
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1330 return NULL;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1331 };
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1332
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1333
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1334 PyDoc_STRVAR(s_unpack__doc__,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1335 "unpack(str) -> (v1, v2, ...)\n\
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1336 \n\
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1337 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	1338 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	1339 strings.");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1340
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1341 static PyObject *
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1342 s_unpack(PyObject self, PyObject inputstr)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1343 {
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1344 PyStructObject soself = (PyStructObject )self;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1345 assert(PyStruct_Check(self));
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1346 assert(soself->s_codes != NULL);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1347 if (inputstr == NULL \|\| !PyString_Check(inputstr) \|\|
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1348 PyString_GET_SIZE(inputstr) != soself->s_size) {
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1349 PyErr_Format(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1350 "unpack requires a string argument of length %d", soself->s_size);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1351 return NULL;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1352 }
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1353 return s_unpack_internal(soself, PyString_AS_STRING(inputstr));
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1354 }
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1355
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1356 PyDoc_STRVAR(s_unpack_from__doc__,
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1357 "unpack_from(buffer[, offset]) -> (v1, v2, ...)\n\
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1358 \n\
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1359 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	1360 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	1361 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	1362 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	1363
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1364 static PyObject *
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1365 s_unpack_from(PyObject self, PyObject args, PyObject *kwds)
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1366 {
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1367 static char *kwlist[] = {"buffer", "offset", 0};
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1368 #if (PY_VERSION_HEX < 0x02050000)
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1369 static char *fmt = "z#\|i:unpack_from";
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1370 #else
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1371 static char *fmt = "z#\|n:unpack_from";
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1372 #endif
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1373 Py_ssize_t buffer_len = 0, offset = 0;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1374 char *buffer = NULL;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1375 PyStructObject soself = (PyStructObject )self;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1376 assert(PyStruct_Check(self));
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1377 assert(soself->s_codes != NULL);
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1378
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1379 if (!PyArg_ParseTupleAndKeywords(args, kwds, fmt, kwlist,
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1380 &buffer, &buffer_len, &offset))
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1381 return NULL;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1382
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1383 if (buffer == NULL) {
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1384 PyErr_Format(StructError,
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1385 "unpack_from requires a buffer argument");
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1386 return NULL;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1387 }
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1388
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1389 if (offset < 0)
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1390 offset += buffer_len;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1391
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1392 if (offset < 0 \|\| (buffer_len - offset) < soself->s_size) {
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1393 PyErr_Format(StructError,
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1394 "unpack_from requires a buffer of at least %d bytes",
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1395 soself->s_size);
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1396 return NULL;
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1397 }
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1398 return s_unpack_internal(soself, buffer + offset);
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1399 }
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1400
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1401
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1402 /*
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1403 * Guts of the pack function.
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1404 *
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1405 * 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	1406 * 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	1407 * 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	1408 * 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	1409 * 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	1410 *
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1411 */
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1412 static int
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1413 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	1414 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1415 formatcode *code;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1416 Py_ssize_t i;
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1417
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1418 memset(buf, '\0', soself->s_size);
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1419 i = offset;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1420 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	1421 Py_ssize_t n;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1422 PyObject *v;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1423 const formatdef *e = code->fmtdef;
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1424 char *res = buf + code->offset;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1425 if (e->format == 's') {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1426 v = PyTuple_GET_ITEM(args, i++);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1427 if (!PyString_Check(v)) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1428 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1429 "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	1430 return -1;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1431 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1432 n = PyString_GET_SIZE(v);
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1433 if (n > code->size)
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1434 n = code->size;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1435 if (n > 0)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1436 memcpy(res, PyString_AS_STRING(v), n);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1437 } else if (e->format == 'p') {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1438 v = PyTuple_GET_ITEM(args, i++);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1439 if (!PyString_Check(v)) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1440 PyErr_SetString(StructError,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1441 "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	1442 return -1;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1443 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1444 n = PyString_GET_SIZE(v);
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1445 if (n > (code->size - 1))
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1446 n = code->size - 1;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1447 if (n > 0)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1448 memcpy(res + 1, PyString_AS_STRING(v), n);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1449 if (n > 255)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1450 n = 255;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1451 *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	1452 } else {
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1453 v = PyTuple_GET_ITEM(args, i++);
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1454 if (e->pack(res, v, e) < 0)
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1455 return -1;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1456 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1457 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1458
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1459 /* Success */
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1460 return 0;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1461 }
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1462
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1463
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1464 PyDoc_STRVAR(s_pack__doc__,
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1465 "pack(v1, v2, ...) -> string\n\
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1466 \n\
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1467 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	1468 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	1469
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1470 static PyObject *
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1471 s_pack(PyObject self, PyObject args)
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1472 {
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1473 PyStructObject *soself;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1474 PyObject *result;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1475
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1476 /* Validate arguments. */
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1477 soself = (PyStructObject *)self;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1478 assert(PyStruct_Check(self));
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1479 assert(soself->s_codes != NULL);
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1480 if (args == NULL \|\| !PyTuple_Check(args) \|\|
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1481 PyTuple_GET_SIZE(args) != soself->s_len)
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1482 {
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1483 PyErr_Format(StructError,
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1484 "pack requires exactly %d arguments", soself->s_len);
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1485 return NULL;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1486 }
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1487
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1488 /* Allocate a new string */
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1489 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	1490 if (result == NULL)
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1491 return NULL;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1492
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1493 /* Call the guts */
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1494 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	1495 Py_DECREF(result);
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1496 return NULL;
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
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1499 return result;
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1500 }
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1501
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1502 PyDoc_STRVAR(s_pack_to__doc__,
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1503 "pack_to(buffer, offset, v1, v2, ...)\n\
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1504 \n\
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1505 Pack the values v2, v2, ... according to this Struct's format, write \n\
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1506 the packed bytes into the given buffer at the given offset. Note that \n\
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1507 the offset is not an optional argument. See struct.__doc__ for \n\
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1508 more on format strings.");
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1509
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1510 static PyObject *
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1511 s_pack_to(PyObject self, PyObject args)
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1512 {
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1513 PyStructObject *soself;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1514 char *buffer;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1515 Py_ssize_t buffer_len, offset;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1516
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1517 /* 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	1518 soself = (PyStructObject *)self;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1519 assert(PyStruct_Check(self));
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1520 assert(soself->s_codes != NULL);
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1521 if (args == NULL \|\| !PyTuple_Check(args) \|\|
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1522 PyTuple_GET_SIZE(args) != (soself->s_len + 2))
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1523 {
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1524 PyErr_Format(StructError,
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1525 "pack_to requires exactly %d arguments",
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1526 (soself->s_len + 2));
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1527 return NULL;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1528 }
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1529
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1530 /* Extract a writable memory buffer from the first argument */
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1531 if ( PyObject_AsWriteBuffer(PyTuple_GET_ITEM(args, 0),
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1532 (void**)&buffer, &buffer_len) == -1 ) {
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1533 return NULL;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1534 }
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1535 assert( buffer_len >= 0 );
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1536
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1537 /* Extract the offset from the first argument */
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1538 offset = PyInt_AsLong(PyTuple_GET_ITEM(args, 1));
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1539
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1540 /* Support negative offsets. */
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1541 if (offset < 0)
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1542 offset += buffer_len;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1543
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1544 /* Check boundaries */
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1545 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	1546 PyErr_Format(StructError,
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1547 "pack_to requires a buffer of at least %d bytes",
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1548 soself->s_size);
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1549 return NULL;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1550 }
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1551
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1552 /* Call the guts */
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1553 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	1554 return NULL;
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1555 }
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1556
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1557 return Py_None;
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1558 }
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1559
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1560
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1561 /* List of functions */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1562
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1563 static struct PyMethodDef s_methods[] = {
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1564 {"pack", (PyCFunction)s_pack, METH_VARARGS, s_pack__doc__},
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 38322 diff changeset	1565 {"pack_to", (PyCFunction)s_pack_to, METH_VARARGS, s_pack_to__doc__},
38277 b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1566 {"unpack", (PyCFunction)s_unpack, METH_O, s_unpack__doc__},
b825e6227366 refactor unpack, add unpack_from Bob Ippolito <bob@redivi.com> parents: 38267 diff changeset	1567 {"unpack_from", (PyCFunction)s_unpack_from, METH_KEYWORDS, s_unpack_from__doc__},
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1568 {NULL, NULL} /* sentinel */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1569 };
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1570
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1571 PyDoc_STRVAR(s__doc__, "Compiled struct object");
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1572
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1573 #define OFF(x) offsetof(PyStructObject, x)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1574
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1575 static PyMemberDef s_memberlist[] = {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1576 {"format", T_OBJECT, OFF(s_format), RO,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1577 "struct format string"},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1578 {"size", T_INT, OFF(s_size), RO,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1579 "struct size in bytes"},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1580 {"_len", T_INT, OFF(s_len), RO,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1581 "number of items expected in tuple"},
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1582 {NULL} /* Sentinel */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1583 };
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1584
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1585
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1586 static
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1587 PyTypeObject PyStructType = {
38312 05324aa444bd Fix Cygwin compiler issue Bob Ippolito <bob@redivi.com> parents: 38310 diff changeset	1588 PyObject_HEAD_INIT(NULL)
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1589 0,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1590 "Struct",
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1591 sizeof(PyStructObject),
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1592 0,
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1593 (destructor)s_dealloc, /* tp_dealloc */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1594 0, /* tp_print */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1595 0, /* tp_getattr */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1596 0, /* tp_setattr */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1597 0, /* tp_compare */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1598 0, /* tp_repr */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1599 0, /* tp_as_number */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1600 0, /* tp_as_sequence */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1601 0, /* tp_as_mapping */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1602 0, /* tp_hash */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1603 0, /* tp_call */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1604 0, /* tp_str */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1605 PyObject_GenericGetAttr, /* tp_getattro */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1606 PyObject_GenericSetAttr, /* tp_setattro */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1607 0, /* tp_as_buffer */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1608 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_HAVE_WEAKREFS, /* tp_flags */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1609 s__doc__, /* tp_doc */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1610 0, /* tp_traverse */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1611 0, /* tp_clear */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1612 0, /* tp_richcompare */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1613 offsetof(PyStructObject, weakreflist), /* tp_weaklistoffset */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1614 0, /* tp_iter */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1615 0, /* tp_iternext */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1616 s_methods, /* tp_methods */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1617 s_memberlist, /* tp_members */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1618 0, /* tp_getset */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1619 0, /* tp_base */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1620 0, /* tp_dict */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1621 0, /* tp_descr_get */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1622 0, /* tp_descr_set */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1623 0, /* tp_dictoffset */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1624 s_init, /* tp_init */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1625 PyType_GenericAlloc, /* tp_alloc */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1626 s_new, /* tp_new */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1627 PyObject_Del, /* tp_free */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1628 };
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1629
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1630 /* Module initialization */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1631
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1632 PyMODINIT_FUNC
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1633 init_struct(void)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1634 {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1635 PyObject *m = Py_InitModule("_struct", NULL);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1636 if (m == NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1637 return;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1638
38312 05324aa444bd Fix Cygwin compiler issue Bob Ippolito <bob@redivi.com> parents: 38310 diff changeset	1639 PyStructType.ob_type = &PyType_Type;
05324aa444bd Fix Cygwin compiler issue Bob Ippolito <bob@redivi.com> parents: 38310 diff changeset	1640 if (PyType_Ready(&PyStructType) < 0)
05324aa444bd Fix Cygwin compiler issue Bob Ippolito <bob@redivi.com> parents: 38310 diff changeset	1641 return;
05324aa444bd Fix Cygwin compiler issue Bob Ippolito <bob@redivi.com> parents: 38310 diff changeset	1642
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	1643 /* 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	1644 {
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	1645 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	1646 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	1647 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	1648 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	1649 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	1650 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	1651 other = bigendian_table;
38322 c77da2736fb2 fix test_float regression and 64-bit size mismatch issue Bob Ippolito <bob@redivi.com> parents: 38317 diff changeset	1652 /* 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	1653 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	1654 native implementations whenever possible
c77da2736fb2 fix test_float regression and 64-bit size mismatch issue Bob Ippolito <bob@redivi.com> parents: 38317 diff changeset	1655 (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	1656 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	1657 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	1658 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	1659 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	1660 /* 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	1661 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	1662 if (ptr == other)
c77da2736fb2 fix test_float regression and 64-bit size mismatch issue Bob Ippolito <bob@redivi.com> parents: 38317 diff changeset	1663 other++;
c77da2736fb2 fix test_float regression and 64-bit size mismatch issue Bob Ippolito <bob@redivi.com> parents: 38317 diff changeset	1664 /* Only use the trick if the
c77da2736fb2 fix test_float regression and 64-bit size mismatch issue Bob Ippolito <bob@redivi.com> parents: 38317 diff changeset	1665 size matches */
c77da2736fb2 fix test_float regression and 64-bit size mismatch issue Bob Ippolito <bob@redivi.com> parents: 38317 diff changeset	1666 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	1667 break;
c77da2736fb2 fix test_float regression and 64-bit size mismatch issue Bob Ippolito <bob@redivi.com> parents: 38317 diff changeset	1668 /* 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	1669 "unknown" float format */
c77da2736fb2 fix test_float regression and 64-bit size mismatch issue Bob Ippolito <bob@redivi.com> parents: 38317 diff changeset	1670 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	1671 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	1672 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	1673 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	1674 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	1675 }
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	1676 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	1677 }
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	1678 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	1679 }
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	1680 }
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	1681
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1682 /* Add some symbolic constants to the module */
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1683 if (StructError == NULL) {
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1684 StructError = PyErr_NewException("struct.error", NULL, NULL);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1685 if (StructError == NULL)
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1686 return;
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1687 }
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	1688
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1689 Py_INCREF(StructError);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1690 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	1691
38259 895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1692 Py_INCREF((PyObject*)&PyStructType);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1693 PyModule_AddObject(m, "Struct", (PyObject*)&PyStructType);
895da42480f1 Patch #1493701: performance enhancements for struct module. Bob Ippolito <bob@redivi.com> parents: diff changeset	1694 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/_struct.c @ 38370:fa98b8df0fe2 legacy-trunk