8d8f83bc05
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
1554 lines
65 KiB
C
1554 lines
65 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* SPDX-FileCopyrightText: Copyright (c) 2013-2019 Damien P. George
|
|
* SPDX-FileCopyrightText: Copyright (c) 2014-2015 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 <stdio.h>
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
|
|
#include "py/emitglue.h"
|
|
#include "py/objtype.h"
|
|
#include "py/runtime.h"
|
|
#include "py/bc0.h"
|
|
#include "py/bc.h"
|
|
#include "py/profile.h"
|
|
|
|
#include "supervisor/linker.h"
|
|
|
|
// *FORMAT-OFF*
|
|
|
|
#if 0
|
|
#if MICROPY_PY_THREAD
|
|
#define TRACE_PREFIX mp_printf(&mp_plat_print, "ts=%p sp=%d ", mp_thread_get_state(), (int)(sp - &code_state->state[0] + 1))
|
|
#else
|
|
#define TRACE_PREFIX mp_printf(&mp_plat_print, "sp=%d ", (int)(sp - &code_state->state[0] + 1))
|
|
#endif
|
|
#define TRACE(ip) TRACE_PREFIX; mp_bytecode_print2(&mp_plat_print, ip, 1, code_state->fun_bc->const_table);
|
|
#else
|
|
#define TRACE(ip)
|
|
#endif
|
|
|
|
// Value stack grows up (this makes it incompatible with native C stack, but
|
|
// makes sure that arguments to functions are in natural order arg1..argN
|
|
// (Python semantics mandates left-to-right evaluation order, including for
|
|
// function arguments). Stack pointer is pre-incremented and points at the
|
|
// top element.
|
|
// Exception stack also grows up, top element is also pointed at.
|
|
|
|
#define DECODE_UINT \
|
|
mp_uint_t unum = 0; \
|
|
do { \
|
|
unum = (unum << 7) + (*ip & 0x7f); \
|
|
} while ((*ip++ & 0x80) != 0)
|
|
#define DECODE_ULABEL size_t ulab = (ip[0] | (ip[1] << 8)); ip += 2
|
|
#define DECODE_SLABEL size_t slab = (ip[0] | (ip[1] << 8)) - 0x8000; ip += 2
|
|
|
|
#if MICROPY_PERSISTENT_CODE
|
|
|
|
#define DECODE_QSTR \
|
|
qstr qst = ip[0] | ip[1] << 8; \
|
|
ip += 2;
|
|
#define DECODE_PTR \
|
|
DECODE_UINT; \
|
|
void *ptr = (void*)(uintptr_t)code_state->fun_bc->const_table[unum]
|
|
#define DECODE_OBJ \
|
|
DECODE_UINT; \
|
|
mp_obj_t obj = (mp_obj_t)code_state->fun_bc->const_table[unum]
|
|
|
|
#else
|
|
|
|
#define DECODE_QSTR qstr qst = 0; \
|
|
do { \
|
|
qst = (qst << 7) + (*ip & 0x7f); \
|
|
} while ((*ip++ & 0x80) != 0)
|
|
#define DECODE_PTR \
|
|
ip = (byte*)MP_ALIGN(ip, sizeof(void*)); \
|
|
void *ptr = *(void**)ip; \
|
|
ip += sizeof(void*)
|
|
#define DECODE_OBJ \
|
|
ip = (byte*)MP_ALIGN(ip, sizeof(mp_obj_t)); \
|
|
mp_obj_t obj = *(mp_obj_t*)ip; \
|
|
ip += sizeof(mp_obj_t)
|
|
|
|
#endif
|
|
|
|
#define PUSH(val) *++sp = (val)
|
|
#define POP() (*sp--)
|
|
#define TOP() (*sp)
|
|
#define SET_TOP(val) *sp = (val)
|
|
|
|
#if MICROPY_PY_SYS_EXC_INFO
|
|
#define CLEAR_SYS_EXC_INFO() MP_STATE_VM(cur_exception) = NULL;
|
|
#else
|
|
#define CLEAR_SYS_EXC_INFO()
|
|
#endif
|
|
|
|
#define PUSH_EXC_BLOCK(with_or_finally) do { \
|
|
DECODE_ULABEL; /* except labels are always forward */ \
|
|
++exc_sp; \
|
|
exc_sp->handler = ip + ulab; \
|
|
exc_sp->val_sp = MP_TAGPTR_MAKE(sp, ((with_or_finally) << 1)); \
|
|
exc_sp->prev_exc = NULL; \
|
|
} while (0)
|
|
|
|
#define POP_EXC_BLOCK() \
|
|
exc_sp--; /* pop back to previous exception handler */ \
|
|
CLEAR_SYS_EXC_INFO() /* just clear sys.exc_info(), not compliant, but it shouldn't be used in 1st place */
|
|
|
|
#define CANCEL_ACTIVE_FINALLY(sp) do { \
|
|
if (mp_obj_is_small_int(sp[-1])) { \
|
|
/* Stack: (..., prev_dest_ip, prev_cause, dest_ip) */ \
|
|
/* Cancel the unwind through the previous finally, replace with current one */ \
|
|
sp[-2] = sp[0]; \
|
|
sp -= 2; \
|
|
} else { \
|
|
assert(sp[-1] == mp_const_none || mp_obj_is_exception_instance(sp[-1])); \
|
|
/* Stack: (..., None/exception, dest_ip) */ \
|
|
/* Silence the finally's exception value (may be None or an exception) */ \
|
|
sp[-1] = sp[0]; \
|
|
--sp; \
|
|
} \
|
|
} while (0)
|
|
|
|
#if MICROPY_PY_SYS_SETTRACE
|
|
|
|
#define FRAME_SETUP() do { \
|
|
assert(code_state != code_state->prev_state); \
|
|
MP_STATE_THREAD(current_code_state) = code_state; \
|
|
assert(code_state != code_state->prev_state); \
|
|
} while(0)
|
|
|
|
#define FRAME_ENTER() do { \
|
|
assert(code_state != code_state->prev_state); \
|
|
code_state->prev_state = MP_STATE_THREAD(current_code_state); \
|
|
assert(code_state != code_state->prev_state); \
|
|
if (!mp_prof_is_executing) { \
|
|
mp_prof_frame_enter(code_state); \
|
|
} \
|
|
} while(0)
|
|
|
|
#define FRAME_LEAVE() do { \
|
|
assert(code_state != code_state->prev_state); \
|
|
MP_STATE_THREAD(current_code_state) = code_state->prev_state; \
|
|
assert(code_state != code_state->prev_state); \
|
|
} while(0)
|
|
|
|
#define FRAME_UPDATE() do { \
|
|
assert(MP_STATE_THREAD(current_code_state) == code_state); \
|
|
if (!mp_prof_is_executing) { \
|
|
code_state->frame = MP_OBJ_TO_PTR(mp_prof_frame_update(code_state)); \
|
|
} \
|
|
} while(0)
|
|
|
|
#define TRACE_TICK(current_ip, current_sp, is_exception) do { \
|
|
assert(code_state != code_state->prev_state); \
|
|
assert(MP_STATE_THREAD(current_code_state) == code_state); \
|
|
if (!mp_prof_is_executing && code_state->frame && MP_STATE_THREAD(prof_trace_callback)) { \
|
|
MP_PROF_INSTR_DEBUG_PRINT(code_state->ip); \
|
|
} \
|
|
if (!mp_prof_is_executing && code_state->frame && code_state->frame->callback) { \
|
|
mp_prof_instr_tick(code_state, is_exception); \
|
|
} \
|
|
} while(0)
|
|
|
|
#else // MICROPY_PY_SYS_SETTRACE
|
|
#define FRAME_SETUP()
|
|
#define FRAME_ENTER()
|
|
#define FRAME_LEAVE()
|
|
#define FRAME_UPDATE()
|
|
#define TRACE_TICK(current_ip, current_sp, is_exception)
|
|
#endif // MICROPY_PY_SYS_SETTRACE
|
|
|
|
#if MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
|
|
static inline mp_map_elem_t *mp_map_cached_lookup(mp_map_t *map, qstr qst, uint8_t *idx_cache) {
|
|
size_t idx = *idx_cache;
|
|
mp_obj_t key = MP_OBJ_NEW_QSTR(qst);
|
|
mp_map_elem_t *elem = NULL;
|
|
if (idx < map->alloc && map->table[idx].key == key) {
|
|
elem = &map->table[idx];
|
|
} else {
|
|
elem = mp_map_lookup(map, key, MP_MAP_LOOKUP);
|
|
if (elem != NULL) {
|
|
*idx_cache = (elem - &map->table[0]) & 0xff;
|
|
}
|
|
}
|
|
return elem;
|
|
}
|
|
#endif
|
|
|
|
// fastn has items in reverse order (fastn[0] is local[0], fastn[-1] is local[1], etc)
|
|
// sp points to bottom of stack which grows up
|
|
// returns:
|
|
// MP_VM_RETURN_NORMAL, sp valid, return value in *sp
|
|
// MP_VM_RETURN_YIELD, ip, sp valid, yielded value in *sp
|
|
// MP_VM_RETURN_EXCEPTION, exception in state[0]
|
|
mp_vm_return_kind_t PLACE_IN_ITCM(mp_execute_bytecode)(mp_code_state_t *code_state, volatile mp_obj_t inject_exc) {
|
|
#define SELECTIVE_EXC_IP (0)
|
|
#if SELECTIVE_EXC_IP
|
|
#define MARK_EXC_IP_SELECTIVE() { code_state->ip = ip; } /* stores ip 1 byte past last opcode */
|
|
#define MARK_EXC_IP_GLOBAL()
|
|
#else
|
|
#define MARK_EXC_IP_SELECTIVE()
|
|
#define MARK_EXC_IP_GLOBAL() { code_state->ip = ip; } /* stores ip pointing to last opcode */
|
|
#endif
|
|
#if MICROPY_OPT_COMPUTED_GOTO
|
|
#include "py/vmentrytable.h"
|
|
#if MICROPY_OPT_COMPUTED_GOTO_SAVE_SPACE
|
|
#define ONE_TRUE_DISPATCH() one_true_dispatch : do { \
|
|
TRACE(ip); \
|
|
MARK_EXC_IP_GLOBAL(); \
|
|
goto *(void *)((char *) && entry_MP_BC_LOAD_CONST_FALSE + entry_table[*ip++]); \
|
|
} while (0)
|
|
#define DISPATCH() do { goto one_true_dispatch; } while (0)
|
|
#else
|
|
#define ONE_TRUE_DISPATCH() DISPATCH()
|
|
#define DISPATCH() do { \
|
|
TRACE(ip); \
|
|
MARK_EXC_IP_GLOBAL(); \
|
|
TRACE_TICK(ip, sp, false); \
|
|
goto *entry_table[*ip++]; \
|
|
} while (0)
|
|
#endif
|
|
#define DISPATCH_WITH_PEND_EXC_CHECK() goto pending_exception_check
|
|
#define ENTRY(op) entry_##op
|
|
#define ENTRY_DEFAULT entry_default
|
|
#else
|
|
#define DISPATCH() goto dispatch_loop
|
|
#define DISPATCH_WITH_PEND_EXC_CHECK() goto pending_exception_check
|
|
#define ENTRY(op) case op
|
|
#define ENTRY_DEFAULT default
|
|
#endif
|
|
|
|
// nlr_raise needs to be implemented as a goto, so that the C compiler's flow analyser
|
|
// sees that it's possible for us to jump from the dispatch loop to the exception
|
|
// handler. Without this, the code may have a different stack layout in the dispatch
|
|
// loop and the exception handler, leading to very obscure bugs.
|
|
#define RAISE(o) do { nlr_pop(); nlr.ret_val = MP_OBJ_TO_PTR(o); goto exception_handler; } while (0)
|
|
|
|
#if MICROPY_STACKLESS
|
|
run_code_state: ;
|
|
#endif
|
|
FRAME_ENTER();
|
|
|
|
#if MICROPY_STACKLESS
|
|
run_code_state_from_return: ;
|
|
#endif
|
|
FRAME_SETUP();
|
|
|
|
// Pointers which are constant for particular invocation of mp_execute_bytecode()
|
|
mp_obj_t * /*const*/ fastn;
|
|
mp_exc_stack_t * /*const*/ exc_stack;
|
|
{
|
|
size_t n_state = code_state->n_state;
|
|
fastn = &code_state->state[n_state - 1];
|
|
exc_stack = (mp_exc_stack_t*)(code_state->state + n_state);
|
|
}
|
|
|
|
// variables that are visible to the exception handler (declared volatile)
|
|
mp_exc_stack_t *volatile exc_sp = MP_CODE_STATE_EXC_SP_IDX_TO_PTR(exc_stack, code_state->exc_sp_idx); // stack grows up, exc_sp points to top of stack
|
|
|
|
#if MICROPY_PY_THREAD_GIL && MICROPY_PY_THREAD_GIL_VM_DIVISOR
|
|
// This needs to be volatile and outside the VM loop so it persists across handling
|
|
// of any exceptions. Otherwise it's possible that the VM never gives up the GIL.
|
|
volatile int gil_divisor = MICROPY_PY_THREAD_GIL_VM_DIVISOR;
|
|
#endif
|
|
|
|
// outer exception handling loop
|
|
for (;;) {
|
|
nlr_buf_t nlr;
|
|
outer_dispatch_loop:
|
|
if (nlr_push(&nlr) == 0) {
|
|
// local variables that are not visible to the exception handler
|
|
const byte *ip = code_state->ip;
|
|
mp_obj_t *sp = code_state->sp;
|
|
mp_obj_t obj_shared;
|
|
MICROPY_VM_HOOK_INIT
|
|
|
|
// If we have exception to inject, now that we finish setting up
|
|
// execution context, raise it. This works as if MP_BC_RAISE_OBJ
|
|
// bytecode was executed.
|
|
// Injecting exc into yield from generator is a special case,
|
|
// handled by MP_BC_YIELD_FROM itself
|
|
if (inject_exc != MP_OBJ_NULL && *ip != MP_BC_YIELD_FROM) {
|
|
mp_obj_t exc = inject_exc;
|
|
inject_exc = MP_OBJ_NULL;
|
|
exc = mp_make_raise_obj(exc);
|
|
RAISE(exc);
|
|
}
|
|
|
|
// loop to execute byte code
|
|
for (;;) {
|
|
dispatch_loop:
|
|
#if MICROPY_OPT_COMPUTED_GOTO
|
|
ONE_TRUE_DISPATCH();
|
|
#else
|
|
TRACE(ip);
|
|
MARK_EXC_IP_GLOBAL();
|
|
TRACE_TICK(ip, sp, false);
|
|
switch (*ip++) {
|
|
#endif
|
|
|
|
ENTRY(MP_BC_LOAD_CONST_FALSE):
|
|
PUSH(mp_const_false);
|
|
DISPATCH();
|
|
|
|
ENTRY(MP_BC_LOAD_CONST_NONE):
|
|
PUSH(mp_const_none);
|
|
DISPATCH();
|
|
|
|
ENTRY(MP_BC_LOAD_CONST_TRUE):
|
|
PUSH(mp_const_true);
|
|
DISPATCH();
|
|
|
|
ENTRY(MP_BC_LOAD_CONST_SMALL_INT): {
|
|
mp_uint_t num = 0;
|
|
if ((ip[0] & 0x40) != 0) {
|
|
// Number is negative
|
|
num--;
|
|
}
|
|
do {
|
|
num = (num << 7) | (*ip & 0x7f);
|
|
} while ((*ip++ & 0x80) != 0);
|
|
PUSH(MP_OBJ_NEW_SMALL_INT(num));
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_LOAD_CONST_STRING): {
|
|
DECODE_QSTR;
|
|
PUSH(MP_OBJ_NEW_QSTR(qst));
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_LOAD_CONST_OBJ): {
|
|
DECODE_OBJ;
|
|
PUSH(obj);
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_LOAD_NULL):
|
|
PUSH(MP_OBJ_NULL);
|
|
DISPATCH();
|
|
|
|
ENTRY(MP_BC_LOAD_FAST_N): {
|
|
DECODE_UINT;
|
|
obj_shared = fastn[-unum];
|
|
load_check:
|
|
if (obj_shared == MP_OBJ_NULL) {
|
|
local_name_error: {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
mp_obj_t obj = mp_obj_new_exception_msg(&mp_type_NameError, MP_ERROR_TEXT("local variable referenced before assignment"));
|
|
RAISE(obj);
|
|
}
|
|
}
|
|
PUSH(obj_shared);
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_LOAD_DEREF): {
|
|
DECODE_UINT;
|
|
obj_shared = mp_obj_cell_get(fastn[-unum]);
|
|
goto load_check;
|
|
}
|
|
|
|
#if !MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
|
|
ENTRY(MP_BC_LOAD_NAME): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_QSTR;
|
|
PUSH(mp_load_name(qst));
|
|
DISPATCH();
|
|
}
|
|
#else
|
|
ENTRY(MP_BC_LOAD_NAME): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_QSTR;
|
|
mp_map_elem_t *elem = mp_map_cached_lookup(&mp_locals_get()->map, qst, (uint8_t*)ip);
|
|
mp_obj_t obj;
|
|
if (elem != NULL) {
|
|
obj = elem->value;
|
|
} else {
|
|
obj = mp_load_name(qst);
|
|
}
|
|
PUSH(obj);
|
|
ip++;
|
|
DISPATCH();
|
|
}
|
|
#endif
|
|
|
|
#if !MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
|
|
ENTRY(MP_BC_LOAD_GLOBAL): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_QSTR;
|
|
PUSH(mp_load_global(qst));
|
|
DISPATCH();
|
|
}
|
|
#else
|
|
ENTRY(MP_BC_LOAD_GLOBAL): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_QSTR;
|
|
mp_map_elem_t *elem = mp_map_cached_lookup(&mp_globals_get()->map, qst, (uint8_t*)ip);
|
|
mp_obj_t obj;
|
|
if (elem != NULL) {
|
|
obj = elem->value;
|
|
} else {
|
|
obj = mp_load_global(qst);
|
|
}
|
|
PUSH(obj);
|
|
ip++;
|
|
DISPATCH();
|
|
}
|
|
#endif
|
|
|
|
#if !MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
|
|
ENTRY(MP_BC_LOAD_ATTR): {
|
|
FRAME_UPDATE();
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_QSTR;
|
|
SET_TOP(mp_load_attr(TOP(), qst));
|
|
DISPATCH();
|
|
}
|
|
#else
|
|
ENTRY(MP_BC_LOAD_ATTR): {
|
|
FRAME_UPDATE();
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_QSTR;
|
|
mp_obj_t top = TOP();
|
|
mp_map_elem_t *elem = NULL;
|
|
if (mp_obj_is_instance_type(mp_obj_get_type(top))) {
|
|
mp_obj_instance_t *self = MP_OBJ_TO_PTR(top);
|
|
elem = mp_map_cached_lookup(&self->members, qst, (uint8_t*)ip);
|
|
}
|
|
mp_obj_t obj;
|
|
if (elem != NULL) {
|
|
obj = elem->value;
|
|
} else {
|
|
obj = mp_load_attr(top, qst);
|
|
}
|
|
SET_TOP(obj);
|
|
ip++;
|
|
DISPATCH();
|
|
}
|
|
#endif
|
|
|
|
ENTRY(MP_BC_LOAD_METHOD): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_QSTR;
|
|
mp_load_method(*sp, qst, sp);
|
|
sp += 1;
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_LOAD_SUPER_METHOD): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_QSTR;
|
|
sp -= 1;
|
|
mp_load_super_method(qst, sp - 1);
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_LOAD_BUILD_CLASS):
|
|
MARK_EXC_IP_SELECTIVE();
|
|
PUSH(mp_load_build_class());
|
|
DISPATCH();
|
|
|
|
ENTRY(MP_BC_LOAD_SUBSCR): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
mp_obj_t index = POP();
|
|
SET_TOP(mp_obj_subscr(TOP(), index, MP_OBJ_SENTINEL));
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_STORE_FAST_N): {
|
|
DECODE_UINT;
|
|
fastn[-unum] = POP();
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_STORE_DEREF): {
|
|
DECODE_UINT;
|
|
mp_obj_cell_set(fastn[-unum], POP());
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_STORE_NAME): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_QSTR;
|
|
mp_store_name(qst, POP());
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_STORE_GLOBAL): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_QSTR;
|
|
mp_store_global(qst, POP());
|
|
DISPATCH();
|
|
}
|
|
|
|
#if !MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
|
|
ENTRY(MP_BC_STORE_ATTR): {
|
|
FRAME_UPDATE();
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_QSTR;
|
|
mp_store_attr(sp[0], qst, sp[-1]);
|
|
sp -= 2;
|
|
DISPATCH();
|
|
}
|
|
#else
|
|
// This caching code works with MICROPY_PY_BUILTINS_PROPERTY and/or
|
|
// MICROPY_PY_DESCRIPTORS enabled because if the attr exists in
|
|
// self->members then it can't be a property or have descriptors. A
|
|
// consequence of this is that we can't use MP_MAP_LOOKUP_ADD_IF_NOT_FOUND
|
|
// in the fast-path below, because that store could override a property.
|
|
ENTRY(MP_BC_STORE_ATTR): {
|
|
FRAME_UPDATE();
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_QSTR;
|
|
mp_map_elem_t *elem = NULL;
|
|
mp_obj_t top = TOP();
|
|
if (mp_obj_is_instance_type(mp_obj_get_type(top)) && sp[-1] != MP_OBJ_NULL) {
|
|
mp_obj_instance_t *self = MP_OBJ_TO_PTR(top);
|
|
elem = mp_map_cached_lookup(&self->members, qst, (uint8_t*)ip);
|
|
}
|
|
if (elem != NULL) {
|
|
elem->value = sp[-1];
|
|
} else {
|
|
mp_store_attr(sp[0], qst, sp[-1]);
|
|
}
|
|
sp -= 2;
|
|
ip++;
|
|
DISPATCH();
|
|
}
|
|
#endif
|
|
|
|
ENTRY(MP_BC_STORE_SUBSCR):
|
|
MARK_EXC_IP_SELECTIVE();
|
|
mp_obj_subscr(sp[-1], sp[0], sp[-2]);
|
|
sp -= 3;
|
|
DISPATCH();
|
|
|
|
ENTRY(MP_BC_DELETE_FAST): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_UINT;
|
|
if (fastn[-unum] == MP_OBJ_NULL) {
|
|
goto local_name_error;
|
|
}
|
|
fastn[-unum] = MP_OBJ_NULL;
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_DELETE_DEREF): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_UINT;
|
|
if (mp_obj_cell_get(fastn[-unum]) == MP_OBJ_NULL) {
|
|
goto local_name_error;
|
|
}
|
|
mp_obj_cell_set(fastn[-unum], MP_OBJ_NULL);
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_DELETE_NAME): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_QSTR;
|
|
mp_delete_name(qst);
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_DELETE_GLOBAL): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_QSTR;
|
|
mp_delete_global(qst);
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_DUP_TOP): {
|
|
mp_obj_t top = TOP();
|
|
PUSH(top);
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_DUP_TOP_TWO):
|
|
sp += 2;
|
|
sp[0] = sp[-2];
|
|
sp[-1] = sp[-3];
|
|
DISPATCH();
|
|
|
|
ENTRY(MP_BC_POP_TOP):
|
|
sp -= 1;
|
|
DISPATCH();
|
|
|
|
ENTRY(MP_BC_ROT_TWO): {
|
|
mp_obj_t top = sp[0];
|
|
sp[0] = sp[-1];
|
|
sp[-1] = top;
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_ROT_THREE): {
|
|
mp_obj_t top = sp[0];
|
|
sp[0] = sp[-1];
|
|
sp[-1] = sp[-2];
|
|
sp[-2] = top;
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_JUMP): {
|
|
DECODE_SLABEL;
|
|
ip += slab;
|
|
DISPATCH_WITH_PEND_EXC_CHECK();
|
|
}
|
|
|
|
ENTRY(MP_BC_POP_JUMP_IF_TRUE): {
|
|
DECODE_SLABEL;
|
|
if (mp_obj_is_true(POP())) {
|
|
ip += slab;
|
|
}
|
|
DISPATCH_WITH_PEND_EXC_CHECK();
|
|
}
|
|
|
|
ENTRY(MP_BC_POP_JUMP_IF_FALSE): {
|
|
DECODE_SLABEL;
|
|
if (!mp_obj_is_true(POP())) {
|
|
ip += slab;
|
|
}
|
|
DISPATCH_WITH_PEND_EXC_CHECK();
|
|
}
|
|
|
|
ENTRY(MP_BC_JUMP_IF_TRUE_OR_POP): {
|
|
DECODE_SLABEL;
|
|
if (mp_obj_is_true(TOP())) {
|
|
ip += slab;
|
|
} else {
|
|
sp--;
|
|
}
|
|
DISPATCH_WITH_PEND_EXC_CHECK();
|
|
}
|
|
|
|
ENTRY(MP_BC_JUMP_IF_FALSE_OR_POP): {
|
|
DECODE_SLABEL;
|
|
if (mp_obj_is_true(TOP())) {
|
|
sp--;
|
|
} else {
|
|
ip += slab;
|
|
}
|
|
DISPATCH_WITH_PEND_EXC_CHECK();
|
|
}
|
|
|
|
ENTRY(MP_BC_SETUP_WITH): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
// stack: (..., ctx_mgr)
|
|
mp_obj_t obj = TOP();
|
|
mp_load_method(obj, MP_QSTR___exit__, sp);
|
|
mp_load_method(obj, MP_QSTR___enter__, sp + 2);
|
|
mp_obj_t ret = mp_call_method_n_kw(0, 0, sp + 2);
|
|
sp += 1;
|
|
PUSH_EXC_BLOCK(1);
|
|
PUSH(ret);
|
|
// stack: (..., __exit__, ctx_mgr, as_value)
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_WITH_CLEANUP): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
// Arriving here, there's "exception control block" on top of stack,
|
|
// and __exit__ method (with self) underneath it. Bytecode calls __exit__,
|
|
// and "deletes" it off stack, shifting "exception control block"
|
|
// to its place.
|
|
// The bytecode emitter ensures that there is enough space on the Python
|
|
// value stack to hold the __exit__ method plus an additional 4 entries.
|
|
if (TOP() == mp_const_none) {
|
|
// stack: (..., __exit__, ctx_mgr, None)
|
|
sp[1] = mp_const_none;
|
|
sp[2] = mp_const_none;
|
|
sp -= 2;
|
|
mp_call_method_n_kw(3, 0, sp);
|
|
SET_TOP(mp_const_none);
|
|
} else if (mp_obj_is_small_int(TOP())) {
|
|
// Getting here there are two distinct cases:
|
|
// - unwind return, stack: (..., __exit__, ctx_mgr, ret_val, SMALL_INT(-1))
|
|
// - unwind jump, stack: (..., __exit__, ctx_mgr, dest_ip, SMALL_INT(num_exc))
|
|
// For both cases we do exactly the same thing.
|
|
mp_obj_t data = sp[-1];
|
|
mp_obj_t cause = sp[0];
|
|
sp[-1] = mp_const_none;
|
|
sp[0] = mp_const_none;
|
|
sp[1] = mp_const_none;
|
|
mp_call_method_n_kw(3, 0, sp - 3);
|
|
sp[-3] = data;
|
|
sp[-2] = cause;
|
|
sp -= 2; // we removed (__exit__, ctx_mgr)
|
|
} else {
|
|
assert(mp_obj_is_exception_instance(TOP()));
|
|
// stack: (..., __exit__, ctx_mgr, exc_instance)
|
|
// Need to pass (exc_type, exc_instance, None) as arguments to __exit__.
|
|
sp[1] = sp[0];
|
|
sp[0] = MP_OBJ_FROM_PTR(mp_obj_get_type(sp[0]));
|
|
sp[2] = mp_const_none;
|
|
sp -= 2;
|
|
mp_obj_t ret_value = mp_call_method_n_kw(3, 0, sp);
|
|
if (mp_obj_is_true(ret_value)) {
|
|
// We need to silence/swallow the exception. This is done
|
|
// by popping the exception and the __exit__ handler and
|
|
// replacing it with None, which signals END_FINALLY to just
|
|
// execute the finally handler normally.
|
|
SET_TOP(mp_const_none);
|
|
} else {
|
|
// We need to re-raise the exception. We pop __exit__ handler
|
|
// by copying the exception instance down to the new top-of-stack.
|
|
sp[0] = sp[3];
|
|
}
|
|
}
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_UNWIND_JUMP): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_SLABEL;
|
|
PUSH((mp_obj_t)(mp_uint_t)(uintptr_t)(ip + slab)); // push destination ip for jump
|
|
PUSH((mp_obj_t)(mp_uint_t)(*ip)); // push number of exception handlers to unwind (0x80 bit set if we also need to pop stack)
|
|
unwind_jump:;
|
|
mp_uint_t unum = (mp_uint_t)POP(); // get number of exception handlers to unwind
|
|
while ((unum & 0x7f) > 0) {
|
|
unum -= 1;
|
|
assert(exc_sp >= exc_stack);
|
|
|
|
if (MP_TAGPTR_TAG1(exc_sp->val_sp)) {
|
|
if (exc_sp->handler > ip) {
|
|
// Found a finally handler that isn't active; run it.
|
|
// Getting here the stack looks like:
|
|
// (..., X, dest_ip)
|
|
// where X is pointed to by exc_sp->val_sp and in the case
|
|
// of a "with" block contains the context manager info.
|
|
assert(&sp[-1] == MP_TAGPTR_PTR(exc_sp->val_sp));
|
|
// We're going to run "finally" code as a coroutine
|
|
// (not calling it recursively). Set up a sentinel
|
|
// on the stack so it can return back to us when it is
|
|
// done (when WITH_CLEANUP or END_FINALLY reached).
|
|
// The sentinel is the number of exception handlers left to
|
|
// unwind, which is a non-negative integer.
|
|
PUSH(MP_OBJ_NEW_SMALL_INT(unum));
|
|
ip = exc_sp->handler;
|
|
goto dispatch_loop;
|
|
} else {
|
|
// Found a finally handler that is already active; cancel it.
|
|
CANCEL_ACTIVE_FINALLY(sp);
|
|
}
|
|
}
|
|
POP_EXC_BLOCK();
|
|
}
|
|
ip = (const byte*)MP_OBJ_TO_PTR(POP()); // pop destination ip for jump
|
|
if (unum != 0) {
|
|
// pop the exhausted iterator
|
|
sp -= MP_OBJ_ITER_BUF_NSLOTS;
|
|
}
|
|
DISPATCH_WITH_PEND_EXC_CHECK();
|
|
}
|
|
|
|
ENTRY(MP_BC_SETUP_EXCEPT):
|
|
ENTRY(MP_BC_SETUP_FINALLY): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
#if SELECTIVE_EXC_IP
|
|
PUSH_EXC_BLOCK((code_state->ip[-1] == MP_BC_SETUP_FINALLY) ? 1 : 0);
|
|
#else
|
|
PUSH_EXC_BLOCK((code_state->ip[0] == MP_BC_SETUP_FINALLY) ? 1 : 0);
|
|
#endif
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_END_FINALLY):
|
|
MARK_EXC_IP_SELECTIVE();
|
|
// if TOS is None, just pops it and continues
|
|
// if TOS is an integer, finishes coroutine and returns control to caller
|
|
// if TOS is an exception, reraises the exception
|
|
assert(exc_sp >= exc_stack);
|
|
POP_EXC_BLOCK();
|
|
if (TOP() == mp_const_none) {
|
|
sp--;
|
|
} else if (mp_obj_is_small_int(TOP())) {
|
|
// We finished "finally" coroutine and now dispatch back
|
|
// to our caller, based on TOS value
|
|
mp_int_t cause = MP_OBJ_SMALL_INT_VALUE(POP());
|
|
if (cause < 0) {
|
|
// A negative cause indicates unwind return
|
|
goto unwind_return;
|
|
} else {
|
|
// Otherwise it's an unwind jump and we must push as a raw
|
|
// number the number of exception handlers to unwind
|
|
PUSH((mp_obj_t)cause);
|
|
goto unwind_jump;
|
|
}
|
|
} else {
|
|
assert(mp_obj_is_exception_instance(TOP()));
|
|
RAISE(TOP());
|
|
}
|
|
DISPATCH();
|
|
|
|
ENTRY(MP_BC_GET_ITER):
|
|
MARK_EXC_IP_SELECTIVE();
|
|
SET_TOP(mp_getiter(TOP(), NULL));
|
|
DISPATCH();
|
|
|
|
// An iterator for a for-loop takes MP_OBJ_ITER_BUF_NSLOTS slots on
|
|
// the Python value stack. These slots are either used to store the
|
|
// iterator object itself, or the first slot is MP_OBJ_NULL and
|
|
// the second slot holds a reference to the iterator object.
|
|
ENTRY(MP_BC_GET_ITER_STACK): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
mp_obj_t obj = TOP();
|
|
mp_obj_iter_buf_t *iter_buf = (mp_obj_iter_buf_t*)sp;
|
|
sp += MP_OBJ_ITER_BUF_NSLOTS - 1;
|
|
obj = mp_getiter(obj, iter_buf);
|
|
if (obj != MP_OBJ_FROM_PTR(iter_buf)) {
|
|
// Iterator didn't use the stack so indicate that with MP_OBJ_NULL.
|
|
sp[-MP_OBJ_ITER_BUF_NSLOTS + 1] = MP_OBJ_NULL;
|
|
sp[-MP_OBJ_ITER_BUF_NSLOTS + 2] = obj;
|
|
}
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_FOR_ITER): {
|
|
FRAME_UPDATE();
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward
|
|
code_state->sp = sp;
|
|
mp_obj_t obj;
|
|
if (sp[-MP_OBJ_ITER_BUF_NSLOTS + 1] == MP_OBJ_NULL) {
|
|
obj = sp[-MP_OBJ_ITER_BUF_NSLOTS + 2];
|
|
} else {
|
|
obj = MP_OBJ_FROM_PTR(&sp[-MP_OBJ_ITER_BUF_NSLOTS + 1]);
|
|
}
|
|
mp_obj_t value = mp_iternext_allow_raise(obj);
|
|
if (value == MP_OBJ_STOP_ITERATION) {
|
|
sp -= MP_OBJ_ITER_BUF_NSLOTS; // pop the exhausted iterator
|
|
ip += ulab; // jump to after for-block
|
|
} else {
|
|
PUSH(value); // push the next iteration value
|
|
#if MICROPY_PY_SYS_SETTRACE
|
|
// LINE event should trigger for every iteration so invalidate last trigger
|
|
if (code_state->frame) {
|
|
code_state->frame->lineno = 0;
|
|
}
|
|
#endif
|
|
}
|
|
DISPATCH_WITH_PEND_EXC_CHECK();
|
|
}
|
|
|
|
ENTRY(MP_BC_POP_EXCEPT_JUMP): {
|
|
assert(exc_sp >= exc_stack);
|
|
POP_EXC_BLOCK();
|
|
DECODE_ULABEL;
|
|
ip += ulab;
|
|
DISPATCH_WITH_PEND_EXC_CHECK();
|
|
}
|
|
|
|
ENTRY(MP_BC_BUILD_TUPLE): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_UINT;
|
|
sp -= unum - 1;
|
|
SET_TOP(mp_obj_new_tuple(unum, sp));
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_BUILD_LIST): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_UINT;
|
|
sp -= unum - 1;
|
|
SET_TOP(mp_obj_new_list(unum, sp));
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_BUILD_MAP): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_UINT;
|
|
PUSH(mp_obj_new_dict(unum));
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_STORE_MAP):
|
|
MARK_EXC_IP_SELECTIVE();
|
|
sp -= 2;
|
|
mp_obj_dict_store(sp[0], sp[2], sp[1]);
|
|
DISPATCH();
|
|
|
|
#if MICROPY_PY_BUILTINS_SET
|
|
ENTRY(MP_BC_BUILD_SET): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_UINT;
|
|
sp -= unum - 1;
|
|
SET_TOP(mp_obj_new_set(unum, sp));
|
|
DISPATCH();
|
|
}
|
|
#endif
|
|
|
|
#if MICROPY_PY_BUILTINS_SLICE
|
|
ENTRY(MP_BC_BUILD_SLICE): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
mp_obj_t step = mp_const_none;
|
|
if (*ip++ == 3) {
|
|
// 3-argument slice includes step
|
|
step = POP();
|
|
}
|
|
mp_obj_t stop = POP();
|
|
mp_obj_t start = TOP();
|
|
SET_TOP(mp_obj_new_slice(start, stop, step));
|
|
DISPATCH();
|
|
}
|
|
#endif
|
|
|
|
ENTRY(MP_BC_STORE_COMP): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_UINT;
|
|
mp_obj_t obj = sp[-(unum >> 2)];
|
|
if ((unum & 3) == 0) {
|
|
mp_obj_list_append(obj, sp[0]);
|
|
sp--;
|
|
} else if (!MICROPY_PY_BUILTINS_SET || (unum & 3) == 1) {
|
|
mp_obj_dict_store(obj, sp[0], sp[-1]);
|
|
sp -= 2;
|
|
#if MICROPY_PY_BUILTINS_SET
|
|
} else {
|
|
mp_obj_set_store(obj, sp[0]);
|
|
sp--;
|
|
#endif
|
|
}
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_UNPACK_SEQUENCE): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_UINT;
|
|
mp_unpack_sequence(sp[0], unum, sp);
|
|
sp += unum - 1;
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_UNPACK_EX): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_UINT;
|
|
mp_unpack_ex(sp[0], unum, sp);
|
|
sp += (unum & 0xff) + ((unum >> 8) & 0xff);
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_MAKE_FUNCTION): {
|
|
DECODE_PTR;
|
|
PUSH(mp_make_function_from_raw_code(ptr, MP_OBJ_NULL, MP_OBJ_NULL));
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_MAKE_FUNCTION_DEFARGS): {
|
|
DECODE_PTR;
|
|
// Stack layout: def_tuple def_dict <- TOS
|
|
mp_obj_t def_dict = POP();
|
|
SET_TOP(mp_make_function_from_raw_code(ptr, TOP(), def_dict));
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_MAKE_CLOSURE): {
|
|
DECODE_PTR;
|
|
size_t n_closed_over = *ip++;
|
|
// Stack layout: closed_overs <- TOS
|
|
sp -= n_closed_over - 1;
|
|
SET_TOP(mp_make_closure_from_raw_code(ptr, n_closed_over, sp));
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_MAKE_CLOSURE_DEFARGS): {
|
|
DECODE_PTR;
|
|
size_t n_closed_over = *ip++;
|
|
// Stack layout: def_tuple def_dict closed_overs <- TOS
|
|
sp -= 2 + n_closed_over - 1;
|
|
SET_TOP(mp_make_closure_from_raw_code(ptr, 0x100 | n_closed_over, sp));
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_CALL_FUNCTION): {
|
|
FRAME_UPDATE();
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_UINT;
|
|
// unum & 0xff == n_positional
|
|
// (unum >> 8) & 0xff == n_keyword
|
|
sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe);
|
|
#if MICROPY_STACKLESS
|
|
if (mp_obj_get_type(*sp) == &mp_type_fun_bc) {
|
|
code_state->ip = ip;
|
|
code_state->sp = sp;
|
|
code_state->exc_sp_idx = MP_CODE_STATE_EXC_SP_IDX_FROM_PTR(exc_stack, exc_sp);
|
|
mp_code_state_t *new_state = mp_obj_fun_bc_prepare_codestate(*sp, unum & 0xff, (unum >> 8) & 0xff, sp + 1);
|
|
#if !MICROPY_ENABLE_PYSTACK
|
|
if (new_state == NULL) {
|
|
// Couldn't allocate codestate on heap: in the strict case raise
|
|
// an exception, otherwise just fall through to stack allocation.
|
|
#if MICROPY_STACKLESS_STRICT
|
|
deep_recursion_error:
|
|
mp_raise_recursion_depth();
|
|
#endif
|
|
} else
|
|
#endif
|
|
{
|
|
new_state->prev = code_state;
|
|
code_state = new_state;
|
|
nlr_pop();
|
|
goto run_code_state;
|
|
}
|
|
}
|
|
#endif
|
|
SET_TOP(mp_call_function_n_kw(*sp, unum & 0xff, (unum >> 8) & 0xff, sp + 1));
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_CALL_FUNCTION_VAR_KW): {
|
|
FRAME_UPDATE();
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_UINT;
|
|
// unum & 0xff == n_positional
|
|
// (unum >> 8) & 0xff == n_keyword
|
|
// We have following stack layout here:
|
|
// fun arg0 arg1 ... kw0 val0 kw1 val1 ... seq dict <- TOS
|
|
sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe) + 2;
|
|
#if MICROPY_STACKLESS
|
|
if (mp_obj_get_type(*sp) == &mp_type_fun_bc) {
|
|
code_state->ip = ip;
|
|
code_state->sp = sp;
|
|
code_state->exc_sp_idx = MP_CODE_STATE_EXC_SP_IDX_FROM_PTR(exc_stack, exc_sp);
|
|
|
|
mp_call_args_t out_args;
|
|
mp_call_prepare_args_n_kw_var(false, unum, sp, &out_args);
|
|
|
|
mp_code_state_t *new_state = mp_obj_fun_bc_prepare_codestate(out_args.fun,
|
|
out_args.n_args, out_args.n_kw, out_args.args);
|
|
#if !MICROPY_ENABLE_PYSTACK
|
|
// Freeing args at this point does not follow a LIFO order so only do it if
|
|
// pystack is not enabled. For pystack, they are freed when code_state is.
|
|
mp_nonlocal_free(out_args.args, out_args.n_alloc * sizeof(mp_obj_t));
|
|
#endif
|
|
#if !MICROPY_ENABLE_PYSTACK
|
|
if (new_state == NULL) {
|
|
// Couldn't allocate codestate on heap: in the strict case raise
|
|
// an exception, otherwise just fall through to stack allocation.
|
|
#if MICROPY_STACKLESS_STRICT
|
|
goto deep_recursion_error;
|
|
#endif
|
|
} else
|
|
#endif
|
|
{
|
|
new_state->prev = code_state;
|
|
code_state = new_state;
|
|
nlr_pop();
|
|
goto run_code_state;
|
|
}
|
|
}
|
|
#endif
|
|
SET_TOP(mp_call_method_n_kw_var(false, unum, sp));
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_CALL_METHOD): {
|
|
FRAME_UPDATE();
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_UINT;
|
|
// unum & 0xff == n_positional
|
|
// (unum >> 8) & 0xff == n_keyword
|
|
sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe) + 1;
|
|
#if MICROPY_STACKLESS
|
|
if (mp_obj_get_type(*sp) == &mp_type_fun_bc) {
|
|
code_state->ip = ip;
|
|
code_state->sp = sp;
|
|
code_state->exc_sp_idx = MP_CODE_STATE_EXC_SP_IDX_FROM_PTR(exc_stack, exc_sp);
|
|
|
|
size_t n_args = unum & 0xff;
|
|
size_t n_kw = (unum >> 8) & 0xff;
|
|
int adjust = (sp[1] == MP_OBJ_NULL) ? 0 : 1;
|
|
|
|
mp_code_state_t *new_state = mp_obj_fun_bc_prepare_codestate(*sp, n_args + adjust, n_kw, sp + 2 - adjust);
|
|
#if !MICROPY_ENABLE_PYSTACK
|
|
if (new_state == NULL) {
|
|
// Couldn't allocate codestate on heap: in the strict case raise
|
|
// an exception, otherwise just fall through to stack allocation.
|
|
#if MICROPY_STACKLESS_STRICT
|
|
goto deep_recursion_error;
|
|
#endif
|
|
} else
|
|
#endif
|
|
{
|
|
new_state->prev = code_state;
|
|
code_state = new_state;
|
|
nlr_pop();
|
|
goto run_code_state;
|
|
}
|
|
}
|
|
#endif
|
|
SET_TOP(mp_call_method_n_kw(unum & 0xff, (unum >> 8) & 0xff, sp));
|
|
DISPATCH_WITH_PEND_EXC_CHECK();
|
|
}
|
|
|
|
ENTRY(MP_BC_CALL_METHOD_VAR_KW): {
|
|
FRAME_UPDATE();
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_UINT;
|
|
// unum & 0xff == n_positional
|
|
// (unum >> 8) & 0xff == n_keyword
|
|
// We have following stack layout here:
|
|
// fun self arg0 arg1 ... kw0 val0 kw1 val1 ... seq dict <- TOS
|
|
sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe) + 3;
|
|
#if MICROPY_STACKLESS
|
|
if (mp_obj_get_type(*sp) == &mp_type_fun_bc) {
|
|
code_state->ip = ip;
|
|
code_state->sp = sp;
|
|
code_state->exc_sp_idx = MP_CODE_STATE_EXC_SP_IDX_FROM_PTR(exc_stack, exc_sp);
|
|
|
|
mp_call_args_t out_args;
|
|
mp_call_prepare_args_n_kw_var(true, unum, sp, &out_args);
|
|
|
|
mp_code_state_t *new_state = mp_obj_fun_bc_prepare_codestate(out_args.fun,
|
|
out_args.n_args, out_args.n_kw, out_args.args);
|
|
#if !MICROPY_ENABLE_PYSTACK
|
|
// Freeing args at this point does not follow a LIFO order so only do it if
|
|
// pystack is not enabled. For pystack, they are freed when code_state is.
|
|
mp_nonlocal_free(out_args.args, out_args.n_alloc * sizeof(mp_obj_t));
|
|
#endif
|
|
#if !MICROPY_ENABLE_PYSTACK
|
|
if (new_state == NULL) {
|
|
// Couldn't allocate codestate on heap: in the strict case raise
|
|
// an exception, otherwise just fall through to stack allocation.
|
|
#if MICROPY_STACKLESS_STRICT
|
|
goto deep_recursion_error;
|
|
#endif
|
|
} else
|
|
#endif
|
|
{
|
|
new_state->prev = code_state;
|
|
code_state = new_state;
|
|
nlr_pop();
|
|
goto run_code_state;
|
|
}
|
|
}
|
|
#endif
|
|
SET_TOP(mp_call_method_n_kw_var(true, unum, sp));
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_RETURN_VALUE):
|
|
MARK_EXC_IP_SELECTIVE();
|
|
unwind_return:
|
|
// Search for and execute finally handlers that aren't already active
|
|
while (exc_sp >= exc_stack) {
|
|
if (MP_TAGPTR_TAG1(exc_sp->val_sp)) {
|
|
if (exc_sp->handler > ip) {
|
|
// Found a finally handler that isn't active; run it.
|
|
// Getting here the stack looks like:
|
|
// (..., X, [iter0, iter1, ...,] ret_val)
|
|
// where X is pointed to by exc_sp->val_sp and in the case
|
|
// of a "with" block contains the context manager info.
|
|
// There may be 0 or more for-iterators between X and the
|
|
// return value, and these must be removed before control can
|
|
// pass to the finally code. We simply copy the ret_value down
|
|
// over these iterators, if they exist. If they don't then the
|
|
// following is a null operation.
|
|
mp_obj_t *finally_sp = MP_TAGPTR_PTR(exc_sp->val_sp);
|
|
finally_sp[1] = sp[0];
|
|
sp = &finally_sp[1];
|
|
// We're going to run "finally" code as a coroutine
|
|
// (not calling it recursively). Set up a sentinel
|
|
// on a stack so it can return back to us when it is
|
|
// done (when WITH_CLEANUP or END_FINALLY reached).
|
|
PUSH(MP_OBJ_NEW_SMALL_INT(-1));
|
|
ip = exc_sp->handler;
|
|
goto dispatch_loop;
|
|
} else {
|
|
// Found a finally handler that is already active; cancel it.
|
|
CANCEL_ACTIVE_FINALLY(sp);
|
|
}
|
|
}
|
|
POP_EXC_BLOCK();
|
|
}
|
|
nlr_pop();
|
|
code_state->sp = sp;
|
|
assert(exc_sp == exc_stack - 1);
|
|
MICROPY_VM_HOOK_RETURN
|
|
#if MICROPY_STACKLESS
|
|
if (code_state->prev != NULL) {
|
|
mp_obj_t res = *sp;
|
|
mp_globals_set(code_state->old_globals);
|
|
mp_code_state_t *new_code_state = code_state->prev;
|
|
#if MICROPY_ENABLE_PYSTACK
|
|
// Free code_state, and args allocated by mp_call_prepare_args_n_kw_var
|
|
// (The latter is implicitly freed when using pystack due to its LIFO nature.)
|
|
// The sizeof in the following statement does not include the size of the variable
|
|
// part of the struct. This arg is anyway not used if pystack is enabled.
|
|
mp_nonlocal_free(code_state, sizeof(mp_code_state_t));
|
|
#endif
|
|
code_state = new_code_state;
|
|
*code_state->sp = res;
|
|
goto run_code_state_from_return;
|
|
}
|
|
#endif
|
|
FRAME_LEAVE();
|
|
return MP_VM_RETURN_NORMAL;
|
|
|
|
ENTRY(MP_BC_RAISE_LAST): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
// search for the inner-most previous exception, to reraise it
|
|
mp_obj_t obj = MP_OBJ_NULL;
|
|
for (mp_exc_stack_t *e = exc_sp; e >= exc_stack; --e) {
|
|
if (e->prev_exc != NULL) {
|
|
obj = MP_OBJ_FROM_PTR(e->prev_exc);
|
|
break;
|
|
}
|
|
}
|
|
if (obj == MP_OBJ_NULL) {
|
|
obj = mp_obj_new_exception_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("no active exception to reraise"));
|
|
}
|
|
RAISE(obj);
|
|
}
|
|
|
|
ENTRY(MP_BC_RAISE_OBJ): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
mp_obj_t obj = mp_make_raise_obj(TOP());
|
|
RAISE(obj);
|
|
}
|
|
|
|
ENTRY(MP_BC_RAISE_FROM): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
mp_warning(NULL, "exception chaining not supported");
|
|
sp--; // ignore (pop) "from" argument
|
|
mp_obj_t obj = mp_make_raise_obj(TOP());
|
|
RAISE(obj);
|
|
}
|
|
|
|
ENTRY(MP_BC_YIELD_VALUE):
|
|
yield:
|
|
nlr_pop();
|
|
code_state->ip = ip;
|
|
code_state->sp = sp;
|
|
code_state->exc_sp_idx = MP_CODE_STATE_EXC_SP_IDX_FROM_PTR(exc_stack, exc_sp);
|
|
FRAME_LEAVE();
|
|
return MP_VM_RETURN_YIELD;
|
|
|
|
ENTRY(MP_BC_YIELD_FROM): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
//#define EXC_MATCH(exc, type) mp_obj_is_type(exc, type)
|
|
#define EXC_MATCH(exc, type) mp_obj_exception_match(exc, type)
|
|
#define GENERATOR_EXIT_IF_NEEDED(t) if (t != MP_OBJ_NULL && EXC_MATCH(t, MP_OBJ_FROM_PTR(&mp_type_GeneratorExit))) { mp_obj_t raise_t = mp_make_raise_obj(t); RAISE(raise_t); }
|
|
mp_vm_return_kind_t ret_kind;
|
|
mp_obj_t send_value = POP();
|
|
mp_obj_t t_exc = MP_OBJ_NULL;
|
|
mp_obj_t ret_value;
|
|
code_state->sp = sp; // Save sp because it's needed if mp_resume raises StopIteration
|
|
if (inject_exc != MP_OBJ_NULL) {
|
|
t_exc = inject_exc;
|
|
inject_exc = MP_OBJ_NULL;
|
|
ret_kind = mp_resume(TOP(), MP_OBJ_NULL, t_exc, &ret_value);
|
|
} else {
|
|
ret_kind = mp_resume(TOP(), send_value, MP_OBJ_NULL, &ret_value);
|
|
}
|
|
|
|
if (ret_kind == MP_VM_RETURN_YIELD) {
|
|
ip--;
|
|
PUSH(ret_value);
|
|
goto yield;
|
|
} else if (ret_kind == MP_VM_RETURN_NORMAL) {
|
|
// The generator has finished, and returned a value via StopIteration
|
|
// Replace exhausted generator with the returned value
|
|
SET_TOP(ret_value);
|
|
// If we injected GeneratorExit downstream, then even
|
|
// if it was swallowed, we re-raise GeneratorExit
|
|
GENERATOR_EXIT_IF_NEEDED(t_exc);
|
|
DISPATCH();
|
|
} else {
|
|
assert(ret_kind == MP_VM_RETURN_EXCEPTION);
|
|
assert(!EXC_MATCH(ret_value, MP_OBJ_FROM_PTR(&mp_type_StopIteration)));
|
|
// Pop exhausted gen
|
|
sp--;
|
|
RAISE(ret_value);
|
|
}
|
|
}
|
|
|
|
ENTRY(MP_BC_IMPORT_NAME): {
|
|
FRAME_UPDATE();
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_QSTR;
|
|
mp_obj_t obj = POP();
|
|
SET_TOP(mp_import_name(qst, obj, TOP()));
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_IMPORT_FROM): {
|
|
FRAME_UPDATE();
|
|
MARK_EXC_IP_SELECTIVE();
|
|
DECODE_QSTR;
|
|
mp_obj_t obj = mp_import_from(TOP(), qst);
|
|
PUSH(obj);
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY(MP_BC_IMPORT_STAR):
|
|
MARK_EXC_IP_SELECTIVE();
|
|
mp_import_all(POP());
|
|
DISPATCH();
|
|
|
|
#if MICROPY_OPT_COMPUTED_GOTO
|
|
ENTRY(MP_BC_LOAD_CONST_SMALL_INT_MULTI):
|
|
PUSH(MP_OBJ_NEW_SMALL_INT((mp_int_t)ip[-1] - MP_BC_LOAD_CONST_SMALL_INT_MULTI - MP_BC_LOAD_CONST_SMALL_INT_MULTI_EXCESS));
|
|
DISPATCH();
|
|
|
|
ENTRY(MP_BC_LOAD_FAST_MULTI):
|
|
obj_shared = fastn[MP_BC_LOAD_FAST_MULTI - (mp_int_t)ip[-1]];
|
|
goto load_check;
|
|
|
|
ENTRY(MP_BC_STORE_FAST_MULTI):
|
|
fastn[MP_BC_STORE_FAST_MULTI - (mp_int_t)ip[-1]] = POP();
|
|
DISPATCH();
|
|
|
|
ENTRY(MP_BC_UNARY_OP_MULTI):
|
|
MARK_EXC_IP_SELECTIVE();
|
|
SET_TOP(mp_unary_op(ip[-1] - MP_BC_UNARY_OP_MULTI, TOP()));
|
|
DISPATCH();
|
|
|
|
ENTRY(MP_BC_BINARY_OP_MULTI): {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
mp_obj_t rhs = POP();
|
|
mp_obj_t lhs = TOP();
|
|
SET_TOP(mp_binary_op(ip[-1] - MP_BC_BINARY_OP_MULTI, lhs, rhs));
|
|
DISPATCH();
|
|
}
|
|
|
|
ENTRY_DEFAULT:
|
|
MARK_EXC_IP_SELECTIVE();
|
|
#else
|
|
ENTRY_DEFAULT:
|
|
if (ip[-1] < MP_BC_LOAD_CONST_SMALL_INT_MULTI + MP_BC_LOAD_CONST_SMALL_INT_MULTI_NUM) {
|
|
PUSH(MP_OBJ_NEW_SMALL_INT((mp_int_t)ip[-1] - MP_BC_LOAD_CONST_SMALL_INT_MULTI - MP_BC_LOAD_CONST_SMALL_INT_MULTI_EXCESS));
|
|
DISPATCH();
|
|
} else if (ip[-1] < MP_BC_LOAD_FAST_MULTI + MP_BC_LOAD_FAST_MULTI_NUM) {
|
|
obj_shared = fastn[MP_BC_LOAD_FAST_MULTI - (mp_int_t)ip[-1]];
|
|
goto load_check;
|
|
} else if (ip[-1] < MP_BC_STORE_FAST_MULTI + MP_BC_STORE_FAST_MULTI_NUM) {
|
|
fastn[MP_BC_STORE_FAST_MULTI - (mp_int_t)ip[-1]] = POP();
|
|
DISPATCH();
|
|
} else if (ip[-1] < MP_BC_UNARY_OP_MULTI + MP_BC_UNARY_OP_MULTI_NUM) {
|
|
SET_TOP(mp_unary_op(ip[-1] - MP_BC_UNARY_OP_MULTI, TOP()));
|
|
DISPATCH();
|
|
} else if (ip[-1] < MP_BC_BINARY_OP_MULTI + MP_BC_BINARY_OP_MULTI_NUM) {
|
|
mp_obj_t rhs = POP();
|
|
mp_obj_t lhs = TOP();
|
|
SET_TOP(mp_binary_op(ip[-1] - MP_BC_BINARY_OP_MULTI, lhs, rhs));
|
|
DISPATCH();
|
|
} else
|
|
#endif
|
|
{
|
|
|
|
mp_obj_t obj = mp_obj_new_exception_msg(&mp_type_NotImplementedError, MP_ERROR_TEXT("opcode"));
|
|
nlr_pop();
|
|
code_state->state[0] = obj;
|
|
FRAME_LEAVE();
|
|
return MP_VM_RETURN_EXCEPTION;
|
|
}
|
|
|
|
#if !MICROPY_OPT_COMPUTED_GOTO
|
|
} // switch
|
|
#endif
|
|
|
|
pending_exception_check:
|
|
MICROPY_VM_HOOK_LOOP
|
|
|
|
#if MICROPY_ENABLE_SCHEDULER
|
|
// This is an inlined variant of mp_handle_pending
|
|
if (MP_STATE_VM(sched_state) == MP_SCHED_PENDING) {
|
|
mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
|
|
// Re-check state is still pending now that we're in the atomic section.
|
|
if (MP_STATE_VM(sched_state) == MP_SCHED_PENDING) {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
mp_obj_t obj = MP_STATE_THREAD(mp_pending_exception);
|
|
if (obj != MP_OBJ_NULL) {
|
|
MP_STATE_THREAD(mp_pending_exception) = MP_OBJ_NULL;
|
|
if (!mp_sched_num_pending()) {
|
|
MP_STATE_VM(sched_state) = MP_SCHED_IDLE;
|
|
}
|
|
MICROPY_END_ATOMIC_SECTION(atomic_state);
|
|
RAISE(obj);
|
|
}
|
|
mp_handle_pending_tail(atomic_state);
|
|
} else {
|
|
MICROPY_END_ATOMIC_SECTION(atomic_state);
|
|
}
|
|
}
|
|
#else
|
|
// This is an inlined variant of mp_handle_pending
|
|
if (MP_STATE_THREAD(mp_pending_exception) != MP_OBJ_NULL) {
|
|
MARK_EXC_IP_SELECTIVE();
|
|
mp_obj_t obj = MP_STATE_THREAD(mp_pending_exception);
|
|
MP_STATE_THREAD(mp_pending_exception) = MP_OBJ_NULL;
|
|
RAISE(obj);
|
|
}
|
|
#endif
|
|
|
|
#if MICROPY_PY_THREAD_GIL
|
|
#if MICROPY_PY_THREAD_GIL_VM_DIVISOR
|
|
if (--gil_divisor == 0)
|
|
#endif
|
|
{
|
|
#if MICROPY_PY_THREAD_GIL_VM_DIVISOR
|
|
gil_divisor = MICROPY_PY_THREAD_GIL_VM_DIVISOR;
|
|
#endif
|
|
#if MICROPY_ENABLE_SCHEDULER
|
|
// can only switch threads if the scheduler is unlocked
|
|
if (MP_STATE_VM(sched_state) == MP_SCHED_IDLE)
|
|
#endif
|
|
{
|
|
MP_THREAD_GIL_EXIT();
|
|
MP_THREAD_GIL_ENTER();
|
|
}
|
|
}
|
|
#endif
|
|
|
|
} // for loop
|
|
|
|
} else {
|
|
exception_handler:
|
|
// exception occurred
|
|
|
|
#if MICROPY_PY_SYS_EXC_INFO
|
|
MP_STATE_VM(cur_exception) = nlr.ret_val;
|
|
#endif
|
|
|
|
#if SELECTIVE_EXC_IP
|
|
// with selective ip, we store the ip 1 byte past the opcode, so move ptr back
|
|
code_state->ip -= 1;
|
|
#endif
|
|
|
|
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))) {
|
|
if (code_state->ip) {
|
|
// check if it's a StopIteration within a for block
|
|
if (*code_state->ip == MP_BC_FOR_ITER) {
|
|
const byte *ip = code_state->ip + 1;
|
|
DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward
|
|
code_state->ip = ip + ulab; // jump to after for-block
|
|
code_state->sp -= MP_OBJ_ITER_BUF_NSLOTS; // pop the exhausted iterator
|
|
goto outer_dispatch_loop; // continue with dispatch loop
|
|
} else if (*code_state->ip == MP_BC_YIELD_FROM) {
|
|
// StopIteration inside yield from call means return a value of
|
|
// yield from, so inject exception's value as yield from's result
|
|
// (Instead of stack pop then push we just replace exhausted gen with value)
|
|
*code_state->sp = mp_obj_exception_get_value(MP_OBJ_FROM_PTR(nlr.ret_val));
|
|
code_state->ip++; // yield from is over, move to next instruction
|
|
goto outer_dispatch_loop; // continue with dispatch loop
|
|
}
|
|
}
|
|
}
|
|
|
|
#if MICROPY_PY_SYS_SETTRACE
|
|
// Exceptions are traced here
|
|
if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(((mp_obj_base_t*)nlr.ret_val)->type), MP_OBJ_FROM_PTR(&mp_type_Exception))) {
|
|
TRACE_TICK(code_state->ip, code_state->sp, true /* yes, it's an exception */);
|
|
}
|
|
#endif
|
|
|
|
#if MICROPY_STACKLESS
|
|
unwind_loop:
|
|
#endif
|
|
// Set traceback info (file and line number) where the exception occurred, but not for:
|
|
// - constant GeneratorExit object, because it's const
|
|
// - exceptions re-raised by END_FINALLY
|
|
// - exceptions re-raised explicitly by "raise"
|
|
if (nlr.ret_val != &mp_const_GeneratorExit_obj
|
|
&& *code_state->ip != MP_BC_END_FINALLY
|
|
&& *code_state->ip != MP_BC_RAISE_LAST) {
|
|
const byte *ip = code_state->fun_bc->bytecode;
|
|
MP_BC_PRELUDE_SIG_DECODE(ip);
|
|
MP_BC_PRELUDE_SIZE_DECODE(ip);
|
|
const byte *bytecode_start = ip + n_info + n_cell;
|
|
#if !MICROPY_PERSISTENT_CODE
|
|
// so bytecode is aligned
|
|
bytecode_start = MP_ALIGN(bytecode_start, sizeof(mp_uint_t));
|
|
#endif
|
|
size_t bc = code_state->ip - bytecode_start;
|
|
#if MICROPY_PERSISTENT_CODE
|
|
qstr block_name = ip[0] | (ip[1] << 8);
|
|
qstr source_file = ip[2] | (ip[3] << 8);
|
|
ip += 4;
|
|
#else
|
|
qstr block_name = mp_decode_uint_value(ip);
|
|
ip = mp_decode_uint_skip(ip);
|
|
qstr source_file = mp_decode_uint_value(ip);
|
|
ip = mp_decode_uint_skip(ip);
|
|
#endif
|
|
size_t source_line = mp_bytecode_get_source_line(ip, bc);
|
|
mp_obj_exception_add_traceback(MP_OBJ_FROM_PTR(nlr.ret_val), source_file, source_line, block_name);
|
|
}
|
|
|
|
while (exc_sp >= exc_stack && exc_sp->handler <= code_state->ip) {
|
|
|
|
// nested exception
|
|
|
|
assert(exc_sp >= exc_stack);
|
|
|
|
// TODO make a proper message for nested exception
|
|
// at the moment we are just raising the very last exception (the one that caused the nested exception)
|
|
|
|
// move up to previous exception handler
|
|
POP_EXC_BLOCK();
|
|
}
|
|
|
|
if (exc_sp >= exc_stack) {
|
|
// catch exception and pass to byte code
|
|
code_state->ip = exc_sp->handler;
|
|
mp_obj_t *sp = MP_TAGPTR_PTR(exc_sp->val_sp);
|
|
// save this exception in the stack so it can be used in a reraise, if needed
|
|
exc_sp->prev_exc = nlr.ret_val;
|
|
// push exception object so it can be handled by bytecode
|
|
PUSH(MP_OBJ_FROM_PTR(nlr.ret_val));
|
|
code_state->sp = sp;
|
|
|
|
#if MICROPY_STACKLESS
|
|
} else if (code_state->prev != NULL) {
|
|
mp_globals_set(code_state->old_globals);
|
|
mp_code_state_t *new_code_state = code_state->prev;
|
|
#if MICROPY_ENABLE_PYSTACK
|
|
// Free code_state, and args allocated by mp_call_prepare_args_n_kw_var
|
|
// (The latter is implicitly freed when using pystack due to its LIFO nature.)
|
|
// The sizeof in the following statement does not include the size of the variable
|
|
// part of the struct. This arg is anyway not used if pystack is enabled.
|
|
mp_nonlocal_free(code_state, sizeof(mp_code_state_t));
|
|
#endif
|
|
code_state = new_code_state;
|
|
size_t n_state = code_state->n_state;
|
|
fastn = &code_state->state[n_state - 1];
|
|
exc_stack = (mp_exc_stack_t*)(code_state->state + n_state);
|
|
// variables that are visible to the exception handler (declared volatile)
|
|
exc_sp = MP_CODE_STATE_EXC_SP_IDX_TO_PTR(exc_stack, code_state->exc_sp_idx); // stack grows up, exc_sp points to top of stack
|
|
goto unwind_loop;
|
|
|
|
#endif
|
|
} else {
|
|
// propagate exception to higher level
|
|
// Note: ip and sp don't have usable values at this point
|
|
code_state->state[0] = MP_OBJ_FROM_PTR(nlr.ret_val); // put exception here because sp is invalid
|
|
FRAME_LEAVE();
|
|
return MP_VM_RETURN_EXCEPTION;
|
|
}
|
|
}
|
|
}
|
|
}
|