[Python-checkins] cpython (merge 3.2 -> default): Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows.
meador.inge
python-checkins at python.org
Thu Jul 19 07:15:45 CEST 2012
http://hg.python.org/cpython/rev/3fbfa61634de
changeset: 78176:3fbfa61634de
parent: 78172:2b0e4c640ec7
parent: 78175:153ae76b963e
user: Meador Inge <meadori at gmail.com>
date: Thu Jul 19 00:14:35 2012 -0500
summary:
Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows.
files:
Lib/ctypes/test/test_bitfields.py | 20 +++++++
Misc/NEWS | 3 +
Modules/_ctypes/cfield.c | 51 ++++++++----------
3 files changed, 46 insertions(+), 28 deletions(-)
diff --git a/Lib/ctypes/test/test_bitfields.py b/Lib/ctypes/test/test_bitfields.py
--- a/Lib/ctypes/test/test_bitfields.py
+++ b/Lib/ctypes/test/test_bitfields.py
@@ -240,5 +240,25 @@
_anonymous_ = ["_"]
_fields_ = [("_", X)]
+ @unittest.skipUnless(hasattr(ctypes, "c_uint32"), "c_int32 is required")
+ def test_uint32(self):
+ class X(Structure):
+ _fields_ = [("a", c_uint32, 32)]
+ x = X()
+ x.a = 10
+ self.assertEquals(x.a, 10)
+ x.a = 0xFDCBA987
+ self.assertEquals(x.a, 0xFDCBA987)
+
+ @unittest.skipUnless(hasattr(ctypes, "c_uint64"), "c_int64 is required")
+ def test_uint64(self):
+ class X(Structure):
+ _fields_ = [("a", c_uint64, 64)]
+ x = X()
+ x.a = 10
+ self.assertEquals(x.a, 10)
+ x.a = 0xFEDCBA9876543211
+ self.assertEquals(x.a, 0xFEDCBA9876543211)
+
if __name__ == "__main__":
unittest.main()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -138,6 +138,9 @@
Extension Modules
-----------------
+- Issue #6493: An issue in ctypes on Windows that caused structure bitfields
+ of type ctypes.c_uint32 and width 32 to incorrectly be set has been fixed.
+
- Issue #15194: Update libffi to the 3.0.11 release.
Tools/Demos
diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c
--- a/Modules/_ctypes/cfield.c
+++ b/Modules/_ctypes/cfield.c
@@ -427,12 +427,8 @@
#define LOW_BIT(x) ((x) & 0xFFFF)
#define NUM_BITS(x) ((x) >> 16)
-/* This seems nore a compiler issue than a Windows/non-Windows one */
-#ifdef MS_WIN32
-# define BIT_MASK(size) ((1 << NUM_BITS(size))-1)
-#else
-# define BIT_MASK(size) ((1LL << NUM_BITS(size))-1)
-#endif
+/* Doesn't work if NUM_BITS(size) == 0, but it never happens in SET() call. */
+#define BIT_MASK(type, size) (((((type)1 << (NUM_BITS(size) - 1)) - 1) << 1) + 1)
/* This macro CHANGES the first parameter IN PLACE. For proper sign handling,
we must first shift left, then right.
@@ -444,10 +440,10 @@
}
/* This macro RETURNS the first parameter with the bit field CHANGED. */
-#define SET(x, v, size) \
+#define SET(type, x, v, size) \
(NUM_BITS(size) ? \
- ( ( x & ~(BIT_MASK(size) << LOW_BIT(size)) ) | ( (v & BIT_MASK(size)) << LOW_BIT(size) ) ) \
- : v)
+ ( ( (type)x & ~(BIT_MASK(type, size) << LOW_BIT(size)) ) | ( ((type)v & BIT_MASK(type, size)) << LOW_BIT(size) ) ) \
+ : (type)v)
/* byte swapping macros */
#define SWAP_2(v) \
@@ -519,7 +515,7 @@
long val;
if (get_long(value, &val) < 0)
return NULL;
- *(signed char *)ptr = (signed char)SET(*(signed char *)ptr, (signed char)val, size);
+ *(signed char *)ptr = SET(signed char, *(signed char *)ptr, val, size);
_RET(value);
}
@@ -538,8 +534,7 @@
unsigned long val;
if (get_ulong(value, &val) < 0)
return NULL;
- *(unsigned char *)ptr = (unsigned char)SET(*(unsigned char*)ptr,
- (unsigned short)val, size);
+ *(unsigned char *)ptr = SET(unsigned char, *(unsigned char*)ptr, val, size);
_RET(value);
}
@@ -560,7 +555,7 @@
if (get_long(value, &val) < 0)
return NULL;
memcpy(&x, ptr, sizeof(x));
- x = SET(x, (short)val, size);
+ x = SET(short, x, val, size);
memcpy(ptr, &x, sizeof(x));
_RET(value);
}
@@ -575,7 +570,7 @@
return NULL;
memcpy(&field, ptr, sizeof(field));
field = SWAP_2(field);
- field = SET(field, (short)val, size);
+ field = SET(short, field, val, size);
field = SWAP_2(field);
memcpy(ptr, &field, sizeof(field));
_RET(value);
@@ -608,7 +603,7 @@
if (get_ulong(value, &val) < 0)
return NULL;
memcpy(&x, ptr, sizeof(x));
- x = SET(x, (unsigned short)val, size);
+ x = SET(unsigned short, x, val, size);
memcpy(ptr, &x, sizeof(x));
_RET(value);
}
@@ -622,7 +617,7 @@
return NULL;
memcpy(&field, ptr, sizeof(field));
field = SWAP_2(field);
- field = SET(field, (unsigned short)val, size);
+ field = SET(unsigned short, field, val, size);
field = SWAP_2(field);
memcpy(ptr, &field, sizeof(field));
_RET(value);
@@ -656,7 +651,7 @@
if (get_long(value, &val) < 0)
return NULL;
memcpy(&x, ptr, sizeof(x));
- x = SET(x, (int)val, size);
+ x = SET(int, x, val, size);
memcpy(ptr, &x, sizeof(x));
_RET(value);
}
@@ -670,7 +665,7 @@
return NULL;
memcpy(&field, ptr, sizeof(field));
field = SWAP_INT(field);
- field = SET(field, (int)val, size);
+ field = SET(int, field, val, size);
field = SWAP_INT(field);
memcpy(ptr, &field, sizeof(field));
_RET(value);
@@ -757,7 +752,7 @@
if (get_ulong(value, &val) < 0)
return NULL;
memcpy(&x, ptr, sizeof(x));
- x = SET(x, (unsigned int)val, size);
+ x = SET(unsigned int, x, val, size);
memcpy(ptr, &x, sizeof(x));
_RET(value);
}
@@ -770,7 +765,7 @@
if (get_ulong(value, &val) < 0)
return NULL;
memcpy(&field, ptr, sizeof(field));
- field = (unsigned int)SET(field, (unsigned int)val, size);
+ field = SET(unsigned int, field, (unsigned int)val, size);
field = SWAP_INT(field);
memcpy(ptr, &field, sizeof(field));
_RET(value);
@@ -804,7 +799,7 @@
if (get_long(value, &val) < 0)
return NULL;
memcpy(&x, ptr, sizeof(x));
- x = SET(x, val, size);
+ x = SET(long, x, val, size);
memcpy(ptr, &x, sizeof(x));
_RET(value);
}
@@ -818,7 +813,7 @@
return NULL;
memcpy(&field, ptr, sizeof(field));
field = SWAP_LONG(field);
- field = (long)SET(field, val, size);
+ field = SET(long, field, val, size);
field = SWAP_LONG(field);
memcpy(ptr, &field, sizeof(field));
_RET(value);
@@ -852,7 +847,7 @@
if (get_ulong(value, &val) < 0)
return NULL;
memcpy(&x, ptr, sizeof(x));
- x = SET(x, val, size);
+ x = SET(unsigned long, x, val, size);
memcpy(ptr, &x, sizeof(x));
_RET(value);
}
@@ -866,7 +861,7 @@
return NULL;
memcpy(&field, ptr, sizeof(field));
field = SWAP_LONG(field);
- field = (unsigned long)SET(field, val, size);
+ field = SET(unsigned long, field, val, size);
field = SWAP_LONG(field);
memcpy(ptr, &field, sizeof(field));
_RET(value);
@@ -901,7 +896,7 @@
if (get_longlong(value, &val) < 0)
return NULL;
memcpy(&x, ptr, sizeof(x));
- x = SET(x, val, size);
+ x = SET(PY_LONG_LONG, x, val, size);
memcpy(ptr, &x, sizeof(x));
_RET(value);
}
@@ -915,7 +910,7 @@
return NULL;
memcpy(&field, ptr, sizeof(field));
field = SWAP_8(field);
- field = (PY_LONG_LONG)SET(field, val, size);
+ field = SET(PY_LONG_LONG, field, val, size);
field = SWAP_8(field);
memcpy(ptr, &field, sizeof(field));
_RET(value);
@@ -948,7 +943,7 @@
if (get_ulonglong(value, &val) < 0)
return NULL;
memcpy(&x, ptr, sizeof(x));
- x = SET(x, val, size);
+ x = SET(PY_LONG_LONG, x, val, size);
memcpy(ptr, &x, sizeof(x));
_RET(value);
}
@@ -962,7 +957,7 @@
return NULL;
memcpy(&field, ptr, sizeof(field));
field = SWAP_8(field);
- field = (unsigned PY_LONG_LONG)SET(field, val, size);
+ field = SET(unsigned PY_LONG_LONG, field, val, size);
field = SWAP_8(field);
memcpy(ptr, &field, sizeof(field));
_RET(value);
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list