mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

binary: machine_uint_t vs uint dichotomy starts doing real damage.

This commit is contained in:
Paul Sokolovsky 2014-06-26 00:41:08 +03:00
parent 8e01291c18
commit f3de62e6c2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
py/binary.c
View File

@ -155,7 +155,7 @@ mp_obj_t mp_binary_get_val(char struct_type, char val_type, byte **ptr) {
int size = mp_binary_get_size(struct_type, val_type, &align); int size = mp_binary_get_size(struct_type, val_type, &align);
if (struct_type == '@') { if (struct_type == '@') {
// Make pointer aligned // Make pointer aligned
p = (byte*)(((machine_uint_t)p + align - 1) & ~(align - 1)); p = (byte*)(((machine_uint_t)p + align - 1) & ~((machine_uint_t)align - 1));
#if MP_ENDIANNESS_LITTLE #if MP_ENDIANNESS_LITTLE
struct_type = '<'; struct_type = '<';
#else #else
@ -184,7 +184,7 @@ void mp_binary_set_val(char struct_type, char val_type, mp_obj_t val_in, byte **
int size = mp_binary_get_size(struct_type, val_type, &align); int size = mp_binary_get_size(struct_type, val_type, &align);
if (struct_type == '@') { if (struct_type == '@') {
// Make pointer aligned // Make pointer aligned
p = (byte*)(((machine_uint_t)p + align - 1) & ~(align - 1)); p = (byte*)(((machine_uint_t)p + align - 1) & ~((machine_uint_t)align - 1));
#if MP_ENDIANNESS_LITTLE #if MP_ENDIANNESS_LITTLE
struct_type = '<'; struct_type = '<';
#else #else