7b393bc406
Introduction of ports subdirectory where all ports are moved to The main change in this release is the introduction of a "ports/" subdirectory at the top-level of the repository, and all of the ports are moved here. In the process the "stmhal" port is renamed to "stm32" to better reflect the MCU that it targets. In addition, the STM32 CMSIS and HAL sources are moved to a new submodule called "stm32lib". The bytecode has changed in this release, compared to the previous release, and as a consequence the .mpy version number has increased to version 3. This means that scripts compiled with the previous mpy-cross must be recompiled to work with this new version. There have also been various enhancements and optimisations, such as: check for valid UTF-8 when creating str objects, support for reverse special binary operations like __radd__, full domain checking in the math module, support for floor-division and modulo in the viper emitter, and addition of stack overflow checking when executing a regex. The stm32 port sees improved support for F7 MCUs, addition of a new board B_L475E_IOT01A based on the STM32L475, and support for the Wiznet W5500 chipset along with improved socket behaviour. A detailed list of changes follows. py core: - objstr: startswith, endswith: check arg to be a string - nlrx86,x64: replace #define of defined() with portable macro usage - objtype: handle NotImplemented return from binary special methods - objtype: mp_obj_class_lookup: improve debug logging - map: remove unused new/free functions - make m_malloc_fail() have void return type, since it doesn't return - modstruct: in struct.pack, stop converting if there are no args left - modstruct: check and prevent buffer-read overflow in struct unpacking - modstruct: check and prevent buffer-write overflow in struct packing - nlrthumb: get working again on standard Thumb arch (ie not Thumb2) - objfloat: fix binary ops with incompatible objects - obj: fix comparison of float/complex NaN with itself - objtype: implement fallback for instance inplace special methods - objtuple: properly implement comparison with incompatible types - objstr: add check for valid UTF-8 when making a str from bytes - objlist: properly implement comparison with incompatible types - runtime0.h: move relational ops to the beginning of mp_binary_op_t - runtime0.h: move MP_BINARY_OP_DIVMOD to the end of mp_binary_op_t - objtype: make sure mp_binary_op_method_name has full size again - runtime0.h: put inplace arith ops in front of normal operations - builtinhelp: simplify code slightly by extracting object type - runtime: implement dispatch for "reverse op" special methods - nlrx86: fix building for Android/x86 - builtinhelp: change signature of help text var from pointer to array - runtime.h: change empty mp_warning macro so var-args are non empty - modbuiltins: implement abs() by dispatching to MP_UNARY_OP_ABS - {objfloat,objcomplex}: optimise MP_UNARY_OP_ABS by reusing variables - mpconfig.h: add note that using computed gotos in VM is not C99 - objstr: strip: don't strip "\0" by default - objexcept: prevent infinite recursion when allocating exceptions - stream: remove unnecessary checks for NULL return from vstr_add_len - vstr: raise a RuntimeError if fixed vstr buffer overflows - vm: use lowercase letter at start of exception message - persistentcode: define mp_raw_code_save_file() for any unix target - add config option to print warnings/errors to stderr - objfloat: support raising a negative number to a fractional power - objset: simplify set and frozenset by separating their locals dicts - objset: check that RHS of a binary op is a set/frozenset - objset: include the failed key in a KeyError raised from set.remove - objtype: change type of enum-to-qstr table to uint16_t to save space - objstr: make empty bytes object have a null-terminating byte - mpprint: only check for null string printing when NDEBUG not defined - objtype: clean up unary- and binary-op enum-to-qstr mapping tables - persistentcode: bump .mpy version number to version 3 - bc: update opcode_format_table to match the bytecode - modmath: add full checks for math domain errors - modmath: convert log2 macro into a function - formatfloat: don't print the negative sign of a NaN value - formatfloat: use standard isinf, isnan funcs instead of custom ones - modbuiltins: use existing utf8_get_char helper in builtin ord func - emitnative: implement floor-division and modulo for viper emitter - objtype: use CPython compatible method name for sizeof - objtype: fit qstrs for special methods in byte type - objtype: define all special methods if requested - objtype: introduce MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS extmod: - modubinascii: only include uzlib/tinf.h when it's really needed - modussl_mbedtls: allow to compile with MBEDTLS_DEBUG_C disabled - machine_pinbase: put PinBase singleton in ROM - re1.5: upgrade to v0.8.2, adds hook for stack overflow checking - modure: add stack overflow checking when executing a regex - uos_dupterm: update uos.dupterm() and helper funcs to have index - uos_dupterm: swallow any errors from dupterm closing the stream - vfs: replace VLA in proxy func with small, static sized array - modussl: add finaliser support for ussl objects - modussl_mbedtls: allow to compile with unix coverage build lib: - add new submodule, stm32lib containing STM32 CMSIS and HAL source - embed/abort_: use mp_raise_msg helper function - libm: fix tanhf so that it correctly handles +/- infinity args - libm: remove implementation of log2f, use MP_NEED_LOG2 instead - axtls: update, support for SSL_EAGAIN return code - berkeley-db-1.xx: update, allow to override MINCACHE, DEFPSIZE drivers: - memory/spiflash: change from hard-coded soft SPI to generic SPI - display/ssd1306.py: improve performance of graphics methods - nrf24l01: make nRF24L01 test script more portable - display/ssd1306: implement SSD1306_I2C poweron method - display/ssd1306: make poweron() work the same with SSD1306_SPI - wiznet5k: improve the performance of socket ops with threading - wiznet5k: get low-level W5500 driver working tools: - upip: upgrade to 1.2.2 - pyboard: use repr() when quoting data in error messages - pyboard: update docstring for additional device support tests: - object_new: better messages, check user __new__() method - class_new: add checks for __init__ being called and other improvements - class_new: add another testcase for __new__/__init__ interaction - class_inplace_op: test for inplace op fallback to normal one - run-bench-tests: update locations of executables, now in ports/ - class_reverse_op: test for reverse arith ops special methods - run-tests: skip class_inplace_op for minimal profile - run-tests: fix copy-paste mistake in var name - cpydiff: add cases for locals() discrepancies - extmod: add test for ure regexes leading to infinite recursion - extmod: add test for '-' in character class in regex - run-tests: close device under test using "finally" - net_inet: update tls test to work with CPython and incl new site unix port: - rename modsocket.c to modusocket.c - modusocket: remove #if MICROPY_SOCKET_EXTRA code blocks - enable MICROPY_PY_REVERSE_SPECIAL_METHODS stm32 port: - modmachine: make machine.bootloader() work when MPU is enabled - modmachine: improve support for sleep/deepsleep on F7 MCUs - compute PLL freq table during build instead of at run time - modmachine: for F7 MCU, save power by reducing internal volt reg - boards/pllvalues.py: make script work with both Python 2 and 3 - Makefile: use lib/stm32lib instead of local cmsis and hal files - remove cmsis and hal files, they are now a submodule - Makefile: automatically fetch stm32lib submodule if needed - update to new STM Cube HAL library - fix clock initialisation of L4 MCUs - rename stmhal port directory to stm32 - remove unused usbd_msc.c file - boards: change remaining stm32f4xx_hal_conf.h to unix line ending - boards: change linker scripts to use "K" instead of hex byte size - boards: fix I2C1 pin mapping on NUCLEO_F401RE/F411RE boards - i2c: when scanning for I2C devices only do 1 probe per address - modnwwiznet5k: release the GIL on blocking network operations - boards: add new board B_L475E_IOT01A based on STM32L475 - make-stmconst.py: make sure mpz const data lives in ROM - timer: make pyb.Timer() instances persistent - mpconfigport.h: add configuration for max periphs on L4 series - usbdev: make the USBD callback struct const so it can go in ROM - usbdev: change static function variable to non-static - usbdev: put all CDC state in a struct - usbdev: put all HID state in a struct - usbdev: simplify CDC tx/rx buffer passing - usbdev: simplify HID tx/rx buffer passing - usbdev/core: add state parameter to all callback functions - usbdev: put all state for the USB device driver in a struct - usbdev: simplify pointers to MSC state and block dev operations - usbdev: merge all global USB device state into a single struct - usbdev: make device descriptor callbacks take a state pointer - usbdev: move all the USB device descriptor state into its struct - timer: enable ARPE so that timer freq can be changed smoothly - modnwwiznet5k: get the IP address of an established socket - boards: fix typos in stm32f767_af.csv table - usbd_cdc_interface: don't reset CDC output buf on initialisation - modnwwiznet5k: implement WIZNET5K.isconnected() method - modusocket: make getaddrinfo() work when passed an IP address - modusocket: return OSError(-2) if getaddrinfo fails - mpconfigport.h: add MICROPY_THREAD_YIELD() macro - modnwwiznet5k: add support for W5500 Ethernet chip - modnwwiznet5k: increase SPI bus speed to 42MHz - modnwwiznet5k: implement stream ioctl for the Wiznet driver - mphalport: improve efficiency of mp_hal_stdout_tx_strn_cooked - make uos.dupterm() conform to specs by using extmod version cc3200 port: - enable micropython.kbd_intr() method - use standard implementation of keyboard interrupt esp8266 port: - rename axtls_helpers.c to posix_helpers.c - posix_helpers: set ENOMEM on memory alloc failure - set DEFPSIZE=1024, MINCACHE=3 for "btree" module - esp_mphal: send data in chunks to mp_uos_dupterm_tx_strn - modnetwork: add "bssid" keyword arg to WLAN.connect() method - modules/webrepl_setup: add info about allowed password length zephyr port: - Makefile: revamp "test" target after ports were moved to ports/ - use CONFIG_NET_APP_SETTINGS to setup initial network addresses - switch to interrupt-driven pull-style console pic16bit port: - add definition of SEEK_SET to unistd.h docs: - pyboard/tutorial: add "timeout=0" to UART in pass-through example - more xrefs to "MicroPython port" in glossary - library/network: fix ref to "socket" module (should be "usocket") - machine.Signal: improve style/grammar and add usage example - library: add description of "index" parameter to uos.dupterm() - library/micropython: fix typo in RST formatting - library/framebuf.rst: generalise constructor to all colour formats - btree: describe page caching policy of the underlying implementation - esp8266/tutorial: update neopixel with example of using 4 bbp - library/network: clarify usage of "bssid" arg in connect() method - pyboard/quickref: add info for Switch, RTC, CAN, Accel classes - pyboard/tutorial: update now that yellow LED also supports PWM - esp8266/quickref: add quickref info for RTC class - library: add missing cross-ref links for classes in pyb module - library/network: update docs to state that W5500 is supported - uselect: document one-shot polling mode - usocket: elaborate descriptions - usocket: document inet_ntop(), inet_pton() - library/network: add dhcp_hostname parameter - reference/isr_rules: minor typo correction - ussl: fix module name refs and use "MicroPython port" term - esp8266/general: add section on TLS limitations - usocket: document that settimeout() isn't supported by all ports - ure: add "|" (alternative) to the list of supported operators - reference/isr_rules.rst: add tutorial on use of micropython.schedule() travis: - use --upgrade when pip is installing cpp-coveralls - update build command now that stm32 Wiznet config has changed examples: - hwconfig_console: add .on()/.off() methods all: - convert mp_uint_t to mp_unary_op_t/mp_binary_op_t where appropriate - convert remaining "mp_uint_t n_args" to "size_t n_args" - make new ports/ sub-directory and move all ports there - update Makefiles and others to build with new ports/ dir layout - remove inclusion of internal py header files - use NULL instead of "" when calling mp_raise exception helpers README: - update "Dependencies" section - add explicit section on contributing - add gcc and arm-none-eabi-newlib to list of required components .gitattributes: - remove obsolete entries for stmhal/hal, stmhal/cmsis - add entries for files that will move to ports/ dir
417 lines
15 KiB
C
417 lines
15 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2014 Damien P. George
|
|
* Copyright (c) 2014 Paul Sokolovsky
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include <stdbool.h>
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
|
|
#include "py/runtime.h"
|
|
#include "py/bc0.h"
|
|
#include "py/bc.h"
|
|
|
|
#if MICROPY_DEBUG_VERBOSE // print debugging info
|
|
#define DEBUG_PRINT (1)
|
|
#else // don't print debugging info
|
|
#define DEBUG_PRINT (0)
|
|
#define DEBUG_printf(...) (void)0
|
|
#endif
|
|
|
|
mp_uint_t mp_decode_uint(const byte **ptr) {
|
|
mp_uint_t unum = 0;
|
|
byte val;
|
|
const byte *p = *ptr;
|
|
do {
|
|
val = *p++;
|
|
unum = (unum << 7) | (val & 0x7f);
|
|
} while ((val & 0x80) != 0);
|
|
*ptr = p;
|
|
return unum;
|
|
}
|
|
|
|
// This function is used to help reduce stack usage at the caller, for the case when
|
|
// the caller doesn't need to increase the ptr argument. If ptr is a local variable
|
|
// and the caller uses mp_decode_uint(&ptr) instead of this function, then the compiler
|
|
// must allocate a slot on the stack for ptr, and this slot cannot be reused for
|
|
// anything else in the function because the pointer may have been stored in a global
|
|
// and reused later in the function.
|
|
mp_uint_t mp_decode_uint_value(const byte *ptr) {
|
|
return mp_decode_uint(&ptr);
|
|
}
|
|
|
|
// This function is used to help reduce stack usage at the caller, for the case when
|
|
// the caller doesn't need the actual value and just wants to skip over it.
|
|
const byte *mp_decode_uint_skip(const byte *ptr) {
|
|
while ((*ptr++) & 0x80) {
|
|
}
|
|
return ptr;
|
|
}
|
|
|
|
STATIC NORETURN void fun_pos_args_mismatch(mp_obj_fun_bc_t *f, size_t expected, size_t given) {
|
|
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
|
|
// generic message, used also for other argument issues
|
|
(void)f;
|
|
(void)expected;
|
|
(void)given;
|
|
mp_arg_error_terse_mismatch();
|
|
#elif MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NORMAL
|
|
(void)f;
|
|
mp_raise_TypeError_varg(
|
|
"function takes %d positional arguments but %d were given", expected, given);
|
|
#elif MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
|
|
mp_raise_TypeError_varg(
|
|
"%q() takes %d positional arguments but %d were given",
|
|
mp_obj_fun_get_name(MP_OBJ_FROM_PTR(f)), expected, given);
|
|
#endif
|
|
}
|
|
|
|
#if DEBUG_PRINT
|
|
STATIC void dump_args(const mp_obj_t *a, size_t sz) {
|
|
DEBUG_printf("%p: ", a);
|
|
for (size_t i = 0; i < sz; i++) {
|
|
DEBUG_printf("%p ", a[i]);
|
|
}
|
|
DEBUG_printf("\n");
|
|
}
|
|
#else
|
|
#define dump_args(...) (void)0
|
|
#endif
|
|
|
|
// On entry code_state should be allocated somewhere (stack/heap) and
|
|
// contain the following valid entries:
|
|
// - code_state->fun_bc should contain a pointer to the function object
|
|
// - code_state->ip should contain the offset in bytes from the pointer
|
|
// code_state->fun_bc->bytecode to the entry n_state (0 for bytecode, non-zero for native)
|
|
void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw, const mp_obj_t *args) {
|
|
// This function is pretty complicated. It's main aim is to be efficient in speed and RAM
|
|
// usage for the common case of positional only args.
|
|
|
|
// get the function object that we want to set up (could be bytecode or native code)
|
|
mp_obj_fun_bc_t *self = code_state->fun_bc;
|
|
|
|
// ip comes in as an offset into bytecode, so turn it into a true pointer
|
|
code_state->ip = self->bytecode + (size_t)code_state->ip;
|
|
|
|
#if MICROPY_STACKLESS
|
|
code_state->prev = NULL;
|
|
#endif
|
|
|
|
// get params
|
|
size_t n_state = mp_decode_uint(&code_state->ip);
|
|
code_state->ip = mp_decode_uint_skip(code_state->ip); // skip n_exc_stack
|
|
size_t scope_flags = *code_state->ip++;
|
|
size_t n_pos_args = *code_state->ip++;
|
|
size_t n_kwonly_args = *code_state->ip++;
|
|
size_t n_def_pos_args = *code_state->ip++;
|
|
|
|
code_state->sp = &code_state->state[0] - 1;
|
|
code_state->exc_sp = (mp_exc_stack_t*)(code_state->state + n_state) - 1;
|
|
|
|
// zero out the local stack to begin with
|
|
memset(code_state->state, 0, n_state * sizeof(*code_state->state));
|
|
|
|
const mp_obj_t *kwargs = args + n_args;
|
|
|
|
// var_pos_kw_args points to the stack where the var-args tuple, and var-kw dict, should go (if they are needed)
|
|
mp_obj_t *var_pos_kw_args = &code_state->state[n_state - 1 - n_pos_args - n_kwonly_args];
|
|
|
|
// check positional arguments
|
|
|
|
if (n_args > n_pos_args) {
|
|
// given more than enough arguments
|
|
if ((scope_flags & MP_SCOPE_FLAG_VARARGS) == 0) {
|
|
fun_pos_args_mismatch(self, n_pos_args, n_args);
|
|
}
|
|
// put extra arguments in varargs tuple
|
|
*var_pos_kw_args-- = mp_obj_new_tuple(n_args - n_pos_args, args + n_pos_args);
|
|
n_args = n_pos_args;
|
|
} else {
|
|
if ((scope_flags & MP_SCOPE_FLAG_VARARGS) != 0) {
|
|
DEBUG_printf("passing empty tuple as *args\n");
|
|
*var_pos_kw_args-- = mp_const_empty_tuple;
|
|
}
|
|
// Apply processing and check below only if we don't have kwargs,
|
|
// otherwise, kw handling code below has own extensive checks.
|
|
if (n_kw == 0 && (scope_flags & MP_SCOPE_FLAG_DEFKWARGS) == 0) {
|
|
if (n_args >= (size_t)(n_pos_args - n_def_pos_args)) {
|
|
// given enough arguments, but may need to use some default arguments
|
|
for (size_t i = n_args; i < n_pos_args; i++) {
|
|
code_state->state[n_state - 1 - i] = self->extra_args[i - (n_pos_args - n_def_pos_args)];
|
|
}
|
|
} else {
|
|
fun_pos_args_mismatch(self, n_pos_args - n_def_pos_args, n_args);
|
|
}
|
|
}
|
|
}
|
|
|
|
// copy positional args into state
|
|
for (size_t i = 0; i < n_args; i++) {
|
|
code_state->state[n_state - 1 - i] = args[i];
|
|
}
|
|
|
|
// check keyword arguments
|
|
|
|
if (n_kw != 0 || (scope_flags & MP_SCOPE_FLAG_DEFKWARGS) != 0) {
|
|
DEBUG_printf("Initial args: ");
|
|
dump_args(code_state->state + n_state - n_pos_args - n_kwonly_args, n_pos_args + n_kwonly_args);
|
|
|
|
mp_obj_t dict = MP_OBJ_NULL;
|
|
if ((scope_flags & MP_SCOPE_FLAG_VARKEYWORDS) != 0) {
|
|
dict = mp_obj_new_dict(n_kw); // TODO: better go conservative with 0?
|
|
*var_pos_kw_args = dict;
|
|
}
|
|
|
|
// get pointer to arg_names array
|
|
const mp_obj_t *arg_names = (const mp_obj_t*)self->const_table;
|
|
|
|
for (size_t i = 0; i < n_kw; i++) {
|
|
// the keys in kwargs are expected to be qstr objects
|
|
mp_obj_t wanted_arg_name = kwargs[2 * i];
|
|
for (size_t j = 0; j < n_pos_args + n_kwonly_args; j++) {
|
|
if (wanted_arg_name == arg_names[j]) {
|
|
if (code_state->state[n_state - 1 - j] != MP_OBJ_NULL) {
|
|
mp_raise_TypeError_varg(
|
|
"function got multiple values for argument '%q'", MP_OBJ_QSTR_VALUE(wanted_arg_name));
|
|
}
|
|
code_state->state[n_state - 1 - j] = kwargs[2 * i + 1];
|
|
goto continue2;
|
|
}
|
|
}
|
|
// Didn't find name match with positional args
|
|
if ((scope_flags & MP_SCOPE_FLAG_VARKEYWORDS) == 0) {
|
|
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
|
|
mp_raise_TypeError("unexpected keyword argument");
|
|
#else
|
|
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
|
|
"unexpected keyword argument '%q'", MP_OBJ_QSTR_VALUE(wanted_arg_name)));
|
|
#endif
|
|
}
|
|
mp_obj_dict_store(dict, kwargs[2 * i], kwargs[2 * i + 1]);
|
|
continue2:;
|
|
}
|
|
|
|
DEBUG_printf("Args with kws flattened: ");
|
|
dump_args(code_state->state + n_state - n_pos_args - n_kwonly_args, n_pos_args + n_kwonly_args);
|
|
|
|
// fill in defaults for positional args
|
|
mp_obj_t *d = &code_state->state[n_state - n_pos_args];
|
|
mp_obj_t *s = &self->extra_args[n_def_pos_args - 1];
|
|
for (size_t i = n_def_pos_args; i > 0; i--, d++, s--) {
|
|
if (*d == MP_OBJ_NULL) {
|
|
*d = *s;
|
|
}
|
|
}
|
|
|
|
DEBUG_printf("Args after filling default positional: ");
|
|
dump_args(code_state->state + n_state - n_pos_args - n_kwonly_args, n_pos_args + n_kwonly_args);
|
|
|
|
// Check that all mandatory positional args are specified
|
|
while (d < &code_state->state[n_state]) {
|
|
if (*d++ == MP_OBJ_NULL) {
|
|
mp_raise_TypeError_varg(
|
|
"function missing required positional argument #%d", &code_state->state[n_state] - d);
|
|
}
|
|
}
|
|
|
|
// Check that all mandatory keyword args are specified
|
|
// Fill in default kw args if we have them
|
|
for (size_t i = 0; i < n_kwonly_args; i++) {
|
|
if (code_state->state[n_state - 1 - n_pos_args - i] == MP_OBJ_NULL) {
|
|
mp_map_elem_t *elem = NULL;
|
|
if ((scope_flags & MP_SCOPE_FLAG_DEFKWARGS) != 0) {
|
|
elem = mp_map_lookup(&((mp_obj_dict_t*)MP_OBJ_TO_PTR(self->extra_args[n_def_pos_args]))->map, arg_names[n_pos_args + i], MP_MAP_LOOKUP);
|
|
}
|
|
if (elem != NULL) {
|
|
code_state->state[n_state - 1 - n_pos_args - i] = elem->value;
|
|
} else {
|
|
mp_raise_TypeError_varg(
|
|
"function missing required keyword argument '%q'",
|
|
MP_OBJ_QSTR_VALUE(arg_names[n_pos_args + i]));
|
|
}
|
|
}
|
|
}
|
|
|
|
} else {
|
|
// no keyword arguments given
|
|
if (n_kwonly_args != 0) {
|
|
mp_raise_TypeError("function missing keyword-only argument");
|
|
}
|
|
if ((scope_flags & MP_SCOPE_FLAG_VARKEYWORDS) != 0) {
|
|
*var_pos_kw_args = mp_obj_new_dict(0);
|
|
}
|
|
}
|
|
|
|
// get the ip and skip argument names
|
|
const byte *ip = code_state->ip;
|
|
|
|
// jump over code info (source file and line-number mapping)
|
|
ip += mp_decode_uint_value(ip);
|
|
|
|
// bytecode prelude: initialise closed over variables
|
|
size_t local_num;
|
|
while ((local_num = *ip++) != 255) {
|
|
code_state->state[n_state - 1 - local_num] =
|
|
mp_obj_new_cell(code_state->state[n_state - 1 - local_num]);
|
|
}
|
|
|
|
// now that we skipped over the prelude, set the ip for the VM
|
|
code_state->ip = ip;
|
|
|
|
DEBUG_printf("Calling: n_pos_args=%d, n_kwonly_args=%d\n", n_pos_args, n_kwonly_args);
|
|
dump_args(code_state->state + n_state - n_pos_args - n_kwonly_args, n_pos_args + n_kwonly_args);
|
|
dump_args(code_state->state, n_state);
|
|
}
|
|
|
|
#if MICROPY_PERSISTENT_CODE_LOAD || MICROPY_PERSISTENT_CODE_SAVE
|
|
|
|
// The following table encodes the number of bytes that a specific opcode
|
|
// takes up. There are 3 special opcodes that always have an extra byte:
|
|
// MP_BC_MAKE_CLOSURE
|
|
// MP_BC_MAKE_CLOSURE_DEFARGS
|
|
// MP_BC_RAISE_VARARGS
|
|
// There are 4 special opcodes that have an extra byte only when
|
|
// MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE is enabled:
|
|
// MP_BC_LOAD_NAME
|
|
// MP_BC_LOAD_GLOBAL
|
|
// MP_BC_LOAD_ATTR
|
|
// MP_BC_STORE_ATTR
|
|
#define OC4(a, b, c, d) (a | (b << 2) | (c << 4) | (d << 6))
|
|
#define U (0) // undefined opcode
|
|
#define B (MP_OPCODE_BYTE) // single byte
|
|
#define Q (MP_OPCODE_QSTR) // single byte plus 2-byte qstr
|
|
#define V (MP_OPCODE_VAR_UINT) // single byte plus variable encoded unsigned int
|
|
#define O (MP_OPCODE_OFFSET) // single byte plus 2-byte bytecode offset
|
|
STATIC const byte opcode_format_table[64] = {
|
|
OC4(U, U, U, U), // 0x00-0x03
|
|
OC4(U, U, U, U), // 0x04-0x07
|
|
OC4(U, U, U, U), // 0x08-0x0b
|
|
OC4(U, U, U, U), // 0x0c-0x0f
|
|
OC4(B, B, B, U), // 0x10-0x13
|
|
OC4(V, U, Q, V), // 0x14-0x17
|
|
OC4(B, V, V, Q), // 0x18-0x1b
|
|
OC4(Q, Q, Q, Q), // 0x1c-0x1f
|
|
OC4(B, B, V, V), // 0x20-0x23
|
|
OC4(Q, Q, Q, B), // 0x24-0x27
|
|
OC4(V, V, Q, Q), // 0x28-0x2b
|
|
OC4(U, U, U, U), // 0x2c-0x2f
|
|
OC4(B, B, B, B), // 0x30-0x33
|
|
OC4(B, O, O, O), // 0x34-0x37
|
|
OC4(O, O, U, U), // 0x38-0x3b
|
|
OC4(U, O, B, O), // 0x3c-0x3f
|
|
OC4(O, B, B, O), // 0x40-0x43
|
|
OC4(B, B, O, B), // 0x44-0x47
|
|
OC4(U, U, U, U), // 0x48-0x4b
|
|
OC4(U, U, U, U), // 0x4c-0x4f
|
|
OC4(V, V, U, V), // 0x50-0x53
|
|
OC4(B, U, V, V), // 0x54-0x57
|
|
OC4(V, V, V, B), // 0x58-0x5b
|
|
OC4(B, B, B, U), // 0x5c-0x5f
|
|
OC4(V, V, V, V), // 0x60-0x63
|
|
OC4(V, V, V, V), // 0x64-0x67
|
|
OC4(Q, Q, B, U), // 0x68-0x6b
|
|
OC4(U, U, U, U), // 0x6c-0x6f
|
|
|
|
OC4(B, B, B, B), // 0x70-0x73
|
|
OC4(B, B, B, B), // 0x74-0x77
|
|
OC4(B, B, B, B), // 0x78-0x7b
|
|
OC4(B, B, B, B), // 0x7c-0x7f
|
|
OC4(B, B, B, B), // 0x80-0x83
|
|
OC4(B, B, B, B), // 0x84-0x87
|
|
OC4(B, B, B, B), // 0x88-0x8b
|
|
OC4(B, B, B, B), // 0x8c-0x8f
|
|
OC4(B, B, B, B), // 0x90-0x93
|
|
OC4(B, B, B, B), // 0x94-0x97
|
|
OC4(B, B, B, B), // 0x98-0x9b
|
|
OC4(B, B, B, B), // 0x9c-0x9f
|
|
OC4(B, B, B, B), // 0xa0-0xa3
|
|
OC4(B, B, B, B), // 0xa4-0xa7
|
|
OC4(B, B, B, B), // 0xa8-0xab
|
|
OC4(B, B, B, B), // 0xac-0xaf
|
|
|
|
OC4(B, B, B, B), // 0xb0-0xb3
|
|
OC4(B, B, B, B), // 0xb4-0xb7
|
|
OC4(B, B, B, B), // 0xb8-0xbb
|
|
OC4(B, B, B, B), // 0xbc-0xbf
|
|
|
|
OC4(B, B, B, B), // 0xc0-0xc3
|
|
OC4(B, B, B, B), // 0xc4-0xc7
|
|
OC4(B, B, B, B), // 0xc8-0xcb
|
|
OC4(B, B, B, B), // 0xcc-0xcf
|
|
|
|
OC4(B, B, B, B), // 0xd0-0xd3
|
|
OC4(U, U, U, B), // 0xd4-0xd7
|
|
OC4(B, B, B, B), // 0xd8-0xdb
|
|
OC4(B, B, B, B), // 0xdc-0xdf
|
|
|
|
OC4(B, B, B, B), // 0xe0-0xe3
|
|
OC4(B, B, B, B), // 0xe4-0xe7
|
|
OC4(B, B, B, B), // 0xe8-0xeb
|
|
OC4(B, B, B, B), // 0xec-0xef
|
|
|
|
OC4(B, B, B, B), // 0xf0-0xf3
|
|
OC4(B, B, B, B), // 0xf4-0xf7
|
|
OC4(U, U, U, U), // 0xf8-0xfb
|
|
OC4(U, U, U, U), // 0xfc-0xff
|
|
};
|
|
#undef OC4
|
|
#undef U
|
|
#undef B
|
|
#undef Q
|
|
#undef V
|
|
#undef O
|
|
|
|
uint mp_opcode_format(const byte *ip, size_t *opcode_size) {
|
|
uint f = (opcode_format_table[*ip >> 2] >> (2 * (*ip & 3))) & 3;
|
|
const byte *ip_start = ip;
|
|
if (f == MP_OPCODE_QSTR) {
|
|
ip += 3;
|
|
} else {
|
|
int extra_byte = (
|
|
*ip == MP_BC_RAISE_VARARGS
|
|
|| *ip == MP_BC_MAKE_CLOSURE
|
|
|| *ip == MP_BC_MAKE_CLOSURE_DEFARGS
|
|
#if MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
|
|
|| *ip == MP_BC_LOAD_NAME
|
|
|| *ip == MP_BC_LOAD_GLOBAL
|
|
|| *ip == MP_BC_LOAD_ATTR
|
|
|| *ip == MP_BC_STORE_ATTR
|
|
#endif
|
|
);
|
|
ip += 1;
|
|
if (f == MP_OPCODE_VAR_UINT) {
|
|
while ((*ip++ & 0x80) != 0) {
|
|
}
|
|
} else if (f == MP_OPCODE_OFFSET) {
|
|
ip += 2;
|
|
}
|
|
ip += extra_byte;
|
|
}
|
|
*opcode_size = ip - ip_start;
|
|
return f;
|
|
}
|
|
|
|
#endif // MICROPY_PERSISTENT_CODE_LOAD || MICROPY_PERSISTENT_CODE_SAVE
|