commit 0f96ec826811e3cec3703141684445bea639e2bc
author Paul Sokolovsky <pfalcon@users.sourceforge.net> Tue Feb 18 21:21:22 2014 +0200
committer Paul Sokolovsky <pfalcon@users.sourceforge.net> Wed Feb 19 15:52:57 2014 +0200
tree c171e47ca4bee59cc396bd1326aebe98cb7ac604
parent 46239413d033a25662700ba39a97b07737b820fc

Bytecode uint varlen encoding: support arbitrary values.

py/vm.c

diff --git a/py/vm.c b/py/vm.c
index 573167b..0fdf5d4 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -38,10 +38,20 @@
     UNWIND_JUMP,
 } mp_unwind_reason_t;
 
-#define DECODE_UINT do { unum = *ip++; if (unum > 127) { unum = ((unum & 0x3f) << 8) | (*ip++); } } while (0)
+#define DECODE_UINT { \
+    unum = 0; \
+    do { \
+        unum = (unum << 7) + (*ip & 0x7f); \
+    } while ((*ip++ & 0x80) != 0); \
+}
 #define DECODE_ULABEL do { unum = (ip[0] | (ip[1] << 8)); ip += 2; } while (0)
 #define DECODE_SLABEL do { unum = (ip[0] | (ip[1] << 8)) - 0x8000; ip += 2; } while (0)
-#define DECODE_QSTR do { qst = *ip++; if (qst > 127) { qst = ((qst & 0x3f) << 8) | (*ip++); } } while (0)
+#define DECODE_QSTR { \
+    qst = 0; \
+    do { \
+        qst = (qst << 7) + (*ip & 0x7f); \
+    } while ((*ip++ & 0x80) != 0); \
+}
 #define PUSH(val) *++sp = (val)
 #define POP() (*sp--)
 #define TOP() (*sp)