cpython-lru_cache-weakref: Modules/

annotate Modules/_struct.c @ 38371:a4e433c136da legacy-trunk

Enable PY_USE_INT_WHEN_POSSIBLE in struct

author	Bob Ippolito <bob@redivi.com>
date	Fri, 26 May 2006 14:29:35 +0000
parents	fa98b8df0fe2
children	1ba3e40e8649

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

Mercurial > cpython-lru_cache-weakref

annotate Modules/_struct.c @ 38371:a4e433c136da legacy-trunk