2014-05-03 18:27:38 -04:00
|
|
|
/*
|
2017-06-30 03:22:17 -04:00
|
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
2014-05-03 18:27:38 -04:00
|
|
|
*
|
|
|
|
* The MIT License (MIT)
|
|
|
|
*
|
2020-06-03 18:40:05 -04:00
|
|
|
* SPDX-FileCopyrightText: Copyright (c) 2013, 2014 Damien P. George
|
2021-04-22 20:55:39 -04:00
|
|
|
* SPDX-FileCopyrightText: Copyright (c) 2014-2018 Paul Sokolovsky
|
2014-05-03 18:27:38 -04:00
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
2017-02-24 09:13:07 -05:00
|
|
|
#include <stdarg.h>
|
2013-10-04 14:53:11 -04:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <assert.h>
|
|
|
|
|
2015-01-01 15:27:54 -05:00
|
|
|
#include "py/parsenum.h"
|
|
|
|
#include "py/compile.h"
|
2020-02-04 13:32:39 -05:00
|
|
|
#include "py/mperrno.h"
|
2015-05-11 08:25:19 -04:00
|
|
|
#include "py/objstr.h"
|
2015-01-01 15:27:54 -05:00
|
|
|
#include "py/objtuple.h"
|
|
|
|
#include "py/objlist.h"
|
2019-11-13 05:05:34 -05:00
|
|
|
#include "py/objtype.h"
|
2015-01-01 15:27:54 -05:00
|
|
|
#include "py/objmodule.h"
|
|
|
|
#include "py/objgenerator.h"
|
|
|
|
#include "py/smallint.h"
|
|
|
|
#include "py/runtime.h"
|
|
|
|
#include "py/builtin.h"
|
|
|
|
#include "py/stackctrl.h"
|
|
|
|
#include "py/gc.h"
|
2013-12-17 13:27:24 -05:00
|
|
|
|
2022-05-27 15:59:54 -04:00
|
|
|
#include "supervisor/shared/translate/translate.h"
|
2018-08-08 21:24:49 -04:00
|
|
|
|
2017-07-24 12:55:14 -04:00
|
|
|
#if MICROPY_DEBUG_VERBOSE // print debugging info
|
2013-10-10 18:25:50 -04:00
|
|
|
#define DEBUG_PRINT (1)
|
2014-02-16 11:11:42 -05:00
|
|
|
#define DEBUG_printf DEBUG_printf
|
2014-02-26 17:40:35 -05:00
|
|
|
#define DEBUG_OP_printf(...) DEBUG_printf(__VA_ARGS__)
|
2013-10-10 06:24:39 -04:00
|
|
|
#else // don't print debugging info
|
2014-02-26 17:40:35 -05:00
|
|
|
#define DEBUG_printf(...) (void)0
|
|
|
|
#define DEBUG_OP_printf(...) (void)0
|
2013-10-10 06:24:39 -04:00
|
|
|
#endif
|
2013-10-04 14:53:11 -04:00
|
|
|
|
2014-04-04 13:08:21 -04:00
|
|
|
const mp_obj_module_t mp_module___main__ = {
|
|
|
|
.base = { &mp_type_module },
|
2021-03-15 09:57:36 -04:00
|
|
|
.globals = (mp_obj_dict_t *)&MP_STATE_VM(dict_main),
|
2014-04-04 13:08:21 -04:00
|
|
|
};
|
|
|
|
|
2014-03-30 08:35:08 -04:00
|
|
|
void mp_init(void) {
|
2014-08-04 05:05:16 -04:00
|
|
|
qstr_init();
|
2014-06-27 13:54:22 -04:00
|
|
|
|
2014-10-25 13:19:55 -04:00
|
|
|
// no pending exceptions to start with
|
2021-05-10 22:53:22 -04:00
|
|
|
MP_STATE_THREAD(mp_pending_exception) = MP_OBJ_NULL;
|
2017-02-16 02:05:06 -05:00
|
|
|
#if MICROPY_ENABLE_SCHEDULER
|
|
|
|
MP_STATE_VM(sched_state) = MP_SCHED_IDLE;
|
2021-04-22 20:55:39 -04:00
|
|
|
MP_STATE_VM(sched_idx) = 0;
|
|
|
|
MP_STATE_VM(sched_len) = 0;
|
2017-02-16 02:05:06 -05:00
|
|
|
#endif
|
2014-10-25 13:19:55 -04:00
|
|
|
|
2021-03-15 09:57:36 -04:00
|
|
|
#if MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF
|
2014-08-04 05:05:16 -04:00
|
|
|
mp_init_emergency_exception_buf();
|
2021-03-15 09:57:36 -04:00
|
|
|
#endif
|
2014-08-04 05:05:16 -04:00
|
|
|
|
2016-12-14 21:00:19 -05:00
|
|
|
#if MICROPY_KBD_EXCEPTION
|
|
|
|
// initialise the exception object for raising KeyboardInterrupt
|
2023-02-10 09:44:58 -05:00
|
|
|
mp_obj_exception_initialize0(&MP_STATE_VM(mp_kbd_exception), &mp_type_KeyboardInterrupt);
|
2016-12-14 21:00:19 -05:00
|
|
|
#endif
|
|
|
|
|
2023-02-10 09:44:58 -05:00
|
|
|
mp_obj_exception_initialize0(&MP_STATE_VM(mp_reload_exception), &mp_type_ReloadException);
|
2018-05-14 16:57:50 -04:00
|
|
|
|
2014-05-12 18:07:34 -04:00
|
|
|
// call port specific initialization if any
|
2021-03-15 09:57:36 -04:00
|
|
|
#ifdef MICROPY_PORT_INIT_FUNC
|
2014-05-03 05:28:29 -04:00
|
|
|
MICROPY_PORT_INIT_FUNC;
|
2021-03-15 09:57:36 -04:00
|
|
|
#endif
|
2014-05-03 05:28:29 -04:00
|
|
|
|
2018-04-04 00:24:03 -04:00
|
|
|
#if MICROPY_ENABLE_COMPILER
|
2014-06-02 12:37:55 -04:00
|
|
|
// optimization disabled by default
|
2015-01-01 18:30:53 -05:00
|
|
|
MP_STATE_VM(mp_optimise_value) = 0;
|
2021-04-23 15:26:42 -04:00
|
|
|
#if MICROPY_EMIT_NATIVE
|
|
|
|
MP_STATE_VM(default_emit_opt) = MP_EMIT_OPT_NONE;
|
|
|
|
#endif
|
2018-04-04 00:24:03 -04:00
|
|
|
#endif
|
2014-05-12 18:07:34 -04:00
|
|
|
|
2017-01-26 07:30:38 -05:00
|
|
|
// init global module dict
|
2021-03-22 06:20:22 -04:00
|
|
|
mp_obj_dict_init(&MP_STATE_VM(mp_loaded_modules_dict), MICROPY_LOADED_MODULES_DICT_SIZE);
|
2014-01-22 18:59:20 -05:00
|
|
|
|
2014-04-05 17:36:42 -04:00
|
|
|
// initialise the __main__ module
|
2015-01-01 18:30:53 -05:00
|
|
|
mp_obj_dict_init(&MP_STATE_VM(dict_main), 1);
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_dict_store(MP_OBJ_FROM_PTR(&MP_STATE_VM(dict_main)), MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR___main__));
|
2014-04-04 13:08:21 -04:00
|
|
|
|
|
|
|
// locals = globals for outer module (see Objects/frameobject.c/PyFrame_New())
|
2017-03-24 03:41:11 -04:00
|
|
|
mp_locals_set(&MP_STATE_VM(dict_main));
|
|
|
|
mp_globals_set(&MP_STATE_VM(dict_main));
|
2014-12-09 11:19:48 -05:00
|
|
|
|
|
|
|
#if MICROPY_CAN_OVERRIDE_BUILTINS
|
|
|
|
// start with no extensions to builtins
|
2015-01-01 18:30:53 -05:00
|
|
|
MP_STATE_VM(mp_module_builtins_override_dict) = NULL;
|
2014-12-09 11:19:48 -05:00
|
|
|
#endif
|
2016-05-26 06:42:53 -04:00
|
|
|
|
2020-07-27 09:52:38 -04:00
|
|
|
#if MICROPY_PERSISTENT_CODE_TRACK_RELOC_CODE
|
|
|
|
MP_STATE_VM(track_reloc_code_list) = MP_OBJ_NULL;
|
|
|
|
#endif
|
|
|
|
|
2017-06-20 13:56:05 -04:00
|
|
|
#ifdef MICROPY_FSUSERMOUNT
|
2016-12-13 19:40:11 -05:00
|
|
|
// zero out the pointers to the user-mounted devices
|
2017-01-12 15:33:15 -05:00
|
|
|
memset(MP_STATE_VM(fs_user_mount) + MICROPY_FATFS_NUM_PERSISTENT, 0,
|
2021-03-15 09:57:36 -04:00
|
|
|
sizeof(MP_STATE_VM(fs_user_mount)) - MICROPY_FATFS_NUM_PERSISTENT);
|
2016-12-13 19:40:11 -05:00
|
|
|
#endif
|
|
|
|
|
2021-12-17 07:35:32 -05:00
|
|
|
#if MICROPY_PY_SYS_PATH_ARGV_DEFAULTS
|
|
|
|
mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_path), 0);
|
2021-12-21 07:07:00 -05:00
|
|
|
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
|
2021-12-17 07:35:32 -05:00
|
|
|
#if MICROPY_MODULE_FROZEN
|
|
|
|
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__dot_frozen));
|
|
|
|
#endif
|
|
|
|
mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_argv), 0);
|
|
|
|
#endif
|
|
|
|
|
2021-04-23 15:26:42 -04:00
|
|
|
#if MICROPY_PY_SYS_ATEXIT
|
|
|
|
MP_STATE_VM(sys_exitfunc) = mp_const_none;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if MICROPY_PY_SYS_SETTRACE
|
|
|
|
MP_STATE_THREAD(prof_trace_callback) = MP_OBJ_NULL;
|
|
|
|
MP_STATE_THREAD(prof_callback_is_executing) = false;
|
|
|
|
MP_STATE_THREAD(current_code_state) = NULL;
|
|
|
|
#endif
|
|
|
|
|
2016-05-26 06:42:53 -04:00
|
|
|
#if MICROPY_PY_THREAD_GIL
|
|
|
|
mp_thread_mutex_init(&MP_STATE_VM(gil_mutex));
|
|
|
|
#endif
|
|
|
|
|
2020-01-09 17:35:13 -05:00
|
|
|
// call port specific initialization if any
|
|
|
|
#ifdef MICROPY_PORT_INIT_FUNC
|
|
|
|
MICROPY_PORT_INIT_FUNC;
|
|
|
|
#endif
|
|
|
|
|
2016-05-26 06:42:53 -04:00
|
|
|
MP_THREAD_GIL_ENTER();
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
|
2014-03-30 08:35:08 -04:00
|
|
|
void mp_deinit(void) {
|
2018-12-26 22:20:31 -05:00
|
|
|
MP_THREAD_GIL_EXIT();
|
|
|
|
|
2016-11-05 13:40:27 -04:00
|
|
|
// call port specific deinitialization if any
|
2021-04-20 01:22:44 -04:00
|
|
|
#ifdef MICROPY_PORT_DEINIT_FUNC
|
2014-05-08 04:56:33 -04:00
|
|
|
MICROPY_PORT_DEINIT_FUNC;
|
2021-03-15 09:57:36 -04:00
|
|
|
#endif
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
|
2021-09-23 22:49:51 -04:00
|
|
|
mp_obj_t MICROPY_WRAP_MP_LOAD_NAME(mp_load_name)(qstr qst) {
|
2013-10-04 14:53:11 -04:00
|
|
|
// logic: search locals, globals, builtins
|
2015-01-20 06:55:10 -05:00
|
|
|
DEBUG_OP_printf("load name %s\n", qstr_str(qst));
|
2014-04-04 21:51:26 -04:00
|
|
|
// If we're at the outer scope (locals == globals), dispatch to load_global right away
|
2017-03-24 03:41:11 -04:00
|
|
|
if (mp_locals_get() != mp_globals_get()) {
|
|
|
|
mp_map_elem_t *elem = mp_map_lookup(&mp_locals_get()->map, MP_OBJ_NEW_QSTR(qst), MP_MAP_LOOKUP);
|
2014-04-04 21:51:26 -04:00
|
|
|
if (elem != NULL) {
|
|
|
|
return elem->value;
|
|
|
|
}
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
2015-01-20 06:55:10 -05:00
|
|
|
return mp_load_global(qst);
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
|
2021-09-23 22:49:51 -04:00
|
|
|
mp_obj_t MICROPY_WRAP_MP_LOAD_GLOBAL(mp_load_global)(qstr qst) {
|
2013-10-09 18:10:10 -04:00
|
|
|
// logic: search globals, builtins
|
2015-01-20 06:55:10 -05:00
|
|
|
DEBUG_OP_printf("load global %s\n", qstr_str(qst));
|
2017-03-24 03:41:11 -04:00
|
|
|
mp_map_elem_t *elem = mp_map_lookup(&mp_globals_get()->map, MP_OBJ_NEW_QSTR(qst), MP_MAP_LOOKUP);
|
2013-10-09 18:10:10 -04:00
|
|
|
if (elem == NULL) {
|
2014-12-09 11:19:48 -05:00
|
|
|
#if MICROPY_CAN_OVERRIDE_BUILTINS
|
2015-01-01 18:30:53 -05:00
|
|
|
if (MP_STATE_VM(mp_module_builtins_override_dict) != NULL) {
|
2014-12-09 11:19:48 -05:00
|
|
|
// lookup in additional dynamic table of builtins first
|
2015-01-20 06:55:10 -05:00
|
|
|
elem = mp_map_lookup(&MP_STATE_VM(mp_module_builtins_override_dict)->map, MP_OBJ_NEW_QSTR(qst), MP_MAP_LOOKUP);
|
2014-12-09 11:19:48 -05:00
|
|
|
if (elem != NULL) {
|
|
|
|
return elem->value;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2021-03-15 09:57:36 -04:00
|
|
|
elem = mp_map_lookup((mp_map_t *)&mp_module_builtins_globals.map, MP_OBJ_NEW_QSTR(qst), MP_MAP_LOOKUP);
|
2013-10-09 18:10:10 -04:00
|
|
|
if (elem == NULL) {
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_msg(&mp_type_NameError, MP_ERROR_TEXT("name not defined"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_msg_varg(&mp_type_NameError, MP_ERROR_TEXT("name '%q' is not defined"), qst);
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2013-10-09 18:10:10 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return elem->value;
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
|
2023-06-06 19:20:47 -04:00
|
|
|
mp_obj_t __attribute__((noinline)) mp_load_build_class(void) {
|
2013-10-04 14:53:11 -04:00
|
|
|
DEBUG_OP_printf("load_build_class\n");
|
2014-12-09 11:19:48 -05:00
|
|
|
#if MICROPY_CAN_OVERRIDE_BUILTINS
|
2015-01-01 18:30:53 -05:00
|
|
|
if (MP_STATE_VM(mp_module_builtins_override_dict) != NULL) {
|
2014-12-09 11:19:48 -05:00
|
|
|
// lookup in additional dynamic table of builtins first
|
2015-01-01 18:30:53 -05:00
|
|
|
mp_map_elem_t *elem = mp_map_lookup(&MP_STATE_VM(mp_module_builtins_override_dict)->map, MP_OBJ_NEW_QSTR(MP_QSTR___build_class__), MP_MAP_LOOKUP);
|
2014-12-09 11:19:48 -05:00
|
|
|
if (elem != NULL) {
|
|
|
|
return elem->value;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(&mp_builtin___build_class___obj);
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
|
2020-01-08 23:32:45 -05:00
|
|
|
void PLACE_IN_ITCM(mp_store_name)(qstr qst, mp_obj_t obj) {
|
2015-01-20 06:55:10 -05:00
|
|
|
DEBUG_OP_printf("store name %s <- %p\n", qstr_str(qst), obj);
|
2017-03-24 03:41:11 -04:00
|
|
|
mp_obj_dict_store(MP_OBJ_FROM_PTR(mp_locals_get()), MP_OBJ_NEW_QSTR(qst), obj);
|
2013-10-09 18:10:10 -04:00
|
|
|
}
|
|
|
|
|
2015-01-20 06:55:10 -05:00
|
|
|
void mp_delete_name(qstr qst) {
|
|
|
|
DEBUG_OP_printf("delete name %s\n", qstr_str(qst));
|
|
|
|
// TODO convert KeyError to NameError if qst not found
|
2017-03-24 03:41:11 -04:00
|
|
|
mp_obj_dict_delete(MP_OBJ_FROM_PTR(mp_locals_get()), MP_OBJ_NEW_QSTR(qst));
|
2014-03-23 15:19:02 -04:00
|
|
|
}
|
|
|
|
|
2020-01-08 23:32:45 -05:00
|
|
|
void PLACE_IN_ITCM(mp_store_global)(qstr qst, mp_obj_t obj) {
|
2015-01-20 06:55:10 -05:00
|
|
|
DEBUG_OP_printf("store global %s <- %p\n", qstr_str(qst), obj);
|
2017-03-24 03:41:11 -04:00
|
|
|
mp_obj_dict_store(MP_OBJ_FROM_PTR(mp_globals_get()), MP_OBJ_NEW_QSTR(qst), obj);
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
|
2015-01-20 06:55:10 -05:00
|
|
|
void mp_delete_global(qstr qst) {
|
|
|
|
DEBUG_OP_printf("delete global %s\n", qstr_str(qst));
|
|
|
|
// TODO convert KeyError to NameError if qst not found
|
2017-03-24 03:41:11 -04:00
|
|
|
mp_obj_dict_delete(MP_OBJ_FROM_PTR(mp_globals_get()), MP_OBJ_NEW_QSTR(qst));
|
2014-04-08 16:11:49 -04:00
|
|
|
}
|
|
|
|
|
2017-08-28 23:04:01 -04:00
|
|
|
mp_obj_t mp_unary_op(mp_unary_op_t op, mp_obj_t arg) {
|
2017-12-08 18:26:21 -05:00
|
|
|
DEBUG_OP_printf("unary " UINT_FMT " %q %p\n", op, mp_unary_op_method_name[op], arg);
|
2014-02-01 18:04:09 -05:00
|
|
|
|
2015-12-08 07:28:11 -05:00
|
|
|
if (op == MP_UNARY_OP_NOT) {
|
|
|
|
// "not x" is the negative of whether "x" is true per Python semantics
|
|
|
|
return mp_obj_new_bool(mp_obj_is_true(arg) == 0);
|
2021-04-22 20:55:39 -04:00
|
|
|
} else if (mp_obj_is_small_int(arg)) {
|
2014-07-03 08:25:24 -04:00
|
|
|
mp_int_t val = MP_OBJ_SMALL_INT_VALUE(arg);
|
2013-11-02 15:47:57 -04:00
|
|
|
switch (op) {
|
2014-03-30 08:35:08 -04:00
|
|
|
case MP_UNARY_OP_BOOL:
|
2015-10-11 05:09:43 -04:00
|
|
|
return mp_obj_new_bool(val != 0);
|
2015-05-11 08:25:19 -04:00
|
|
|
case MP_UNARY_OP_HASH:
|
|
|
|
return arg;
|
2014-03-30 08:35:08 -04:00
|
|
|
case MP_UNARY_OP_POSITIVE:
|
2018-08-29 10:59:36 -04:00
|
|
|
case MP_UNARY_OP_INT:
|
2014-03-12 11:38:15 -04:00
|
|
|
return arg;
|
2014-03-30 08:35:08 -04:00
|
|
|
case MP_UNARY_OP_NEGATIVE:
|
2014-03-12 11:38:15 -04:00
|
|
|
// check for overflow
|
|
|
|
if (val == MP_SMALL_INT_MIN) {
|
|
|
|
return mp_obj_new_int(-val);
|
|
|
|
} else {
|
|
|
|
return MP_OBJ_NEW_SMALL_INT(-val);
|
|
|
|
}
|
2017-09-17 17:06:43 -04:00
|
|
|
case MP_UNARY_OP_ABS:
|
|
|
|
if (val >= 0) {
|
|
|
|
return arg;
|
|
|
|
} else if (val == MP_SMALL_INT_MIN) {
|
|
|
|
// check for overflow
|
|
|
|
return mp_obj_new_int(-val);
|
|
|
|
} else {
|
|
|
|
return MP_OBJ_NEW_SMALL_INT(-val);
|
|
|
|
}
|
2014-03-12 11:38:15 -04:00
|
|
|
default:
|
2017-01-17 01:03:56 -05:00
|
|
|
assert(op == MP_UNARY_OP_INVERT);
|
|
|
|
return MP_OBJ_NEW_SMALL_INT(~val);
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
2021-04-22 20:55:39 -04:00
|
|
|
} else if (op == MP_UNARY_OP_HASH && mp_obj_is_str_or_bytes(arg)) {
|
2015-05-11 08:25:19 -04:00
|
|
|
// fast path for hashing str/bytes
|
|
|
|
GET_STR_HASH(arg, h);
|
2016-09-02 00:42:53 -04:00
|
|
|
if (h == 0) {
|
|
|
|
GET_STR_DATA_LEN(arg, data, len);
|
|
|
|
h = qstr_compute_hash(data, len);
|
|
|
|
}
|
2015-05-11 08:25:19 -04:00
|
|
|
return MP_OBJ_NEW_SMALL_INT(h);
|
2014-01-23 13:27:51 -05:00
|
|
|
} else {
|
2020-01-08 19:01:14 -05:00
|
|
|
const mp_obj_type_t *type = mp_obj_get_type(arg);
|
2021-07-12 08:03:50 -04:00
|
|
|
mp_unary_op_fun_t unary_op = mp_type_get_unary_op_slot(type);
|
2021-07-06 10:08:57 -04:00
|
|
|
if (unary_op != NULL) {
|
|
|
|
mp_obj_t result = unary_op(op, arg);
|
2014-05-21 14:42:43 -04:00
|
|
|
if (result != MP_OBJ_NULL) {
|
2013-12-21 13:17:45 -05:00
|
|
|
return result;
|
|
|
|
}
|
2013-11-02 15:47:57 -04:00
|
|
|
}
|
2020-02-20 06:30:49 -05:00
|
|
|
if (op == MP_UNARY_OP_BOOL) {
|
|
|
|
// Type doesn't have unary_op (or didn't handle MP_UNARY_OP_BOOL),
|
|
|
|
// so is implicitly True as this code path is impossible to reach
|
|
|
|
// if arg==mp_const_none.
|
|
|
|
return mp_const_true;
|
|
|
|
}
|
2018-08-29 10:59:36 -04:00
|
|
|
// With MP_UNARY_OP_INT, mp_unary_op() becomes a fallback for mp_obj_get_int().
|
|
|
|
// In this case provide a more focused error message to not confuse, e.g. chr(1.0)
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2019-09-26 08:52:04 -04:00
|
|
|
if (op == MP_UNARY_OP_INT) {
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("can't convert to int"));
|
2014-11-06 12:36:16 -05:00
|
|
|
} else {
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("unsupported type for operator"));
|
2014-11-06 12:36:16 -05:00
|
|
|
}
|
2019-09-26 08:52:04 -04:00
|
|
|
#else
|
|
|
|
if (op == MP_UNARY_OP_INT) {
|
2022-11-08 15:44:08 -05:00
|
|
|
mp_raise_TypeError_varg(MP_ERROR_TEXT("can't convert %q to %q"), mp_obj_get_type_qstr(arg), MP_QSTR_int);
|
2019-09-26 08:52:04 -04:00
|
|
|
} else {
|
2021-06-18 11:54:19 -04:00
|
|
|
mp_raise_TypeError_varg(MP_ERROR_TEXT("unsupported type for %q: '%q'"),
|
|
|
|
mp_unary_op_method_name[op], mp_obj_get_type_qstr(arg));
|
2019-09-26 08:52:04 -04:00
|
|
|
}
|
|
|
|
#endif
|
2013-11-02 15:47:57 -04:00
|
|
|
}
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
|
2021-09-23 22:49:51 -04:00
|
|
|
mp_obj_t MICROPY_WRAP_MP_BINARY_OP(mp_binary_op)(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
|
2017-12-08 18:26:21 -05:00
|
|
|
DEBUG_OP_printf("binary " UINT_FMT " %q %p %p\n", op, mp_binary_op_method_name[op], lhs, rhs);
|
2014-01-03 09:09:31 -05:00
|
|
|
|
|
|
|
// TODO correctly distinguish inplace operators for mutable objects
|
|
|
|
// lookup logic that CPython uses for +=:
|
|
|
|
// check for implemented +=
|
|
|
|
// then check for implemented +
|
|
|
|
// then check for implemented seq.inplace_concat
|
|
|
|
// then check for implemented seq.concat
|
|
|
|
// then fail
|
|
|
|
// note that list does not implement + or +=, so that inplace_concat is reached first for +=
|
|
|
|
|
2014-02-01 18:04:09 -05:00
|
|
|
// deal with is
|
2014-03-30 08:35:08 -04:00
|
|
|
if (op == MP_BINARY_OP_IS) {
|
2015-10-11 05:09:43 -04:00
|
|
|
return mp_obj_new_bool(lhs == rhs);
|
2014-01-14 17:31:28 -05:00
|
|
|
}
|
|
|
|
|
2014-01-11 05:47:22 -05:00
|
|
|
// deal with == and != for all types
|
2014-03-30 08:35:08 -04:00
|
|
|
if (op == MP_BINARY_OP_EQUAL || op == MP_BINARY_OP_NOT_EQUAL) {
|
2019-12-31 17:19:12 -05:00
|
|
|
// mp_obj_equal_not_equal supports a bunch of shortcuts
|
|
|
|
return mp_obj_equal_not_equal(op, lhs, rhs);
|
2014-01-11 05:47:22 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// deal with exception_match for all types
|
2014-03-30 08:35:08 -04:00
|
|
|
if (op == MP_BINARY_OP_EXCEPTION_MATCH) {
|
2014-02-15 11:10:44 -05:00
|
|
|
// rhs must be issubclass(rhs, BaseException)
|
|
|
|
if (mp_obj_is_exception_type(rhs)) {
|
2014-09-24 09:05:40 -04:00
|
|
|
if (mp_obj_exception_match(lhs, rhs)) {
|
2014-01-11 05:47:22 -05:00
|
|
|
return mp_const_true;
|
|
|
|
} else {
|
|
|
|
return mp_const_false;
|
|
|
|
}
|
2021-04-22 20:55:39 -04:00
|
|
|
} else if (mp_obj_is_type(rhs, &mp_type_tuple)) {
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_tuple_t *tuple = MP_OBJ_TO_PTR(rhs);
|
2017-02-15 23:32:34 -05:00
|
|
|
for (size_t i = 0; i < tuple->len; i++) {
|
2014-09-24 09:05:40 -04:00
|
|
|
rhs = tuple->items[i];
|
|
|
|
if (!mp_obj_is_exception_type(rhs)) {
|
|
|
|
goto unsupported_op;
|
|
|
|
}
|
|
|
|
if (mp_obj_exception_match(lhs, rhs)) {
|
|
|
|
return mp_const_true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return mp_const_false;
|
2014-01-11 05:47:22 -05:00
|
|
|
}
|
2014-09-24 09:05:40 -04:00
|
|
|
goto unsupported_op;
|
2014-01-11 05:47:22 -05:00
|
|
|
}
|
|
|
|
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_small_int(lhs)) {
|
2014-07-03 08:25:24 -04:00
|
|
|
mp_int_t lhs_val = MP_OBJ_SMALL_INT_VALUE(lhs);
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_small_int(rhs)) {
|
2014-07-03 08:25:24 -04:00
|
|
|
mp_int_t rhs_val = MP_OBJ_SMALL_INT_VALUE(rhs);
|
2014-03-12 11:38:15 -04:00
|
|
|
// This is a binary operation: lhs_val op rhs_val
|
|
|
|
// We need to be careful to handle overflow; see CERT INT32-C
|
|
|
|
// Operations that can overflow:
|
2014-07-03 08:25:24 -04:00
|
|
|
// + result always fits in mp_int_t, then handled by SMALL_INT check
|
|
|
|
// - result always fits in mp_int_t, then handled by SMALL_INT check
|
2014-03-12 11:38:15 -04:00
|
|
|
// * checked explicitly
|
2014-07-03 08:25:24 -04:00
|
|
|
// / if lhs=MIN and rhs=-1; result always fits in mp_int_t, then handled by SMALL_INT check
|
|
|
|
// % if lhs=MIN and rhs=-1; result always fits in mp_int_t, then handled by SMALL_INT check
|
2014-03-12 11:38:15 -04:00
|
|
|
// << checked explicitly
|
2014-01-06 17:13:00 -05:00
|
|
|
switch (op) {
|
2014-03-30 08:35:08 -04:00
|
|
|
case MP_BINARY_OP_OR:
|
2021-03-15 09:57:36 -04:00
|
|
|
case MP_BINARY_OP_INPLACE_OR:
|
|
|
|
lhs_val |= rhs_val;
|
|
|
|
break;
|
2014-03-30 08:35:08 -04:00
|
|
|
case MP_BINARY_OP_XOR:
|
2021-03-15 09:57:36 -04:00
|
|
|
case MP_BINARY_OP_INPLACE_XOR:
|
|
|
|
lhs_val ^= rhs_val;
|
|
|
|
break;
|
2014-03-30 08:35:08 -04:00
|
|
|
case MP_BINARY_OP_AND:
|
2021-03-15 09:57:36 -04:00
|
|
|
case MP_BINARY_OP_INPLACE_AND:
|
|
|
|
lhs_val &= rhs_val;
|
|
|
|
break;
|
2014-03-30 08:35:08 -04:00
|
|
|
case MP_BINARY_OP_LSHIFT:
|
|
|
|
case MP_BINARY_OP_INPLACE_LSHIFT: {
|
2014-03-12 11:38:15 -04:00
|
|
|
if (rhs_val < 0) {
|
|
|
|
// negative shift not allowed
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("negative shift count"));
|
2021-02-03 23:32:59 -05:00
|
|
|
} else if (rhs_val >= (mp_int_t)(sizeof(lhs_val) * MP_BITS_PER_BYTE)
|
2021-02-03 23:27:53 -05:00
|
|
|
|| lhs_val > (MP_SMALL_INT_MAX >> rhs_val)
|
|
|
|
|| lhs_val < (MP_SMALL_INT_MIN >> rhs_val)) {
|
2014-03-12 11:38:15 -04:00
|
|
|
// left-shift will overflow, so use higher precision integer
|
|
|
|
lhs = mp_obj_new_int_from_ll(lhs_val);
|
|
|
|
goto generic_binary_op;
|
|
|
|
} else {
|
|
|
|
// use standard precision
|
2021-06-08 08:45:56 -04:00
|
|
|
lhs_val = (mp_uint_t)lhs_val << rhs_val;
|
2014-03-12 11:38:15 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2014-03-30 08:35:08 -04:00
|
|
|
case MP_BINARY_OP_RSHIFT:
|
|
|
|
case MP_BINARY_OP_INPLACE_RSHIFT:
|
2014-03-12 11:38:15 -04:00
|
|
|
if (rhs_val < 0) {
|
|
|
|
// negative shift not allowed
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("negative shift count"));
|
2014-03-12 11:38:15 -04:00
|
|
|
} else {
|
|
|
|
// standard precision is enough for right-shift
|
2021-02-03 23:32:59 -05:00
|
|
|
if (rhs_val >= (mp_int_t)(sizeof(lhs_val) * MP_BITS_PER_BYTE)) {
|
2023-03-18 11:17:02 -04:00
|
|
|
// Shifting to big amounts is undefined behavior
|
2014-11-01 20:39:41 -04:00
|
|
|
// in C and is CPU-dependent; propagate sign bit.
|
2021-02-03 23:32:59 -05:00
|
|
|
rhs_val = sizeof(lhs_val) * MP_BITS_PER_BYTE - 1;
|
2014-11-01 20:39:41 -04:00
|
|
|
}
|
2014-03-12 11:38:15 -04:00
|
|
|
lhs_val >>= rhs_val;
|
|
|
|
}
|
|
|
|
break;
|
2014-03-30 08:35:08 -04:00
|
|
|
case MP_BINARY_OP_ADD:
|
2021-03-15 09:57:36 -04:00
|
|
|
case MP_BINARY_OP_INPLACE_ADD:
|
|
|
|
lhs_val += rhs_val;
|
|
|
|
break;
|
2014-03-30 08:35:08 -04:00
|
|
|
case MP_BINARY_OP_SUBTRACT:
|
2021-03-15 09:57:36 -04:00
|
|
|
case MP_BINARY_OP_INPLACE_SUBTRACT:
|
|
|
|
lhs_val -= rhs_val;
|
|
|
|
break;
|
2014-03-30 08:35:08 -04:00
|
|
|
case MP_BINARY_OP_MULTIPLY:
|
|
|
|
case MP_BINARY_OP_INPLACE_MULTIPLY: {
|
2014-03-12 11:38:15 -04:00
|
|
|
|
2014-07-03 08:25:24 -04:00
|
|
|
// If long long type exists and is larger than mp_int_t, then
|
2014-03-12 11:38:15 -04:00
|
|
|
// we can use the following code to perform overflow-checked multiplication.
|
2014-04-04 07:13:51 -04:00
|
|
|
// Otherwise (eg in x64 case) we must use mp_small_int_mul_overflow.
|
2014-03-12 11:38:15 -04:00
|
|
|
#if 0
|
|
|
|
// compute result using long long precision
|
|
|
|
long long res = (long long)lhs_val * (long long)rhs_val;
|
|
|
|
if (res > MP_SMALL_INT_MAX || res < MP_SMALL_INT_MIN) {
|
|
|
|
// result overflowed SMALL_INT, so return higher precision integer
|
|
|
|
return mp_obj_new_int_from_ll(res);
|
|
|
|
} else {
|
|
|
|
// use standard precision
|
2014-07-03 08:25:24 -04:00
|
|
|
lhs_val = (mp_int_t)res;
|
2014-03-12 11:38:15 -04:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2014-04-04 07:13:51 -04:00
|
|
|
if (mp_small_int_mul_overflow(lhs_val, rhs_val)) {
|
|
|
|
// use higher precision
|
|
|
|
lhs = mp_obj_new_int_from_ll(lhs_val);
|
|
|
|
goto generic_binary_op;
|
|
|
|
} else {
|
|
|
|
// use standard precision
|
|
|
|
return MP_OBJ_NEW_SMALL_INT(lhs_val * rhs_val);
|
|
|
|
}
|
2014-03-12 11:38:15 -04:00
|
|
|
}
|
2014-03-30 08:35:08 -04:00
|
|
|
case MP_BINARY_OP_FLOOR_DIVIDE:
|
|
|
|
case MP_BINARY_OP_INPLACE_FLOOR_DIVIDE:
|
2014-03-30 19:20:00 -04:00
|
|
|
if (rhs_val == 0) {
|
|
|
|
goto zero_division;
|
|
|
|
}
|
2014-04-04 07:13:51 -04:00
|
|
|
lhs_val = mp_small_int_floor_divide(lhs_val, rhs_val);
|
2014-03-22 16:19:24 -04:00
|
|
|
break;
|
2014-03-30 19:20:00 -04:00
|
|
|
|
2014-06-01 08:32:54 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_FLOAT
|
2014-03-30 08:35:08 -04:00
|
|
|
case MP_BINARY_OP_TRUE_DIVIDE:
|
2014-03-30 19:20:00 -04:00
|
|
|
case MP_BINARY_OP_INPLACE_TRUE_DIVIDE:
|
|
|
|
if (rhs_val == 0) {
|
2014-04-02 12:06:05 -04:00
|
|
|
goto zero_division;
|
2014-03-30 19:20:00 -04:00
|
|
|
}
|
|
|
|
return mp_obj_new_float((mp_float_t)lhs_val / (mp_float_t)rhs_val);
|
2014-03-12 11:38:15 -04:00
|
|
|
#endif
|
2014-01-06 17:13:00 -05:00
|
|
|
|
2014-03-30 08:35:08 -04:00
|
|
|
case MP_BINARY_OP_MODULO:
|
2014-04-04 07:13:51 -04:00
|
|
|
case MP_BINARY_OP_INPLACE_MODULO: {
|
2015-10-01 17:48:48 -04:00
|
|
|
if (rhs_val == 0) {
|
|
|
|
goto zero_division;
|
|
|
|
}
|
2014-04-04 07:13:51 -04:00
|
|
|
lhs_val = mp_small_int_modulo(lhs_val, rhs_val);
|
2014-03-22 13:29:27 -04:00
|
|
|
break;
|
|
|
|
}
|
2014-04-04 07:13:51 -04:00
|
|
|
|
2014-03-30 08:35:08 -04:00
|
|
|
case MP_BINARY_OP_POWER:
|
|
|
|
case MP_BINARY_OP_INPLACE_POWER:
|
2014-03-12 11:38:15 -04:00
|
|
|
if (rhs_val < 0) {
|
2014-06-01 08:32:54 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_FLOAT
|
2020-04-13 14:56:31 -04:00
|
|
|
return mp_obj_float_binary_op(op, (mp_float_t)lhs_val, rhs);
|
2014-03-12 11:38:15 -04:00
|
|
|
#else
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("negative power with no float support"));
|
2014-03-12 11:38:15 -04:00
|
|
|
#endif
|
|
|
|
} else {
|
2014-07-03 08:25:24 -04:00
|
|
|
mp_int_t ans = 1;
|
2014-03-12 11:38:15 -04:00
|
|
|
while (rhs_val > 0) {
|
|
|
|
if (rhs_val & 1) {
|
2014-04-04 07:13:51 -04:00
|
|
|
if (mp_small_int_mul_overflow(ans, lhs_val)) {
|
2014-04-03 19:16:32 -04:00
|
|
|
goto power_overflow;
|
|
|
|
}
|
2014-04-04 07:13:51 -04:00
|
|
|
ans *= lhs_val;
|
2014-04-03 19:16:32 -04:00
|
|
|
}
|
|
|
|
if (rhs_val == 1) {
|
|
|
|
break;
|
2014-03-12 11:38:15 -04:00
|
|
|
}
|
|
|
|
rhs_val /= 2;
|
2014-04-04 07:13:51 -04:00
|
|
|
if (mp_small_int_mul_overflow(lhs_val, lhs_val)) {
|
2014-04-03 19:16:32 -04:00
|
|
|
goto power_overflow;
|
|
|
|
}
|
2014-04-04 07:13:51 -04:00
|
|
|
lhs_val *= lhs_val;
|
2014-01-06 17:13:00 -05:00
|
|
|
}
|
2014-03-12 11:38:15 -04:00
|
|
|
lhs_val = ans;
|
2013-12-17 16:35:38 -05:00
|
|
|
}
|
2014-01-06 17:13:00 -05:00
|
|
|
break;
|
2014-04-03 19:16:32 -04:00
|
|
|
|
|
|
|
power_overflow:
|
|
|
|
// use higher precision
|
|
|
|
lhs = mp_obj_new_int_from_ll(MP_OBJ_SMALL_INT_VALUE(lhs));
|
|
|
|
goto generic_binary_op;
|
|
|
|
|
2015-06-13 17:00:10 -04:00
|
|
|
case MP_BINARY_OP_DIVMOD: {
|
|
|
|
if (rhs_val == 0) {
|
|
|
|
goto zero_division;
|
|
|
|
}
|
|
|
|
// to reduce stack usage we don't pass a temp array of the 2 items
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_tuple_t *tuple = MP_OBJ_TO_PTR(mp_obj_new_tuple(2, NULL));
|
2015-06-13 17:00:10 -04:00
|
|
|
tuple->items[0] = MP_OBJ_NEW_SMALL_INT(mp_small_int_floor_divide(lhs_val, rhs_val));
|
|
|
|
tuple->items[1] = MP_OBJ_NEW_SMALL_INT(mp_small_int_modulo(lhs_val, rhs_val));
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(tuple);
|
2015-06-13 17:00:10 -04:00
|
|
|
}
|
|
|
|
|
2021-03-15 09:57:36 -04:00
|
|
|
case MP_BINARY_OP_LESS:
|
|
|
|
return mp_obj_new_bool(lhs_val < rhs_val);
|
|
|
|
case MP_BINARY_OP_MORE:
|
|
|
|
return mp_obj_new_bool(lhs_val > rhs_val);
|
|
|
|
case MP_BINARY_OP_LESS_EQUAL:
|
|
|
|
return mp_obj_new_bool(lhs_val <= rhs_val);
|
|
|
|
case MP_BINARY_OP_MORE_EQUAL:
|
|
|
|
return mp_obj_new_bool(lhs_val >= rhs_val);
|
2013-12-17 16:35:38 -05:00
|
|
|
|
2014-04-17 11:26:50 -04:00
|
|
|
default:
|
|
|
|
goto unsupported_op;
|
2014-01-06 17:13:00 -05:00
|
|
|
}
|
2018-07-14 09:05:25 -04:00
|
|
|
// This is an inlined version of mp_obj_new_int, for speed
|
2014-05-28 09:51:12 -04:00
|
|
|
if (MP_SMALL_INT_FITS(lhs_val)) {
|
2014-01-06 17:13:00 -05:00
|
|
|
return MP_OBJ_NEW_SMALL_INT(lhs_val);
|
2014-03-12 11:38:15 -04:00
|
|
|
} else {
|
2018-07-14 09:05:25 -04:00
|
|
|
return mp_obj_new_int_from_ll(lhs_val);
|
2014-01-06 17:13:00 -05:00
|
|
|
}
|
2021-03-15 09:57:36 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_FLOAT
|
2015-08-20 18:30:12 -04:00
|
|
|
} else if (mp_obj_is_float(rhs)) {
|
2020-04-13 14:56:31 -04:00
|
|
|
mp_obj_t res = mp_obj_float_binary_op(op, (mp_float_t)lhs_val, rhs);
|
2014-04-10 15:08:11 -04:00
|
|
|
if (res == MP_OBJ_NULL) {
|
|
|
|
goto unsupported_op;
|
|
|
|
} else {
|
|
|
|
return res;
|
|
|
|
}
|
2020-02-26 23:36:53 -05:00
|
|
|
#endif
|
2021-03-15 09:57:36 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_COMPLEX
|
2021-04-22 20:55:39 -04:00
|
|
|
} else if (mp_obj_is_type(rhs, &mp_type_complex)) {
|
2020-04-13 14:56:31 -04:00
|
|
|
mp_obj_t res = mp_obj_complex_binary_op(op, (mp_float_t)lhs_val, 0, rhs);
|
2014-04-10 15:08:11 -04:00
|
|
|
if (res == MP_OBJ_NULL) {
|
|
|
|
goto unsupported_op;
|
|
|
|
} else {
|
|
|
|
return res;
|
|
|
|
}
|
2021-03-15 09:57:36 -04:00
|
|
|
#endif
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
2014-01-11 07:39:33 -05:00
|
|
|
}
|
2013-11-02 10:33:10 -04:00
|
|
|
|
2017-11-23 21:04:24 -05:00
|
|
|
// Convert MP_BINARY_OP_IN to MP_BINARY_OP_CONTAINS with swapped args.
|
2014-03-30 08:35:08 -04:00
|
|
|
if (op == MP_BINARY_OP_IN) {
|
2017-11-23 21:04:24 -05:00
|
|
|
op = MP_BINARY_OP_CONTAINS;
|
|
|
|
mp_obj_t temp = lhs;
|
|
|
|
lhs = rhs;
|
|
|
|
rhs = temp;
|
2014-01-11 07:39:33 -05:00
|
|
|
}
|
|
|
|
|
2014-01-22 09:35:10 -05:00
|
|
|
// generic binary_op supplied by type
|
2020-01-08 19:01:14 -05:00
|
|
|
const mp_obj_type_t *type;
|
2014-03-12 11:38:15 -04:00
|
|
|
generic_binary_op:
|
|
|
|
type = mp_obj_get_type(lhs);
|
2021-07-12 08:03:52 -04:00
|
|
|
mp_binary_op_fun_t binary_op = mp_type_get_binary_op_slot(type);
|
2021-07-06 10:08:57 -04:00
|
|
|
if (binary_op != NULL) {
|
|
|
|
mp_obj_t result = binary_op(op, lhs, rhs);
|
2014-05-21 14:42:43 -04:00
|
|
|
if (result != MP_OBJ_NULL) {
|
2014-01-22 09:35:10 -05:00
|
|
|
return result;
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
}
|
2013-10-22 11:53:02 -04:00
|
|
|
|
2021-03-15 09:57:36 -04:00
|
|
|
#if MICROPY_PY_REVERSE_SPECIAL_METHODS
|
2021-04-23 15:26:42 -04:00
|
|
|
if (op >= MP_BINARY_OP_OR && op <= MP_BINARY_OP_POWER) {
|
2017-09-10 10:05:20 -04:00
|
|
|
mp_obj_t t = rhs;
|
|
|
|
rhs = lhs;
|
|
|
|
lhs = t;
|
2021-04-23 15:26:42 -04:00
|
|
|
op += MP_BINARY_OP_REVERSE_OR - MP_BINARY_OP_OR;
|
|
|
|
goto generic_binary_op;
|
|
|
|
} else if (op >= MP_BINARY_OP_REVERSE_OR) {
|
2017-09-10 10:05:20 -04:00
|
|
|
// Convert __rop__ back to __op__ for error message
|
2021-04-23 15:26:42 -04:00
|
|
|
mp_obj_t t = rhs;
|
|
|
|
rhs = lhs;
|
|
|
|
lhs = t;
|
2017-09-10 10:05:20 -04:00
|
|
|
op -= MP_BINARY_OP_REVERSE_OR - MP_BINARY_OP_OR;
|
|
|
|
}
|
2021-03-15 09:57:36 -04:00
|
|
|
#endif
|
2014-01-22 09:35:10 -05:00
|
|
|
|
2017-11-23 21:04:24 -05:00
|
|
|
if (op == MP_BINARY_OP_CONTAINS) {
|
|
|
|
// If type didn't support containment then explicitly walk the iterator.
|
|
|
|
// mp_getiter will raise the appropriate exception if lhs is not iterable.
|
|
|
|
mp_obj_iter_buf_t iter_buf;
|
|
|
|
mp_obj_t iter = mp_getiter(lhs, &iter_buf);
|
|
|
|
mp_obj_t next;
|
|
|
|
while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
|
|
|
|
if (mp_obj_equal(next, rhs)) {
|
|
|
|
return mp_const_true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return mp_const_false;
|
|
|
|
}
|
|
|
|
|
2014-04-10 15:08:11 -04:00
|
|
|
unsupported_op:
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("unsupported type for operator"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_raise_TypeError_varg(
|
2021-05-04 14:40:55 -04:00
|
|
|
MP_ERROR_TEXT("unsupported types for %q: '%q', '%q'"),
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_binary_op_method_name[op], mp_obj_get_type_qstr(lhs), mp_obj_get_type_qstr(rhs));
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-04-02 12:06:05 -04:00
|
|
|
|
|
|
|
zero_division:
|
2022-11-08 16:24:49 -05:00
|
|
|
mp_raise_ZeroDivisionError();
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
|
2014-03-30 08:35:08 -04:00
|
|
|
mp_obj_t mp_call_function_0(mp_obj_t fun) {
|
|
|
|
return mp_call_function_n_kw(fun, 0, 0, NULL);
|
2013-10-10 17:06:54 -04:00
|
|
|
}
|
|
|
|
|
2014-03-30 08:35:08 -04:00
|
|
|
mp_obj_t mp_call_function_1(mp_obj_t fun, mp_obj_t arg) {
|
|
|
|
return mp_call_function_n_kw(fun, 1, 0, &arg);
|
2013-10-10 17:06:54 -04:00
|
|
|
}
|
|
|
|
|
2014-03-30 08:35:08 -04:00
|
|
|
mp_obj_t mp_call_function_2(mp_obj_t fun, mp_obj_t arg1, mp_obj_t arg2) {
|
2013-12-21 13:17:45 -05:00
|
|
|
mp_obj_t args[2];
|
2014-01-18 09:10:48 -05:00
|
|
|
args[0] = arg1;
|
|
|
|
args[1] = arg2;
|
2014-03-30 08:35:08 -04:00
|
|
|
return mp_call_function_n_kw(fun, 2, 0, args);
|
2013-10-10 17:06:54 -04:00
|
|
|
}
|
|
|
|
|
2014-01-18 09:10:48 -05:00
|
|
|
// args contains, eg: arg0 arg1 key0 value0 key1 value1
|
2017-02-15 23:32:34 -05:00
|
|
|
mp_obj_t mp_call_function_n_kw(mp_obj_t fun_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
|
2013-12-21 13:17:45 -05:00
|
|
|
// TODO improve this: fun object can specify its type and we parse here the arguments,
|
|
|
|
// passing to the function arrays of fixed and keyword arguments
|
2013-10-10 17:06:54 -04:00
|
|
|
|
2014-09-23 05:59:05 -04:00
|
|
|
DEBUG_OP_printf("calling function %p(n_args=" UINT_FMT ", n_kw=" UINT_FMT ", args=%p)\n", fun_in, n_args, n_kw, args);
|
2014-01-07 18:06:46 -05:00
|
|
|
|
2014-01-31 18:49:49 -05:00
|
|
|
// get the type
|
2020-01-08 19:01:14 -05:00
|
|
|
const mp_obj_type_t *type = mp_obj_get_type(fun_in);
|
2014-01-31 18:49:49 -05:00
|
|
|
|
|
|
|
// do the call
|
2021-07-12 08:03:25 -04:00
|
|
|
mp_call_fun_t call = mp_type_get_call_slot(type);
|
2021-07-06 10:08:57 -04:00
|
|
|
if (call) {
|
|
|
|
return call(fun_in, n_args, n_kw, args);
|
2014-01-07 18:06:46 -05:00
|
|
|
}
|
2014-04-25 14:15:16 -04:00
|
|
|
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("object not callable"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_TypeError_varg(MP_ERROR_TEXT("'%q' object is not callable"), mp_obj_get_type_qstr(fun_in));
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2013-11-26 10:16:41 -05:00
|
|
|
}
|
|
|
|
|
2014-01-18 09:10:48 -05:00
|
|
|
// args contains: fun self/NULL arg(0) ... arg(n_args-2) arg(n_args-1) kw_key(0) kw_val(0) ... kw_key(n_kw-1) kw_val(n_kw-1)
|
|
|
|
// if n_args==0 and n_kw==0 then there are only fun and self/NULL
|
2017-02-15 23:32:34 -05:00
|
|
|
mp_obj_t mp_call_method_n_kw(size_t n_args, size_t n_kw, const mp_obj_t *args) {
|
2014-09-23 05:59:05 -04:00
|
|
|
DEBUG_OP_printf("call method (fun=%p, self=%p, n_args=" UINT_FMT ", n_kw=" UINT_FMT ", args=%p)\n", args[0], args[1], n_args, n_kw, args);
|
2015-11-27 12:01:44 -05:00
|
|
|
int adjust = (args[1] == MP_OBJ_NULL) ? 0 : 1;
|
2014-03-30 08:35:08 -04:00
|
|
|
return mp_call_function_n_kw(args[0], n_args + adjust, n_kw, args + 2 - adjust);
|
2013-11-26 10:16:41 -05:00
|
|
|
}
|
|
|
|
|
2015-04-01 18:31:30 -04:00
|
|
|
// This function only needs to be exposed externally when in stackless mode.
|
|
|
|
#if !MICROPY_STACKLESS
|
|
|
|
STATIC
|
|
|
|
#endif
|
2020-01-08 23:32:45 -05:00
|
|
|
void PLACE_IN_ITCM(mp_call_prepare_args_n_kw_var)(bool have_self, size_t n_args_n_kw, const mp_obj_t *args, mp_call_args_t *out_args) {
|
2014-03-30 16:21:24 -04:00
|
|
|
mp_obj_t fun = *args++;
|
|
|
|
mp_obj_t self = MP_OBJ_NULL;
|
|
|
|
if (have_self) {
|
|
|
|
self = *args++; // may be MP_OBJ_NULL
|
|
|
|
}
|
|
|
|
uint n_args = n_args_n_kw & 0xff;
|
|
|
|
uint n_kw = (n_args_n_kw >> 8) & 0xff;
|
2015-03-03 14:37:37 -05:00
|
|
|
mp_obj_t pos_seq = args[n_args + 2 * n_kw]; // may be MP_OBJ_NULL
|
|
|
|
mp_obj_t kw_dict = args[n_args + 2 * n_kw + 1]; // may be MP_OBJ_NULL
|
2014-03-30 16:21:24 -04:00
|
|
|
|
|
|
|
DEBUG_OP_printf("call method var (fun=%p, self=%p, n_args=%u, n_kw=%u, args=%p, seq=%p, dict=%p)\n", fun, self, n_args, n_kw, args, pos_seq, kw_dict);
|
|
|
|
|
|
|
|
// We need to create the following array of objects:
|
|
|
|
// args[0 .. n_args] unpacked(pos_seq) args[n_args .. n_args + 2 * n_kw] unpacked(kw_dict)
|
|
|
|
// TODO: optimize one day to avoid constructing new arg array? Will be hard.
|
|
|
|
|
|
|
|
// The new args array
|
|
|
|
mp_obj_t *args2;
|
|
|
|
uint args2_alloc;
|
|
|
|
uint args2_len = 0;
|
|
|
|
|
|
|
|
// Try to get a hint for the size of the kw_dict
|
|
|
|
uint kw_dict_len = 0;
|
2021-04-22 20:55:39 -04:00
|
|
|
if (kw_dict != MP_OBJ_NULL && mp_obj_is_type(kw_dict, &mp_type_dict)) {
|
2014-03-30 16:21:24 -04:00
|
|
|
kw_dict_len = mp_obj_dict_len(kw_dict);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Extract the pos_seq sequence to the new args array.
|
|
|
|
// Note that it can be arbitrary iterator.
|
|
|
|
if (pos_seq == MP_OBJ_NULL) {
|
|
|
|
// no sequence
|
|
|
|
|
|
|
|
// allocate memory for the new array of args
|
|
|
|
args2_alloc = 1 + n_args + 2 * (n_kw + kw_dict_len);
|
2017-11-26 07:48:23 -05:00
|
|
|
args2 = mp_nonlocal_alloc(args2_alloc * sizeof(mp_obj_t));
|
2014-03-30 16:21:24 -04:00
|
|
|
|
|
|
|
// copy the self
|
|
|
|
if (self != MP_OBJ_NULL) {
|
|
|
|
args2[args2_len++] = self;
|
|
|
|
}
|
|
|
|
|
|
|
|
// copy the fixed pos args
|
2014-05-10 14:36:33 -04:00
|
|
|
mp_seq_copy(args2 + args2_len, args, n_args, mp_obj_t);
|
2014-03-30 16:21:24 -04:00
|
|
|
args2_len += n_args;
|
|
|
|
|
2021-04-22 20:55:39 -04:00
|
|
|
} else if (mp_obj_is_type(pos_seq, &mp_type_tuple) || mp_obj_is_type(pos_seq, &mp_type_list)) {
|
2014-03-30 16:21:24 -04:00
|
|
|
// optimise the case of a tuple and list
|
|
|
|
|
|
|
|
// get the items
|
2017-03-25 04:35:08 -04:00
|
|
|
size_t len;
|
2014-03-30 16:21:24 -04:00
|
|
|
mp_obj_t *items;
|
|
|
|
mp_obj_get_array(pos_seq, &len, &items);
|
|
|
|
|
|
|
|
// allocate memory for the new array of args
|
|
|
|
args2_alloc = 1 + n_args + len + 2 * (n_kw + kw_dict_len);
|
2017-11-26 07:48:23 -05:00
|
|
|
args2 = mp_nonlocal_alloc(args2_alloc * sizeof(mp_obj_t));
|
2014-03-30 16:21:24 -04:00
|
|
|
|
|
|
|
// copy the self
|
|
|
|
if (self != MP_OBJ_NULL) {
|
|
|
|
args2[args2_len++] = self;
|
|
|
|
}
|
|
|
|
|
|
|
|
// copy the fixed and variable position args
|
2014-05-10 14:36:33 -04:00
|
|
|
mp_seq_cat(args2 + args2_len, args, n_args, items, len, mp_obj_t);
|
2014-03-30 16:21:24 -04:00
|
|
|
args2_len += n_args + len;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
// generic iterator
|
|
|
|
|
|
|
|
// allocate memory for the new array of args
|
|
|
|
args2_alloc = 1 + n_args + 2 * (n_kw + kw_dict_len) + 3;
|
2017-11-26 07:48:23 -05:00
|
|
|
args2 = mp_nonlocal_alloc(args2_alloc * sizeof(mp_obj_t));
|
2014-03-30 16:21:24 -04:00
|
|
|
|
|
|
|
// copy the self
|
|
|
|
if (self != MP_OBJ_NULL) {
|
|
|
|
args2[args2_len++] = self;
|
|
|
|
}
|
|
|
|
|
|
|
|
// copy the fixed position args
|
2014-05-10 14:36:33 -04:00
|
|
|
mp_seq_copy(args2 + args2_len, args, n_args, mp_obj_t);
|
2015-12-03 12:59:49 -05:00
|
|
|
args2_len += n_args;
|
2014-03-30 16:21:24 -04:00
|
|
|
|
|
|
|
// extract the variable position args from the iterator
|
2016-01-09 18:14:54 -05:00
|
|
|
mp_obj_iter_buf_t iter_buf;
|
|
|
|
mp_obj_t iterable = mp_getiter(pos_seq, &iter_buf);
|
2014-03-30 16:21:24 -04:00
|
|
|
mp_obj_t item;
|
2014-04-17 18:19:36 -04:00
|
|
|
while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
|
2014-03-30 16:21:24 -04:00
|
|
|
if (args2_len >= args2_alloc) {
|
2017-11-26 07:48:23 -05:00
|
|
|
args2 = mp_nonlocal_realloc(args2, args2_alloc * sizeof(mp_obj_t), args2_alloc * 2 * sizeof(mp_obj_t));
|
2014-03-30 16:21:24 -04:00
|
|
|
args2_alloc *= 2;
|
|
|
|
}
|
|
|
|
args2[args2_len++] = item;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// The size of the args2 array now is the number of positional args.
|
|
|
|
uint pos_args_len = args2_len;
|
|
|
|
|
|
|
|
// Copy the fixed kw args.
|
2014-05-10 14:36:33 -04:00
|
|
|
mp_seq_copy(args2 + args2_len, args + n_args, 2 * n_kw, mp_obj_t);
|
2014-03-30 16:21:24 -04:00
|
|
|
args2_len += 2 * n_kw;
|
|
|
|
|
|
|
|
// Extract (key,value) pairs from kw_dict dictionary and append to args2.
|
|
|
|
// Note that it can be arbitrary iterator.
|
|
|
|
if (kw_dict == MP_OBJ_NULL) {
|
|
|
|
// pass
|
2021-04-22 20:55:39 -04:00
|
|
|
} else if (mp_obj_is_type(kw_dict, &mp_type_dict)) {
|
2014-03-30 16:21:24 -04:00
|
|
|
// dictionary
|
|
|
|
mp_map_t *map = mp_obj_dict_get_map(kw_dict);
|
|
|
|
assert(args2_len + 2 * map->used <= args2_alloc); // should have enough, since kw_dict_len is in this case hinted correctly above
|
2017-02-15 23:32:34 -05:00
|
|
|
for (size_t i = 0; i < map->alloc; i++) {
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_map_slot_is_filled(map, i)) {
|
2016-04-21 11:51:36 -04:00
|
|
|
// the key must be a qstr, so intern it if it's a string
|
|
|
|
mp_obj_t key = map->table[i].key;
|
2021-04-22 20:55:39 -04:00
|
|
|
if (!mp_obj_is_qstr(key)) {
|
2018-03-29 20:09:00 -04:00
|
|
|
key = mp_obj_str_intern_checked(key);
|
2016-04-21 11:51:36 -04:00
|
|
|
}
|
|
|
|
args2[args2_len++] = key;
|
2014-03-30 16:21:24 -04:00
|
|
|
args2[args2_len++] = map->table[i].value;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
2016-05-07 17:02:46 -04:00
|
|
|
// generic mapping:
|
|
|
|
// - call keys() to get an iterable of all keys in the mapping
|
|
|
|
// - call __getitem__ for each key to get the corresponding value
|
|
|
|
|
|
|
|
// get the keys iterable
|
|
|
|
mp_obj_t dest[3];
|
|
|
|
mp_load_method(kw_dict, MP_QSTR_keys, dest);
|
2017-02-12 23:44:31 -05:00
|
|
|
mp_obj_t iterable = mp_getiter(mp_call_method_n_kw(0, 0, dest), NULL);
|
2016-05-07 17:02:46 -04:00
|
|
|
|
|
|
|
mp_obj_t key;
|
|
|
|
while ((key = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
|
|
|
|
// expand size of args array if needed
|
2014-03-30 16:21:24 -04:00
|
|
|
if (args2_len + 1 >= args2_alloc) {
|
|
|
|
uint new_alloc = args2_alloc * 2;
|
|
|
|
if (new_alloc < 4) {
|
|
|
|
new_alloc = 4;
|
|
|
|
}
|
2017-11-26 07:48:23 -05:00
|
|
|
args2 = mp_nonlocal_realloc(args2, args2_alloc * sizeof(mp_obj_t), new_alloc * sizeof(mp_obj_t));
|
2014-03-30 16:21:24 -04:00
|
|
|
args2_alloc = new_alloc;
|
|
|
|
}
|
2016-05-07 17:02:46 -04:00
|
|
|
|
2016-04-21 11:51:36 -04:00
|
|
|
// the key must be a qstr, so intern it if it's a string
|
2021-04-22 20:55:39 -04:00
|
|
|
if (!mp_obj_is_qstr(key)) {
|
2018-03-29 20:09:00 -04:00
|
|
|
key = mp_obj_str_intern_checked(key);
|
2016-04-21 11:51:36 -04:00
|
|
|
}
|
2016-05-07 17:02:46 -04:00
|
|
|
|
|
|
|
// get the value corresponding to the key
|
|
|
|
mp_load_method(kw_dict, MP_QSTR___getitem__, dest);
|
|
|
|
dest[2] = key;
|
|
|
|
mp_obj_t value = mp_call_method_n_kw(1, 0, dest);
|
|
|
|
|
|
|
|
// store the key/value pair in the argument array
|
2016-04-21 11:51:36 -04:00
|
|
|
args2[args2_len++] = key;
|
2016-05-07 17:02:46 -04:00
|
|
|
args2[args2_len++] = value;
|
2014-03-30 16:21:24 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-03-27 19:14:45 -04:00
|
|
|
out_args->fun = fun;
|
|
|
|
out_args->args = args2;
|
|
|
|
out_args->n_args = pos_args_len;
|
|
|
|
out_args->n_kw = (args2_len - pos_args_len) / 2;
|
|
|
|
out_args->n_alloc = args2_alloc;
|
|
|
|
}
|
|
|
|
|
2017-02-15 23:32:34 -05:00
|
|
|
mp_obj_t mp_call_method_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_obj_t *args) {
|
2015-04-01 18:31:30 -04:00
|
|
|
mp_call_args_t out_args;
|
2015-03-27 19:14:45 -04:00
|
|
|
mp_call_prepare_args_n_kw_var(have_self, n_args_n_kw, args, &out_args);
|
|
|
|
|
|
|
|
mp_obj_t res = mp_call_function_n_kw(out_args.fun, out_args.n_args, out_args.n_kw, out_args.args);
|
2017-11-26 07:48:23 -05:00
|
|
|
mp_nonlocal_free(out_args.args, out_args.n_alloc * sizeof(mp_obj_t));
|
2014-03-30 16:21:24 -04:00
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2014-01-18 18:42:49 -05:00
|
|
|
// unpacked items are stored in reverse order into the array pointed to by items
|
2023-06-06 19:20:47 -04:00
|
|
|
void __attribute__((noinline,)) mp_unpack_sequence(mp_obj_t seq_in, size_t num, mp_obj_t *items) {
|
2017-03-25 04:35:08 -04:00
|
|
|
size_t seq_len;
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_type(seq_in, &mp_type_tuple) || mp_obj_is_type(seq_in, &mp_type_list)) {
|
2013-12-21 13:17:45 -05:00
|
|
|
mp_obj_t *seq_items;
|
2017-03-04 06:29:20 -05:00
|
|
|
mp_obj_get_array(seq_in, &seq_len, &seq_items);
|
2013-12-21 13:17:45 -05:00
|
|
|
if (seq_len < num) {
|
2014-02-01 17:54:06 -05:00
|
|
|
goto too_short;
|
2013-12-21 13:17:45 -05:00
|
|
|
} else if (seq_len > num) {
|
2014-02-01 17:54:06 -05:00
|
|
|
goto too_long;
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
2017-02-15 23:32:34 -05:00
|
|
|
for (size_t i = 0; i < num; i++) {
|
2014-01-18 18:42:49 -05:00
|
|
|
items[i] = seq_items[num - 1 - i];
|
|
|
|
}
|
2013-11-26 10:16:41 -05:00
|
|
|
} else {
|
2016-01-09 18:14:54 -05:00
|
|
|
mp_obj_iter_buf_t iter_buf;
|
|
|
|
mp_obj_t iterable = mp_getiter(seq_in, &iter_buf);
|
2014-02-01 17:54:06 -05:00
|
|
|
|
|
|
|
for (seq_len = 0; seq_len < num; seq_len++) {
|
2014-03-30 08:35:08 -04:00
|
|
|
mp_obj_t el = mp_iternext(iterable);
|
2014-04-17 18:19:36 -04:00
|
|
|
if (el == MP_OBJ_STOP_ITERATION) {
|
2014-02-01 17:54:06 -05:00
|
|
|
goto too_short;
|
|
|
|
}
|
|
|
|
items[num - 1 - seq_len] = el;
|
|
|
|
}
|
2014-04-17 18:19:36 -04:00
|
|
|
if (mp_iternext(iterable) != MP_OBJ_STOP_ITERATION) {
|
2014-02-01 17:54:06 -05:00
|
|
|
goto too_long;
|
|
|
|
}
|
2013-11-26 10:16:41 -05:00
|
|
|
}
|
2014-02-01 17:54:06 -05:00
|
|
|
return;
|
|
|
|
|
|
|
|
too_short:
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("wrong number of values to unpack"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_ValueError_varg(MP_ERROR_TEXT("need more than %d values to unpack"),
|
2021-03-15 09:57:36 -04:00
|
|
|
(int)seq_len);
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-02-01 17:54:06 -05:00
|
|
|
too_long:
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("wrong number of values to unpack"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_ValueError_varg(MP_ERROR_TEXT("too many values to unpack (expected %d)"),
|
2021-03-15 09:57:36 -04:00
|
|
|
(int)num);
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2013-11-26 10:16:41 -05:00
|
|
|
}
|
|
|
|
|
2014-04-08 12:51:47 -04:00
|
|
|
// unpacked items are stored in reverse order into the array pointed to by items
|
2023-06-06 19:20:47 -04:00
|
|
|
void __attribute__((noinline)) mp_unpack_ex(mp_obj_t seq_in, size_t num_in, mp_obj_t *items) {
|
2017-02-15 23:32:34 -05:00
|
|
|
size_t num_left = num_in & 0xff;
|
|
|
|
size_t num_right = (num_in >> 8) & 0xff;
|
2014-09-23 05:59:05 -04:00
|
|
|
DEBUG_OP_printf("unpack ex " UINT_FMT " " UINT_FMT "\n", num_left, num_right);
|
2017-03-25 04:35:08 -04:00
|
|
|
size_t seq_len;
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_type(seq_in, &mp_type_tuple) || mp_obj_is_type(seq_in, &mp_type_list)) {
|
|
|
|
// Make the seq variable volatile so the compiler keeps a reference to it,
|
|
|
|
// since if it's a tuple then seq_items points to the interior of the GC cell
|
|
|
|
// and mp_obj_new_list may trigger a GC which doesn't trace this and reclaims seq.
|
|
|
|
volatile mp_obj_t seq = seq_in;
|
2014-04-08 12:51:47 -04:00
|
|
|
mp_obj_t *seq_items;
|
2021-04-22 20:55:39 -04:00
|
|
|
mp_obj_get_array(seq, &seq_len, &seq_items);
|
2014-04-08 12:51:47 -04:00
|
|
|
if (seq_len < num_left + num_right) {
|
|
|
|
goto too_short;
|
|
|
|
}
|
2017-02-15 23:32:34 -05:00
|
|
|
for (size_t i = 0; i < num_right; i++) {
|
2014-04-08 12:51:47 -04:00
|
|
|
items[i] = seq_items[seq_len - 1 - i];
|
|
|
|
}
|
|
|
|
items[num_right] = mp_obj_new_list(seq_len - num_left - num_right, seq_items + num_left);
|
2017-02-15 23:32:34 -05:00
|
|
|
for (size_t i = 0; i < num_left; i++) {
|
2014-04-08 12:51:47 -04:00
|
|
|
items[num_right + 1 + i] = seq_items[num_left - 1 - i];
|
|
|
|
}
|
2021-04-22 20:55:39 -04:00
|
|
|
seq = MP_OBJ_NULL;
|
2014-04-08 12:51:47 -04:00
|
|
|
} else {
|
|
|
|
// Generic iterable; this gets a bit messy: we unpack known left length to the
|
|
|
|
// items destination array, then the rest to a dynamically created list. Once the
|
|
|
|
// iterable is exhausted, we take from this list for the right part of the items.
|
|
|
|
// TODO Improve to waste less memory in the dynamically created list.
|
2017-02-12 23:44:31 -05:00
|
|
|
mp_obj_t iterable = mp_getiter(seq_in, NULL);
|
2014-04-08 12:51:47 -04:00
|
|
|
mp_obj_t item;
|
|
|
|
for (seq_len = 0; seq_len < num_left; seq_len++) {
|
|
|
|
item = mp_iternext(iterable);
|
2014-04-17 18:19:36 -04:00
|
|
|
if (item == MP_OBJ_STOP_ITERATION) {
|
2014-04-08 12:51:47 -04:00
|
|
|
goto too_short;
|
|
|
|
}
|
|
|
|
items[num_left + num_right + 1 - 1 - seq_len] = item;
|
|
|
|
}
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_list_t *rest = MP_OBJ_TO_PTR(mp_obj_new_list(0, NULL));
|
2014-04-17 18:19:36 -04:00
|
|
|
while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_list_append(MP_OBJ_FROM_PTR(rest), item);
|
2014-04-08 12:51:47 -04:00
|
|
|
}
|
2014-08-30 10:17:47 -04:00
|
|
|
if (rest->len < num_right) {
|
2014-04-08 12:51:47 -04:00
|
|
|
goto too_short;
|
|
|
|
}
|
2015-11-27 12:01:44 -05:00
|
|
|
items[num_right] = MP_OBJ_FROM_PTR(rest);
|
2017-02-15 23:32:34 -05:00
|
|
|
for (size_t i = 0; i < num_right; i++) {
|
2014-08-30 10:17:47 -04:00
|
|
|
items[num_right - 1 - i] = rest->items[rest->len - num_right + i];
|
2014-04-08 12:51:47 -04:00
|
|
|
}
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_list_set_len(MP_OBJ_FROM_PTR(rest), rest->len - num_right);
|
2014-04-08 12:51:47 -04:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
|
|
|
|
too_short:
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_ValueError(MP_ERROR_TEXT("wrong number of values to unpack"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_ValueError_varg(MP_ERROR_TEXT("need more than %d values to unpack"),
|
2021-03-15 09:57:36 -04:00
|
|
|
(int)seq_len);
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-04-08 12:51:47 -04:00
|
|
|
}
|
|
|
|
|
2014-04-05 19:12:03 -04:00
|
|
|
mp_obj_t mp_load_attr(mp_obj_t base, qstr attr) {
|
2014-01-09 15:57:50 -05:00
|
|
|
DEBUG_OP_printf("load attr %p.%s\n", base, qstr_str(attr));
|
2014-04-05 19:12:03 -04:00
|
|
|
// use load_method
|
2014-01-09 15:57:50 -05:00
|
|
|
mp_obj_t dest[2];
|
2014-04-05 19:12:03 -04:00
|
|
|
mp_load_method(base, attr, dest);
|
|
|
|
if (dest[1] == MP_OBJ_NULL) {
|
2014-01-09 15:57:50 -05:00
|
|
|
// load_method returned just a normal attribute
|
2014-01-18 09:10:48 -05:00
|
|
|
return dest[0];
|
2014-01-09 15:57:50 -05:00
|
|
|
} else {
|
|
|
|
// load_method returned a method, so build a bound method object
|
|
|
|
return mp_obj_new_bound_meth(dest[0], dest[1]);
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-06-19 08:49:10 -04:00
|
|
|
#if MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG
|
|
|
|
|
|
|
|
// The following "checked fun" type is local to the mp_convert_member_lookup
|
|
|
|
// function, and serves to check that the first argument to a builtin function
|
|
|
|
// has the correct type.
|
|
|
|
|
|
|
|
typedef struct _mp_obj_checked_fun_t {
|
|
|
|
mp_obj_base_t base;
|
|
|
|
const mp_obj_type_t *type;
|
|
|
|
mp_obj_t fun;
|
|
|
|
} mp_obj_checked_fun_t;
|
|
|
|
|
2016-01-03 04:59:18 -05:00
|
|
|
STATIC mp_obj_t checked_fun_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_checked_fun_t *self = MP_OBJ_TO_PTR(self_in);
|
2015-06-19 08:49:10 -04:00
|
|
|
if (n_args > 0) {
|
|
|
|
const mp_obj_type_t *arg0_type = mp_obj_get_type(args[0]);
|
|
|
|
if (arg0_type != self->type) {
|
|
|
|
if (MICROPY_ERROR_REPORTING != MICROPY_ERROR_REPORTING_DETAILED) {
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("argument has wrong type"));
|
2015-06-19 08:49:10 -04:00
|
|
|
} else {
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_TypeError_varg(MP_ERROR_TEXT("argument should be a '%q' not a '%q'"),
|
2017-02-24 09:13:07 -05:00
|
|
|
self->type->name, arg0_type->name);
|
2015-06-19 08:49:10 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return mp_call_function_n_kw(self->fun, n_args, n_kw, args);
|
|
|
|
}
|
|
|
|
|
|
|
|
STATIC const mp_obj_type_t mp_type_checked_fun = {
|
|
|
|
{ &mp_type_type },
|
2021-07-09 15:59:37 -04:00
|
|
|
.flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_EXTENDED,
|
2015-06-19 08:49:10 -04:00
|
|
|
.name = MP_QSTR_function,
|
2021-07-12 07:57:59 -04:00
|
|
|
MP_TYPE_EXTENDED_FIELDS(
|
2021-07-06 11:37:32 -04:00
|
|
|
.call = checked_fun_call,
|
|
|
|
)
|
2015-06-19 08:49:10 -04:00
|
|
|
};
|
|
|
|
|
|
|
|
STATIC mp_obj_t mp_obj_new_checked_fun(const mp_obj_type_t *type, mp_obj_t fun) {
|
|
|
|
mp_obj_checked_fun_t *o = m_new_obj(mp_obj_checked_fun_t);
|
|
|
|
o->base.type = &mp_type_checked_fun;
|
|
|
|
o->type = type;
|
|
|
|
o->fun = fun;
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(o);
|
2015-06-19 08:49:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif // MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG
|
|
|
|
|
2015-03-21 10:21:54 -04:00
|
|
|
// Given a member that was extracted from an instance, convert it correctly
|
|
|
|
// and put the result in the dest[] array for a possible method call.
|
|
|
|
// Conversion means dealing with static/class methods, callables, and values.
|
|
|
|
// see http://docs.python.org/3/howto/descriptor.html
|
2020-06-27 19:39:20 -04:00
|
|
|
// and also https://mail.python.org/pipermail/python-dev/2015-March/138950.html
|
2015-03-21 10:21:54 -04:00
|
|
|
void mp_convert_member_lookup(mp_obj_t self, const mp_obj_type_t *type, mp_obj_t member, mp_obj_t *dest) {
|
2020-06-27 19:39:20 -04:00
|
|
|
if (mp_obj_is_obj(member)) {
|
2021-03-15 09:57:36 -04:00
|
|
|
const mp_obj_type_t *m_type = ((mp_obj_base_t *)MP_OBJ_TO_PTR(member))->type;
|
2020-06-27 19:39:20 -04:00
|
|
|
if (m_type->flags & MP_TYPE_FLAG_BINDS_SELF) {
|
|
|
|
// `member` is a function that binds self as its first argument.
|
|
|
|
if (m_type->flags & MP_TYPE_FLAG_BUILTIN_FUN) {
|
|
|
|
// `member` is a built-in function, which has special behaviour.
|
|
|
|
if (mp_obj_is_instance_type(type)) {
|
|
|
|
// Built-in functions on user types always behave like a staticmethod.
|
|
|
|
dest[0] = member;
|
|
|
|
}
|
|
|
|
#if MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG
|
|
|
|
else if (self == MP_OBJ_NULL && type != &mp_type_object) {
|
|
|
|
// `member` is a built-in method without a first argument, so wrap
|
|
|
|
// it in a type checker that will check self when it's supplied.
|
|
|
|
// Note that object will do its own checking so shouldn't be wrapped.
|
|
|
|
dest[0] = mp_obj_new_checked_fun(type, member);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
else {
|
|
|
|
// Return a (built-in) bound method, with self being this object.
|
|
|
|
dest[0] = member;
|
|
|
|
dest[1] = self;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// Return a bound method, with self being this object.
|
|
|
|
dest[0] = member;
|
|
|
|
dest[1] = self;
|
|
|
|
}
|
|
|
|
} else if (m_type == &mp_type_staticmethod) {
|
|
|
|
// `member` is a staticmethod, return the function that it wraps.
|
|
|
|
dest[0] = ((mp_obj_static_class_method_t *)MP_OBJ_TO_PTR(member))->fun;
|
|
|
|
} else if (m_type == &mp_type_classmethod) {
|
|
|
|
// `member` is a classmethod, return a bound method with self being the type of
|
|
|
|
// this object. This type should be the type of the original instance, not the
|
|
|
|
// base type (which is what is passed in the `type` argument to this function).
|
|
|
|
if (self != MP_OBJ_NULL) {
|
|
|
|
type = mp_obj_get_type(self);
|
|
|
|
}
|
|
|
|
dest[0] = ((mp_obj_static_class_method_t *)MP_OBJ_TO_PTR(member))->fun;
|
|
|
|
dest[1] = MP_OBJ_FROM_PTR(type);
|
2021-05-05 10:37:41 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_PROPERTY
|
|
|
|
// If self is MP_OBJ_NULL, we looking at the class itself, not an instance.
|
|
|
|
} else if (mp_obj_is_type(member, &mp_type_property) && mp_obj_is_native_type(type) && self != MP_OBJ_NULL) {
|
|
|
|
// object member is a property; delegate the load to the property
|
|
|
|
// Note: This is an optimisation for code size and execution time.
|
|
|
|
// The proper way to do it is have the functionality just below
|
|
|
|
// in a __get__ method of the property object, and then it would
|
|
|
|
// be called by the descriptor code down below. But that way
|
|
|
|
// requires overhead for the nested mp_call's and overhead for
|
|
|
|
// the code.
|
2022-05-03 09:31:41 -04:00
|
|
|
size_t n_proxy;
|
|
|
|
const mp_obj_t *proxy = mp_obj_property_get(member, &n_proxy);
|
2021-05-05 10:37:41 -04:00
|
|
|
if (proxy[0] == mp_const_none) {
|
2021-05-05 20:51:52 -04:00
|
|
|
mp_raise_AttributeError(MP_ERROR_TEXT("unreadable attribute"));
|
2021-05-05 10:37:41 -04:00
|
|
|
} else {
|
|
|
|
dest[0] = mp_call_function_n_kw(proxy[0], 1, 0, &self);
|
|
|
|
}
|
|
|
|
#endif
|
2020-06-27 19:39:20 -04:00
|
|
|
} else {
|
|
|
|
// `member` is a value, so just return that value.
|
2015-06-19 08:49:10 -04:00
|
|
|
dest[0] = member;
|
|
|
|
}
|
2015-03-21 10:21:54 -04:00
|
|
|
} else {
|
2020-06-27 19:39:20 -04:00
|
|
|
// `member` is a value, so just return that value.
|
2015-03-21 10:21:54 -04:00
|
|
|
dest[0] = member;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-24 19:17:36 -05:00
|
|
|
// no attribute found, returns: dest[0] == MP_OBJ_NULL, dest[1] == MP_OBJ_NULL
|
|
|
|
// normal attribute found, returns: dest[0] == <attribute>, dest[1] == MP_OBJ_NULL
|
|
|
|
// method attribute found, returns: dest[0] == <method>, dest[1] == <self>
|
2015-03-20 18:58:07 -04:00
|
|
|
void mp_load_method_maybe(mp_obj_t obj, qstr attr, mp_obj_t *dest) {
|
2014-01-09 15:57:50 -05:00
|
|
|
// clear output to indicate no attribute/method found yet
|
|
|
|
dest[0] = MP_OBJ_NULL;
|
|
|
|
dest[1] = MP_OBJ_NULL;
|
|
|
|
|
2021-08-19 08:46:40 -04:00
|
|
|
// Note: the specific case of obj being an instance type is fast-path'ed in the VM
|
|
|
|
// for the MP_BC_LOAD_ATTR opcode. Instance types handle type->attr and look up directly
|
|
|
|
// in their member's map.
|
|
|
|
|
2014-01-09 15:57:50 -05:00
|
|
|
// get the type
|
2020-01-08 19:01:14 -05:00
|
|
|
const mp_obj_type_t *type = mp_obj_get_type(obj);
|
2014-01-09 15:57:50 -05:00
|
|
|
|
2014-03-31 17:57:56 -04:00
|
|
|
// look for built-in names
|
2021-03-15 09:57:36 -04:00
|
|
|
#if MICROPY_CPYTHON_COMPAT
|
2021-04-22 20:55:39 -04:00
|
|
|
if (attr == MP_QSTR___class__) {
|
2014-03-31 17:57:56 -04:00
|
|
|
// a.__class__ is equivalent to type(a)
|
2015-11-27 12:01:44 -05:00
|
|
|
dest[0] = MP_OBJ_FROM_PTR(type);
|
2020-02-19 08:17:13 -05:00
|
|
|
return;
|
|
|
|
}
|
2021-03-15 09:57:36 -04:00
|
|
|
#endif
|
2020-02-19 08:17:13 -05:00
|
|
|
|
2021-07-12 08:03:59 -04:00
|
|
|
if (attr == MP_QSTR___next__ && mp_type_get_iternext_slot(type) != NULL) {
|
2015-11-27 12:01:44 -05:00
|
|
|
dest[0] = MP_OBJ_FROM_PTR(&mp_builtin_next_obj);
|
2015-03-20 18:58:07 -04:00
|
|
|
dest[1] = obj;
|
2021-07-06 10:08:57 -04:00
|
|
|
return;
|
|
|
|
}
|
2021-07-12 08:30:29 -04:00
|
|
|
mp_attr_fun_t attr_fun = mp_type_get_attr_slot(type);
|
2021-07-06 10:08:57 -04:00
|
|
|
if (attr_fun != NULL) {
|
2014-03-31 17:57:56 -04:00
|
|
|
// this type can do its own load, so call it
|
2021-07-06 10:08:57 -04:00
|
|
|
attr_fun(obj, attr, dest);
|
Merge tag 'v1.18'
Boosted performance, board.json metadata, more mimxrt, rp2, samd features
This release of MicroPython sees a boost to the overall performance of the
VM and runtime. This is achieved by the addition of an optional cache to
speed up general hash table lookups, as well as a fast path in the VM for
the LOAD_ATTR opcode on instance types. The new configuration options are
MICROPY_OPT_MAP_LOOKUP_CACHE and MICROPY_OPT_LOAD_ATTR_FAST_PATH. As part
of this improvement the MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE option has
been removed, which provided a similar map caching mechanism but with the
cache stored in the bytecode, which made it not useful on bare metal ports.
The new mechanism is measured to be at least as good as the old one,
applies to more map lookups, has a constant RAM overhead, and applies to
native code as well as bytecode.
These performance options are enabled on the esp32, mimxrt, rp2, stm32 and
unix ports. For esp32 and mimxrt some code is also moved to RAM to further
boost performance. On stm32, performance increases by about 20% for
benchmarks that are heavy on name lookups, like misc_pystone.py and
misc_raytrace.py. On esp32 performance can increase by 2-3x, and on mimxrt
it is up to 6x.
All boards in all ports now have a board.json metadata file, which is used
to automatically build firmware and generate a webpage for that board
(among other possibilities). Auto-build scripts have been added for this
purpose and they build all esp32, mimxrt, rp2, samd and stm32 boards. The
generated output is available at https://micropython.org/download.
Support for FROZEN_DIR and FROZEN_MPY_DIR has been deprecated for some time
and was finally removed in this release. Instead of these, FROZEN_MANIFEST
can be used. The io.resource_stream() function is also removed, replaced
by the pure Python version in micropython-lib.
The search order for importing frozen Python modules is now controlled by
the ".frozen" entry in sys.path. This string is added by default in the
second position in sys.path. User code should adjust sys.path depending on
the desired behaviour. Putting ".frozen" first in sys.path will speed up
importing frozen modules.
A bug in multiple precision integers with bitwise of -0 was fixed in commit
2c139bbf4e5724ab253b5b034ce925e04267a9c4.
The platform module has been added to allow querying the compiler and
underlying SDK/HAL/libc version. This is enabled on esp32, mimxrt and
stm32 ports.
The mpremote tool now supports seek, flush, mkdir and rmdir on PC-mounted
filesystems. And a help command has been added.
The documentation has seen many additions and improvements thanks (for a
second time) to the Google Season of Docs project. The rp2 documentation
now includes a reference for PIO assembly instructions, a PIO quick
reference and a PIO tutorial. The random and stm modules have been
documented, along with sys.settrace, manifest.py files and mpremote. There
is also now more detail about the differences between MicroPython and
standard Python 3.5 and above.
The esp32 port sees support for ESP32-S3 SoCs, and new boards GENERIC_S3,
ESP32_S2_WROVER, LOLIN_S2_MINI, LOLIN_S2_PICO and UM_FEATHERS2NEO. The PWM
driver has been improved and now supports all PWM timers and channels, and
the duty_u16() and duty_ns() methods, and it keeps the duty constant when
changing frequency. The machine.bitstream() function has been improved to
use RMT, with an option to select the original bit-banging implementation.
The mimxrt port gained new hardware features: SDRAM and SD card support, as
well as network integration with a LAN driver. The machine.WDT class was
added along with the machine.reset_cause(), machine.soft_reset(),
machine.unique_id() add machine.bitstream() functions. DHT sensor support
was added, and f-strings were enabled.
The rp2 port now has support for networking, and bluetooth using NimBLE.
The Nina-W10 WiFi/BT driver is fully integrated and supported by the new
Arduino Nano RP2040 connect board. I2S protocol support is added along
with a machine.bitstream() driver and DHT sensor support. The PWM driver
had a bug fix with the accuracy of setting/getting the frequency, and the
duty value is now retained when changing the frequency.
On the samd port there is now support for the internal flash being a block
device, and for filesystems and the os module. Pin and LED classes have
been implemented. There are more time functions, more Python features
enabled, and the help() function is added. SEEED_WIO_TERMINAL and
SEEED_XIAO board definitions are now available.
The stm32 port now has support for F427, F479 and H7A3(Q)/H7B3(Q) MCUs, and
new board definitions for VCC_GND_H743VI, OLIMEX_H407, MIKROE_QUAIL,
GARATRONIC_PYBSTICK26_F411, STM32H73B3I_DK. A bug was fixed in the SPI
driver where a SPI transfer could fail if the CYW43 WiFi driver was also
active at the same time.
On the windows port the help() function has been enabled, and support for
build variants added, to match the unix port.
The zephyr port upgraded Zephyr to v2.7.0.
The change in code size since the previous release for various ports is
(absolute and percentage change in the text section):
bare-arm: -1520 -2.605%
minimal x86: -2256 -1.531%
unix x64: -457 -0.089%
unix nanbox: -925 -0.204%
stm32: +312 +0.079% PYBV10
cc3200: -176 -0.096%
esp8266: +532 +0.076% GENERIC
esp32: +27096 +1.820% GENERIC
nrf: -212 -0.121% pca10040
rp2: +9904 +2.051% PICO
samd: +35332 +33.969% ADAFRUIT_ITSYBITSY_M4_EXPRESS
The changes that dominate these numbers are:
- bare-arm, minimal: use of new MICROPY_CONFIG_ROM_LEVEL_MINIMUM option and
subsequent disabling of remaining optional features
- unix, cc3200, nrf: general code size reductions of the core
- stm32: performance improvements, addition of platform module
- esp8266: enabling f-strings
- esp32: use of -O2 instead of -Os
- rp2: machine.I2S and other new hardware features
- samd: filesystem support and other new hardware features
Thanks to everyone who contributed to this release: Alan Dragomirecký,
Alexey Shvetsov, Andrew Leech, Andrew Scheller, Antoine Aubert, Boris
Vinogradov, Chris Boudacoff, Chris Fiege, Christian Decker, Damien George,
Daniel Gorny, Dave Hylands, David Michieli, Emilie Feral, Frédéric Pierson,
gibbonsc, Henk Vergonet, iabdalkader, Ihor Nehrutsa, Jan Hrudka, Jan Staal,
jc_.kim, Jim Mussared, Jonathan Hogg, Laurens Valk, leo chung, Lorenzo
Cappelletti, Magnus von Wachenfeldt, Matt Trentini, Matt van de Werken,
Maureen Helm, Michael Bentley, Michael Buesch, Mike Causer, Mike Teachman,
Mike Wadsten, Ned Konz, NitiKaur, oli, patrick, Patrick Van Oosterwijck,
Peter Boin, Peter Hinch, Peter van der Burg, Philipp Ebensberger, Pooya
Moradi, retsyo, robert-hh, roland van straten, Scott Armitage, Sebastian
Wicki, Seon Rozenblum, Sergei Silnov, Simon Baatz, Stewart Bonnick, stijn,
Tobias Thyrrestrup, Tomas Vanek, YoungJoon Chun.
What follows is a detailed list of changes, generated from the git commit
history, and organised into sections.
Main components
===============
all:
- remove MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
- update Python formatting to latest Black version 21.12b0
- remove support for FROZEN_DIR and FROZEN_MPY_DIR
py core:
- parse: simplify parse nodes representing a list
- emitnative: ensure load_subscr does not clobber existing REG_RET
- mpconfig.h: define initial templates for "feature levels"
- vm: add a fast path for LOAD_ATTR on instance types
- map: add an optional cache of (map+index) to speed up map lookups
- builtinimport: forward all debug printing to MICROPY_DEBUG_PRINTER
- add wrapper macros so hot VM functions can go in fast code location
- runtime: fix crash when exc __new__ doesn't return an exc instance
- mpconfig.h: define the "extra" feature level
- mpconfig.h: revert MICROPY_REPL_INFO to disabled at all levels
- gc: add hook to run code during time consuming GC operations
- showbc: print unary-op string when dumping bytecode
- modsys: replace non-ASCII quote char with ASCII char
- runtime: allow types to use both .attr and .locals_dict
- lexer: support nested [] and {} characters within f-string params
- objfun.h: remove obsolete comments about entries in extra_args
- builtinimport: refactor module importing
- showbc: fix printing of raw bytecode header on nanbox builds
- modio: remove io.resource_stream function
- only search frozen modules when '.frozen' is found in sys.path
- mkrules.cmake: set frozen preprocessor defs early
- runtime: allow initialising sys.path/argv with defaults
- mpstate.h: only include sys.path/argv objects in state when enabled
- mpz: fix bugs with bitwise of -0 by ensuring all 0's are positive
- qstr: reset mpstate.qstr_last_chunk before raising an error
- modbuiltins: add additional macro for extending builtins
- mpconfig.h: define MICROPY_PY_USSL_FINALISER only if not defined
extmod:
- machine_i2c: make SoftI2C configurable via macro option
- machine_spi: make SoftSPI configurable via macro option
- modonewire: make _onewire module configurable via macro option
- machine_pwm: factor out machine.PWM bindings to common code
- move modnetwork and modusocket from stm32 to extmod
- modnetwork: add STA_IF and AP_IF constants
- modnetwork: add extended socket state
- modusocket: add read/write stream methods to socket object
- modnetwork: define network interfaces in port config files
- network_cyw43: make consistent use of STA and AP constants
- modnetwork: remove STM32 references
- modnetwork: remove modnetwork socket u_state member
- mpbthci.h: add mp_bluetooth_hci_uart_any prototype
- nimble: add nimble CMake fragment file
- add platform module
- moduplatform: improve implementation for PC ports
- vfs_posix_file: support MP_STREAM_POLL in vfs_posix_file_ioctl
- modbluetooth: add connection interval to gap_connect
- nimble: update to NimBLE v1.4
- nimble: remove workaround for OS_ENOMEM
- uasyncio: fix gather returning exceptions from a cancelled task
- uplatform: remove unused definitions
- uplatform: use generic custom platform string
- network_ninaw10: fix scan list order to match other NICs
- modbluetooth: support gap_connect(None) to cancel a connection
- modure: redirect regex debug printing to mp_printf
- network_ninaw10: fix config of AP mode
- network_ninaw10: disable active connections before connecting
- network_ninaw10: make NIC state persistent
- network_ninaw10: return -1 on timeout from recv/send
- network_ninaw10: make recv/recvfrom interchangeable
- moduplatform: detect xtensa arch
- modusocket: allow setting timeout on unbound sockets
- modusocket: initialise accepted socket state
- network_ninaw10: use socket timeout preset in modusocket
- modbluetooth: fix conditional compilation of ringbuf_put_uuid
- modbluetooth: put declaration of connect_cancel in correct place
shared:
- libc/string0: don't include string.h, and provide __memcpy_chk
- runtime/pyexec: cleanup EXEC_FLAG flag constants
drivers:
- ninaw10: add ublox Nina-W10 WiFi/BT module driver
- lsm6dsox: add LSM6DSOX driver and examples
- neopixel: avoid heap alloc in fill()
- ninaw10: fix BSSID byte order, and add null byte to ESSID
- ninaw10/nina_wifi_drv: fix DNS resolution
mpy-cross: no changes specific to this component/port
lib:
- mynewt-nimble: switch to the MicroPython fork of NimBLE
- asf4: point submodule to latest commit on circuitpython branch
- update pico-sdk to 1.3.0 and tinyusb to 0.12.0
- stm32lib: update library for L4 v1.17.0, new G4, WL, and MMC fixes
- stm32lib: update library for fix to F7 USB HS
Support components
==================
docs:
- library/os.rst: clarify littlefs requirements for block erase
- library/bluetooth.rst: update incorrect link to gatts_write
- make.bat: change Windows output dir from '_build' to 'build'
- library/machine.I2S.rst: specify that I2S.shift args are kw-only
- esp32: explain ESP32 PWM modes, timers, and channels
- rp2: add reference for PIO assembly instructions, and PIO tutorial
- library/random.rst: document the random module
- reference/mpremote.rst: add docs for mpremote
- reference/manifest.rst: add docs for manifest.py files
- library/stm.rst: document the stm module
- esp32/tutorial: add an example of peripheral control via regs
- rp2/general.rst: fix typo with missing spaces
- library/framebuf.rst: adjust dimensions in example
- library/rp2.rst: update function asm_pio_encode to add sideset_opt
- reference/filesystem.rst: add detail on how to use littlefs fuse
- rp2/quickref.rst: add section on PIO
- library/sys.rst: add docs for sys.settrace
- esp8266/tutorial: fix comments of FrameBuffer examples
- library/uasyncio.rst: detail exception behaviour in cancel/timeout
- library/machine.Timer.rst: document 'id' as positional-only arg
- library/machine.SPI.rst: add example SPI usage
- library/machine.Timer.rst: document `period` and `callback` args
- library/machine.Pin.rst: add Pin.ANALOG mode constant
- remove trailing spaces and convert tabs to spaces
- library/sys.rst: add note about '.frozen' as an entry in sys.path
- differences: document details of new PEPs/features in Python 3.5+
- update copyright year range to include 2022
- esp32: update RMT quickref example to match latest code
examples: no changes specific to this component/port
tests:
- perf_bench: use math.log instead of math.log2
- basics: add tests for type-checking subclassed exc instances
- micropython/const.py: add comment about required config for test
- cpydiff: clarify f-string diffs regarding concatenation
- basics/int_big_cmp.py: add more tests for big-int comparison
- extmod: skip uselect_poll_udp when poll() is not available
tools:
- autobuild: add auto build for GENERIC_C3_USB
- ci.sh: use IDF v4.4 as part of esp32 CI and build GENERIC_S3
- autobuild: add the MIMXRT1010_EVK board to autobuild
- ci.sh: use a specific ESP IDF v4.4 commit
- autobuild: add script to generate website board metadata
- dfu.py: make tool work with python3 when parsing DFU files
- autobuild: automatically build all mimxrt, rp2 and samd boards
- autobuild: automatically build all stm32 boards
- mpremote: implement seek and flush in ioctl method
- autobuild: automatically build all esp32 boards
- upip.py: support == to specify exact package version
- makemanifest.py: make str conversion compatible with Python 2
- makemanifest.py: merge make-frozen.py
- mpremote: add mkdir and rmdir to RemoteFS
- mpremote: add help command
- mpremote: add link to mpremote docs URL in help message
- upip.py: skip '.frozen' entry in sys.path for install path
- autobuild: build esp8266 OTA image with GENERIC_1M board
- ci.sh: upgrade Zephyr docker image to v0.21.0
- ci.sh: build zephyr nucleo_wb55rg to test zephyr bluetooth build
CI:
- workflows: use Python 3.8 for macos workflow
- workflows: add new workflow to build ports download metadata
The ports
=========
all ports:
- add board.json for all boards
- add images, features and urls to board.json
- add '.frozen' as the first entry in sys.path
- move '.frozen' to second entry in sys.path
bare-arm port:
- mpconfigport.h: use MICROPY_CONFIG_ROM_LEVEL_MINIMUM
- mpconfigport.h: disable remaining optional features
cc3200 port: no changes specific to this component/port
esp8266 port:
- boards/GENERIC: enable f-strings
- extract qstr from object when comparing keys in config()
- etshal.h: remove unneeded function declarations
- allow building a board to any dest directory
esp32 port:
- boards: add new FeatherS2-Neo board definition
- machine_timer: use tx_update member for IDF 4.4 and above
- add support for ESP32-S3 SoCs
- boards: add new GENERIC_S3 board definition
- machine_hw_spi: fix hardware SPI DMA channels for S2/S3
- boards: add board definition for ESP32-S2-WROVER module
- boards: add LOLIN_S2_MINI ESP32-S2 board
- machine_pwm: add support for all PWM timers and channels
- README: updated readme with req IDF vers for ESP32-S2, C3 and S3
- usb: add USB host connection detection for CDC serial output
- machine_pin: block out IO16 and IO17 when using SPIRAM on ESP32
- mpthreadport: fix TCB cleanup function so thread_mutex is ready
- main: add option for a board to hook code into startup sequence
- split out WLAN code from modnetwork.c to network_wlan.c
- enable optimisations and move code to iRAM to boost performance
- usb: improve speed of USB CDC output
- add specific deploy_s2.md instructions for esp32-s2
- boards/LOLIN_S2_MINI: add image to board.json
- boards: update board and deploy metadata for UM_xxx boards
- usb: further improve speed of USB CDC output
- boards/LOLIN_S2_PICO: add LOLIN_S2_PICO board definition files
- boards/ESP32_S2_WROVER: link to specific deploy_s2 instructions
- support building with latest IDF v5
- in machine_i2s, send null samples in underflow situations
- in machine_i2s, make object reference arrays root pointers
- add SDCard support for S3, and a GENERIC_S3_SPIRAM board
- boards/GENERIC_S3: enable BLE on ESP32 S3
- machine_pwm: implement duty_u16() and duty_ns() PWM methods
- extract qstr from object when comparing keys in config()
- machine_pin: make GPIO 26 usable for S2,S3 if SPIRAM not config'd
- machine_hw_spi: fix SPI default pins reordering on ESP32-S2/S3
- machine_hw_spi: set proper default SPI(id=1) pins on S2,S3 and C3
- machine_hw_spi: set proper default SPI(id=2) pins on S2 and S3
- boards: remove SPI pin defaults from GENERIC S2/S3 boards
- modnetwork: synchronize WiFi AUTH_xxx constants with IDF values
- machine_pwm: keep duty constant when changing frequency
- machine_bitstream: replace bit-bang code with RMT-based driver
- machine_i2s: add support for ESP-IDF 4.4
- machine_bitstream: fix signal duplication on output pins
- esp32: enable platform module with IDF version
- boards/GENERIC_D2WD: build with -Os optimisation
- esp32_rmt: install RMT driver on core 1
- machine_bitstream: reinstate bitstream bit-bang implementation
javascript port: no changes specific to this component/port
mimxrt port:
- sdcard: implement SDCard driver
- machine_bitstream: add bitstream function to machine module
- rework flash configuration
- sdram: add SDRAM support
- eth: add LAN support and integrate the network module
- modmachine: implement machine.WDT() and machine.reset_cause()
- boards: fix the D14/D15 pin assignment of MIMXRT1050/60/64_EVK
- hal: remove duplicate definitions from flexspi_hyper_flash.h
- dma_channel: fix the DMA channel management
- fix cycle counter for time.ticks_cpu() and machine.bitstream()
- add dht_readinto() to the mimxrt module, and freeze dht.py
- extend the help() message and README.md
- mpconfigport.h: enable f-strings
- modmachine: implement soft_reset() and unique_id() functions
- boards/make-pins.py: allow empty lines and comments in pins.csv
- optimize the runtime speed
- enable the platform module
- boards: add the Seeed ARCH MIX board
- boards: update the board.json files and add deploy_xx.md files
- fix mp_hal_quiet_timing_enter()/exit() so timer still runs
- support PWM using the FLEXPWM and QTMR modules
- define UART 0 on MIMXRT boards
- support selection of PHY type and address
- re-enable eth checksum creation by HW
- fix a tiny unnoticed bug in sdcard.c
- add a driver for the DP83848 PHY device
- refactor the reading of the machine id
- enable ticks_cpu at boot time for NDEBUG builds only
- use -Og instead of -O0 for DEBUG builds
- tidy up the board flash related files
- hal: allow readSampleClkSrc to be configured by a board
- enable MICROPY_PY_USSL_FINALISER
minimal port:
- mpconfigport.h: use MICROPY_CONFIG_ROM_LEVEL_MINIMUM
- Makefile: don't force a 32-bit build
- mpconfigport.h: disable features that are not needed
nrf port:
- Makefile: improve Black Magic Probe commands
- main: use VFS helper function to mount fs and chdir
pic16bit port: no changes specific to this component/port
powerpc port: no changes specific to this component/port
qemu-arm port: no changes specific to this component/port
rp2 port:
- mpconfigport.h: enable heapq module
- add support for bluetooth module using NimBLE
- add framework for networking
- mpconfigport.h: use the "extra" feature level
- enable optimisations (comp goto, map cache, fast attr)
- machine_i2s: add I2S protocol support
- add support for Nina-W10 WiFi/BT module
- boards: add support for Arduino Nano RP2040
- machine_bitstream: implement the machine.bitstream driver
- boards: add neopixel.py to manifest.py
- rp2_pio: support exec with sideset
- boards/PIMORONI_PICOLIPO_16MB: fix 16MB flash size
- boards: add PYBSTICK26 RP2040 board definition
- machine_uart: handle and clear UART RX timeout IRQ
- boards/ARDUINO_NANO_RP2040_CONNECT: set default I2C pins
- machine_pwm: fix PWM frequency setting
- machine_pwm: keep duty value when changing the frequency
- add support for DHT11 and DHT22 sensors
- CMakeLists.txt: allow a board to override PICO_BOARD
- boards/GARATRONIC_PYBSTICK26_RP2040: use correct pico-sdk board cfg
samd port:
- integrate latest asf4, add help, more time funcs and uPy features
- samd_soc: allow a board to configure the low-level MCU config
- add internal flash block device, filesystem and uos support
- add Pin and LED classes, and machine.unique_id
- boards/ADAFRUIT_FEATHER_M0_EXPRESS: update for flash and pins
- boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS: update for flash and pins
- boards/MINISAM_M4: update for flash and pins
- boards/ADAFRUIT_TRINKET_M0: update for flash and pins
- boards/SAMD21_XPLAINED_PRO: update for flash and pins
- boards/SEEED_WIO_TERMINAL: add new board definition
- boards/SEEED_XIAO: add new board definition
- README.md: update README to reflect new features and boards
stm32 port:
- pin: enable GPIO clock of pin if it's constructed without init
- main: don't unconditionally enable GPIO A,B,C,D clocks
- boards/VCC_GND_H743VI: add board definition for VCC_GND_H743VI
- boards/OLIMEX_E407: add Ethernet RMII support
- boards/LEGO_HUB_NO6: remove user paths from cc2564 init file
- boards: remove trailing spaces, and add newline at end of file
- add basic support for STM32H750
- add support for H7A3(Q)/H7B3(Q), and STM32H73B3I_DK board defn
- suggest putting code in main.py not boot.py
- boards/make-pins.py: allow a CPU pin to be hidden
- boards/make-pins.py: allow empty lines and comments in pins.csv
- dma: add functions for external users of DMA to enable clock
- enable LOAD_ATTR fast path, and map lookup caching on >M0
- boards: add OLIMEX H407 board definition
- enable platform module
- extended flash filesystem space to 512K on H743 boards
- boards/NUCLEO_H743ZI: enable VfsLfs2 on NUCLEO_H743ZI(2) boards
- boards: add PF11-BOOT0 to stm32f091_af.csv
- machine_i2c: use hardware I2C for STM32H7
- sdram: enforce gcc opt, and use volatile and DSB in sdram_test
- usbd_cdc_interface: allow a board to hook into USBD CDC RX events
- mpbthciport: allow a board to hook BT HCI poll functions
- pendsv: allow a board to add entries for pendsv_schedule_dispatch
- boards: add images to board.json for Adafruit and VCC_GND boards
- uart: fix race conditions and clearing status in IRQ handler
- mpconfigport.h: use the "extra" feature level
- in machine_i2s, send null samples in underflow situations
- in machine_i2s, make object reference arrays root pointers
- led: support an extra 2 LEDs in board configuration
- boards/MIKROE_CLICKER2_STM32: add more detail to board.json
- boards: add new board MikroElektronika Quail, and F427 support
- main: run optional frozen module at boot
- sdio: don't explicitly disable DMA2 on deinit of SDIO
- dma: make DMA2_Stream3 exclusive to SDIO when CYW43 enabled
- boards: build NUCLEO_WB55 and STM32F769DISC without mboot enabled
- boards: add PYBSTICK26 F411 board definition
- boards/NADHAT_PYBF405: rename board to GARATRONIC_NADHAT_F405
- usb: use a table of allowed values to simplify usb_mode get/set
- boards/NUCLEO_WB55: update rfcore_firmwre for new WS
- flashbdev: support generic flash storage config via link symbols
- boards: convert F413,F439,H743,L4xx,WB55 to new flash FS config
- add support for F479 MCUs
- include HAL MMC code in F4 builds
- boards/make-pins.py: use cpu pins to define static alt-fun macros
- boards/NUCLEO_WB55: fix LED ordering
- boards/LEGO_HUB_NO6: set filesystem label as HUB_NO6
- boards: remove stray '+' characters at start of lines in ld files
- boards: remove unused MICROPY_HW_ENABLE_TIMER config
- boards: enable MICROPY_HW_ENABLE_SERVO on various boards
- update L4 code to build with latest stm32lib and L4 HAL 1.17.0
- main: call sdcard_init when only MICROPY_HW_ENABLE_MMCARD enabled
- sdcard: support 8-bit wide SDIO bus
- sdcard: add config option to force MM card capacity
- factoryreset: init vfs flags before calling pyb_flash_init_vfs
- qspi: fix typo in address comment
- boards/make-pins.py: generate empty ADC table if needed
- boards/OLIMEX_H407: fix typo in OLIMEX H407 board.json
- network_wiznet5k: fix build error with wiznet5k and lwip enabled
- enable MICROPY_PY_USSL_FINALISER
teensy port:
- switch to use manifest.py instead of FROZEN_DIR
unix port:
- enable LOAD_ATTR fast path, and map lookup caching
- modusocket: support MP_STREAM_POLL in unix socket_ioctl
- modos: add support for uos.urandom(n)
- coverage: change remaining printf to mp_printf
- Makefile: use -Og instead of -O0 for debug builds
windows port:
- README: remove unsupported Python instructions for Cygwin
- mpconfigport.h: enable help and help("modules")
- add support for build variants to windows port
- run tests via Makefile
- appveyor: build both standard and dev variants
- appveyor: build mpy-cross only once for mingw-w64
- msvc: run qstr preprocessing phase in parallel
zephyr port:
- mphalport.h: remove unused and unimplemented C-level pin API
- increase minimum CMake version to 3.20.0
- update include path to reboot.h
- get UART console device from devicetree instead of Kconfig
- use CONFIG_USB_DEVICE_STACK for conditional USB device support
- upgrade to Zephyr v2.7.0
- modbluetooth_zephyr: provide dummy connect_cancel function
2022-02-15 13:36:26 -05:00
|
|
|
|
2020-07-17 16:31:09 -04:00
|
|
|
// If type->attr has set dest[1] = MP_OBJ_SENTINEL, we should proceed
|
|
|
|
// with lookups below (i.e. in locals_dict). If not, return right away.
|
|
|
|
if (dest[1] != MP_OBJ_SENTINEL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
// Clear the fail flag set by type->attr so it's like it never ran.
|
|
|
|
dest[1] = MP_OBJ_NULL;
|
2021-07-06 10:08:57 -04:00
|
|
|
}
|
|
|
|
if (type->locals_dict != NULL) {
|
2014-03-31 17:57:56 -04:00
|
|
|
// generic method lookup
|
|
|
|
// this is a lookup in the object (ie not class or type)
|
2017-06-30 03:22:17 -04:00
|
|
|
assert(type->locals_dict->base.type == &mp_type_dict); // MicroPython restriction, for now
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_map_t *locals_map = &type->locals_dict->map;
|
2014-03-31 17:57:56 -04:00
|
|
|
mp_map_elem_t *elem = mp_map_lookup(locals_map, MP_OBJ_NEW_QSTR(attr), MP_MAP_LOOKUP);
|
|
|
|
if (elem != NULL) {
|
2015-03-21 10:21:54 -04:00
|
|
|
mp_convert_member_lookup(obj, type, elem->value, dest);
|
2013-11-02 19:58:14 -04:00
|
|
|
}
|
2020-07-17 16:31:09 -04:00
|
|
|
return;
|
2013-10-09 18:10:10 -04:00
|
|
|
}
|
2014-01-24 19:17:36 -05:00
|
|
|
}
|
|
|
|
|
2014-03-30 08:35:08 -04:00
|
|
|
void mp_load_method(mp_obj_t base, qstr attr, mp_obj_t *dest) {
|
2014-01-24 19:17:36 -05:00
|
|
|
DEBUG_OP_printf("load method %p.%s\n", base, qstr_str(attr));
|
|
|
|
|
2014-03-30 08:35:08 -04:00
|
|
|
mp_load_method_maybe(base, attr, dest);
|
2013-10-09 18:10:10 -04:00
|
|
|
|
2014-01-24 19:17:36 -05:00
|
|
|
if (dest[0] == MP_OBJ_NULL) {
|
2014-01-09 15:57:50 -05:00
|
|
|
// no attribute/method called attr
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2021-05-05 20:51:52 -04:00
|
|
|
mp_raise_AttributeError(MP_ERROR_TEXT("no such attribute"));
|
2019-09-26 08:52:04 -04:00
|
|
|
#else
|
2021-03-15 09:57:36 -04:00
|
|
|
// following CPython, we give a more detailed error message for type objects
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_type(base, &mp_type_type)) {
|
2019-09-26 08:52:04 -04:00
|
|
|
mp_raise_msg_varg(&mp_type_AttributeError,
|
2020-03-02 06:35:22 -05:00
|
|
|
MP_ERROR_TEXT("type object '%q' has no attribute '%q'"),
|
2019-09-26 08:52:04 -04:00
|
|
|
((mp_obj_type_t *)MP_OBJ_TO_PTR(base))->name, attr);
|
2021-03-15 09:57:36 -04:00
|
|
|
} else {
|
2019-09-26 08:52:04 -04:00
|
|
|
mp_raise_msg_varg(&mp_type_AttributeError,
|
2020-03-02 06:35:22 -05:00
|
|
|
MP_ERROR_TEXT("'%s' object has no attribute '%q'"),
|
2019-09-26 08:52:04 -04:00
|
|
|
mp_obj_get_type_str(base), attr);
|
2021-03-15 09:57:36 -04:00
|
|
|
}
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-01-09 15:57:50 -05:00
|
|
|
}
|
2013-10-09 18:10:10 -04:00
|
|
|
}
|
|
|
|
|
2018-05-10 09:00:04 -04:00
|
|
|
// Acts like mp_load_method_maybe but catches AttributeError, and all other exceptions if requested
|
|
|
|
void mp_load_method_protected(mp_obj_t obj, qstr attr, mp_obj_t *dest, bool catch_all_exc) {
|
|
|
|
nlr_buf_t nlr;
|
|
|
|
if (nlr_push(&nlr) == 0) {
|
|
|
|
mp_load_method_maybe(obj, attr, dest);
|
|
|
|
nlr_pop();
|
|
|
|
} else {
|
|
|
|
if (!catch_all_exc
|
2021-03-15 09:57:36 -04:00
|
|
|
&& !mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(((mp_obj_base_t *)nlr.ret_val)->type),
|
2018-05-10 09:00:04 -04:00
|
|
|
MP_OBJ_FROM_PTR(&mp_type_AttributeError))) {
|
|
|
|
// Re-raise the exception
|
|
|
|
nlr_raise(MP_OBJ_FROM_PTR(nlr.ret_val));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-30 08:35:08 -04:00
|
|
|
void mp_store_attr(mp_obj_t base, qstr attr, mp_obj_t value) {
|
2013-10-18 14:58:12 -04:00
|
|
|
DEBUG_OP_printf("store attr %p.%s <- %p\n", base, qstr_str(attr), value);
|
2020-01-08 19:01:14 -05:00
|
|
|
const mp_obj_type_t *type = mp_obj_get_type(base);
|
2021-07-12 08:30:29 -04:00
|
|
|
mp_attr_fun_t attr_fun = mp_type_get_attr_slot(type);
|
2021-07-06 10:08:57 -04:00
|
|
|
if (attr_fun != NULL) {
|
2015-04-01 10:10:50 -04:00
|
|
|
mp_obj_t dest[2] = {MP_OBJ_SENTINEL, value};
|
2021-07-06 10:08:57 -04:00
|
|
|
attr_fun(base, attr, dest);
|
2015-04-01 10:10:50 -04:00
|
|
|
if (dest[0] == MP_OBJ_NULL) {
|
|
|
|
// success
|
2014-01-09 15:57:50 -05:00
|
|
|
return;
|
|
|
|
}
|
2016-11-05 13:40:27 -04:00
|
|
|
#if MICROPY_PY_BUILTINS_PROPERTY
|
|
|
|
} else if (type->locals_dict != NULL) {
|
|
|
|
// generic method lookup
|
|
|
|
// this is a lookup in the object (ie not class or type)
|
|
|
|
assert(type->locals_dict->base.type == &mp_type_dict); // Micro Python restriction, for now
|
|
|
|
mp_map_t *locals_map = &type->locals_dict->map;
|
|
|
|
mp_map_elem_t *elem = mp_map_lookup(locals_map, MP_OBJ_NEW_QSTR(attr), MP_MAP_LOOKUP);
|
2018-07-14 22:17:25 -04:00
|
|
|
// If base is MP_OBJ_NULL, we looking at the class itself, not an instance.
|
2021-04-22 20:55:39 -04:00
|
|
|
if (elem != NULL && mp_obj_is_type(elem->value, &mp_type_property) && base != MP_OBJ_NULL) {
|
2016-11-05 13:40:27 -04:00
|
|
|
// attribute exists and is a property; delegate the store/delete
|
|
|
|
// Note: This is an optimisation for code size and execution time.
|
|
|
|
// The proper way to do it is have the functionality just below in
|
|
|
|
// a __set__/__delete__ method of the property object, and then it
|
|
|
|
// would be called by the descriptor code down below. But that way
|
|
|
|
// requires overhead for the nested mp_call's and overhead for
|
|
|
|
// the code.
|
2022-05-03 09:31:41 -04:00
|
|
|
size_t n_proxy;
|
|
|
|
const mp_obj_t *proxy = mp_obj_property_get(elem->value, &n_proxy);
|
2016-11-05 13:40:27 -04:00
|
|
|
mp_obj_t dest[2] = {base, value};
|
|
|
|
if (value == MP_OBJ_NULL) {
|
|
|
|
// delete attribute
|
2022-05-03 09:31:41 -04:00
|
|
|
if (n_proxy == 3 && proxy[2] != mp_const_none) {
|
2016-11-05 13:40:27 -04:00
|
|
|
mp_call_function_n_kw(proxy[2], 1, 0, dest);
|
|
|
|
return;
|
|
|
|
}
|
2022-05-03 09:31:41 -04:00
|
|
|
} else if (n_proxy > 1 && proxy[1] != mp_const_none) {
|
2016-11-05 13:40:27 -04:00
|
|
|
mp_call_function_n_kw(proxy[1], 2, 0, dest);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2013-10-09 18:10:10 -04:00
|
|
|
}
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2021-05-05 20:51:52 -04:00
|
|
|
mp_raise_AttributeError(MP_ERROR_TEXT("no such attribute"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2019-09-26 08:52:04 -04:00
|
|
|
mp_raise_msg_varg(&mp_type_AttributeError,
|
2023-01-02 11:45:58 -05:00
|
|
|
MP_ERROR_TEXT("can't set attribute '%q'"),
|
|
|
|
attr);
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2013-10-09 18:10:10 -04:00
|
|
|
}
|
|
|
|
|
2016-01-09 18:14:54 -05:00
|
|
|
mp_obj_t mp_getiter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf) {
|
2014-05-11 13:32:39 -04:00
|
|
|
assert(o_in);
|
2020-01-08 19:01:14 -05:00
|
|
|
const mp_obj_type_t *type = mp_obj_get_type(o_in);
|
2021-07-12 08:03:57 -04:00
|
|
|
mp_getiter_fun_t getiter = mp_type_get_getiter_slot(type);
|
2017-01-16 23:38:32 -05:00
|
|
|
// Check for native getiter which is the identity. We handle this case explicitly
|
|
|
|
// so we don't unnecessarily allocate any RAM for the iter_buf, which won't be used.
|
2021-07-06 10:08:57 -04:00
|
|
|
if (getiter == mp_identity_getiter) {
|
2017-01-16 23:38:32 -05:00
|
|
|
return o_in;
|
|
|
|
}
|
2015-02-14 20:10:13 -05:00
|
|
|
|
|
|
|
// check for native getiter (corresponds to __iter__)
|
2021-07-06 10:08:57 -04:00
|
|
|
if (getiter != NULL) {
|
|
|
|
if (iter_buf == NULL && getiter != mp_obj_instance_getiter) {
|
2019-11-13 05:05:34 -05:00
|
|
|
// if caller did not provide a buffer then allocate one on the heap
|
|
|
|
// mp_obj_instance_getiter is special, it will allocate only if needed
|
|
|
|
iter_buf = m_new_obj(mp_obj_iter_buf_t);
|
|
|
|
}
|
2021-07-06 10:08:57 -04:00
|
|
|
mp_obj_t iter = getiter(o_in, iter_buf);
|
2015-02-14 20:10:13 -05:00
|
|
|
if (iter != MP_OBJ_NULL) {
|
|
|
|
return iter;
|
2014-05-11 13:32:39 -04:00
|
|
|
}
|
2015-02-14 20:10:13 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// check for __getitem__
|
|
|
|
mp_obj_t dest[2];
|
|
|
|
mp_load_method_maybe(o_in, MP_QSTR___getitem__, dest);
|
|
|
|
if (dest[0] != MP_OBJ_NULL) {
|
|
|
|
// __getitem__ exists, create and return an iterator
|
2019-11-13 05:05:34 -05:00
|
|
|
if (iter_buf == NULL) {
|
|
|
|
// if caller did not provide a buffer then allocate one on the heap
|
|
|
|
iter_buf = m_new_obj(mp_obj_iter_buf_t);
|
|
|
|
}
|
2016-01-09 18:14:54 -05:00
|
|
|
return mp_obj_new_getitem_iter(dest, iter_buf);
|
2015-02-14 20:10:13 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// object not iterable
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("object not iterable"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_raise_TypeError_varg(
|
2021-05-04 14:40:55 -04:00
|
|
|
MP_ERROR_TEXT("'%q' object is not iterable"), mp_obj_get_type_qstr(o_in));
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
2013-10-16 15:39:12 -04:00
|
|
|
|
2014-04-17 18:19:36 -04:00
|
|
|
// may return MP_OBJ_STOP_ITERATION as an optimisation instead of raise StopIteration()
|
2014-03-26 15:27:58 -04:00
|
|
|
// may also raise StopIteration()
|
2014-03-30 08:35:08 -04:00
|
|
|
mp_obj_t mp_iternext_allow_raise(mp_obj_t o_in) {
|
2020-01-08 19:01:14 -05:00
|
|
|
const mp_obj_type_t *type = mp_obj_get_type(o_in);
|
2021-07-12 08:03:59 -04:00
|
|
|
mp_fun_1_t iternext = mp_type_get_iternext_slot(type);
|
2021-07-06 10:08:57 -04:00
|
|
|
if (iternext != NULL) {
|
2021-06-29 03:34:34 -04:00
|
|
|
MP_STATE_THREAD(stop_iteration_arg) = MP_OBJ_NULL;
|
2021-07-06 10:08:57 -04:00
|
|
|
return iternext(o_in);
|
2013-12-21 13:17:45 -05:00
|
|
|
} else {
|
2014-03-26 14:37:06 -04:00
|
|
|
// check for __next__ method
|
|
|
|
mp_obj_t dest[2];
|
2014-03-30 08:35:08 -04:00
|
|
|
mp_load_method_maybe(o_in, MP_QSTR___next__, dest);
|
2014-03-26 14:37:06 -04:00
|
|
|
if (dest[0] != MP_OBJ_NULL) {
|
|
|
|
// __next__ exists, call it and return its result
|
2014-03-30 08:35:08 -04:00
|
|
|
return mp_call_method_n_kw(0, 0, dest);
|
2014-03-26 14:37:06 -04:00
|
|
|
} else {
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("object not an iterator"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_TypeError_varg(MP_ERROR_TEXT("'%q' object is not an iterator"),
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_obj_get_type_qstr(o_in));
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-03-26 14:37:06 -04:00
|
|
|
}
|
2014-02-15 11:10:44 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-17 18:19:36 -04:00
|
|
|
// will always return MP_OBJ_STOP_ITERATION instead of raising StopIteration() (or any subclass thereof)
|
2014-03-26 15:27:58 -04:00
|
|
|
// may raise other exceptions
|
2014-03-30 08:35:08 -04:00
|
|
|
mp_obj_t mp_iternext(mp_obj_t o_in) {
|
2015-06-03 17:19:41 -04:00
|
|
|
MP_STACK_CHECK(); // enumerate, filter, map and zip can recursively call mp_iternext
|
2020-01-08 19:01:14 -05:00
|
|
|
const mp_obj_type_t *type = mp_obj_get_type(o_in);
|
2021-07-12 08:03:59 -04:00
|
|
|
mp_fun_1_t iternext = mp_type_get_iternext_slot(type);
|
2021-07-06 10:08:57 -04:00
|
|
|
if (iternext != NULL) {
|
2021-06-29 03:34:34 -04:00
|
|
|
MP_STATE_THREAD(stop_iteration_arg) = MP_OBJ_NULL;
|
2021-07-06 10:08:57 -04:00
|
|
|
return iternext(o_in);
|
2014-03-26 15:27:58 -04:00
|
|
|
} else {
|
|
|
|
// check for __next__ method
|
|
|
|
mp_obj_t dest[2];
|
2014-03-30 08:35:08 -04:00
|
|
|
mp_load_method_maybe(o_in, MP_QSTR___next__, dest);
|
2014-03-26 15:27:58 -04:00
|
|
|
if (dest[0] != MP_OBJ_NULL) {
|
|
|
|
// __next__ exists, call it and return its result
|
|
|
|
nlr_buf_t nlr;
|
|
|
|
if (nlr_push(&nlr) == 0) {
|
2014-03-30 08:35:08 -04:00
|
|
|
mp_obj_t ret = mp_call_method_n_kw(0, 0, dest);
|
2014-03-26 15:27:58 -04:00
|
|
|
nlr_pop();
|
|
|
|
return ret;
|
|
|
|
} else {
|
2021-03-15 09:57:36 -04:00
|
|
|
if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(((mp_obj_base_t *)nlr.ret_val)->type), MP_OBJ_FROM_PTR(&mp_type_StopIteration))) {
|
2021-06-29 03:34:34 -04:00
|
|
|
return mp_make_stop_iteration(mp_obj_exception_get_value(MP_OBJ_FROM_PTR(nlr.ret_val)));
|
2014-03-26 15:27:58 -04:00
|
|
|
} else {
|
2015-11-27 12:01:44 -05:00
|
|
|
nlr_jump(nlr.ret_val);
|
2014-03-26 15:27:58 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("object not an iterator"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_TypeError_varg(MP_ERROR_TEXT("'%q' object is not an iterator"),
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_obj_get_type_qstr(o_in));
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-03-26 15:27:58 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-30 16:14:55 -04:00
|
|
|
mp_vm_return_kind_t mp_resume(mp_obj_t self_in, mp_obj_t send_value, mp_obj_t throw_value, mp_obj_t *ret_val) {
|
2014-03-30 21:19:12 -04:00
|
|
|
assert((send_value != MP_OBJ_NULL) ^ (throw_value != MP_OBJ_NULL));
|
2020-01-08 19:01:14 -05:00
|
|
|
const mp_obj_type_t *type = mp_obj_get_type(self_in);
|
2014-03-30 16:14:55 -04:00
|
|
|
|
|
|
|
if (type == &mp_type_gen_instance) {
|
|
|
|
return mp_obj_gen_resume(self_in, send_value, throw_value, ret_val);
|
|
|
|
}
|
|
|
|
|
2021-07-12 08:03:59 -04:00
|
|
|
mp_fun_1_t iternext = mp_type_get_iternext_slot(type);
|
2021-07-06 10:08:57 -04:00
|
|
|
if (iternext != NULL && send_value == mp_const_none) {
|
2021-06-29 03:34:34 -04:00
|
|
|
MP_STATE_THREAD(stop_iteration_arg) = MP_OBJ_NULL;
|
2021-07-06 10:08:57 -04:00
|
|
|
mp_obj_t ret = iternext(self_in);
|
2018-02-26 23:48:09 -05:00
|
|
|
*ret_val = ret;
|
2015-05-09 17:41:34 -04:00
|
|
|
if (ret != MP_OBJ_STOP_ITERATION) {
|
2014-03-30 16:14:55 -04:00
|
|
|
return MP_VM_RETURN_YIELD;
|
|
|
|
} else {
|
2021-06-29 08:39:24 -04:00
|
|
|
// The generator is finished.
|
2021-06-29 03:34:34 -04:00
|
|
|
// This is an optimised "raise StopIteration(*ret_val)".
|
|
|
|
*ret_val = MP_STATE_THREAD(stop_iteration_arg);
|
|
|
|
if (*ret_val == MP_OBJ_NULL) {
|
|
|
|
*ret_val = mp_const_none;
|
|
|
|
}
|
2014-03-30 16:14:55 -04:00
|
|
|
return MP_VM_RETURN_NORMAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
mp_obj_t dest[3]; // Reserve slot for send() arg
|
|
|
|
|
2016-11-14 17:10:34 -05:00
|
|
|
// Python instance iterator protocol
|
2014-03-30 16:14:55 -04:00
|
|
|
if (send_value == mp_const_none) {
|
|
|
|
mp_load_method_maybe(self_in, MP_QSTR___next__, dest);
|
|
|
|
if (dest[0] != MP_OBJ_NULL) {
|
2018-09-28 08:16:56 -04:00
|
|
|
*ret_val = mp_call_method_n_kw(0, 0, dest);
|
|
|
|
return MP_VM_RETURN_YIELD;
|
2014-03-30 16:14:55 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-11-14 17:10:34 -05:00
|
|
|
// Either python instance generator protocol, or native object
|
|
|
|
// generator protocol.
|
2014-03-30 16:14:55 -04:00
|
|
|
if (send_value != MP_OBJ_NULL) {
|
|
|
|
mp_load_method(self_in, MP_QSTR_send, dest);
|
|
|
|
dest[2] = send_value;
|
|
|
|
*ret_val = mp_call_method_n_kw(1, 0, dest);
|
|
|
|
return MP_VM_RETURN_YIELD;
|
|
|
|
}
|
|
|
|
|
2017-01-16 08:09:56 -05:00
|
|
|
assert(throw_value != MP_OBJ_NULL);
|
|
|
|
{
|
2015-11-27 12:01:44 -05:00
|
|
|
if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(mp_obj_get_type(throw_value)), MP_OBJ_FROM_PTR(&mp_type_GeneratorExit))) {
|
2014-03-30 16:14:55 -04:00
|
|
|
mp_load_method_maybe(self_in, MP_QSTR_close, dest);
|
|
|
|
if (dest[0] != MP_OBJ_NULL) {
|
runtime: Add TODO for mp_resume() on handling .close().
Exceptions in .close() should be ignored (dumped to sys.stderr, not
propagated), but in uPy, they are propagated. Fix would require
nlr-wrapping .close() call, which is expensive. Bu on the other hand,
.close() is not called often, so maybe that's not too bad (depends,
if it's finally called and that causes stack overflow, there's nothing
good in that). And yet on another hand, .close() can be implemented to
catch exceptions on its side, and that should be the right choice.
2015-05-09 19:39:45 -04:00
|
|
|
// TODO: Exceptions raised in close() are not propagated,
|
|
|
|
// printed to sys.stderr
|
2014-03-30 16:14:55 -04:00
|
|
|
*ret_val = mp_call_method_n_kw(0, 0, dest);
|
|
|
|
// We assume one can't "yield" from close()
|
|
|
|
return MP_VM_RETURN_NORMAL;
|
|
|
|
}
|
2017-01-16 08:10:49 -05:00
|
|
|
} else {
|
|
|
|
mp_load_method_maybe(self_in, MP_QSTR_throw, dest);
|
|
|
|
if (dest[0] != MP_OBJ_NULL) {
|
|
|
|
dest[2] = throw_value;
|
|
|
|
*ret_val = mp_call_method_n_kw(1, 0, dest);
|
|
|
|
// If .throw() method returned, we assume it's value to yield
|
|
|
|
// - any exception would be thrown with nlr_raise().
|
|
|
|
return MP_VM_RETURN_YIELD;
|
|
|
|
}
|
2014-03-30 21:14:30 -04:00
|
|
|
}
|
|
|
|
// If there's nowhere to throw exception into, then we assume that object
|
|
|
|
// is just incapable to handle it, so any exception thrown into it
|
|
|
|
// will be propagated up. This behavior is approved by test_pep380.py
|
|
|
|
// test_delegation_of_close_to_non_generator(),
|
|
|
|
// test_delegating_throw_to_non_generator()
|
2021-04-23 15:26:42 -04:00
|
|
|
if (mp_obj_exception_match(throw_value, MP_OBJ_FROM_PTR(&mp_type_StopIteration))) {
|
|
|
|
// PEP479: if StopIteration is raised inside a generator it is replaced with RuntimeError
|
2020-03-02 06:35:22 -05:00
|
|
|
*ret_val = mp_obj_new_exception_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("generator raised StopIteration"));
|
2021-04-23 15:26:42 -04:00
|
|
|
} else {
|
|
|
|
*ret_val = mp_make_raise_obj(throw_value);
|
|
|
|
}
|
2014-03-30 21:14:30 -04:00
|
|
|
return MP_VM_RETURN_EXCEPTION;
|
2014-03-30 16:14:55 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-30 08:35:08 -04:00
|
|
|
mp_obj_t mp_make_raise_obj(mp_obj_t o) {
|
2014-02-15 11:10:44 -05:00
|
|
|
DEBUG_printf("raise %p\n", o);
|
|
|
|
if (mp_obj_is_exception_type(o)) {
|
|
|
|
// o is an exception type (it is derived from BaseException (or is BaseException))
|
|
|
|
// create and return a new exception instance by calling o
|
2014-02-15 16:05:25 -05:00
|
|
|
// TODO could have an option to disable traceback, then builtin exceptions (eg TypeError)
|
|
|
|
// could have const instances in ROM which we return here instead
|
2020-01-13 12:51:04 -05:00
|
|
|
o = mp_call_function_n_kw(o, 0, 0, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mp_obj_is_exception_instance(o)) {
|
2014-02-15 11:10:44 -05:00
|
|
|
// o is an instance of an exception, so use it as the exception
|
|
|
|
return o;
|
|
|
|
} else {
|
|
|
|
// o cannot be used as an exception, so return a type error (which will be raised by the caller)
|
2020-03-02 06:35:22 -05:00
|
|
|
return mp_obj_new_exception_msg(&mp_type_TypeError, MP_ERROR_TEXT("exceptions must derive from BaseException"));
|
2013-10-15 17:25:17 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-30 08:35:08 -04:00
|
|
|
mp_obj_t mp_import_name(qstr name, mp_obj_t fromlist, mp_obj_t level) {
|
2015-06-26 17:32:35 -04:00
|
|
|
DEBUG_printf("import name '%s' level=%d\n", qstr_str(name), MP_OBJ_SMALL_INT_VALUE(level));
|
2014-02-06 15:31:44 -05:00
|
|
|
|
2013-12-10 12:27:24 -05:00
|
|
|
// build args array
|
2013-12-21 13:17:45 -05:00
|
|
|
mp_obj_t args[5];
|
2014-01-22 09:35:10 -05:00
|
|
|
args[0] = MP_OBJ_NEW_QSTR(name);
|
2013-12-21 13:17:45 -05:00
|
|
|
args[1] = mp_const_none; // TODO should be globals
|
|
|
|
args[2] = mp_const_none; // TODO should be locals
|
2013-12-10 12:27:24 -05:00
|
|
|
args[3] = fromlist;
|
2018-10-01 01:35:10 -04:00
|
|
|
args[4] = level;
|
2013-12-10 12:27:24 -05:00
|
|
|
|
2021-04-23 15:26:42 -04:00
|
|
|
#if MICROPY_CAN_OVERRIDE_BUILTINS
|
|
|
|
// Lookup __import__ and call that if it exists
|
|
|
|
mp_obj_dict_t *bo_dict = MP_STATE_VM(mp_module_builtins_override_dict);
|
|
|
|
if (bo_dict != NULL) {
|
|
|
|
mp_map_elem_t *import = mp_map_lookup(&bo_dict->map, MP_OBJ_NEW_QSTR(MP_QSTR___import__), MP_MAP_LOOKUP);
|
|
|
|
if (import != NULL) {
|
|
|
|
return mp_call_function_n_kw(import->value, 5, 0, args);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
return mp_builtin___import__(5, args);
|
2013-12-10 12:27:24 -05:00
|
|
|
}
|
|
|
|
|
2023-06-06 19:20:47 -04:00
|
|
|
mp_obj_t __attribute__((noinline,)) mp_import_from(mp_obj_t module, qstr name) {
|
2014-02-06 15:31:44 -05:00
|
|
|
DEBUG_printf("import from %p %s\n", module, qstr_str(name));
|
|
|
|
|
2014-04-11 17:15:19 -04:00
|
|
|
mp_obj_t dest[2];
|
|
|
|
|
|
|
|
mp_load_method_maybe(module, name, dest);
|
|
|
|
|
|
|
|
if (dest[1] != MP_OBJ_NULL) {
|
|
|
|
// Hopefully we can't import bound method from an object
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_msg_varg(&mp_type_ImportError, MP_ERROR_TEXT("cannot import name %q"), name);
|
2014-04-11 17:15:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (dest[0] != MP_OBJ_NULL) {
|
|
|
|
return dest[0];
|
|
|
|
}
|
|
|
|
|
2018-02-20 02:00:44 -05:00
|
|
|
#if MICROPY_ENABLE_EXTERNAL_IMPORT
|
|
|
|
|
2014-04-11 17:15:19 -04:00
|
|
|
// See if it's a package, then can try FS import
|
2014-10-25 14:04:13 -04:00
|
|
|
if (!mp_obj_is_package(module)) {
|
2021-05-05 20:51:52 -04:00
|
|
|
mp_raise_msg_varg(&mp_type_ImportError, MP_ERROR_TEXT("cannot import name %q"), name);
|
2013-12-10 12:27:24 -05:00
|
|
|
}
|
2014-04-11 17:15:19 -04:00
|
|
|
|
|
|
|
mp_load_method_maybe(module, MP_QSTR___name__, dest);
|
2017-03-25 04:48:18 -04:00
|
|
|
size_t pkg_name_len;
|
2014-04-11 17:15:19 -04:00
|
|
|
const char *pkg_name = mp_obj_str_get_data(dest[0], &pkg_name_len);
|
2018-01-24 16:57:46 -05:00
|
|
|
|
2014-05-05 06:18:27 -04:00
|
|
|
const uint dot_name_len = pkg_name_len + 1 + qstr_len(name);
|
2017-11-26 07:37:19 -05:00
|
|
|
char *dot_name = mp_local_alloc(dot_name_len);
|
2014-04-11 17:15:19 -04:00
|
|
|
memcpy(dot_name, pkg_name, pkg_name_len);
|
|
|
|
dot_name[pkg_name_len] = '.';
|
|
|
|
memcpy(dot_name + pkg_name_len + 1, qstr_str(name), qstr_len(name));
|
2014-05-05 06:18:27 -04:00
|
|
|
qstr dot_name_q = qstr_from_strn(dot_name, dot_name_len);
|
2017-11-26 07:37:19 -05:00
|
|
|
mp_local_free(dot_name);
|
2014-04-11 17:15:19 -04:00
|
|
|
|
2018-10-01 01:22:03 -04:00
|
|
|
// For fromlist, pass sentinel "non empty" value to force returning of leaf module
|
|
|
|
return mp_import_name(dot_name_q, mp_const_true, MP_OBJ_NEW_SMALL_INT(0));
|
2018-02-20 02:00:44 -05:00
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
// Package import not supported with external imports disabled
|
2021-05-05 20:51:52 -04:00
|
|
|
mp_raise_msg_varg(&mp_type_ImportError, MP_ERROR_TEXT("cannot import name %q"), name);
|
2018-02-20 02:00:44 -05:00
|
|
|
|
|
|
|
#endif
|
2013-12-10 12:27:24 -05:00
|
|
|
}
|
|
|
|
|
2023-06-06 19:20:47 -04:00
|
|
|
void __attribute__((noinline)) mp_import_all(mp_obj_t module) {
|
2014-02-13 17:22:06 -05:00
|
|
|
DEBUG_printf("import all %p\n", module);
|
|
|
|
|
2014-04-17 21:11:19 -04:00
|
|
|
// TODO: Support __all__
|
2018-07-08 07:31:09 -04:00
|
|
|
mp_map_t *map = &mp_obj_module_get_globals(module)->map;
|
2017-02-15 23:32:34 -05:00
|
|
|
for (size_t i = 0; i < map->alloc; i++) {
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_map_slot_is_filled(map, i)) {
|
2018-10-25 16:48:03 -04:00
|
|
|
// Entry in module global scope may be generated programmatically
|
|
|
|
// (and thus be not a qstr for longer names). Avoid turning it in
|
|
|
|
// qstr if it has '_' and was used exactly to save memory.
|
|
|
|
const char *name = mp_obj_str_get_str(map->table[i].key);
|
|
|
|
if (*name != '_') {
|
|
|
|
qstr qname = mp_obj_str_get_qstr(map->table[i].key);
|
|
|
|
mp_store_name(qname, map->table[i].value);
|
2014-04-17 21:11:19 -04:00
|
|
|
}
|
2014-02-13 17:22:06 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-12-18 07:35:44 -05:00
|
|
|
#if MICROPY_ENABLE_COMPILER
|
|
|
|
|
2014-10-05 15:13:34 -04:00
|
|
|
mp_obj_t mp_parse_compile_execute(mp_lexer_t *lex, mp_parse_input_kind_t parse_input_kind, mp_obj_dict_t *globals, mp_obj_dict_t *locals) {
|
2015-02-07 13:33:58 -05:00
|
|
|
// save context
|
|
|
|
mp_obj_dict_t *volatile old_globals = mp_globals_get();
|
|
|
|
mp_obj_dict_t *volatile old_locals = mp_locals_get();
|
2014-10-05 15:13:34 -04:00
|
|
|
|
2015-02-07 13:33:58 -05:00
|
|
|
// set new context
|
2014-10-05 15:13:34 -04:00
|
|
|
mp_globals_set(globals);
|
|
|
|
mp_locals_set(locals);
|
|
|
|
|
|
|
|
nlr_buf_t nlr;
|
|
|
|
if (nlr_push(&nlr) == 0) {
|
2015-02-07 13:33:58 -05:00
|
|
|
qstr source_name = lex->source_name;
|
2015-09-23 05:50:43 -04:00
|
|
|
mp_parse_tree_t parse_tree = mp_parse(lex, parse_input_kind);
|
2020-08-20 20:30:09 -04:00
|
|
|
mp_obj_t module_fun = mp_compile(&parse_tree, source_name, parse_input_kind == MP_PARSE_SINGLE_INPUT);
|
2015-02-07 13:33:58 -05:00
|
|
|
|
|
|
|
mp_obj_t ret;
|
|
|
|
if (MICROPY_PY_BUILTINS_COMPILE && globals == NULL) {
|
|
|
|
// for compile only, return value is the module function
|
|
|
|
ret = module_fun;
|
|
|
|
} else {
|
|
|
|
// execute module function and get return value
|
|
|
|
ret = mp_call_function_0(module_fun);
|
|
|
|
}
|
|
|
|
|
|
|
|
// finish nlr block, restore context and return value
|
2014-10-05 15:13:34 -04:00
|
|
|
nlr_pop();
|
|
|
|
mp_globals_set(old_globals);
|
|
|
|
mp_locals_set(old_locals);
|
|
|
|
return ret;
|
|
|
|
} else {
|
|
|
|
// exception; restore context and re-raise same exception
|
|
|
|
mp_globals_set(old_globals);
|
|
|
|
mp_locals_set(old_locals);
|
2015-11-27 12:01:44 -05:00
|
|
|
nlr_jump(nlr.ret_val);
|
2014-10-05 15:13:34 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-12-18 07:35:44 -05:00
|
|
|
#endif // MICROPY_ENABLE_COMPILER
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void m_malloc_fail(size_t num_bytes) {
|
2016-01-08 08:49:58 -05:00
|
|
|
DEBUG_printf("memory allocation failed, allocating %u bytes\n", (uint)num_bytes);
|
2014-10-09 11:44:43 -04:00
|
|
|
#if MICROPY_ENABLE_GC
|
2017-06-30 19:23:29 -04:00
|
|
|
if (gc_is_locked()) {
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_msg(&mp_type_MemoryError, MP_ERROR_TEXT("memory allocation failed, heap is locked"));
|
2014-10-07 03:50:20 -04:00
|
|
|
}
|
2017-06-30 19:23:29 -04:00
|
|
|
#endif
|
2017-08-25 22:17:07 -04:00
|
|
|
mp_raise_msg_varg(&mp_type_MemoryError,
|
2020-03-02 06:35:22 -05:00
|
|
|
MP_ERROR_TEXT("memory allocation failed, allocating %u bytes"), (uint)num_bytes);
|
2014-04-04 06:52:59 -04:00
|
|
|
}
|
|
|
|
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NONE
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_type(const mp_obj_type_t *exc_type) {
|
2021-04-21 22:13:58 -04:00
|
|
|
nlr_raise(mp_obj_new_exception(exc_type));
|
|
|
|
}
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_ValueError_no_msg(void) {
|
2021-04-21 22:13:58 -04:00
|
|
|
mp_raise_type(&mp_type_ValueError);
|
|
|
|
}
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_TypeError_no_msg(void) {
|
2021-04-21 22:13:58 -04:00
|
|
|
mp_raise_type(&mp_type_TypeError);
|
|
|
|
}
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_NotImplementedError_no_msg(void) {
|
2021-04-21 22:13:58 -04:00
|
|
|
mp_raise_type(&mp_type_NotImplementedError);
|
|
|
|
}
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_msg(const mp_obj_type_t *exc_type, const compressed_string_t *msg) {
|
2017-02-24 09:57:25 -05:00
|
|
|
if (msg == NULL) {
|
|
|
|
nlr_raise(mp_obj_new_exception(exc_type));
|
|
|
|
} else {
|
|
|
|
nlr_raise(mp_obj_new_exception_msg(exc_type, msg));
|
|
|
|
}
|
2017-02-24 09:13:07 -05:00
|
|
|
}
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_msg_vlist(const mp_obj_type_t *exc_type, const compressed_string_t *fmt, va_list argptr) {
|
2020-08-01 14:05:30 -04:00
|
|
|
mp_obj_t exception = mp_obj_new_exception_msg_vlist(exc_type, fmt, argptr);
|
|
|
|
nlr_raise(exception);
|
|
|
|
}
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_msg_varg(const mp_obj_type_t *exc_type, const compressed_string_t *fmt, ...) {
|
2017-02-24 09:13:07 -05:00
|
|
|
va_list argptr;
|
|
|
|
va_start(argptr,fmt);
|
2020-08-01 14:05:30 -04:00
|
|
|
mp_raise_msg_vlist(exc_type, fmt, argptr);
|
2017-02-24 09:13:07 -05:00
|
|
|
va_end(argptr);
|
|
|
|
}
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_msg_str(const mp_obj_type_t *exc_type, const char *msg) {
|
2021-04-23 15:26:42 -04:00
|
|
|
if (msg == NULL) {
|
|
|
|
nlr_raise(mp_obj_new_exception(exc_type));
|
|
|
|
} else {
|
|
|
|
nlr_raise(mp_obj_new_exception_msg_str(exc_type, msg));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_AttributeError(const compressed_string_t *msg) {
|
2017-02-24 09:13:07 -05:00
|
|
|
mp_raise_msg(&mp_type_AttributeError, msg);
|
|
|
|
}
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_RuntimeError(const compressed_string_t *msg) {
|
2017-02-24 09:13:07 -05:00
|
|
|
mp_raise_msg(&mp_type_RuntimeError, msg);
|
|
|
|
}
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_ImportError(const compressed_string_t *msg) {
|
2017-02-24 09:13:07 -05:00
|
|
|
mp_raise_msg(&mp_type_ImportError, msg);
|
|
|
|
}
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_IndexError(const compressed_string_t *msg) {
|
2017-02-24 09:13:07 -05:00
|
|
|
mp_raise_msg(&mp_type_IndexError, msg);
|
2016-08-12 14:26:12 -04:00
|
|
|
}
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_IndexError_varg(const compressed_string_t *fmt, ...) {
|
2020-08-01 13:14:55 -04:00
|
|
|
va_list argptr;
|
|
|
|
va_start(argptr,fmt);
|
2020-08-01 14:05:30 -04:00
|
|
|
mp_raise_msg_vlist(&mp_type_IndexError, fmt, argptr);
|
2020-08-01 13:14:55 -04:00
|
|
|
va_end(argptr);
|
|
|
|
}
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_ValueError(const compressed_string_t *msg) {
|
2016-08-12 14:26:12 -04:00
|
|
|
mp_raise_msg(&mp_type_ValueError, msg);
|
|
|
|
}
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_ValueError_varg(const compressed_string_t *fmt, ...) {
|
2017-02-24 09:13:07 -05:00
|
|
|
va_list argptr;
|
|
|
|
va_start(argptr,fmt);
|
2020-08-01 14:05:30 -04:00
|
|
|
mp_raise_msg_vlist(&mp_type_ValueError, fmt, argptr);
|
2017-02-24 09:13:07 -05:00
|
|
|
va_end(argptr);
|
|
|
|
}
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_TypeError(const compressed_string_t *msg) {
|
2016-08-12 14:26:12 -04:00
|
|
|
mp_raise_msg(&mp_type_TypeError, msg);
|
|
|
|
}
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_TypeError_varg(const compressed_string_t *fmt, ...) {
|
2017-02-24 09:13:07 -05:00
|
|
|
va_list argptr;
|
|
|
|
va_start(argptr,fmt);
|
2020-08-01 14:05:30 -04:00
|
|
|
mp_raise_msg_vlist(&mp_type_TypeError, fmt, argptr);
|
2017-02-24 09:13:07 -05:00
|
|
|
va_end(argptr);
|
2016-10-06 22:31:59 -04:00
|
|
|
}
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_OSError_msg(const compressed_string_t *msg) {
|
2018-11-20 23:04:58 -05:00
|
|
|
mp_raise_msg(&mp_type_OSError, msg);
|
|
|
|
}
|
2017-08-25 22:17:07 -04:00
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_OSError_errno_str(int errno_, mp_obj_t str) {
|
2020-02-04 16:19:40 -05:00
|
|
|
mp_obj_t args[2] = {
|
|
|
|
MP_OBJ_NEW_SMALL_INT(errno_),
|
|
|
|
str,
|
|
|
|
};
|
|
|
|
nlr_raise(mp_obj_new_exception_args(&mp_type_OSError, 2, args));
|
2020-02-04 13:32:39 -05:00
|
|
|
}
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_OSError_msg_varg(const compressed_string_t *fmt, ...) {
|
2018-12-27 00:04:04 -05:00
|
|
|
va_list argptr;
|
|
|
|
va_start(argptr,fmt);
|
2020-08-01 14:05:30 -04:00
|
|
|
mp_raise_msg_vlist(&mp_type_OSError, fmt, argptr);
|
2018-12-27 00:04:04 -05:00
|
|
|
va_end(argptr);
|
|
|
|
}
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_ConnectionError(const compressed_string_t *msg) {
|
2020-08-21 14:00:02 -04:00
|
|
|
mp_raise_msg(&mp_type_ConnectionError, msg);
|
|
|
|
}
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_BrokenPipeError(void) {
|
Merge tag 'v1.17' into merge-1.17
F-strings, new machine.I2S class, ESP32-C3 support and LEGO_HUB_NO6 board
This release of MicroPython adds support for f-strings (PEP-498), with a
few limitations compared to normal Python. F-strings are essentially
syntactic sugar for "".format() and make formatting strings a lot more
convenient. Other improvements to the core runtime include pretty printing
OSError when it has two arguments (an errno code and a string), scheduling
of KeyboardInterrupt on the main thread, and support for a single argument
to the optimised form of StopIteration.
In the machine module a new I2S class has been added, with support for
esp32 and stm32 ports. This provides a consistent API for transmit and
receive of audio data in blocking, non-blocking and asyncio-based
operation. Also, the json module has support for the "separators" argument
in the dump and dumps functions, and framebuf now includes a way to blit
between frame buffers of different formats using a palette. A new,
portable machine.bitstream function is also added which can output a stream
of bits with configurable timing, and is used as the basis for driving
WS2812 LEDs in a common way across ports.
There has been some restructuring of the repository directory layout, with
all third-party code now in the lib/ directory. And a new top-level
directory shared/ has been added with first-party code that was previously
in lib/ moved there.
The docs have seen further improvement with enhancements and additions to
the rp2 parts, as well as a new quick reference for the zephyr port.
The terms master/slave have been replaced with controller/peripheral,
mainly relating to I2C and SPI usage. And u-module references have been
replaced with just the module name without the u-prefix to help clear up
the intended usage of modules in MicroPython.
For the esp8266 and esp32 ports, hidden networks are now included in WLAN
scan results. On the esp32 the RMT class is enhanced with idle_level and
write_pulses modes. There is initial support for ESP32-C3 chips with
GENERIC_C3 and GENERIC_C3_USB boards.
The javascript port has had its Makefile and garbage collector
implementation reworked so it compiles and runs with latest the Emscripten
using asyncify.
The mimxrt port sees the addition of hardware I2C and SPI support, as well
as some additional methods to the machine module. There is also support
for Hyperflash chips.
The nrf port now has full VFS storage support, enables source-line on
traceback, and has .mpy features consistent with other ports.
For the rp2 port there is now more configurability for boards, and more
boards added.
The stm32 port has a new LEGO_HUB_NO6 board definition with detailed
information how to get this LEGO Hub running stock MicroPython. There is
also now support to change the CPU frequency on STM32WB MCUs. And USBD_xxx
descriptor options have been renamed to MICROPY_HW_USB_xxx.
Thanks to everyone who contributed to this release: Amir Gonnen, Andrew
Scheller, Bryan Tong Minh, Chris Wilson, Damien George, Daniel Mizyrycki,
David Lechner, David P, Fernando, finefoot, Frank Pilhofer, Glenn Ruben
Bakke, iabdalkader, Jeff Epler, Jim Mussared, Jonathan Hogg, Josh Klar,
Josh Lloyd, Julia Hathaway, Krzysztof Adamski, Matúš Olekšák, Michael
Weiss, Michel Bouwmans, Mike Causer, Mike Teachman, Ned Konz, NitiKaur,
oclyke, Patrick Van Oosterwijck, Peter Hinch, Peter Züger, Philipp
Ebensberger, robert-hh, Roberto Colistete Jr, Sashkoiv, Seon Rozenblum,
Tobias Thyrrestrup, Tom McDermott, Will Sowerbutts, Yonatan Goldschmidt.
What follows is a detailed list of changes, generated from the git commit
history, and organised into sections.
Main components
===============
all:
- fix signed shifts and NULL access errors from -fsanitize=undefined
- update to point to files in new shared/ directory
py core:
- mpstate: make exceptions thread-local
- mpstate: schedule KeyboardInterrupt on main thread
- mperrno: add MP_ECANCELED error code
- makeqstrdefs.py: don't include .h files explicitly in preprocessing
- mark unused arguments from bytecode decoding macros
- objexcept: pretty print OSError also when it has 2 arguments
- makeversionhdr: add --tags arg to git describe
- vm: simplify handling of MP_OBJ_STOP_ITERATION in yield-from opcode
- objexcept: make mp_obj_exception_get_value support subclassed excs
- support single argument to optimised MP_OBJ_STOP_ITERATION
- introduce and use mp_raise_type_arg helper
- modsys: optimise sys.exit for code size by using exception helpers
- objexcept: make mp_obj_new_exception_arg1 inline
- obj: fix formatting of comment for mp_obj_is_integer
- emitnative: reuse need_reg_all func in need_stack_settled
- emitnative: ensure stack settling is safe mid-branch
- runtime: fix bool unary op for subclasses of native types
- builtinimport: fix condition for including do_execute_raw_code()
- mkrules: automatically build mpy-cross if it doesn't exist
- implement partial PEP-498 (f-string) support
- lexer: clear fstring_args vstr on lexer free
- mkrules.mk: do submodule sync in "make submodules"
extmod:
- btstack: add missing call to mp_bluetooth_hci_uart_deinit
- btstack: check that BLE is active before performing operations
- uasyncio: get addr and bind server socket before creating task
- axtls-include: add axtls_os_port.h to customise axTLS
- update for move of crypto-algorithms, re1.5, uzlib to lib
- moduselect: conditionally compile select()
- nimble: fix leak in l2cap_send if send-while-stalled
- btstack/btstack.mk: use -Wno-implicit-fallthrough, not =0
- utime: always invoke mp_hal_delay_ms when >= to 0ms
- modbluetooth: clamp MTU values to 32->UINT16_MAX
- nimble: allow modbluetooth binding to hook "sent HCI packet"
- nimble: add "memory stalling" mechanism for l2cap_send
- uasyncio: in open_connection use address info in socket creation
- modujson: add support for dump/dumps separators keyword-argument
- modlwip: fix close and clean up of UDP and raw sockets
- modbluetooth: add send_update arg to gatts_write
- add machine.bitstream
- modframebuf: enable blit between different formats via a palette
lib:
- tinyusb: update to version 0.10.1
- pico-sdk: update to version 1.2.0
- utils/stdout_helpers: make mp_hal_stdout_tx_strn_cooked efficient
- axtls: switch to repo at micropython/axtls
- axtls: update to latest axtls 2.1.5 wih additional commits
- re1.5: move re1.5 code from extmod to lib
- uzlib: move uzlib code from extmod to lib
- crypto-algorithms: move crypto-algorithms code from extmod to lib
- update README's based on contents of these dirs
drivers:
- neopixel: add common machine.bitstream-based neopixel module
- neopixel: optimize fill() for speed
- neopixel: reduce code size of driver
- cyw43: fix cyw43_deinit so it can be called many times in a row
- cyw43: make wifi join fail if interface is not active
mpy-cross:
- disable stack check when building with Emscripten
Support components
==================
docs:
- library: document new esp32.RMT features and fix wait_done
- library: warn that ustruct doesn't handle spaces in format strings
- esp8266/tutorial: change flash mode from dio to dout
- replace master/slave with controller/peripheral in I2C and SPI
- rp2: enhance quickref and change image to Pico pinout
- rp2: update general section to give a brief technical overview
- library/utime.rst: clarify behaviour and precision of sleep ms/us
- library/uasyncio.rst: document stream readexactly() method
- library/machine.I2S.rst: fix use of sd pin in examples
- zephyr: add quick reference for the Zephyr port
- library/zephyr: add libraries specific to the Zephyr port
- templates: add unix and zephyr quickref links to top-index
- rename ufoo.rst to foo.rst
- replace ufoo with foo in all docs
- library/index.rst: clarify module naming and purpose
- library/builtins.rst: add module title
- library/network.rst: simplify socket import
- add docs for machine.bitstream and neopixel module
- library: fix usage of :term: for frozen module reference
- esp8266: use monospace for software tools
- reference: mention that slicing a memoryview causes allocation
examples: no changes specific to this component/port
tests:
- extmod: make uasyncio_heaplock test more deterministic
- cpydiff/modules_struct_whitespace_in_format: run black
- extmod/ujson: add tests for dump/dumps separators argument
- run-multitests.py: add broadcast and wait facility
- multi_bluetooth/ble_subscribe.py: add test for subscription
- extmod/vfs_fat_finaliser.py: ensure alloc at never-used GC blocks
- basics: split f-string debug printing to separate file with .exp
- pybnative: make while.py test run on boards without pyb.delay
tools:
- autobuild: add scripts to build release firmware
- remove obsolete build-stm-latest.sh script
- ci.sh: run apt-get update in ci_powerpc_setup
- makemanifest.py: allow passing flags to mpy-tool.py
- autobuild: add mimxrt port to build scripts for nightly builds
- pyboard.py: add cmd-line option to make soft reset configurable
- mpremote: swap order of PID and VID in connect-list output
- ci.sh: build unix dev variant as part of macOS CI
- ci.sh: build GENERIC_C3 board as part of esp32 CI
- autobuild: use separate IDF version to build newer esp32 SoCs
- autobuild: add FeatherS2 and TinyS2 to esp32 auto builds
- mpremote: add seek whence for mounted files
- mpremote: raise OSError on unsupported RemoteFile.seek
- autobuild: add the MIMXRT1050_EVKB board to the daily builds
- ci.sh: add mpy-cross build to nrf port
- codeformat.py: include ports/nrf/modules/nrf in code formatting
- gen-cpydiff.py: don't rename foo to ufoo in diff output
- autobuild: add auto build for Silicognition wESP32
- mpremote: fix connect-list in case VID/PID are None
- mpremote: add "devs" shortcut for "connect list"
- mpremote: remove support for pyb.USB_VCP in/out specialisation
- autobuild: don't use "-B" for make, it's already a fresh build
- pyboard.py: move --no-exclusive/--soft-reset out of mutex group
- pyboard.py: make --no-follow use same variable as --follow
- pyboard.py: add --exclusive to match --no-exclusive
- pyboard.py: make --no-soft-reset consistent with other args
- uncrustify: force 1 newline at end of file
- mpremote: bump version to 0.0.6
CI:
- workflows: add workflow to build and test javascript port
- workflows: switch from Coveralls to Codecov
- workflows: switch from lcov to gcov
- workflows: add workflow to build and test unix dev variant
The ports
=========
all ports:
- use common mp_hal_stdout_tx_strn_cooked instead of custom one
- update for move of crypto-algorithms, uzlib to lib
- rename USBD_VID/PID config macros to MICROPY_HW_USB_VID/PID
bare-arm port: no changes specific to this component/port
cc3200 port: no changes specific to this component/port
esp8266 port:
- add __len__ to NeoPixel driver to support iterating
- Makefile: add more libm files to build
- include hidden networks in WLAN.scan results
- replace esp.neopixel with machine.bitstream
- remove dead code for end_ticks in machine_bitstream
esp32 port:
- boards/sdkconfig.base: disable MEMPROT_FEATURE to alloc from IRAM
- add __len__ to NeoPixel driver to support iterating
- main: allow MICROPY_DIR to be overridden
- esp32_rmt: fix RMT looping in newer IDF versions
- esp32_rmt: enhance RMT with idle_level and write_pulses modes
- add new machine.I2S class for I2S protocol support
- machine_spi: calculate actual attained baudrate
- machine_hw_spi: use a 2 item SPI queue for long transfers
- machine_dac: add MICROPY_PY_MACHINE_DAC option, enable by default
- machine_i2s: add MICROPY_PY_MACHINE_I2S option, enable by default
- fix use of mp_int_t, size_t and uintptr_t
- add initial support for ESP32C3 SoCs
- boards/GENERIC_C3: add generic C3-based board
- modmachine: release the GIL in machine.idle()
- mphalport: always yield at least once in delay_ms
- machine_uart: add flow kw-arg to enable hardware flow control
- boards: add Silicognition wESP32 board configuration
- mpconfigport.h: enable reverse and inplace special methods
- include hidden networks in WLAN.scan results
- makeimg.py: get bootloader and partition offset from sdkconfig
- enable MICROPY_PY_FSTRINGS by default
- machine_hw_spi: release GIL during transfers
- machine_pin: make check for non-output pins respect chip variant
- replace esp.neopixel with machine.bitstream
- remove dead code for end_ticks in machine_bitstream
- boards: add GENERIC_C3_USB board with USB serial/JTAG support
javascript port:
- rework Makefile and GC so it works with latest Emscripten
- Makefile: suppress compiler errors from array bounds
- Makefile: change variable to EXPORTED_RUNTIME_METHODS
mimxrt port:
- move calc_weekday helper function to timeutils
- machine_spi: add the SPI class to the machine module
- moduos: seed the PRNG on boot using the TRNG
- boards: set vfs partition start to 1 MBbyte
- main: skip running main.py if boot.py failed
- main: extend the information returned by help()
- mimxrt_flash: remove commented-out code
- modmachine: add a few minor methods to the machine module
- machine_led: use mp_raise_msg_varg helper
- machine_i2c: add hardware-based machine.I2C to machine module
- add support for Hyperflash chips
- boards: add support for the MIMXRT1050_EVKB board
- machine_pin: implement ioctl for Pin
minimal port:
- Makefile: add support for building with user C modules
nrf port:
- modules: replace master/slave with controller/peripheral in SPI
- boards/common.ld: calculate unused flash region
- modules/nrf: add new nrf module with flash block device
- drivers: add support for using flash block device with SoftDevice
- mpconfigport.h: expose nrf module when MICROPY_PY_NRF is set
- README: update README.md to reflect internal file systems
- mpconfigport.h: tune FAT FS configuration
- Makefile: add _fs_size linker script override from make
- modules/uos: allow a board to configure MICROPY_VFS_FAT/LFS1/LFS2
- mpconfigport.h: enable MICROPY_PY_IO_FILEIO when an FS is enabled
- qstrdefsport.h: add entries for in-built FS mount points
- main: add auto mount and auto format hook for internal flash FS
- boards: enable needed features for FAT/LFS1/LFS2
- facilitate use of freeze manifest
- boards: set FROZEN_MANIFEST blank when SD present on nrf51 targets
- modules/scripts: add file system formatting script
- Makefile: set default manifest file for all targets
- mphalport: add dummy function for mp_hal_time_ns()
- boards: enable MICROPY_VFS_LFS2 for all target boards
- modules/uos: add ilistdir to uos module
- modules/nrf: add function to enable/disable DCDC
- enable source line on tracebacks
- set .mpy features consistent with documentation and other ports
pic16bit port: no changes specific to this component/port
powerpc port: no changes specific to this component/port
qemu-arm port: no changes specific to this component/port
rp2 port:
- use 0=Monday datetime convention in RTC
- machine_rtc: in RTC.datetime, compute weekday automatically
- CMakeLists.txt: suppress compiler errors for pico-sdk and tinyusb
- tusb_config.h: set CFG_TUD_CDC_EP_BUFSIZE to 256
- machine_uart: add hardware flow control support
- machine_uart: allow overriding default machine UART pins
- machine_i2c: allow boards to configure I2C pins using new macros
- machine_spi: allow boards to configure SPI pins using new macros
- machine_uart: fix poll ioctl to also check hardware FIFO
- machine_uart: fix read when FIFO has chars but ringbuf doesn't
- tusb_port: allow boards to configure USB VID and PID
- boards/ADAFRUIT_FEATHER_RP2040: configure custom VID/PID
- boards/ADAFRUIT_FEATHER_RP2040: configure I2C/SPI default pins
- boards/SPARKFUN_PROMICRO: configure UART/I2C/SPI default pins
- boards/SPARKFUN_THINGPLUS: configure I2C/SPI default pins
- boards: add Adafruit ItsyBitsy RP2040
- boards: add Adafruit QT Py RP2040
- boards: add Pimoroni Pico LiPo 4MB
- boards: add Pimoroni Pico LiPo 16MB
- boards: add Pimoroni Tiny 2040
- CMakeLists.txt: allow a board's cmake to set the manifest path
- enable MICROPY_PY_FSTRINGS by default
- Makefile: add "submodules" target, to match other ports
- rp2_flash: disable IRQs while calling flash_erase/program
- CMakeLists.txt: add option to enable double tap reset to bootrom
- mpconfigport.h: allow boards to add root pointers
samd port:
- add support for building with user C modules
stm32 port:
- softtimer: add soft_timer_reinsert() helper function
- mpbthciport: change from systick to soft-timer for BT scheduling
- provide a custom BTstack runloop that integrates with soft timer
- usb: make irq's default trigger enable all events
- boardctrl: skip running main.py if boot.py had an error
- sdio: fix undefined reference to DMA stream on H7
- dma: add DMAMUX configuration for H7 to fix dma_nohal_init
- main: call mp_deinit() at end of main
- adc: allow using ADC12 and ADC3 for H7
- adc: define the ADC instance used for internal channels
- adc: simplify and generalise how pin_adcX table is defined
- add new machine.I2S class for I2S protocol support
- boards/NUCLEO_F446RE: fix I2C1 pin assignment to match datasheet
- replace master/slave with controller/peripheral in I2C and SPI
- systick: always POLL_HOOK when delaying for milliseconds
- sdram: make SDRAM test cache aware, and optional failure with msg
- boards/NUCLEO_F446RE: enable CAN bus support
- boards: add support for SparkFun STM32 MicroMod Processor board
- uart: fix LPUART1 baudrate set/get
- uart: support low baudrates on LPUART1
- boards/STM32F429DISC: set correct UART2 pins and add UART3/6
- boards/NUCLEO_F439ZI: add board definition for NUCLEO_F439ZI
- boards/LEGO_HUB_NO6: add board definition for LEGO_HUB_NO6
- Makefile: update to only pull in used Bluetooth library
- README.md: update supported MCUs, and submodule and mboot use
- usbd_desc: rename USBD_xxx descriptor opts to MICROPY_HW_USB_xxx
- usbd_cdc_interface: rename USBD_CDC_xx opts to MICROPY_HW_USB_xx
- powerctrl: support changing frequency on WB MCUs
- boards/NUCLEO_H743ZI2: add modified version of NUCLEO_H743ZI
- mbedtls: fix compile warning about uninitialized val
- enable MICROPY_PY_FSTRINGS by default
- add implementation of machine.bitstream
- Makefile: allow GIT_SUBMODULES and LIBS to be extended
- stm32_it: support TIM17 IRQs on WB MCUs
- disable computed goto on constrained boards
- storage: make extended-block-device more configurable
- boards/LEGO_HUB_NO6: change SPI flash storage to use hardware SPI
- boards/LEGO_HUB_NO6: skip first 1MiB of SPI flash for storage
- boards/LEGO_HUB_NO6: add make commands to backup/restore firmware
teensy port: no changes specific to this component/port
unix port:
- modffi: add option to lock GC in callback, and cfun access
- Makefile: add back LIB_SRC_C to list of object files
- variants: enable help and help("modules") on standard and dev
- Makefile: disable error compression on arm-linux-gnueabi-gcc
windows port:
- Makefile: add .exe extension to executables name
- appveyor: update to VS 2017 and use Python 3.8 for build/test
zephyr port:
- machine_spi: add support for hardware SPI
2021-10-14 15:38:41 -04:00
|
|
|
mp_raise_type_arg(&mp_type_BrokenPipeError, MP_OBJ_NEW_SMALL_INT(MP_EPIPE));
|
2020-08-18 20:06:59 -04:00
|
|
|
}
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_NotImplementedError(const compressed_string_t *msg) {
|
2016-08-12 14:26:12 -04:00
|
|
|
mp_raise_msg(&mp_type_NotImplementedError, msg);
|
2014-06-07 16:22:41 -04:00
|
|
|
}
|
2017-11-20 01:29:58 -05:00
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_NotImplementedError_varg(const compressed_string_t *fmt, ...) {
|
2019-04-09 14:36:10 -04:00
|
|
|
va_list argptr;
|
|
|
|
va_start(argptr,fmt);
|
2020-08-01 14:05:30 -04:00
|
|
|
mp_raise_msg_vlist(&mp_type_NotImplementedError, fmt, argptr);
|
2019-04-09 14:36:10 -04:00
|
|
|
va_end(argptr);
|
|
|
|
}
|
|
|
|
|
Merge tag 'v1.17' into merge-1.17
F-strings, new machine.I2S class, ESP32-C3 support and LEGO_HUB_NO6 board
This release of MicroPython adds support for f-strings (PEP-498), with a
few limitations compared to normal Python. F-strings are essentially
syntactic sugar for "".format() and make formatting strings a lot more
convenient. Other improvements to the core runtime include pretty printing
OSError when it has two arguments (an errno code and a string), scheduling
of KeyboardInterrupt on the main thread, and support for a single argument
to the optimised form of StopIteration.
In the machine module a new I2S class has been added, with support for
esp32 and stm32 ports. This provides a consistent API for transmit and
receive of audio data in blocking, non-blocking and asyncio-based
operation. Also, the json module has support for the "separators" argument
in the dump and dumps functions, and framebuf now includes a way to blit
between frame buffers of different formats using a palette. A new,
portable machine.bitstream function is also added which can output a stream
of bits with configurable timing, and is used as the basis for driving
WS2812 LEDs in a common way across ports.
There has been some restructuring of the repository directory layout, with
all third-party code now in the lib/ directory. And a new top-level
directory shared/ has been added with first-party code that was previously
in lib/ moved there.
The docs have seen further improvement with enhancements and additions to
the rp2 parts, as well as a new quick reference for the zephyr port.
The terms master/slave have been replaced with controller/peripheral,
mainly relating to I2C and SPI usage. And u-module references have been
replaced with just the module name without the u-prefix to help clear up
the intended usage of modules in MicroPython.
For the esp8266 and esp32 ports, hidden networks are now included in WLAN
scan results. On the esp32 the RMT class is enhanced with idle_level and
write_pulses modes. There is initial support for ESP32-C3 chips with
GENERIC_C3 and GENERIC_C3_USB boards.
The javascript port has had its Makefile and garbage collector
implementation reworked so it compiles and runs with latest the Emscripten
using asyncify.
The mimxrt port sees the addition of hardware I2C and SPI support, as well
as some additional methods to the machine module. There is also support
for Hyperflash chips.
The nrf port now has full VFS storage support, enables source-line on
traceback, and has .mpy features consistent with other ports.
For the rp2 port there is now more configurability for boards, and more
boards added.
The stm32 port has a new LEGO_HUB_NO6 board definition with detailed
information how to get this LEGO Hub running stock MicroPython. There is
also now support to change the CPU frequency on STM32WB MCUs. And USBD_xxx
descriptor options have been renamed to MICROPY_HW_USB_xxx.
Thanks to everyone who contributed to this release: Amir Gonnen, Andrew
Scheller, Bryan Tong Minh, Chris Wilson, Damien George, Daniel Mizyrycki,
David Lechner, David P, Fernando, finefoot, Frank Pilhofer, Glenn Ruben
Bakke, iabdalkader, Jeff Epler, Jim Mussared, Jonathan Hogg, Josh Klar,
Josh Lloyd, Julia Hathaway, Krzysztof Adamski, Matúš Olekšák, Michael
Weiss, Michel Bouwmans, Mike Causer, Mike Teachman, Ned Konz, NitiKaur,
oclyke, Patrick Van Oosterwijck, Peter Hinch, Peter Züger, Philipp
Ebensberger, robert-hh, Roberto Colistete Jr, Sashkoiv, Seon Rozenblum,
Tobias Thyrrestrup, Tom McDermott, Will Sowerbutts, Yonatan Goldschmidt.
What follows is a detailed list of changes, generated from the git commit
history, and organised into sections.
Main components
===============
all:
- fix signed shifts and NULL access errors from -fsanitize=undefined
- update to point to files in new shared/ directory
py core:
- mpstate: make exceptions thread-local
- mpstate: schedule KeyboardInterrupt on main thread
- mperrno: add MP_ECANCELED error code
- makeqstrdefs.py: don't include .h files explicitly in preprocessing
- mark unused arguments from bytecode decoding macros
- objexcept: pretty print OSError also when it has 2 arguments
- makeversionhdr: add --tags arg to git describe
- vm: simplify handling of MP_OBJ_STOP_ITERATION in yield-from opcode
- objexcept: make mp_obj_exception_get_value support subclassed excs
- support single argument to optimised MP_OBJ_STOP_ITERATION
- introduce and use mp_raise_type_arg helper
- modsys: optimise sys.exit for code size by using exception helpers
- objexcept: make mp_obj_new_exception_arg1 inline
- obj: fix formatting of comment for mp_obj_is_integer
- emitnative: reuse need_reg_all func in need_stack_settled
- emitnative: ensure stack settling is safe mid-branch
- runtime: fix bool unary op for subclasses of native types
- builtinimport: fix condition for including do_execute_raw_code()
- mkrules: automatically build mpy-cross if it doesn't exist
- implement partial PEP-498 (f-string) support
- lexer: clear fstring_args vstr on lexer free
- mkrules.mk: do submodule sync in "make submodules"
extmod:
- btstack: add missing call to mp_bluetooth_hci_uart_deinit
- btstack: check that BLE is active before performing operations
- uasyncio: get addr and bind server socket before creating task
- axtls-include: add axtls_os_port.h to customise axTLS
- update for move of crypto-algorithms, re1.5, uzlib to lib
- moduselect: conditionally compile select()
- nimble: fix leak in l2cap_send if send-while-stalled
- btstack/btstack.mk: use -Wno-implicit-fallthrough, not =0
- utime: always invoke mp_hal_delay_ms when >= to 0ms
- modbluetooth: clamp MTU values to 32->UINT16_MAX
- nimble: allow modbluetooth binding to hook "sent HCI packet"
- nimble: add "memory stalling" mechanism for l2cap_send
- uasyncio: in open_connection use address info in socket creation
- modujson: add support for dump/dumps separators keyword-argument
- modlwip: fix close and clean up of UDP and raw sockets
- modbluetooth: add send_update arg to gatts_write
- add machine.bitstream
- modframebuf: enable blit between different formats via a palette
lib:
- tinyusb: update to version 0.10.1
- pico-sdk: update to version 1.2.0
- utils/stdout_helpers: make mp_hal_stdout_tx_strn_cooked efficient
- axtls: switch to repo at micropython/axtls
- axtls: update to latest axtls 2.1.5 wih additional commits
- re1.5: move re1.5 code from extmod to lib
- uzlib: move uzlib code from extmod to lib
- crypto-algorithms: move crypto-algorithms code from extmod to lib
- update README's based on contents of these dirs
drivers:
- neopixel: add common machine.bitstream-based neopixel module
- neopixel: optimize fill() for speed
- neopixel: reduce code size of driver
- cyw43: fix cyw43_deinit so it can be called many times in a row
- cyw43: make wifi join fail if interface is not active
mpy-cross:
- disable stack check when building with Emscripten
Support components
==================
docs:
- library: document new esp32.RMT features and fix wait_done
- library: warn that ustruct doesn't handle spaces in format strings
- esp8266/tutorial: change flash mode from dio to dout
- replace master/slave with controller/peripheral in I2C and SPI
- rp2: enhance quickref and change image to Pico pinout
- rp2: update general section to give a brief technical overview
- library/utime.rst: clarify behaviour and precision of sleep ms/us
- library/uasyncio.rst: document stream readexactly() method
- library/machine.I2S.rst: fix use of sd pin in examples
- zephyr: add quick reference for the Zephyr port
- library/zephyr: add libraries specific to the Zephyr port
- templates: add unix and zephyr quickref links to top-index
- rename ufoo.rst to foo.rst
- replace ufoo with foo in all docs
- library/index.rst: clarify module naming and purpose
- library/builtins.rst: add module title
- library/network.rst: simplify socket import
- add docs for machine.bitstream and neopixel module
- library: fix usage of :term: for frozen module reference
- esp8266: use monospace for software tools
- reference: mention that slicing a memoryview causes allocation
examples: no changes specific to this component/port
tests:
- extmod: make uasyncio_heaplock test more deterministic
- cpydiff/modules_struct_whitespace_in_format: run black
- extmod/ujson: add tests for dump/dumps separators argument
- run-multitests.py: add broadcast and wait facility
- multi_bluetooth/ble_subscribe.py: add test for subscription
- extmod/vfs_fat_finaliser.py: ensure alloc at never-used GC blocks
- basics: split f-string debug printing to separate file with .exp
- pybnative: make while.py test run on boards without pyb.delay
tools:
- autobuild: add scripts to build release firmware
- remove obsolete build-stm-latest.sh script
- ci.sh: run apt-get update in ci_powerpc_setup
- makemanifest.py: allow passing flags to mpy-tool.py
- autobuild: add mimxrt port to build scripts for nightly builds
- pyboard.py: add cmd-line option to make soft reset configurable
- mpremote: swap order of PID and VID in connect-list output
- ci.sh: build unix dev variant as part of macOS CI
- ci.sh: build GENERIC_C3 board as part of esp32 CI
- autobuild: use separate IDF version to build newer esp32 SoCs
- autobuild: add FeatherS2 and TinyS2 to esp32 auto builds
- mpremote: add seek whence for mounted files
- mpremote: raise OSError on unsupported RemoteFile.seek
- autobuild: add the MIMXRT1050_EVKB board to the daily builds
- ci.sh: add mpy-cross build to nrf port
- codeformat.py: include ports/nrf/modules/nrf in code formatting
- gen-cpydiff.py: don't rename foo to ufoo in diff output
- autobuild: add auto build for Silicognition wESP32
- mpremote: fix connect-list in case VID/PID are None
- mpremote: add "devs" shortcut for "connect list"
- mpremote: remove support for pyb.USB_VCP in/out specialisation
- autobuild: don't use "-B" for make, it's already a fresh build
- pyboard.py: move --no-exclusive/--soft-reset out of mutex group
- pyboard.py: make --no-follow use same variable as --follow
- pyboard.py: add --exclusive to match --no-exclusive
- pyboard.py: make --no-soft-reset consistent with other args
- uncrustify: force 1 newline at end of file
- mpremote: bump version to 0.0.6
CI:
- workflows: add workflow to build and test javascript port
- workflows: switch from Coveralls to Codecov
- workflows: switch from lcov to gcov
- workflows: add workflow to build and test unix dev variant
The ports
=========
all ports:
- use common mp_hal_stdout_tx_strn_cooked instead of custom one
- update for move of crypto-algorithms, uzlib to lib
- rename USBD_VID/PID config macros to MICROPY_HW_USB_VID/PID
bare-arm port: no changes specific to this component/port
cc3200 port: no changes specific to this component/port
esp8266 port:
- add __len__ to NeoPixel driver to support iterating
- Makefile: add more libm files to build
- include hidden networks in WLAN.scan results
- replace esp.neopixel with machine.bitstream
- remove dead code for end_ticks in machine_bitstream
esp32 port:
- boards/sdkconfig.base: disable MEMPROT_FEATURE to alloc from IRAM
- add __len__ to NeoPixel driver to support iterating
- main: allow MICROPY_DIR to be overridden
- esp32_rmt: fix RMT looping in newer IDF versions
- esp32_rmt: enhance RMT with idle_level and write_pulses modes
- add new machine.I2S class for I2S protocol support
- machine_spi: calculate actual attained baudrate
- machine_hw_spi: use a 2 item SPI queue for long transfers
- machine_dac: add MICROPY_PY_MACHINE_DAC option, enable by default
- machine_i2s: add MICROPY_PY_MACHINE_I2S option, enable by default
- fix use of mp_int_t, size_t and uintptr_t
- add initial support for ESP32C3 SoCs
- boards/GENERIC_C3: add generic C3-based board
- modmachine: release the GIL in machine.idle()
- mphalport: always yield at least once in delay_ms
- machine_uart: add flow kw-arg to enable hardware flow control
- boards: add Silicognition wESP32 board configuration
- mpconfigport.h: enable reverse and inplace special methods
- include hidden networks in WLAN.scan results
- makeimg.py: get bootloader and partition offset from sdkconfig
- enable MICROPY_PY_FSTRINGS by default
- machine_hw_spi: release GIL during transfers
- machine_pin: make check for non-output pins respect chip variant
- replace esp.neopixel with machine.bitstream
- remove dead code for end_ticks in machine_bitstream
- boards: add GENERIC_C3_USB board with USB serial/JTAG support
javascript port:
- rework Makefile and GC so it works with latest Emscripten
- Makefile: suppress compiler errors from array bounds
- Makefile: change variable to EXPORTED_RUNTIME_METHODS
mimxrt port:
- move calc_weekday helper function to timeutils
- machine_spi: add the SPI class to the machine module
- moduos: seed the PRNG on boot using the TRNG
- boards: set vfs partition start to 1 MBbyte
- main: skip running main.py if boot.py failed
- main: extend the information returned by help()
- mimxrt_flash: remove commented-out code
- modmachine: add a few minor methods to the machine module
- machine_led: use mp_raise_msg_varg helper
- machine_i2c: add hardware-based machine.I2C to machine module
- add support for Hyperflash chips
- boards: add support for the MIMXRT1050_EVKB board
- machine_pin: implement ioctl for Pin
minimal port:
- Makefile: add support for building with user C modules
nrf port:
- modules: replace master/slave with controller/peripheral in SPI
- boards/common.ld: calculate unused flash region
- modules/nrf: add new nrf module with flash block device
- drivers: add support for using flash block device with SoftDevice
- mpconfigport.h: expose nrf module when MICROPY_PY_NRF is set
- README: update README.md to reflect internal file systems
- mpconfigport.h: tune FAT FS configuration
- Makefile: add _fs_size linker script override from make
- modules/uos: allow a board to configure MICROPY_VFS_FAT/LFS1/LFS2
- mpconfigport.h: enable MICROPY_PY_IO_FILEIO when an FS is enabled
- qstrdefsport.h: add entries for in-built FS mount points
- main: add auto mount and auto format hook for internal flash FS
- boards: enable needed features for FAT/LFS1/LFS2
- facilitate use of freeze manifest
- boards: set FROZEN_MANIFEST blank when SD present on nrf51 targets
- modules/scripts: add file system formatting script
- Makefile: set default manifest file for all targets
- mphalport: add dummy function for mp_hal_time_ns()
- boards: enable MICROPY_VFS_LFS2 for all target boards
- modules/uos: add ilistdir to uos module
- modules/nrf: add function to enable/disable DCDC
- enable source line on tracebacks
- set .mpy features consistent with documentation and other ports
pic16bit port: no changes specific to this component/port
powerpc port: no changes specific to this component/port
qemu-arm port: no changes specific to this component/port
rp2 port:
- use 0=Monday datetime convention in RTC
- machine_rtc: in RTC.datetime, compute weekday automatically
- CMakeLists.txt: suppress compiler errors for pico-sdk and tinyusb
- tusb_config.h: set CFG_TUD_CDC_EP_BUFSIZE to 256
- machine_uart: add hardware flow control support
- machine_uart: allow overriding default machine UART pins
- machine_i2c: allow boards to configure I2C pins using new macros
- machine_spi: allow boards to configure SPI pins using new macros
- machine_uart: fix poll ioctl to also check hardware FIFO
- machine_uart: fix read when FIFO has chars but ringbuf doesn't
- tusb_port: allow boards to configure USB VID and PID
- boards/ADAFRUIT_FEATHER_RP2040: configure custom VID/PID
- boards/ADAFRUIT_FEATHER_RP2040: configure I2C/SPI default pins
- boards/SPARKFUN_PROMICRO: configure UART/I2C/SPI default pins
- boards/SPARKFUN_THINGPLUS: configure I2C/SPI default pins
- boards: add Adafruit ItsyBitsy RP2040
- boards: add Adafruit QT Py RP2040
- boards: add Pimoroni Pico LiPo 4MB
- boards: add Pimoroni Pico LiPo 16MB
- boards: add Pimoroni Tiny 2040
- CMakeLists.txt: allow a board's cmake to set the manifest path
- enable MICROPY_PY_FSTRINGS by default
- Makefile: add "submodules" target, to match other ports
- rp2_flash: disable IRQs while calling flash_erase/program
- CMakeLists.txt: add option to enable double tap reset to bootrom
- mpconfigport.h: allow boards to add root pointers
samd port:
- add support for building with user C modules
stm32 port:
- softtimer: add soft_timer_reinsert() helper function
- mpbthciport: change from systick to soft-timer for BT scheduling
- provide a custom BTstack runloop that integrates with soft timer
- usb: make irq's default trigger enable all events
- boardctrl: skip running main.py if boot.py had an error
- sdio: fix undefined reference to DMA stream on H7
- dma: add DMAMUX configuration for H7 to fix dma_nohal_init
- main: call mp_deinit() at end of main
- adc: allow using ADC12 and ADC3 for H7
- adc: define the ADC instance used for internal channels
- adc: simplify and generalise how pin_adcX table is defined
- add new machine.I2S class for I2S protocol support
- boards/NUCLEO_F446RE: fix I2C1 pin assignment to match datasheet
- replace master/slave with controller/peripheral in I2C and SPI
- systick: always POLL_HOOK when delaying for milliseconds
- sdram: make SDRAM test cache aware, and optional failure with msg
- boards/NUCLEO_F446RE: enable CAN bus support
- boards: add support for SparkFun STM32 MicroMod Processor board
- uart: fix LPUART1 baudrate set/get
- uart: support low baudrates on LPUART1
- boards/STM32F429DISC: set correct UART2 pins and add UART3/6
- boards/NUCLEO_F439ZI: add board definition for NUCLEO_F439ZI
- boards/LEGO_HUB_NO6: add board definition for LEGO_HUB_NO6
- Makefile: update to only pull in used Bluetooth library
- README.md: update supported MCUs, and submodule and mboot use
- usbd_desc: rename USBD_xxx descriptor opts to MICROPY_HW_USB_xxx
- usbd_cdc_interface: rename USBD_CDC_xx opts to MICROPY_HW_USB_xx
- powerctrl: support changing frequency on WB MCUs
- boards/NUCLEO_H743ZI2: add modified version of NUCLEO_H743ZI
- mbedtls: fix compile warning about uninitialized val
- enable MICROPY_PY_FSTRINGS by default
- add implementation of machine.bitstream
- Makefile: allow GIT_SUBMODULES and LIBS to be extended
- stm32_it: support TIM17 IRQs on WB MCUs
- disable computed goto on constrained boards
- storage: make extended-block-device more configurable
- boards/LEGO_HUB_NO6: change SPI flash storage to use hardware SPI
- boards/LEGO_HUB_NO6: skip first 1MiB of SPI flash for storage
- boards/LEGO_HUB_NO6: add make commands to backup/restore firmware
teensy port: no changes specific to this component/port
unix port:
- modffi: add option to lock GC in callback, and cfun access
- Makefile: add back LIB_SRC_C to list of object files
- variants: enable help and help("modules") on standard and dev
- Makefile: disable error compression on arm-linux-gnueabi-gcc
windows port:
- Makefile: add .exe extension to executables name
- appveyor: update to VS 2017 and use Python 3.8 for build/test
zephyr port:
- machine_spi: add support for hardware SPI
2021-10-14 15:38:41 -04:00
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_OverflowError_varg(const compressed_string_t *fmt, ...) {
|
2019-05-09 03:20:15 -04:00
|
|
|
va_list argptr;
|
|
|
|
va_start(argptr,fmt);
|
2020-08-01 14:05:30 -04:00
|
|
|
mp_raise_msg_vlist(&mp_type_OverflowError, fmt, argptr);
|
2019-05-09 03:20:15 -04:00
|
|
|
va_end(argptr);
|
|
|
|
}
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_type_arg(const mp_obj_type_t *exc_type, mp_obj_t arg) {
|
2021-07-14 08:56:52 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_arg1(exc_type, arg));
|
|
|
|
}
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
// Leave this as not COLD because it is used by iterators in normal execution.
|
2021-06-29 03:34:34 -04:00
|
|
|
NORETURN void mp_raise_StopIteration(mp_obj_t arg) {
|
|
|
|
if (arg == MP_OBJ_NULL) {
|
|
|
|
mp_raise_type(&mp_type_StopIteration);
|
|
|
|
} else {
|
2021-07-14 08:56:52 -04:00
|
|
|
mp_raise_type_arg(&mp_type_StopIteration, arg);
|
2021-06-29 03:34:34 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_OSError(int errno_) {
|
2021-07-14 08:56:52 -04:00
|
|
|
mp_raise_type_arg(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno_));
|
2021-04-21 22:13:58 -04:00
|
|
|
}
|
|
|
|
|
2021-06-18 11:54:19 -04:00
|
|
|
#endif
|
|
|
|
|
py: Introduce a Python stack for scoped allocation.
This patch introduces the MICROPY_ENABLE_PYSTACK option (disabled by
default) which enables a "Python stack" that allows to allocate and free
memory in a scoped, or Last-In-First-Out (LIFO) way, similar to alloca().
A new memory allocation API is introduced along with this Py-stack. It
includes both "local" and "nonlocal" LIFO allocation. Local allocation is
intended to be equivalent to using alloca(), whereby the same function must
free the memory. Nonlocal allocation is where another function may free
the memory, so long as it's still LIFO.
Follow-up patches will convert all uses of alloca() and VLA to the new
scoped allocation API. The old behaviour (using alloca()) will still be
available, but when MICROPY_ENABLE_PYSTACK is enabled then alloca() is no
longer required or used.
The benefits of enabling this option are (or will be once subsequent
patches are made to convert alloca()/VLA):
- Toolchains without alloca() can use this feature to obtain correct and
efficient scoped memory allocation (compared to using the heap instead
of alloca(), which is slower).
- Even if alloca() is available, enabling the Py-stack gives slightly more
efficient use of stack space when calling nested Python functions, due to
the way that compilers implement alloca().
- Enabling the Py-stack with the stackless mode allows for even more
efficient stack usage, as well as retaining high performance (because the
heap is no longer used to build and destroy stackless code states).
- With Py-stack and stackless enabled, Python-calling-Python is no longer
recursive in the C mp_execute_bytecode function.
The micropython.pystack_use() function is included to measure usage of the
Python stack.
2017-11-26 07:28:40 -05:00
|
|
|
#if MICROPY_STACK_CHECK || MICROPY_ENABLE_PYSTACK
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_recursion_depth(void) {
|
2021-05-05 20:51:52 -04:00
|
|
|
mp_raise_RuntimeError(MP_ERROR_TEXT("maximum recursion depth exceeded"));
|
2017-11-20 01:29:58 -05:00
|
|
|
}
|
|
|
|
#endif
|
2022-11-08 16:24:49 -05:00
|
|
|
|
2023-02-28 18:07:35 -05:00
|
|
|
NORETURN MP_COLD void mp_raise_ZeroDivisionError(void) {
|
2022-11-08 16:24:49 -05:00
|
|
|
mp_raise_msg(&mp_type_ZeroDivisionError, MP_ERROR_TEXT("division by zero"));
|
|
|
|
}
|