djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/mpy-tool.py: Fix merge of multiple mpy files to POP_TOP correctly. 

MP_BC_CALL_FUNCTION will leave the result on the Python stack, so that
result must be discarded by MP_BC_POP_TOP.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2020-09-04 16:12:09 +10:00
parent 5f50568b1f
commit 4f2fe34623
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/mpy-tool.py
View File

@ -938,7 +938,7 @@ def merge_mpy(raw_codes, output_file):
merged_mpy.extend(header) merged_mpy.extend(header)
bytecode = bytearray() bytecode = bytearray()
bytecode_len = 6 + len(raw_codes) * 4 + 2 bytecode_len = 6 + len(raw_codes) * 5 + 2
bytecode.append(bytecode_len << 2) # kind and length bytecode.append(bytecode_len << 2) # kind and length
bytecode.append(0b00000000) # signature prelude bytecode.append(0b00000000) # signature prelude
bytecode.append(0b00001000) # size prelude bytecode.append(0b00001000) # size prelude
@ -947,7 +947,7 @@ def merge_mpy(raw_codes, output_file):
for idx in range(len(raw_codes)): for idx in range(len(raw_codes)):
bytecode.append(0x32) # MP_BC_MAKE_FUNCTION bytecode.append(0x32) # MP_BC_MAKE_FUNCTION
bytecode.append(idx) # index raw code bytecode.append(idx) # index raw code
bytecode.extend(b"\x34\x00") # MP_BC_CALL_FUNCTION, 0 args bytecode.extend(b"\x34\x00\x59") # MP_BC_CALL_FUNCTION, 0 args, MP_BC_POP_TOP
bytecode.extend(b"\x51\x63") # MP_BC_LOAD_NONE, MP_BC_RETURN_VALUE bytecode.extend(b"\x51\x63") # MP_BC_LOAD_NONE, MP_BC_RETURN_VALUE
bytecode.append(0) # n_obj bytecode.append(0) # n_obj