TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

py/bc: Fix size calculation of UNWIND_JUMP opcode in mp_opcode_format.

Browse Source 
Prior to this patch mp_opcode_format would calculate the incorrect size of
the MP_BC_UNWIND_JUMP opcode, missing the additional byte.  But, because
opcodes below 0x10 are unused and treated as bytes in the .mpy load/save
and freezing code, this bug did not show any symptoms, since nested unwind
jumps would rarely (if ever) reach a depth of 16 (so the extra byte of this
opcode would be between 0x01 and 0x0f and be correctly loaded/saved/frozen
simply as an undefined opcode).

This patch fixes this bug by correctly accounting for the additional byte.
        .
This commit is contained in:
Damien George
2019-09-02 13:30:16 +10:00
parent c348e79187
commit b29fae0c56
4 changed files with 83 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/mpy-tool.py
View File

@@ -109,6 +109,7 @@ MP_OPCODE_VAR_UINT = 2
MP_OPCODE_OFFSET = 3
# extra bytes:
MP_BC_UNWIND_JUMP = 0x46
MP_BC_MAKE_CLOSURE = 0x62
MP_BC_MAKE_CLOSURE_DEFARGS = 0x63
MP_BC_RAISE_VARARGS = 0x5c
@@ -215,7 +216,8 @@ def mp_opcode_format(bytecode, ip, count_var_uint, opcode_format=make_opcode_for
ip += 3
else:
extra_byte = (
opcode == MP_BC_RAISE_VARARGS
opcode == MP_BC_UNWIND_JUMP
or opcode == MP_BC_RAISE_VARARGS
or opcode == MP_BC_MAKE_CLOSURE
or opcode == MP_BC_MAKE_CLOSURE_DEFARGS
)