Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2026-01-05 03:30:14 +01:00
Code Issues Actions 52 Packages Projects Releases Wiki Activity

shared/runtime/pyexec: Call mp_hal_stdio_mode_orig/raw as appropriate.

Browse Source 
This ensures that ctrl-C works on the unix port when executing code at the
REPL.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George
2025-10-08 13:11:23 +11:00
parent e06ac9ce08
commit fd1ddc3f12
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ports/unix/main.c
View File

@@ -193,7 +193,6 @@ static int do_repl(void) {
// use MicroPython supplied readline-based REPL // use MicroPython supplied readline-based REPL
int ret = 0; int ret = 0;
mp_hal_stdio_mode_raw();
for (;;) { for (;;) {
if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) { if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
if ((ret = pyexec_raw_repl()) != 0) { if ((ret = pyexec_raw_repl()) != 0) {
@@ -205,7 +204,6 @@ static int do_repl(void) {
} }
} }
} }
mp_hal_stdio_mode_orig();
return ret; return ret;
#else #else

3
ports/unix/mphalport.h
View File

@@ -48,6 +48,9 @@
MP_THREAD_GIL_ENTER(); \ MP_THREAD_GIL_ENTER(); \
} while (0) } while (0)
// The port provides `mp_hal_stdio_mode_raw()` and `mp_hal_stdio_mode_orig()`.
#define MICROPY_HAL_HAS_STDIO_MODE_SWITCH (1)
void mp_hal_set_interrupt_char(char c); void mp_hal_set_interrupt_char(char c);
#define mp_hal_stdio_poll unused // this is not implemented, nor needed #define mp_hal_stdio_poll unused // this is not implemented, nor needed

23
shared/runtime/pyexec.c
View File

@@ -536,10 +536,20 @@ MP_REGISTER_ROOT_POINTER(vstr_t * repl_line);
#else // MICROPY_REPL_EVENT_DRIVEN #else // MICROPY_REPL_EVENT_DRIVEN
#if !MICROPY_HAL_HAS_STDIO_MODE_SWITCH
// If the port doesn't need any stdio mode switching calls then provide trivial ones.
static inline void mp_hal_stdio_mode_raw(void) {
}
static inline void mp_hal_stdio_mode_orig(void) {
}
#endif
int pyexec_raw_repl(void) { int pyexec_raw_repl(void) {
vstr_t line; vstr_t line;
vstr_init(&line, 32); vstr_init(&line, 32);
mp_hal_stdio_mode_raw();
raw_repl_reset: raw_repl_reset:
mp_hal_stdout_tx_str("raw REPL; CTRL-B to exit\r\n"); mp_hal_stdout_tx_str("raw REPL; CTRL-B to exit\r\n");
@@ -553,6 +563,7 @@ raw_repl_reset:
if (vstr_len(&line) == 2 && vstr_str(&line)[0] == CHAR_CTRL_E) { if (vstr_len(&line) == 2 && vstr_str(&line)[0] == CHAR_CTRL_E) {
int ret = do_reader_stdin(vstr_str(&line)[1]); int ret = do_reader_stdin(vstr_str(&line)[1]);
if (ret & PYEXEC_FORCED_EXIT) { if (ret & PYEXEC_FORCED_EXIT) {
mp_hal_stdio_mode_orig();
return ret; return ret;
} }
vstr_reset(&line); vstr_reset(&line);
@@ -565,6 +576,7 @@ raw_repl_reset:
mp_hal_stdout_tx_str("\r\n"); mp_hal_stdout_tx_str("\r\n");
vstr_clear(&line); vstr_clear(&line);
pyexec_mode_kind = PYEXEC_MODE_FRIENDLY_REPL; pyexec_mode_kind = PYEXEC_MODE_FRIENDLY_REPL;
mp_hal_stdio_mode_orig();
return 0; return 0;
} else if (c == CHAR_CTRL_C) { } else if (c == CHAR_CTRL_C) {
// clear line // clear line
@@ -585,13 +597,17 @@ raw_repl_reset:
// exit for a soft reset // exit for a soft reset
mp_hal_stdout_tx_str("\r\n"); mp_hal_stdout_tx_str("\r\n");
vstr_clear(&line); vstr_clear(&line);
mp_hal_stdio_mode_orig();
return PYEXEC_FORCED_EXIT; return PYEXEC_FORCED_EXIT;
} }
// Switch to original terminal mode to execute code, eg to support keyboard interrupt (SIGINT).
mp_hal_stdio_mode_orig();
int ret = parse_compile_execute(&line, MP_PARSE_FILE_INPUT, EXEC_FLAG_PRINT_EOF | EXEC_FLAG_SOURCE_IS_VSTR); int ret = parse_compile_execute(&line, MP_PARSE_FILE_INPUT, EXEC_FLAG_PRINT_EOF | EXEC_FLAG_SOURCE_IS_VSTR);
if (ret & PYEXEC_FORCED_EXIT) { if (ret & PYEXEC_FORCED_EXIT) {
return ret; return ret;
} }
mp_hal_stdio_mode_raw();
} }
} }
@@ -599,6 +615,8 @@ int pyexec_friendly_repl(void) {
vstr_t line; vstr_t line;
vstr_init(&line, 32); vstr_init(&line, 32);
mp_hal_stdio_mode_raw();
friendly_repl_reset: friendly_repl_reset:
mp_hal_stdout_tx_str(MICROPY_BANNER_NAME_AND_VERSION); mp_hal_stdout_tx_str(MICROPY_BANNER_NAME_AND_VERSION);
mp_hal_stdout_tx_str("; " MICROPY_BANNER_MACHINE); mp_hal_stdout_tx_str("; " MICROPY_BANNER_MACHINE);
@@ -640,6 +658,7 @@ friendly_repl_reset:
mp_hal_stdout_tx_str("\r\n"); mp_hal_stdout_tx_str("\r\n");
vstr_clear(&line); vstr_clear(&line);
pyexec_mode_kind = PYEXEC_MODE_RAW_REPL; pyexec_mode_kind = PYEXEC_MODE_RAW_REPL;
mp_hal_stdio_mode_orig();
return 0; return 0;
} else if (ret == CHAR_CTRL_B) { } else if (ret == CHAR_CTRL_B) {
// reset friendly REPL // reset friendly REPL
@@ -653,6 +672,7 @@ friendly_repl_reset:
// exit for a soft reset // exit for a soft reset
mp_hal_stdout_tx_str("\r\n"); mp_hal_stdout_tx_str("\r\n");
vstr_clear(&line); vstr_clear(&line);
mp_hal_stdio_mode_orig();
return PYEXEC_FORCED_EXIT; return PYEXEC_FORCED_EXIT;
} else if (ret == CHAR_CTRL_E) { } else if (ret == CHAR_CTRL_E) {
// paste mode // paste mode
@@ -697,10 +717,13 @@ friendly_repl_reset:
} }
} }
// Switch to original terminal mode to execute code, eg to support keyboard interrupt (SIGINT).
mp_hal_stdio_mode_orig();
ret = parse_compile_execute(&line, parse_input_kind, EXEC_FLAG_ALLOW_DEBUGGING | EXEC_FLAG_IS_REPL | EXEC_FLAG_SOURCE_IS_VSTR); ret = parse_compile_execute(&line, parse_input_kind, EXEC_FLAG_ALLOW_DEBUGGING | EXEC_FLAG_IS_REPL | EXEC_FLAG_SOURCE_IS_VSTR);
if (ret & PYEXEC_FORCED_EXIT) { if (ret & PYEXEC_FORCED_EXIT) {
return ret; return ret;
} }
mp_hal_stdio_mode_raw();
} }
} }