diff options
author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-04-11 03:47:21 +0300 |
---|---|---|
committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-04-11 03:59:16 +0300 |
commit | 0c43cf9154e331ab82bec7c727bc58307f8222c5 (patch) | |
tree | d909e5a1a48ef86467d078d06a068b0618be4e2d /py/modstruct.c | |
parent | ef9124f5ffb60aee8d3c59288a03d2fa078eec5a (diff) |
modstruct: Basic implementation of native struct alignment and types.
Diffstat (limited to 'py/modstruct.c')
-rw-r--r-- | py/modstruct.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/py/modstruct.c b/py/modstruct.c index 328ced913..3b9679a4c 100644 --- a/py/modstruct.c +++ b/py/modstruct.c @@ -37,7 +37,7 @@ STATIC uint calcsize_items(const char *fmt) { STATIC mp_obj_t struct_calcsize(mp_obj_t fmt_in) { const char *fmt = mp_obj_str_get_str(fmt_in); char fmt_type = get_fmt_type(&fmt); - assert(fmt_type == '<' || fmt_type == '>'); (void)fmt_type; + (void)fmt_type; machine_uint_t size; for (size = 0; *fmt; fmt++) { int sz = mp_binary_get_size(*fmt); @@ -53,7 +53,6 @@ STATIC mp_obj_t struct_unpack(mp_obj_t fmt_in, mp_obj_t data_in) { // TODO: "The buffer must contain exactly the amount of data required by the format (len(bytes) must equal calcsize(fmt))." const char *fmt = mp_obj_str_get_str(fmt_in); char fmt_type = get_fmt_type(&fmt); - assert(fmt_type == '<' || fmt_type == '>'); (void)fmt_type; uint size = calcsize_items(fmt); mp_obj_tuple_t *res = mp_obj_new_tuple(size, NULL); buffer_info_t bufinfo; @@ -61,7 +60,7 @@ STATIC mp_obj_t struct_unpack(mp_obj_t fmt_in, mp_obj_t data_in) { byte *p = bufinfo.buf; for (uint i = 0; i < size; i++) { - mp_obj_t item = mp_binary_get_val_unaligned(*fmt++, &p); + mp_obj_t item = mp_binary_get_val(fmt_type, *fmt++, &p); res->items[i] = item; } return res; |