summaryrefslogtreecommitdiff
path: root/shared/runtime/pyexec.h
diff options
context:
space:
mode:
authorDamien George <damien@micropython.org>2024-07-18 13:20:31 +1000
committerDamien George <damien@micropython.org>2024-07-20 12:13:14 +1000
commit69c25ea8653566ec97690b5121bd10b753c89426 (patch)
treef7994c218eebafb78ecd2e0e05a8c7e341523068 /shared/runtime/pyexec.h
parenta734ee9057a760b0316eca110d71db1524142fec (diff)
shared/runtime/pyexec: Make a raised SystemExit always do a forced exit.
The current situation with SystemExit and soft reset is the following: - `sys.exit()` follows CPython and just raises `SystemExit`. - On the unix port, raising `SystemExit` quits the application/MicroPython, whether at the REPL or in code (this follows CPython behaviour). - On bare-metal ports, raising `SystemExit` at the REPL does nothing, raising it in code will stop the code and drop into the REPL. - `machine.soft_reset()` raises `SystemExit` but with a special flag set, and bare-metal targets check this flag when it propagates to the top-level and do a soft reset when they receive it. The original idea here was that a bare-metal target can't "quit" like the unix port can, and so dropping to the REPL was considered the same as "quit". But this bare-metal behaviour is arguably inconsistent with unix, and "quit" should mean terminate everything, including REPL access. This commit changes the behaviour to the following, which is more consistent: - Raising `SystemExit` on a bare-metal port will do a soft reset (unless the exception is caught by the application). - `machine.soft_reset()` is now equivalent to `sys.exit()`. - unix port behaviour remains unchanged. Tested running the test suite on an stm32 board and everything still passes, in particular tests that skip by raising `SystemExit` still correctly skip. Signed-off-by: Damien George <damien@micropython.org>
Diffstat (limited to 'shared/runtime/pyexec.h')
-rw-r--r--shared/runtime/pyexec.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/shared/runtime/pyexec.h b/shared/runtime/pyexec.h
index 64c5ef943..5779d3e09 100644
--- a/shared/runtime/pyexec.h
+++ b/shared/runtime/pyexec.h
@@ -35,11 +35,6 @@ typedef enum {
extern pyexec_mode_kind_t pyexec_mode_kind;
-// Set this to the value (eg PYEXEC_FORCED_EXIT) that will be propagated through
-// the pyexec functions if a SystemExit exception is raised by the running code.
-// It will reset to 0 at the start of each execution (eg each REPL entry).
-extern int pyexec_system_exit;
-
#define PYEXEC_FORCED_EXIT (0x100)
int pyexec_raw_repl(void);