1 files changed, 8 insertions, 1 deletions
diff --git a/py/vm.c b/py/vm.c
index c04eb89547..75093d2401 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -158,6 +158,13 @@ mp_vm_return_kind_t mp_execute_bytecode(const byte *code, const mp_obj_t *args,
     mp_vm_return_kind_t vm_return_kind = mp_execute_bytecode2(code, &ip, &state[n_state - 1], &sp, exc_stack, &exc_sp, MP_OBJ_NULL);
 
 #if DETECT_VM_STACK_OVERFLOW
+    if (vm_return_kind == MP_VM_RETURN_NORMAL) {
+        if (sp < state) {
+            printf("VM stack underflow: " INT_FMT "\n", sp - state);
+            assert(0);
+        }
+    }
+
     // We can't check the case when an exception is returned in state[n_state - 1]
     // and there are no arguments, because in this case our detection slot may have
     // been overwritten by the returned exception (which is allowed).
@@ -171,7 +178,7 @@ mp_vm_return_kind_t mp_execute_bytecode(const byte *code, const mp_obj_t *args,
             }
         }
         if (overflow) {
-            printf("VM stack overflow state=%p n_state+1=%u\n", state, n_state);
+            printf("VM stack overflow state=%p n_state+1=" UINT_FMT "\n", state, n_state);
             assert(0);
         }
     }