stm32: Make soft_reset use VM abort.

dpgeorge · dpgeorge · commit a2fc451cc7ba · 2023-01-25T17:31:17.000+11:00
Signed-off-by: Damien George &lt;damien@micropython.org&gt;
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
@@ -265,8 +265,12 @@ STATIC mp_obj_t machine_reset(void) {
 MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
 
 STATIC mp_obj_t machine_soft_reset(void) {
-    pyexec_system_exit = PYEXEC_FORCED_EXIT;
-    mp_raise_type(&mp_type_SystemExit);
+    mp_sched_vm_abort();
+    // Either handle the pending abort, or wait if we aren't the main thread.
+    for (;;) {
+        MICROPY_EVENT_POLL_HOOK;
+    }
+    return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_soft_reset_obj, machine_soft_reset);
 
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
@@ -76,6 +76,7 @@
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_FLOAT)
 #endif
 #define MICROPY_USE_INTERNAL_ERRNO  (1)
+#define MICROPY_SCHED_VM_ABORT      (1)
 #define MICROPY_SCHEDULER_STATIC_NODES (1)
 #define MICROPY_SCHEDULER_DEPTH     (8)
 #define MICROPY_VFS                 (1)
