summaryrefslogtreecommitdiffstatshomepage
path: root/py
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-12-12 17:18:56 +0000
committerDamien George <damien.p.george@gmail.com>2014-12-12 17:18:56 +0000
commit7764f163fa54dc39532f7729c774ab92611bb115 (patch)
treed74be7c2d1f9fbeb0cf56884035b8201061fda27 /py
parent1ca28bd570e1d4b905a281d276fb822df35833da (diff)
downloadmicropython-7764f163fa54dc39532f7729c774ab92611bb115.tar.gz
micropython-7764f163fa54dc39532f7729c774ab92611bb115.zip
py: Fix label printing in showbc; print sp in vm trace.
Diffstat (limited to 'py')
-rw-r--r--py/showbc.c8
-rw-r--r--py/vm.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/py/showbc.c b/py/showbc.c
index 93fe2c3787..5ae05432aa 100644
--- 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
index a2e6a3faf9..fd9bbf0543 100644
--- 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