summaryrefslogtreecommitdiffstatshomepage
path: root/py/vm.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-05-21 20:32:59 +0100
committerDamien George <damien.p.george@gmail.com>2014-05-21 20:32:59 +0100
commit58ebde46646dd49d22b2accfa9c7a78e15921e48 (patch)
treebdb130a761309e138cd9d3ff60f4639c897a8808 /py/vm.c
parentaa7cf6f72f4e8a553f892629bb3338ab8c982d57 (diff)
downloadmicropython-58ebde46646dd49d22b2accfa9c7a78e15921e48.tar.gz
micropython-58ebde46646dd49d22b2accfa9c7a78e15921e48.zip
Tidy up some configuration options.
MP_ALLOC_* -> MICROPY_ALLOC_* MICROPY_PATH_MAX -> MICROPY_ALLOC_PATH_MAX MICROPY_ENABLE_REPL_HELPERS -> MICROPY_HELPER_REPL MICROPY_ENABLE_LEXER_UNIX -> MICROPY_HELPER_LEXER_UNIX MICROPY_EXTRA_* -> MICROPY_PORT_* See issue #35.
Diffstat (limited to 'py/vm.c')
-rw-r--r--py/vm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/py/vm.c b/py/vm.c
index 123f520280..ee2ec23607 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -222,7 +222,7 @@ mp_vm_return_kind_t mp_execute_bytecode2(const byte *code_info, const byte **ip_
mp_obj_t *fastn, mp_obj_t **sp_in_out,
mp_exc_stack_t *exc_stack, mp_exc_stack_t **exc_sp_in_out,
volatile mp_obj_t inject_exc) {
-#if MICROPY_USE_COMPUTED_GOTO
+#if MICROPY_OPT_COMPUTED_GOTO
#include "vmentrytable.h"
#define DISPATCH() do { \
TRACE(ip); \
@@ -276,7 +276,7 @@ outer_dispatch_loop:
// loop to execute byte code
for (;;) {
dispatch_loop:
-#if MICROPY_USE_COMPUTED_GOTO
+#if MICROPY_OPT_COMPUTED_GOTO
DISPATCH();
#else
TRACE(ip);
@@ -982,7 +982,7 @@ yield:
fastn[0] = obj1;
return MP_VM_RETURN_EXCEPTION;
-#if !MICROPY_USE_COMPUTED_GOTO
+#if !MICROPY_OPT_COMPUTED_GOTO
} // switch
#endif
} // for loop