bc1488a05f
Improvements are: 2 ctrl-C's are now needed to truly kill running script on pyboard, so make CDC interface allow multiple ctrl-C's through at once (ie sending b'\x03\x03' to pyboard now counts as 2 ctrl-C's). ctrl-C in friendly-repl can now stop multi-line input. In raw-repl mode, use ctrl-D to indicate end of running script, and also end of any error message. Thus, output of raw-repl is always at least 2 ctrl-D's and it's much easier to parse. pyboard.py is now a bit faster, handles exceptions from pyboard better (prints them and exits with exit code 1), prints out the pyboard output while the script is running (instead of waiting till the end), and allows to follow the output of a previous script when run with no arguments.
314 lines
10 KiB
C
314 lines
10 KiB
C
/*
|
|
* This file is part of the Micro Python 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.
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <stdint.h>
|
|
|
|
#include "mpconfig.h"
|
|
#include "nlr.h"
|
|
#include "misc.h"
|
|
#include "qstr.h"
|
|
#include "misc.h"
|
|
#include "lexer.h"
|
|
#include "parse.h"
|
|
#include "obj.h"
|
|
#include "parsehelper.h"
|
|
#include "compile.h"
|
|
#include "runtime.h"
|
|
#include "repl.h"
|
|
#include "gc.h"
|
|
#include "gccollect.h"
|
|
#include MICROPY_HAL_H
|
|
#include "systick.h"
|
|
#include "readline.h"
|
|
#include "pyexec.h"
|
|
#include "usb.h"
|
|
#include "uart.h"
|
|
#include "pybstdio.h"
|
|
#include "genhdr/py-version.h"
|
|
|
|
pyexec_mode_kind_t pyexec_mode_kind = PYEXEC_MODE_FRIENDLY_REPL;
|
|
STATIC bool repl_display_debugging_info = 0;
|
|
|
|
#define EXEC_FLAG_PRINT_EOF (1)
|
|
#define EXEC_FLAG_ALLOW_DEBUGGING (2)
|
|
#define EXEC_FLAG_IS_REPL (4)
|
|
|
|
// parses, compiles and executes the code in the lexer
|
|
// frees the lexer before returning
|
|
// EXEC_FLAG_PRINT_EOF prints 2 EOF chars: 1 after normal output, 1 after exception output
|
|
// EXEC_FLAG_ALLOW_DEBUGGING allows debugging info to be printed after executing the code
|
|
// EXEC_FLAG_IS_REPL is used for REPL inputs (flag passed on to mp_compile)
|
|
STATIC int parse_compile_execute(mp_lexer_t *lex, mp_parse_input_kind_t input_kind, int exec_flags) {
|
|
int ret = 0;
|
|
|
|
mp_parse_error_kind_t parse_error_kind;
|
|
mp_parse_node_t pn = mp_parse(lex, input_kind, &parse_error_kind);
|
|
qstr source_name = mp_lexer_source_name(lex);
|
|
|
|
// check for parse error
|
|
if (pn == MP_PARSE_NODE_NULL) {
|
|
if (exec_flags & EXEC_FLAG_PRINT_EOF) {
|
|
stdout_tx_strn("\x04", 1);
|
|
}
|
|
mp_parse_show_exception(lex, parse_error_kind);
|
|
mp_lexer_free(lex);
|
|
goto finish;
|
|
}
|
|
|
|
mp_lexer_free(lex);
|
|
|
|
mp_obj_t module_fun = mp_compile(pn, source_name, MP_EMIT_OPT_NONE, exec_flags & EXEC_FLAG_IS_REPL);
|
|
|
|
// check for compile error
|
|
if (mp_obj_is_exception_instance(module_fun)) {
|
|
if (exec_flags & EXEC_FLAG_PRINT_EOF) {
|
|
stdout_tx_strn("\x04", 1);
|
|
}
|
|
mp_obj_print_exception(module_fun);
|
|
goto finish;
|
|
}
|
|
|
|
// execute code
|
|
nlr_buf_t nlr;
|
|
uint32_t start = HAL_GetTick();
|
|
if (nlr_push(&nlr) == 0) {
|
|
usb_vcp_set_interrupt_char(VCP_CHAR_CTRL_C); // allow ctrl-C to interrupt us
|
|
mp_call_function_0(module_fun);
|
|
usb_vcp_set_interrupt_char(VCP_CHAR_NONE); // disable interrupt
|
|
nlr_pop();
|
|
ret = 1;
|
|
if (exec_flags & EXEC_FLAG_PRINT_EOF) {
|
|
stdout_tx_strn("\x04", 1);
|
|
}
|
|
} else {
|
|
// uncaught exception
|
|
// FIXME it could be that an interrupt happens just before we disable it here
|
|
usb_vcp_set_interrupt_char(VCP_CHAR_NONE); // disable interrupt
|
|
// print EOF after normal output
|
|
if (exec_flags & EXEC_FLAG_PRINT_EOF) {
|
|
stdout_tx_strn("\x04", 1);
|
|
}
|
|
// check for SystemExit
|
|
if (mp_obj_is_subclass_fast(mp_obj_get_type((mp_obj_t)nlr.ret_val), &mp_type_SystemExit)) {
|
|
// at the moment, the value of SystemExit is unused
|
|
ret = PYEXEC_FORCED_EXIT;
|
|
} else {
|
|
mp_obj_print_exception((mp_obj_t)nlr.ret_val);
|
|
ret = 0;
|
|
}
|
|
}
|
|
|
|
// display debugging info if wanted
|
|
if ((exec_flags & EXEC_FLAG_ALLOW_DEBUGGING) && repl_display_debugging_info) {
|
|
uint32_t ticks = HAL_GetTick() - start; // TODO implement a function that does this properly
|
|
printf("took %lu ms\n", ticks);
|
|
gc_collect();
|
|
// qstr info
|
|
{
|
|
mp_uint_t n_pool, n_qstr, n_str_data_bytes, n_total_bytes;
|
|
qstr_pool_info(&n_pool, &n_qstr, &n_str_data_bytes, &n_total_bytes);
|
|
printf("qstr:\n n_pool=" UINT_FMT "\n n_qstr=" UINT_FMT "\n n_str_data_bytes=" UINT_FMT "\n n_total_bytes=" UINT_FMT "\n", n_pool, n_qstr, n_str_data_bytes, n_total_bytes);
|
|
}
|
|
|
|
// GC info
|
|
{
|
|
gc_info_t info;
|
|
gc_info(&info);
|
|
printf("GC:\n");
|
|
printf(" " UINT_FMT " total\n", info.total);
|
|
printf(" " UINT_FMT " : " UINT_FMT "\n", info.used, info.free);
|
|
printf(" 1=" UINT_FMT " 2=" UINT_FMT " m=" UINT_FMT "\n", info.num_1block, info.num_2block, info.max_block);
|
|
}
|
|
}
|
|
|
|
finish:
|
|
if (exec_flags & EXEC_FLAG_PRINT_EOF) {
|
|
stdout_tx_strn("\x04", 1);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
int pyexec_raw_repl(void) {
|
|
vstr_t line;
|
|
vstr_init(&line, 32);
|
|
|
|
raw_repl_reset:
|
|
stdout_tx_str("raw REPL; CTRL-B to exit\r\n");
|
|
|
|
for (;;) {
|
|
vstr_reset(&line);
|
|
stdout_tx_str(">");
|
|
for (;;) {
|
|
char c = stdin_rx_chr();
|
|
if (c == VCP_CHAR_CTRL_A) {
|
|
// reset raw REPL
|
|
goto raw_repl_reset;
|
|
} else if (c == VCP_CHAR_CTRL_B) {
|
|
// change to friendly REPL
|
|
stdout_tx_str("\r\n");
|
|
vstr_clear(&line);
|
|
pyexec_mode_kind = PYEXEC_MODE_FRIENDLY_REPL;
|
|
return 0;
|
|
} else if (c == VCP_CHAR_CTRL_C) {
|
|
// clear line
|
|
vstr_reset(&line);
|
|
} else if (c == VCP_CHAR_CTRL_D) {
|
|
// input finished
|
|
break;
|
|
} else if (c <= 127) {
|
|
// let through any other ASCII character
|
|
vstr_add_char(&line, c);
|
|
}
|
|
}
|
|
|
|
// indicate reception of command
|
|
stdout_tx_str("OK");
|
|
|
|
if (line.len == 0) {
|
|
// exit for a soft reset
|
|
stdout_tx_str("\r\n");
|
|
vstr_clear(&line);
|
|
return PYEXEC_FORCED_EXIT;
|
|
}
|
|
|
|
mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, line.buf, line.len, 0);
|
|
if (lex == NULL) {
|
|
printf("\x04MemoryError\n\x04");
|
|
} else {
|
|
int ret = parse_compile_execute(lex, MP_PARSE_FILE_INPUT, EXEC_FLAG_PRINT_EOF);
|
|
if (ret & PYEXEC_FORCED_EXIT) {
|
|
return ret;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
int pyexec_friendly_repl(void) {
|
|
vstr_t line;
|
|
vstr_init(&line, 32);
|
|
|
|
#if defined(USE_HOST_MODE) && MICROPY_HW_HAS_LCD
|
|
// in host mode, we enable the LCD for the repl
|
|
mp_obj_t lcd_o = mp_call_function_0(mp_load_name(qstr_from_str("LCD")));
|
|
mp_call_function_1(mp_load_attr(lcd_o, qstr_from_str("light")), mp_const_true);
|
|
#endif
|
|
|
|
friendly_repl_reset:
|
|
stdout_tx_str("Micro Python " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n");
|
|
stdout_tx_str("Type \"help()\" for more information.\r\n");
|
|
|
|
// to test ctrl-C
|
|
/*
|
|
{
|
|
uint32_t x[4] = {0x424242, 0xdeaddead, 0x242424, 0xdeadbeef};
|
|
for (;;) {
|
|
nlr_buf_t nlr;
|
|
printf("pyexec_repl: %p\n", x);
|
|
usb_vcp_set_interrupt_char(VCP_CHAR_CTRL_C);
|
|
if (nlr_push(&nlr) == 0) {
|
|
for (;;) {
|
|
}
|
|
} else {
|
|
printf("break\n");
|
|
}
|
|
}
|
|
}
|
|
*/
|
|
|
|
for (;;) {
|
|
input_restart:
|
|
vstr_reset(&line);
|
|
int ret = readline(&line, ">>> ");
|
|
|
|
if (ret == VCP_CHAR_CTRL_A) {
|
|
// change to raw REPL
|
|
stdout_tx_str("\r\n");
|
|
vstr_clear(&line);
|
|
pyexec_mode_kind = PYEXEC_MODE_RAW_REPL;
|
|
return 0;
|
|
} else if (ret == VCP_CHAR_CTRL_B) {
|
|
// reset friendly REPL
|
|
stdout_tx_str("\r\n");
|
|
goto friendly_repl_reset;
|
|
} else if (ret == VCP_CHAR_CTRL_C) {
|
|
// break
|
|
stdout_tx_str("\r\n");
|
|
continue;
|
|
} else if (ret == VCP_CHAR_CTRL_D) {
|
|
// exit for a soft reset
|
|
stdout_tx_str("\r\n");
|
|
vstr_clear(&line);
|
|
return PYEXEC_FORCED_EXIT;
|
|
} else if (vstr_len(&line) == 0) {
|
|
continue;
|
|
}
|
|
|
|
while (mp_repl_continue_with_input(vstr_str(&line))) {
|
|
vstr_add_char(&line, '\n');
|
|
int ret = readline(&line, "... ");
|
|
if (ret == VCP_CHAR_CTRL_C) {
|
|
// cancel everything
|
|
stdout_tx_str("\r\n");
|
|
goto input_restart;
|
|
} else if (ret == VCP_CHAR_CTRL_D) {
|
|
// stop entering compound statement
|
|
break;
|
|
}
|
|
}
|
|
|
|
mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, vstr_str(&line), vstr_len(&line), 0);
|
|
if (lex == NULL) {
|
|
printf("MemoryError\n");
|
|
} else {
|
|
int ret = parse_compile_execute(lex, MP_PARSE_SINGLE_INPUT, EXEC_FLAG_ALLOW_DEBUGGING | EXEC_FLAG_IS_REPL);
|
|
if (ret & PYEXEC_FORCED_EXIT) {
|
|
return ret;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
int pyexec_file(const char *filename) {
|
|
mp_lexer_t *lex = mp_lexer_new_from_file(filename);
|
|
|
|
if (lex == NULL) {
|
|
printf("could not open file '%s' for reading\n", filename);
|
|
return false;
|
|
}
|
|
|
|
return parse_compile_execute(lex, MP_PARSE_FILE_INPUT, 0);
|
|
}
|
|
|
|
mp_obj_t pyb_set_repl_info(mp_obj_t o_value) {
|
|
repl_display_debugging_info = mp_obj_get_int(o_value);
|
|
return mp_const_none;
|
|
}
|
|
|
|
MP_DEFINE_CONST_FUN_OBJ_1(pyb_set_repl_info_obj, pyb_set_repl_info);
|