From 5889cf58dbab8eae52bdd0ad592556bd7aff06df Mon Sep 17 00:00:00 2001
From: Damien George
Date: Mon, 2 Sep 2019 20:24:01 +1000
Subject: py/bc0: Order opcodes into groups based on their size and format.

---
 tools/mpy-tool.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'tools')

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index e159165f1..d49789620 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -109,15 +109,15 @@ 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
+MP_BC_UNWIND_JUMP = 0x40
+MP_BC_MAKE_CLOSURE = 0x20
+MP_BC_MAKE_CLOSURE_DEFARGS = 0x21
+MP_BC_RAISE_VARARGS = 0x60
 # extra byte if caching enabled:
-MP_BC_LOAD_NAME = 0x1b
-MP_BC_LOAD_GLOBAL = 0x1c
-MP_BC_LOAD_ATTR = 0x1d
-MP_BC_STORE_ATTR = 0x26
+MP_BC_LOAD_NAME = 0x11
+MP_BC_LOAD_GLOBAL = 0x12
+MP_BC_LOAD_ATTR = 0x13
+MP_BC_STORE_ATTR = 0x18
 
 def make_opcode_format():
     def OC4(a, b, c, d):
-- 
cgit v1.2.3