From c8870b7c6969db23815da3c4ecfeaf2200ca2792 Mon Sep 17 00:00:00 2001 From: Damien George Date: Thu, 18 Jun 2015 15:12:17 +0000 Subject: [PATCH] py: Make showbc decode UNPACK_EX, and use correct range for unop/binop. --- py/showbc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/py/showbc.c b/py/showbc.c index 30b51de625..e08140e6b6 100644 --- a/py/showbc.c +++ b/py/showbc.c @@ -426,6 +426,11 @@ const byte *mp_bytecode_print_str(const byte *ip) { printf("UNPACK_SEQUENCE " UINT_FMT, unum); break; + case MP_BC_UNPACK_EX: + DECODE_UINT; + printf("UNPACK_EX " UINT_FMT, unum); + break; + case MP_BC_MAKE_FUNCTION: DECODE_PTR; printf("MAKE_FUNCTION %p", (void*)unum); @@ -508,9 +513,9 @@ const byte *mp_bytecode_print_str(const byte *ip) { printf("LOAD_FAST " UINT_FMT, (mp_uint_t)ip[-1] - MP_BC_LOAD_FAST_MULTI); } else if (ip[-1] < MP_BC_STORE_FAST_MULTI + 16) { printf("STORE_FAST " UINT_FMT, (mp_uint_t)ip[-1] - MP_BC_STORE_FAST_MULTI); - } else if (ip[-1] < MP_BC_UNARY_OP_MULTI + 5) { + } else if (ip[-1] < MP_BC_UNARY_OP_MULTI + 6) { printf("UNARY_OP " UINT_FMT, (mp_uint_t)ip[-1] - MP_BC_UNARY_OP_MULTI); - } else if (ip[-1] < MP_BC_BINARY_OP_MULTI + 35) { + } else if (ip[-1] < MP_BC_BINARY_OP_MULTI + 36) { mp_uint_t op = ip[-1] - MP_BC_BINARY_OP_MULTI; printf("BINARY_OP " UINT_FMT " %s", op, qstr_str(mp_binary_op_method_name[op])); } else {