py: Fix label printing in showbc; print sp in vm trace.

dpgeorge · dpgeorge · commit 7764f163fa54 · 2014-12-12T17:18:56.000Z
diff --git a/py/showbc.c b/py/showbc.c
@@ -299,22 +299,22 @@ void mp_bytecode_print2(const byte *ip, mp_uint_t len) {
 
             case MP_BC_POP_JUMP_IF_TRUE:
                 DECODE_SLABEL;
-                printf("POP_JUMP_IF_TRUE " UINT_FMT, ip + unum - ip_start);
+                printf("POP_JUMP_IF_TRUE " INT_FMT, ip + unum - ip_start);
                 break;
 
             case MP_BC_POP_JUMP_IF_FALSE:
                 DECODE_SLABEL;
-                printf("POP_JUMP_IF_FALSE " UINT_FMT, ip + unum - ip_start);
+                printf("POP_JUMP_IF_FALSE " INT_FMT, ip + unum - ip_start);
                 break;
 
             case MP_BC_JUMP_IF_TRUE_OR_POP:
                 DECODE_SLABEL;
-                printf("JUMP_IF_TRUE_OR_POP " UINT_FMT, ip + unum - ip_start);
+                printf("JUMP_IF_TRUE_OR_POP " INT_FMT, ip + unum - ip_start);
                 break;
 
             case MP_BC_JUMP_IF_FALSE_OR_POP:
                 DECODE_SLABEL;
-                printf("JUMP_IF_FALSE_OR_POP " UINT_FMT, ip + unum - ip_start);
+                printf("JUMP_IF_FALSE_OR_POP " INT_FMT, ip + unum - ip_start);
                 break;
 
             case MP_BC_SETUP_WITH:
diff --git a/py/vm.c b/py/vm.c
@@ -41,7 +41,7 @@
 #include "objgenerator.h"
 
 #if 0
-#define TRACE(ip) mp_bytecode_print2(ip, 1);
+#define TRACE(ip) printf("sp=" INT_FMT " ", sp - code_state->sp); mp_bytecode_print2(ip, 1);
 #else
 #define TRACE(ip)
 #endif
