mirrors/micropython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extmod: Fix uctypes size calculation for bitfields

Browse Source
This commit is contained in:
Dave Hylands 2016-01-03 10:38:36 -08:00 committed by Paul Sokolovsky
parent 8175877ad6
commit 66d0c1052a
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extmod/moductypes.c
View File

@ -230,6 +230,9 @@ STATIC mp_uint_t uctypes_struct_size(mp_obj_t desc_in, int layout_type, mp_uint_
mp_uint_t offset = MP_OBJ_SMALL_INT_VALUE(v); mp_uint_t offset = MP_OBJ_SMALL_INT_VALUE(v);
mp_uint_t val_type = GET_TYPE(offset, VAL_TYPE_BITS); mp_uint_t val_type = GET_TYPE(offset, VAL_TYPE_BITS);
offset &= VALUE_MASK(VAL_TYPE_BITS); offset &= VALUE_MASK(VAL_TYPE_BITS);
if (val_type >= BFUINT8 && val_type <= BFINT32) {
offset &= (1 << OFFSET_BITS) - 1;
}
mp_uint_t s = uctypes_struct_scalar_size(val_type); mp_uint_t s = uctypes_struct_scalar_size(val_type);
if (s > *max_field_size) { if (s > *max_field_size) {
*max_field_size = s; *max_field_size = s;

9
tests/extmod/uctypes_sizeof.py
View File

@ -6,7 +6,11 @@ desc = {
# arr2 is array at offset 0, size 2, of structures defined recursively # arr2 is array at offset 0, size 2, of structures defined recursively
"arr2": (uctypes.ARRAY | 0, 2, {"b": uctypes.UINT8 | 0}), "arr2": (uctypes.ARRAY | 0, 2, {"b": uctypes.UINT8 | 0}),
"arr3": (uctypes.ARRAY | 2, uctypes.UINT16 | 2), "arr3": (uctypes.ARRAY | 2, uctypes.UINT16 | 2),
"arr4": (uctypes.ARRAY | 0, 2, {"b": uctypes.UINT8 | 0, "w": uctypes.UINT16 | 1}) "arr4": (uctypes.ARRAY | 0, 2, {"b": uctypes.UINT8 | 0, "w": uctypes.UINT16 | 1}),
"sub": (0, {
'b1': uctypes.BFUINT8 | 0 | 4 << uctypes.BF_POS | 4 << uctypes.BF_LEN,
'b2': uctypes.BFUINT8 | 0 | 0 << uctypes.BF_POS | 4 << uctypes.BF_LEN,
}),
} }
data = bytearray(b"01234567") data = bytearray(b"01234567")
@ -29,3 +33,6 @@ except TypeError:
print(uctypes.sizeof(S.arr4)) print(uctypes.sizeof(S.arr4))
assert uctypes.sizeof(S.arr4) == 6 assert uctypes.sizeof(S.arr4) == 6
print(uctypes.sizeof(S.sub))
assert uctypes.sizeof(S.sub) == 1

1
tests/extmod/uctypes_sizeof.py.exp
View File

@ -3,3 +3,4 @@
4 4
TypeError TypeError
6 6
1