mirror of
https://github.com/micropython/micropython.git
synced 2025-09-06 18:00:48 +02:00
69c25ea865
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>
55 lines
2.0 KiB
C
55 lines
2.0 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2013, 2014 Damien P. George
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
#ifndef MICROPY_INCLUDED_LIB_UTILS_PYEXEC_H
|
|
#define MICROPY_INCLUDED_LIB_UTILS_PYEXEC_H
|
|
|
|
#include "py/obj.h"
|
|
|
|
typedef enum {
|
|
PYEXEC_MODE_FRIENDLY_REPL,
|
|
PYEXEC_MODE_RAW_REPL,
|
|
} pyexec_mode_kind_t;
|
|
|
|
extern pyexec_mode_kind_t pyexec_mode_kind;
|
|
|
|
#define PYEXEC_FORCED_EXIT (0x100)
|
|
|
|
int pyexec_raw_repl(void);
|
|
int pyexec_friendly_repl(void);
|
|
int pyexec_file(const char *filename);
|
|
int pyexec_file_if_exists(const char *filename);
|
|
int pyexec_frozen_module(const char *name, bool allow_keyboard_interrupt);
|
|
void pyexec_event_repl_init(void);
|
|
int pyexec_event_repl_process_char(int c);
|
|
extern uint8_t pyexec_repl_active;
|
|
|
|
#if MICROPY_REPL_INFO
|
|
mp_obj_t pyb_set_repl_info(mp_obj_t o_value);
|
|
MP_DECLARE_CONST_FUN_OBJ_1(pyb_set_repl_info_obj);
|
|
#endif
|
|
|
|
#endif // MICROPY_INCLUDED_LIB_UTILS_PYEXEC_H
|