py/showbc: Make sure to set the const_table before printing bytecode.

dpgeorge · dpgeorge · commit cc4c1adf6e05 · 2017-01-27T12:34:09.000+11:00
diff --git a/py/bc.h b/py/bc.h
@@ -94,9 +94,9 @@ mp_code_state_t *mp_obj_fun_bc_prepare_codestate(mp_obj_t func, size_t n_args, s
 struct _mp_obj_fun_bc_t;
 void mp_setup_code_state(mp_code_state_t *code_state, struct _mp_obj_fun_bc_t *self, 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_print2(const byte *code, mp_uint_t len);
+void mp_bytecode_print2(const byte *code, size_t len, const mp_uint_t *const_table);
 const byte *mp_bytecode_print_str(const byte *ip);
-#define mp_bytecode_print_inst(code) mp_bytecode_print2(code, 1)
+#define mp_bytecode_print_inst(code, const_table) mp_bytecode_print2(code, 1, const_table)
 
 // Helper macros to access pointer with least significant bits holding flags
 #define MP_TAGPTR_PTR(x) ((void*)((uintptr_t)(x) & ~((uintptr_t)3)))
diff --git a/py/showbc.c b/py/showbc.c
@@ -82,7 +82,6 @@ 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) {
     mp_showbc_code_start = ip;
-    mp_showbc_const_table = const_table;
 
     // get bytecode parameters
     mp_uint_t n_state = mp_decode_uint(&ip);
@@ -159,7 +158,7 @@ void mp_bytecode_print(const void *descr, const byte *ip, mp_uint_t len, const m
             printf("  bc=" INT_FMT " line=" UINT_FMT "\n", bc, source_line);
         }
     }
-    mp_bytecode_print2(ip, len - 0);
+    mp_bytecode_print2(ip, len - 0, const_table);
 }
 
 const byte *mp_bytecode_print_str(const byte *ip) {
@@ -547,8 +546,9 @@ const byte *mp_bytecode_print_str(const byte *ip) {
     return ip;
 }
 
-void mp_bytecode_print2(const byte *ip, mp_uint_t len) {
+void mp_bytecode_print2(const byte *ip, size_t len, const mp_uint_t *const_table) {
     mp_showbc_code_start = ip;
+    mp_showbc_const_table = const_table;
     while (ip < len + mp_showbc_code_start) {
         printf("%02u ", (uint)(ip - mp_showbc_code_start));
         ip = mp_bytecode_print_str(ip);
diff --git a/py/vm.c b/py/vm.c
@@ -38,8 +38,7 @@
 #include "py/bc.h"
 
 #if 0
-//#define TRACE(ip) printf("sp=" INT_FMT " ", sp - code_state->sp); mp_bytecode_print2(ip, 1);
-#define TRACE(ip) printf("sp=%d ", sp - code_state->sp); mp_bytecode_print2(ip, 1);
+#define TRACE(ip) printf("sp=%d ", (int)(sp - code_state->sp)); mp_bytecode_print2(ip, 1, code_state->const_table);
 #else
 #define TRACE(ip)
 #endif

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,6 @@ const mp_uint_t *mp_showbc_const_table;`
`82`	`82`
`83`	`83`	`void mp_bytecode_print(const void descr, const byte ip, mp_uint_t len, const mp_uint_t *const_table) {`
`84`	`84`	`mp_showbc_code_start = ip;`
`85`		`- mp_showbc_const_table = const_table;`
`86`	`85`
`87`	`86`	`// get bytecode parameters`
`88`	`87`	`mp_uint_t n_state = mp_decode_uint(&ip);`
`@@ -159,7 +158,7 @@ void mp_bytecode_print(const void descr, const byte ip, mp_uint_t len, const m`
`159`	`158`	`printf(" bc=" INT_FMT " line=" UINT_FMT "\n", bc, source_line);`
`160`	`159`	`}`
`161`	`160`	`}`
`162`		`- mp_bytecode_print2(ip, len - 0);`
	`161`	`+ mp_bytecode_print2(ip, len - 0, const_table);`
`163`	`162`	`}`
`164`	`163`
`165`	`164`	`const byte mp_bytecode_print_str(const byte ip) {`
`@@ -547,8 +546,9 @@ const byte mp_bytecode_print_str(const byte ip) {`
`547`	`546`	`return ip;`
`548`	`547`	`}`
`549`	`548`
`550`		`-void mp_bytecode_print2(const byte *ip, mp_uint_t len) {`
	`549`	`+void mp_bytecode_print2(const byte ip, size_t len, const mp_uint_t const_table) {`
`551`	`550`	`mp_showbc_code_start = ip;`
	`551`	`+ mp_showbc_const_table = const_table;`
`552`	`552`	`while (ip < len + mp_showbc_code_start) {`
`553`	`553`	`printf("%02u ", (uint)(ip - mp_showbc_code_start));`
`554`	`554`	`ip = mp_bytecode_print_str(ip);`