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

py/showbc: Pass in an mp_print_t struct to all bytecode-print functions.

Browse Source 
So the output can be redirected if needed.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2020-09-11 17:22:28 +10:00
parent 50efce8174
commit 85f2b239d8
4 changed files with 109 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
py/bc.h
View File

@ -226,10 +226,10 @@ const byte *mp_decode_uint_skip(const byte *ptr);
mp_vm_return_kind_t mp_execute_bytecode(mp_code_state_t *code_state, volatile mp_obj_t inject_exc); mp_vm_return_kind_t mp_execute_bytecode(mp_code_state_t *code_state, volatile mp_obj_t inject_exc);
mp_code_state_t *mp_obj_fun_bc_prepare_codestate(mp_obj_t func, size_t n_args, size_t n_kw, const mp_obj_t *args); mp_code_state_t *mp_obj_fun_bc_prepare_codestate(mp_obj_t func, size_t n_args, size_t n_kw, const mp_obj_t *args);
void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw, const mp_obj_t *args); void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw, const mp_obj_t *args);
void mp_bytecode_print(const void *descr, const byte *code, mp_uint_t len, const mp_uint_t *const_table); void mp_bytecode_print(const mp_print_t *print, const void *descr, const byte *code, mp_uint_t len, const mp_uint_t *const_table);
void mp_bytecode_print2(const byte *code, size_t len, const mp_uint_t *const_table); void mp_bytecode_print2(const mp_print_t *print, const byte *code, size_t len, const mp_uint_t *const_table);
const byte *mp_bytecode_print_str(const byte *ip); const byte *mp_bytecode_print_str(const mp_print_t *print, const byte *ip);
#define mp_bytecode_print_inst(code, const_table) mp_bytecode_print2(code, 1, const_table) #define mp_bytecode_print_inst(print, code, const_table) mp_bytecode_print2(print, code, 1, const_table)
// Helper macros to access pointer with least significant bits holding flags // Helper macros to access pointer with least significant bits holding flags
#define MP_TAGPTR_PTR(x) ((void *)((uintptr_t)(x) & ~((uintptr_t)3))) #define MP_TAGPTR_PTR(x) ((void *)((uintptr_t)(x) & ~((uintptr_t)3)))

2
py/emitglue.c
View File

@ -92,7 +92,7 @@ void mp_emit_glue_assign_bytecode(mp_raw_code_t *rc, const byte *code,
#endif #endif
#if MICROPY_DEBUG_PRINTERS #if MICROPY_DEBUG_PRINTERS
if (mp_verbose_flag >= 2) { if (mp_verbose_flag >= 2) {
mp_bytecode_print(rc, code, len, const_table); mp_bytecode_print(&mp_plat_print, rc, code, len, const_table);
} }
#endif #endif
} }

209
py/showbc.c
View File

@ -32,9 +32,6 @@
#if MICROPY_DEBUG_PRINTERS #if MICROPY_DEBUG_PRINTERS
// redirect all printfs in this file to the platform print stream
#define printf(...) mp_printf(&mp_plat_print, __VA_ARGS__)
#define DECODE_UINT { \ #define DECODE_UINT { \
unum = 0; \ unum = 0; \
do { \ do { \
@ -80,7 +77,7 @@
const byte *mp_showbc_code_start; const byte *mp_showbc_code_start;
const mp_uint_t *mp_showbc_const_table; const mp_uint_t *mp_showbc_const_table;
void mp_bytecode_print(const void *descr, const byte *ip, mp_uint_t len, const mp_uint_t *const_table) { void mp_bytecode_print(const mp_print_t *print, const void *descr, const byte *ip, mp_uint_t len, const mp_uint_t *const_table) {
mp_showbc_code_start = ip; mp_showbc_code_start = ip;
// Decode prelude // Decode prelude
@ -96,30 +93,30 @@ void mp_bytecode_print(const void *descr, const byte *ip, mp_uint_t len, const m
qstr block_name = mp_decode_uint(&code_info); qstr block_name = mp_decode_uint(&code_info);
qstr source_file = mp_decode_uint(&code_info); qstr source_file = mp_decode_uint(&code_info);
#endif #endif
printf("File %s, code block '%s' (descriptor: %p, bytecode @%p " UINT_FMT " bytes)\n", mp_printf(print, "File %s, code block '%s' (descriptor: %p, bytecode @%p " UINT_FMT " bytes)\n",
qstr_str(source_file), qstr_str(block_name), descr, mp_showbc_code_start, len); qstr_str(source_file), qstr_str(block_name), descr, mp_showbc_code_start, len);
// raw bytecode dump // raw bytecode dump
size_t prelude_size = ip - mp_showbc_code_start + n_info + n_cell; size_t prelude_size = ip - mp_showbc_code_start + n_info + n_cell;
printf("Raw bytecode (code_info_size=" UINT_FMT ", bytecode_size=" UINT_FMT "):\n", mp_printf(print, "Raw bytecode (code_info_size=" UINT_FMT ", bytecode_size=" UINT_FMT "):\n",
prelude_size, len - prelude_size); prelude_size, len - prelude_size);
for (mp_uint_t i = 0; i < len; i++) { for (mp_uint_t i = 0; i < len; i++) {
if (i > 0 && i % 16 == 0) { if (i > 0 && i % 16 == 0) {
printf("\n"); mp_printf(print, "\n");
} }
printf(" %02x", mp_showbc_code_start[i]); mp_printf(print, " %02x", mp_showbc_code_start[i]);
} }
printf("\n"); mp_printf(print, "\n");
// bytecode prelude: arg names (as qstr objects) // bytecode prelude: arg names (as qstr objects)
printf("arg names:"); mp_printf(print, "arg names:");
for (mp_uint_t i = 0; i < n_pos_args + n_kwonly_args; i++) { for (mp_uint_t i = 0; i < n_pos_args + n_kwonly_args; i++) {
printf(" %s", qstr_str(MP_OBJ_QSTR_VALUE(const_table[i]))); mp_printf(print, " %s", qstr_str(MP_OBJ_QSTR_VALUE(const_table[i])));
} }
printf("\n"); mp_printf(print, "\n");
printf("(N_STATE %u)\n", (unsigned)n_state); mp_printf(print, "(N_STATE %u)\n", (unsigned)n_state);
printf("(N_EXC_STACK %u)\n", (unsigned)n_exc_stack); mp_printf(print, "(N_EXC_STACK %u)\n", (unsigned)n_exc_stack);
// skip over code_info // skip over code_info
ip += n_info; ip += n_info;
@ -127,14 +124,14 @@ void mp_bytecode_print(const void *descr, const byte *ip, mp_uint_t len, const m
// bytecode prelude: initialise closed over variables // bytecode prelude: initialise closed over variables
for (size_t i = 0; i < n_cell; ++i) { for (size_t i = 0; i < n_cell; ++i) {
uint local_num = *ip++; uint local_num = *ip++;
printf("(INIT_CELL %u)\n", local_num); mp_printf(print, "(INIT_CELL %u)\n", local_num);
} }
// print out line number info // print out line number info
{ {
mp_int_t bc = 0; mp_int_t bc = 0;
mp_uint_t source_line = 1; mp_uint_t source_line = 1;
printf(" bc=" INT_FMT " line=" UINT_FMT "\n", bc, source_line); mp_printf(print, " bc=" INT_FMT " line=" UINT_FMT "\n", bc, source_line);
for (const byte *ci = code_info; *ci;) { for (const byte *ci = code_info; *ci;) {
if ((ci[0] & 0x80) == 0) { if ((ci[0] & 0x80) == 0) {
// 0b0LLBBBBB encoding // 0b0LLBBBBB encoding
@ -147,27 +144,27 @@ void mp_bytecode_print(const void *descr, const byte *ip, mp_uint_t len, const m
source_line += ((ci[0] << 4) & 0x700) | ci[1]; source_line += ((ci[0] << 4) & 0x700) | ci[1];
ci += 2; ci += 2;
} }
printf(" bc=" INT_FMT " line=" UINT_FMT "\n", bc, source_line); mp_printf(print, " bc=" INT_FMT " line=" UINT_FMT "\n", bc, source_line);
} }
} }
mp_bytecode_print2(ip, len - prelude_size, const_table); mp_bytecode_print2(print, ip, len - prelude_size, const_table);
} }
const byte *mp_bytecode_print_str(const byte *ip) { const byte *mp_bytecode_print_str(const mp_print_t *print, const byte *ip) {
mp_uint_t unum; mp_uint_t unum;
qstr qst; qstr qst;
switch (*ip++) { switch (*ip++) {
case MP_BC_LOAD_CONST_FALSE: case MP_BC_LOAD_CONST_FALSE:
printf("LOAD_CONST_FALSE"); mp_printf(print, "LOAD_CONST_FALSE");
break; break;
case MP_BC_LOAD_CONST_NONE: case MP_BC_LOAD_CONST_NONE:
printf("LOAD_CONST_NONE"); mp_printf(print, "LOAD_CONST_NONE");
break; break;
case MP_BC_LOAD_CONST_TRUE: case MP_BC_LOAD_CONST_TRUE:
printf("LOAD_CONST_TRUE"); mp_printf(print, "LOAD_CONST_TRUE");
break; break;
case MP_BC_LOAD_CONST_SMALL_INT: { case MP_BC_LOAD_CONST_SMALL_INT: {
@ -179,197 +176,197 @@ const byte *mp_bytecode_print_str(const byte *ip) {
do { do {
num = (num << 7) | (*ip & 0x7f); num = (num << 7) | (*ip & 0x7f);
} while ((*ip++ & 0x80) != 0); } while ((*ip++ & 0x80) != 0);
printf("LOAD_CONST_SMALL_INT " INT_FMT, num); mp_printf(print, "LOAD_CONST_SMALL_INT " INT_FMT, num);
break; break;
} }
case MP_BC_LOAD_CONST_STRING: case MP_BC_LOAD_CONST_STRING:
DECODE_QSTR; DECODE_QSTR;
printf("LOAD_CONST_STRING '%s'", qstr_str(qst)); mp_printf(print, "LOAD_CONST_STRING '%s'", qstr_str(qst));
break; break;
case MP_BC_LOAD_CONST_OBJ: case MP_BC_LOAD_CONST_OBJ:
DECODE_OBJ; DECODE_OBJ;
printf("LOAD_CONST_OBJ %p=", MP_OBJ_TO_PTR(unum)); mp_printf(print, "LOAD_CONST_OBJ %p=", MP_OBJ_TO_PTR(unum));
mp_obj_print_helper(&mp_plat_print, (mp_obj_t)unum, PRINT_REPR); mp_obj_print_helper(print, (mp_obj_t)unum, PRINT_REPR);
break; break;
case MP_BC_LOAD_NULL: case MP_BC_LOAD_NULL:
printf("LOAD_NULL"); mp_printf(print, "LOAD_NULL");
break; break;
case MP_BC_LOAD_FAST_N: case MP_BC_LOAD_FAST_N:
DECODE_UINT; DECODE_UINT;
printf("LOAD_FAST_N " UINT_FMT, unum); mp_printf(print, "LOAD_FAST_N " UINT_FMT, unum);
break; break;
case MP_BC_LOAD_DEREF: case MP_BC_LOAD_DEREF:
DECODE_UINT; DECODE_UINT;
printf("LOAD_DEREF " UINT_FMT, unum); mp_printf(print, "LOAD_DEREF " UINT_FMT, unum);
break; break;
case MP_BC_LOAD_NAME: case MP_BC_LOAD_NAME:
DECODE_QSTR; DECODE_QSTR;
printf("LOAD_NAME %s", qstr_str(qst)); mp_printf(print, "LOAD_NAME %s", qstr_str(qst));
if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE) { if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE) {
printf(" (cache=%u)", *ip++); mp_printf(print, " (cache=%u)", *ip++);
} }
break; break;
case MP_BC_LOAD_GLOBAL: case MP_BC_LOAD_GLOBAL:
DECODE_QSTR; DECODE_QSTR;
printf("LOAD_GLOBAL %s", qstr_str(qst)); mp_printf(print, "LOAD_GLOBAL %s", qstr_str(qst));
if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE) { if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE) {
printf(" (cache=%u)", *ip++); mp_printf(print, " (cache=%u)", *ip++);
} }
break; break;
case MP_BC_LOAD_ATTR: case MP_BC_LOAD_ATTR:
DECODE_QSTR; DECODE_QSTR;
printf("LOAD_ATTR %s", qstr_str(qst)); mp_printf(print, "LOAD_ATTR %s", qstr_str(qst));
if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE) { if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE) {
printf(" (cache=%u)", *ip++); mp_printf(print, " (cache=%u)", *ip++);
} }
break; break;
case MP_BC_LOAD_METHOD: case MP_BC_LOAD_METHOD:
DECODE_QSTR; DECODE_QSTR;
printf("LOAD_METHOD %s", qstr_str(qst)); mp_printf(print, "LOAD_METHOD %s", qstr_str(qst));
break; break;
case MP_BC_LOAD_SUPER_METHOD: case MP_BC_LOAD_SUPER_METHOD:
DECODE_QSTR; DECODE_QSTR;
printf("LOAD_SUPER_METHOD %s", qstr_str(qst)); mp_printf(print, "LOAD_SUPER_METHOD %s", qstr_str(qst));
break; break;
case MP_BC_LOAD_BUILD_CLASS: case MP_BC_LOAD_BUILD_CLASS:
printf("LOAD_BUILD_CLASS"); mp_printf(print, "LOAD_BUILD_CLASS");
break; break;
case MP_BC_LOAD_SUBSCR: case MP_BC_LOAD_SUBSCR:
printf("LOAD_SUBSCR"); mp_printf(print, "LOAD_SUBSCR");
break; break;
case MP_BC_STORE_FAST_N: case MP_BC_STORE_FAST_N:
DECODE_UINT; DECODE_UINT;
printf("STORE_FAST_N " UINT_FMT, unum); mp_printf(print, "STORE_FAST_N " UINT_FMT, unum);
break; break;
case MP_BC_STORE_DEREF: case MP_BC_STORE_DEREF:
DECODE_UINT; DECODE_UINT;
printf("STORE_DEREF " UINT_FMT, unum); mp_printf(print, "STORE_DEREF " UINT_FMT, unum);
break; break;
case MP_BC_STORE_NAME: case MP_BC_STORE_NAME:
DECODE_QSTR; DECODE_QSTR;
printf("STORE_NAME %s", qstr_str(qst)); mp_printf(print, "STORE_NAME %s", qstr_str(qst));
break; break;
case MP_BC_STORE_GLOBAL: case MP_BC_STORE_GLOBAL:
DECODE_QSTR; DECODE_QSTR;
printf("STORE_GLOBAL %s", qstr_str(qst)); mp_printf(print, "STORE_GLOBAL %s", qstr_str(qst));
break; break;
case MP_BC_STORE_ATTR: case MP_BC_STORE_ATTR:
DECODE_QSTR; DECODE_QSTR;
printf("STORE_ATTR %s", qstr_str(qst)); mp_printf(print, "STORE_ATTR %s", qstr_str(qst));
if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE) { if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE) {
printf(" (cache=%u)", *ip++); mp_printf(print, " (cache=%u)", *ip++);
} }
break; break;
case MP_BC_STORE_SUBSCR: case MP_BC_STORE_SUBSCR:
printf("STORE_SUBSCR"); mp_printf(print, "STORE_SUBSCR");
break; break;
case MP_BC_DELETE_FAST: case MP_BC_DELETE_FAST:
DECODE_UINT; DECODE_UINT;
printf("DELETE_FAST " UINT_FMT, unum); mp_printf(print, "DELETE_FAST " UINT_FMT, unum);
break; break;
case MP_BC_DELETE_DEREF: case MP_BC_DELETE_DEREF:
DECODE_UINT; DECODE_UINT;
printf("DELETE_DEREF " UINT_FMT, unum); mp_printf(print, "DELETE_DEREF " UINT_FMT, unum);
break; break;
case MP_BC_DELETE_NAME: case MP_BC_DELETE_NAME:
DECODE_QSTR; DECODE_QSTR;
printf("DELETE_NAME %s", qstr_str(qst)); mp_printf(print, "DELETE_NAME %s", qstr_str(qst));
break; break;
case MP_BC_DELETE_GLOBAL: case MP_BC_DELETE_GLOBAL:
DECODE_QSTR; DECODE_QSTR;
printf("DELETE_GLOBAL %s", qstr_str(qst)); mp_printf(print, "DELETE_GLOBAL %s", qstr_str(qst));
break; break;
case MP_BC_DUP_TOP: case MP_BC_DUP_TOP:
printf("DUP_TOP"); mp_printf(print, "DUP_TOP");
break; break;
case MP_BC_DUP_TOP_TWO: case MP_BC_DUP_TOP_TWO:
printf("DUP_TOP_TWO"); mp_printf(print, "DUP_TOP_TWO");
break; break;
case MP_BC_POP_TOP: case MP_BC_POP_TOP:
printf("POP_TOP"); mp_printf(print, "POP_TOP");
break; break;
case MP_BC_ROT_TWO: case MP_BC_ROT_TWO:
printf("ROT_TWO"); mp_printf(print, "ROT_TWO");
break; break;
case MP_BC_ROT_THREE: case MP_BC_ROT_THREE:
printf("ROT_THREE"); mp_printf(print, "ROT_THREE");
break; break;
case MP_BC_JUMP: case MP_BC_JUMP:
DECODE_SLABEL; DECODE_SLABEL;
printf("JUMP " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start)); mp_printf(print, "JUMP " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
break; break;
case MP_BC_POP_JUMP_IF_TRUE: case MP_BC_POP_JUMP_IF_TRUE:
DECODE_SLABEL; DECODE_SLABEL;
printf("POP_JUMP_IF_TRUE " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start)); mp_printf(print, "POP_JUMP_IF_TRUE " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
break; break;
case MP_BC_POP_JUMP_IF_FALSE: case MP_BC_POP_JUMP_IF_FALSE:
DECODE_SLABEL; DECODE_SLABEL;
printf("POP_JUMP_IF_FALSE " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start)); mp_printf(print, "POP_JUMP_IF_FALSE " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
break; break;
case MP_BC_JUMP_IF_TRUE_OR_POP: case MP_BC_JUMP_IF_TRUE_OR_POP:
DECODE_SLABEL; DECODE_SLABEL;
printf("JUMP_IF_TRUE_OR_POP " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start)); mp_printf(print, "JUMP_IF_TRUE_OR_POP " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
break; break;
case MP_BC_JUMP_IF_FALSE_OR_POP: case MP_BC_JUMP_IF_FALSE_OR_POP:
DECODE_SLABEL; DECODE_SLABEL;
printf("JUMP_IF_FALSE_OR_POP " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start)); mp_printf(print, "JUMP_IF_FALSE_OR_POP " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
break; break;
case MP_BC_SETUP_WITH: case MP_BC_SETUP_WITH:
DECODE_ULABEL; // loop-like labels are always forward DECODE_ULABEL; // loop-like labels are always forward
printf("SETUP_WITH " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start)); mp_printf(print, "SETUP_WITH " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
break; break;
case MP_BC_WITH_CLEANUP: case MP_BC_WITH_CLEANUP:
printf("WITH_CLEANUP"); mp_printf(print, "WITH_CLEANUP");
break; break;
case MP_BC_UNWIND_JUMP: case MP_BC_UNWIND_JUMP:
DECODE_SLABEL; DECODE_SLABEL;
printf("UNWIND_JUMP " UINT_FMT " %d", (mp_uint_t)(ip + unum - mp_showbc_code_start), *ip); mp_printf(print, "UNWIND_JUMP " UINT_FMT " %d", (mp_uint_t)(ip + unum - mp_showbc_code_start), *ip);
ip += 1; ip += 1;
break; break;
case MP_BC_SETUP_EXCEPT: case MP_BC_SETUP_EXCEPT:
DECODE_ULABEL; // except labels are always forward DECODE_ULABEL; // except labels are always forward
printf("SETUP_EXCEPT " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start)); mp_printf(print, "SETUP_EXCEPT " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
break; break;
case MP_BC_SETUP_FINALLY: case MP_BC_SETUP_FINALLY:
DECODE_ULABEL; // except labels are always forward DECODE_ULABEL; // except labels are always forward
printf("SETUP_FINALLY " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start)); mp_printf(print, "SETUP_FINALLY " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
break; break;
case MP_BC_END_FINALLY: case MP_BC_END_FINALLY:
@ -377,169 +374,169 @@ const byte *mp_bytecode_print_str(const byte *ip) {
// if TOS is an integer, does something else // if TOS is an integer, does something else
// if TOS is None, just pops it and continues // if TOS is None, just pops it and continues
// else error // else error
printf("END_FINALLY"); mp_printf(print, "END_FINALLY");
break; break;
case MP_BC_GET_ITER: case MP_BC_GET_ITER:
printf("GET_ITER"); mp_printf(print, "GET_ITER");
break; break;
case MP_BC_GET_ITER_STACK: case MP_BC_GET_ITER_STACK:
printf("GET_ITER_STACK"); mp_printf(print, "GET_ITER_STACK");
break; break;
case MP_BC_FOR_ITER: case MP_BC_FOR_ITER:
DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward
printf("FOR_ITER " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start)); mp_printf(print, "FOR_ITER " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
break; break;
case MP_BC_POP_EXCEPT_JUMP: case MP_BC_POP_EXCEPT_JUMP:
DECODE_ULABEL; // these labels are always forward DECODE_ULABEL; // these labels are always forward
printf("POP_EXCEPT_JUMP " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start)); mp_printf(print, "POP_EXCEPT_JUMP " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
break; break;
case MP_BC_BUILD_TUPLE: case MP_BC_BUILD_TUPLE:
DECODE_UINT; DECODE_UINT;
printf("BUILD_TUPLE " UINT_FMT, unum); mp_printf(print, "BUILD_TUPLE " UINT_FMT, unum);
break; break;
case MP_BC_BUILD_LIST: case MP_BC_BUILD_LIST:
DECODE_UINT; DECODE_UINT;
printf("BUILD_LIST " UINT_FMT, unum); mp_printf(print, "BUILD_LIST " UINT_FMT, unum);
break; break;
case MP_BC_BUILD_MAP: case MP_BC_BUILD_MAP:
DECODE_UINT; DECODE_UINT;
printf("BUILD_MAP " UINT_FMT, unum); mp_printf(print, "BUILD_MAP " UINT_FMT, unum);
break; break;
case MP_BC_STORE_MAP: case MP_BC_STORE_MAP:
printf("STORE_MAP"); mp_printf(print, "STORE_MAP");
break; break;
case MP_BC_BUILD_SET: case MP_BC_BUILD_SET:
DECODE_UINT; DECODE_UINT;
printf("BUILD_SET " UINT_FMT, unum); mp_printf(print, "BUILD_SET " UINT_FMT, unum);
break; break;
#if MICROPY_PY_BUILTINS_SLICE #if MICROPY_PY_BUILTINS_SLICE
case MP_BC_BUILD_SLICE: case MP_BC_BUILD_SLICE:
DECODE_UINT; DECODE_UINT;
printf("BUILD_SLICE " UINT_FMT, unum); mp_printf(print, "BUILD_SLICE " UINT_FMT, unum);
break; break;
#endif #endif
case MP_BC_STORE_COMP: case MP_BC_STORE_COMP:
DECODE_UINT; DECODE_UINT;
printf("STORE_COMP " UINT_FMT, unum); mp_printf(print, "STORE_COMP " UINT_FMT, unum);
break; break;
case MP_BC_UNPACK_SEQUENCE: case MP_BC_UNPACK_SEQUENCE:
DECODE_UINT; DECODE_UINT;
printf("UNPACK_SEQUENCE " UINT_FMT, unum); mp_printf(print, "UNPACK_SEQUENCE " UINT_FMT, unum);
break; break;
case MP_BC_UNPACK_EX: case MP_BC_UNPACK_EX:
DECODE_UINT; DECODE_UINT;
printf("UNPACK_EX " UINT_FMT, unum); mp_printf(print, "UNPACK_EX " UINT_FMT, unum);
break; break;
case MP_BC_MAKE_FUNCTION: case MP_BC_MAKE_FUNCTION:
DECODE_PTR; DECODE_PTR;
printf("MAKE_FUNCTION %p", (void *)(uintptr_t)unum); mp_printf(print, "MAKE_FUNCTION %p", (void *)(uintptr_t)unum);
break; break;
case MP_BC_MAKE_FUNCTION_DEFARGS: case MP_BC_MAKE_FUNCTION_DEFARGS:
DECODE_PTR; DECODE_PTR;
printf("MAKE_FUNCTION_DEFARGS %p", (void *)(uintptr_t)unum); mp_printf(print, "MAKE_FUNCTION_DEFARGS %p", (void *)(uintptr_t)unum);
break; break;
case MP_BC_MAKE_CLOSURE: { case MP_BC_MAKE_CLOSURE: {
DECODE_PTR; DECODE_PTR;
mp_uint_t n_closed_over = *ip++; mp_uint_t n_closed_over = *ip++;
printf("MAKE_CLOSURE %p " UINT_FMT, (void *)(uintptr_t)unum, n_closed_over); mp_printf(print, "MAKE_CLOSURE %p " UINT_FMT, (void *)(uintptr_t)unum, n_closed_over);
break; break;
} }
case MP_BC_MAKE_CLOSURE_DEFARGS: { case MP_BC_MAKE_CLOSURE_DEFARGS: {
DECODE_PTR; DECODE_PTR;
mp_uint_t n_closed_over = *ip++; mp_uint_t n_closed_over = *ip++;
printf("MAKE_CLOSURE_DEFARGS %p " UINT_FMT, (void *)(uintptr_t)unum, n_closed_over); mp_printf(print, "MAKE_CLOSURE_DEFARGS %p " UINT_FMT, (void *)(uintptr_t)unum, n_closed_over);
break; break;
} }
case MP_BC_CALL_FUNCTION: case MP_BC_CALL_FUNCTION:
DECODE_UINT; DECODE_UINT;
printf("CALL_FUNCTION n=" UINT_FMT " nkw=" UINT_FMT, unum & 0xff, (unum >> 8) & 0xff); mp_printf(print, "CALL_FUNCTION n=" UINT_FMT " nkw=" UINT_FMT, unum & 0xff, (unum >> 8) & 0xff);
break; break;
case MP_BC_CALL_FUNCTION_VAR_KW: case MP_BC_CALL_FUNCTION_VAR_KW:
DECODE_UINT; DECODE_UINT;
printf("CALL_FUNCTION_VAR_KW n=" UINT_FMT " nkw=" UINT_FMT, unum & 0xff, (unum >> 8) & 0xff); mp_printf(print, "CALL_FUNCTION_VAR_KW n=" UINT_FMT " nkw=" UINT_FMT, unum & 0xff, (unum >> 8) & 0xff);
break; break;
case MP_BC_CALL_METHOD: case MP_BC_CALL_METHOD:
DECODE_UINT; DECODE_UINT;
printf("CALL_METHOD n=" UINT_FMT " nkw=" UINT_FMT, unum & 0xff, (unum >> 8) & 0xff); mp_printf(print, "CALL_METHOD n=" UINT_FMT " nkw=" UINT_FMT, unum & 0xff, (unum >> 8) & 0xff);
break; break;
case MP_BC_CALL_METHOD_VAR_KW: case MP_BC_CALL_METHOD_VAR_KW:
DECODE_UINT; DECODE_UINT;
printf("CALL_METHOD_VAR_KW n=" UINT_FMT " nkw=" UINT_FMT, unum & 0xff, (unum >> 8) & 0xff); mp_printf(print, "CALL_METHOD_VAR_KW n=" UINT_FMT " nkw=" UINT_FMT, unum & 0xff, (unum >> 8) & 0xff);
break; break;
case MP_BC_RETURN_VALUE: case MP_BC_RETURN_VALUE:
printf("RETURN_VALUE"); mp_printf(print, "RETURN_VALUE");
break; break;
case MP_BC_RAISE_LAST: case MP_BC_RAISE_LAST:
printf("RAISE_LAST"); mp_printf(print, "RAISE_LAST");
break; break;
case MP_BC_RAISE_OBJ: case MP_BC_RAISE_OBJ:
printf("RAISE_OBJ"); mp_printf(print, "RAISE_OBJ");
break; break;
case MP_BC_RAISE_FROM: case MP_BC_RAISE_FROM:
printf("RAISE_FROM"); mp_printf(print, "RAISE_FROM");
break; break;
case MP_BC_YIELD_VALUE: case MP_BC_YIELD_VALUE:
printf("YIELD_VALUE"); mp_printf(print, "YIELD_VALUE");
break; break;
case MP_BC_YIELD_FROM: case MP_BC_YIELD_FROM:
printf("YIELD_FROM"); mp_printf(print, "YIELD_FROM");
break; break;
case MP_BC_IMPORT_NAME: case MP_BC_IMPORT_NAME:
DECODE_QSTR; DECODE_QSTR;
printf("IMPORT_NAME '%s'", qstr_str(qst)); mp_printf(print, "IMPORT_NAME '%s'", qstr_str(qst));
break; break;
case MP_BC_IMPORT_FROM: case MP_BC_IMPORT_FROM:
DECODE_QSTR; DECODE_QSTR;
printf("IMPORT_FROM '%s'", qstr_str(qst)); mp_printf(print, "IMPORT_FROM '%s'", qstr_str(qst));
break; break;
case MP_BC_IMPORT_STAR: case MP_BC_IMPORT_STAR:
printf("IMPORT_STAR"); mp_printf(print, "IMPORT_STAR");
break; break;
default: default:
if (ip[-1] < MP_BC_LOAD_CONST_SMALL_INT_MULTI + 64) { if (ip[-1] < MP_BC_LOAD_CONST_SMALL_INT_MULTI + 64) {
printf("LOAD_CONST_SMALL_INT " INT_FMT, (mp_int_t)ip[-1] - MP_BC_LOAD_CONST_SMALL_INT_MULTI - 16); mp_printf(print, "LOAD_CONST_SMALL_INT " INT_FMT, (mp_int_t)ip[-1] - MP_BC_LOAD_CONST_SMALL_INT_MULTI - 16);
} else if (ip[-1] < MP_BC_LOAD_FAST_MULTI + 16) { } else if (ip[-1] < MP_BC_LOAD_FAST_MULTI + 16) {
printf("LOAD_FAST " UINT_FMT, (mp_uint_t)ip[-1] - MP_BC_LOAD_FAST_MULTI); mp_printf(print, "LOAD_FAST " UINT_FMT, (mp_uint_t)ip[-1] - MP_BC_LOAD_FAST_MULTI);
} else if (ip[-1] < MP_BC_STORE_FAST_MULTI + 16) { } 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); mp_printf(print, "STORE_FAST " UINT_FMT, (mp_uint_t)ip[-1] - MP_BC_STORE_FAST_MULTI);
} else if (ip[-1] < MP_BC_UNARY_OP_MULTI + MP_UNARY_OP_NUM_BYTECODE) { } else if (ip[-1] < MP_BC_UNARY_OP_MULTI + MP_UNARY_OP_NUM_BYTECODE) {
printf("UNARY_OP " UINT_FMT, (mp_uint_t)ip[-1] - MP_BC_UNARY_OP_MULTI); mp_printf(print, "UNARY_OP " UINT_FMT, (mp_uint_t)ip[-1] - MP_BC_UNARY_OP_MULTI);
} else if (ip[-1] < MP_BC_BINARY_OP_MULTI + MP_BINARY_OP_NUM_BYTECODE) { } else if (ip[-1] < MP_BC_BINARY_OP_MULTI + MP_BINARY_OP_NUM_BYTECODE) {
mp_uint_t op = ip[-1] - MP_BC_BINARY_OP_MULTI; 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])); mp_printf(print, "BINARY_OP " UINT_FMT " %s", op, qstr_str(mp_binary_op_method_name[op]));
} else { } else {
printf("code %p, byte code 0x%02x not implemented\n", ip - 1, ip[-1]); mp_printf(print, "code %p, byte code 0x%02x not implemented\n", ip - 1, ip[-1]);
assert(0); assert(0);
return ip; return ip;
} }
@ -549,13 +546,13 @@ const byte *mp_bytecode_print_str(const byte *ip) {
return ip; return ip;
} }
void mp_bytecode_print2(const byte *ip, size_t len, const mp_uint_t *const_table) { void mp_bytecode_print2(const mp_print_t *print, const byte *ip, size_t len, const mp_uint_t *const_table) {
mp_showbc_code_start = ip; mp_showbc_code_start = ip;
mp_showbc_const_table = const_table; mp_showbc_const_table = const_table;
while (ip < len + mp_showbc_code_start) { while (ip < len + mp_showbc_code_start) {
printf("%02u ", (uint)(ip - mp_showbc_code_start)); mp_printf(print, "%02u ", (uint)(ip - mp_showbc_code_start));
ip = mp_bytecode_print_str(ip); ip = mp_bytecode_print_str(print, ip);
printf("\n"); mp_printf(print, "\n");
} }
} }

2
py/vm.c
View File

@ -39,7 +39,7 @@
// *FORMAT-OFF* // *FORMAT-OFF*
#if 0 #if 0
#define TRACE(ip) printf("sp=%d ", (int)(sp - &code_state->state[0] + 1)); mp_bytecode_print2(ip, 1, code_state->fun_bc->const_table); #define TRACE(ip) printf("sp=%d ", (int)(sp - &code_state->state[0] + 1)); mp_bytecode_print2(&mp_plat_print, ip, 1, code_state->fun_bc->const_table);
#else #else
#define TRACE(ip) #define TRACE(ip)
#endif #endif