01cabb0324
Boosted performance, board.json metadata, more mimxrt, rp2, samd features
This release of MicroPython sees a boost to the overall performance of the
VM and runtime. This is achieved by the addition of an optional cache to
speed up general hash table lookups, as well as a fast path in the VM for
the LOAD_ATTR opcode on instance types. The new configuration options are
MICROPY_OPT_MAP_LOOKUP_CACHE and MICROPY_OPT_LOAD_ATTR_FAST_PATH. As part
of this improvement the MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE option has
been removed, which provided a similar map caching mechanism but with the
cache stored in the bytecode, which made it not useful on bare metal ports.
The new mechanism is measured to be at least as good as the old one,
applies to more map lookups, has a constant RAM overhead, and applies to
native code as well as bytecode.
These performance options are enabled on the esp32, mimxrt, rp2, stm32 and
unix ports. For esp32 and mimxrt some code is also moved to RAM to further
boost performance. On stm32, performance increases by about 20% for
benchmarks that are heavy on name lookups, like misc_pystone.py and
misc_raytrace.py. On esp32 performance can increase by 2-3x, and on mimxrt
it is up to 6x.
All boards in all ports now have a board.json metadata file, which is used
to automatically build firmware and generate a webpage for that board
(among other possibilities). Auto-build scripts have been added for this
purpose and they build all esp32, mimxrt, rp2, samd and stm32 boards. The
generated output is available at https://micropython.org/download.
Support for FROZEN_DIR and FROZEN_MPY_DIR has been deprecated for some time
and was finally removed in this release. Instead of these, FROZEN_MANIFEST
can be used. The io.resource_stream() function is also removed, replaced
by the pure Python version in micropython-lib.
The search order for importing frozen Python modules is now controlled by
the ".frozen" entry in sys.path. This string is added by default in the
second position in sys.path. User code should adjust sys.path depending on
the desired behaviour. Putting ".frozen" first in sys.path will speed up
importing frozen modules.
A bug in multiple precision integers with bitwise of -0 was fixed in commit
2c139bbf4e
.
The platform module has been added to allow querying the compiler and
underlying SDK/HAL/libc version. This is enabled on esp32, mimxrt and
stm32 ports.
The mpremote tool now supports seek, flush, mkdir and rmdir on PC-mounted
filesystems. And a help command has been added.
The documentation has seen many additions and improvements thanks (for a
second time) to the Google Season of Docs project. The rp2 documentation
now includes a reference for PIO assembly instructions, a PIO quick
reference and a PIO tutorial. The random and stm modules have been
documented, along with sys.settrace, manifest.py files and mpremote. There
is also now more detail about the differences between MicroPython and
standard Python 3.5 and above.
The esp32 port sees support for ESP32-S3 SoCs, and new boards GENERIC_S3,
ESP32_S2_WROVER, LOLIN_S2_MINI, LOLIN_S2_PICO and UM_FEATHERS2NEO. The PWM
driver has been improved and now supports all PWM timers and channels, and
the duty_u16() and duty_ns() methods, and it keeps the duty constant when
changing frequency. The machine.bitstream() function has been improved to
use RMT, with an option to select the original bit-banging implementation.
The mimxrt port gained new hardware features: SDRAM and SD card support, as
well as network integration with a LAN driver. The machine.WDT class was
added along with the machine.reset_cause(), machine.soft_reset(),
machine.unique_id() add machine.bitstream() functions. DHT sensor support
was added, and f-strings were enabled.
The rp2 port now has support for networking, and bluetooth using NimBLE.
The Nina-W10 WiFi/BT driver is fully integrated and supported by the new
Arduino Nano RP2040 connect board. I2S protocol support is added along
with a machine.bitstream() driver and DHT sensor support. The PWM driver
had a bug fix with the accuracy of setting/getting the frequency, and the
duty value is now retained when changing the frequency.
On the samd port there is now support for the internal flash being a block
device, and for filesystems and the os module. Pin and LED classes have
been implemented. There are more time functions, more Python features
enabled, and the help() function is added. SEEED_WIO_TERMINAL and
SEEED_XIAO board definitions are now available.
The stm32 port now has support for F427, F479 and H7A3(Q)/H7B3(Q) MCUs, and
new board definitions for VCC_GND_H743VI, OLIMEX_H407, MIKROE_QUAIL,
GARATRONIC_PYBSTICK26_F411, STM32H73B3I_DK. A bug was fixed in the SPI
driver where a SPI transfer could fail if the CYW43 WiFi driver was also
active at the same time.
On the windows port the help() function has been enabled, and support for
build variants added, to match the unix port.
The zephyr port upgraded Zephyr to v2.7.0.
The change in code size since the previous release for various ports is
(absolute and percentage change in the text section):
bare-arm: -1520 -2.605%
minimal x86: -2256 -1.531%
unix x64: -457 -0.089%
unix nanbox: -925 -0.204%
stm32: +312 +0.079% PYBV10
cc3200: -176 -0.096%
esp8266: +532 +0.076% GENERIC
esp32: +27096 +1.820% GENERIC
nrf: -212 -0.121% pca10040
rp2: +9904 +2.051% PICO
samd: +35332 +33.969% ADAFRUIT_ITSYBITSY_M4_EXPRESS
The changes that dominate these numbers are:
- bare-arm, minimal: use of new MICROPY_CONFIG_ROM_LEVEL_MINIMUM option and
subsequent disabling of remaining optional features
- unix, cc3200, nrf: general code size reductions of the core
- stm32: performance improvements, addition of platform module
- esp8266: enabling f-strings
- esp32: use of -O2 instead of -Os
- rp2: machine.I2S and other new hardware features
- samd: filesystem support and other new hardware features
Thanks to everyone who contributed to this release: Alan Dragomirecký,
Alexey Shvetsov, Andrew Leech, Andrew Scheller, Antoine Aubert, Boris
Vinogradov, Chris Boudacoff, Chris Fiege, Christian Decker, Damien George,
Daniel Gorny, Dave Hylands, David Michieli, Emilie Feral, Frédéric Pierson,
gibbonsc, Henk Vergonet, iabdalkader, Ihor Nehrutsa, Jan Hrudka, Jan Staal,
jc_.kim, Jim Mussared, Jonathan Hogg, Laurens Valk, leo chung, Lorenzo
Cappelletti, Magnus von Wachenfeldt, Matt Trentini, Matt van de Werken,
Maureen Helm, Michael Bentley, Michael Buesch, Mike Causer, Mike Teachman,
Mike Wadsten, Ned Konz, NitiKaur, oli, patrick, Patrick Van Oosterwijck,
Peter Boin, Peter Hinch, Peter van der Burg, Philipp Ebensberger, Pooya
Moradi, retsyo, robert-hh, roland van straten, Scott Armitage, Sebastian
Wicki, Seon Rozenblum, Sergei Silnov, Simon Baatz, Stewart Bonnick, stijn,
Tobias Thyrrestrup, Tomas Vanek, YoungJoon Chun.
What follows is a detailed list of changes, generated from the git commit
history, and organised into sections.
Main components
===============
all:
- remove MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
- update Python formatting to latest Black version 21.12b0
- remove support for FROZEN_DIR and FROZEN_MPY_DIR
py core:
- parse: simplify parse nodes representing a list
- emitnative: ensure load_subscr does not clobber existing REG_RET
- mpconfig.h: define initial templates for "feature levels"
- vm: add a fast path for LOAD_ATTR on instance types
- map: add an optional cache of (map+index) to speed up map lookups
- builtinimport: forward all debug printing to MICROPY_DEBUG_PRINTER
- add wrapper macros so hot VM functions can go in fast code location
- runtime: fix crash when exc __new__ doesn't return an exc instance
- mpconfig.h: define the "extra" feature level
- mpconfig.h: revert MICROPY_REPL_INFO to disabled at all levels
- gc: add hook to run code during time consuming GC operations
- showbc: print unary-op string when dumping bytecode
- modsys: replace non-ASCII quote char with ASCII char
- runtime: allow types to use both .attr and .locals_dict
- lexer: support nested [] and {} characters within f-string params
- objfun.h: remove obsolete comments about entries in extra_args
- builtinimport: refactor module importing
- showbc: fix printing of raw bytecode header on nanbox builds
- modio: remove io.resource_stream function
- only search frozen modules when '.frozen' is found in sys.path
- mkrules.cmake: set frozen preprocessor defs early
- runtime: allow initialising sys.path/argv with defaults
- mpstate.h: only include sys.path/argv objects in state when enabled
- mpz: fix bugs with bitwise of -0 by ensuring all 0's are positive
- qstr: reset mpstate.qstr_last_chunk before raising an error
- modbuiltins: add additional macro for extending builtins
- mpconfig.h: define MICROPY_PY_USSL_FINALISER only if not defined
extmod:
- machine_i2c: make SoftI2C configurable via macro option
- machine_spi: make SoftSPI configurable via macro option
- modonewire: make _onewire module configurable via macro option
- machine_pwm: factor out machine.PWM bindings to common code
- move modnetwork and modusocket from stm32 to extmod
- modnetwork: add STA_IF and AP_IF constants
- modnetwork: add extended socket state
- modusocket: add read/write stream methods to socket object
- modnetwork: define network interfaces in port config files
- network_cyw43: make consistent use of STA and AP constants
- modnetwork: remove STM32 references
- modnetwork: remove modnetwork socket u_state member
- mpbthci.h: add mp_bluetooth_hci_uart_any prototype
- nimble: add nimble CMake fragment file
- add platform module
- moduplatform: improve implementation for PC ports
- vfs_posix_file: support MP_STREAM_POLL in vfs_posix_file_ioctl
- modbluetooth: add connection interval to gap_connect
- nimble: update to NimBLE v1.4
- nimble: remove workaround for OS_ENOMEM
- uasyncio: fix gather returning exceptions from a cancelled task
- uplatform: remove unused definitions
- uplatform: use generic custom platform string
- network_ninaw10: fix scan list order to match other NICs
- modbluetooth: support gap_connect(None) to cancel a connection
- modure: redirect regex debug printing to mp_printf
- network_ninaw10: fix config of AP mode
- network_ninaw10: disable active connections before connecting
- network_ninaw10: make NIC state persistent
- network_ninaw10: return -1 on timeout from recv/send
- network_ninaw10: make recv/recvfrom interchangeable
- moduplatform: detect xtensa arch
- modusocket: allow setting timeout on unbound sockets
- modusocket: initialise accepted socket state
- network_ninaw10: use socket timeout preset in modusocket
- modbluetooth: fix conditional compilation of ringbuf_put_uuid
- modbluetooth: put declaration of connect_cancel in correct place
shared:
- libc/string0: don't include string.h, and provide __memcpy_chk
- runtime/pyexec: cleanup EXEC_FLAG flag constants
drivers:
- ninaw10: add ublox Nina-W10 WiFi/BT module driver
- lsm6dsox: add LSM6DSOX driver and examples
- neopixel: avoid heap alloc in fill()
- ninaw10: fix BSSID byte order, and add null byte to ESSID
- ninaw10/nina_wifi_drv: fix DNS resolution
mpy-cross: no changes specific to this component/port
lib:
- mynewt-nimble: switch to the MicroPython fork of NimBLE
- asf4: point submodule to latest commit on circuitpython branch
- update pico-sdk to 1.3.0 and tinyusb to 0.12.0
- stm32lib: update library for L4 v1.17.0, new G4, WL, and MMC fixes
- stm32lib: update library for fix to F7 USB HS
Support components
==================
docs:
- library/os.rst: clarify littlefs requirements for block erase
- library/bluetooth.rst: update incorrect link to gatts_write
- make.bat: change Windows output dir from '_build' to 'build'
- library/machine.I2S.rst: specify that I2S.shift args are kw-only
- esp32: explain ESP32 PWM modes, timers, and channels
- rp2: add reference for PIO assembly instructions, and PIO tutorial
- library/random.rst: document the random module
- reference/mpremote.rst: add docs for mpremote
- reference/manifest.rst: add docs for manifest.py files
- library/stm.rst: document the stm module
- esp32/tutorial: add an example of peripheral control via regs
- rp2/general.rst: fix typo with missing spaces
- library/framebuf.rst: adjust dimensions in example
- library/rp2.rst: update function asm_pio_encode to add sideset_opt
- reference/filesystem.rst: add detail on how to use littlefs fuse
- rp2/quickref.rst: add section on PIO
- library/sys.rst: add docs for sys.settrace
- esp8266/tutorial: fix comments of FrameBuffer examples
- library/uasyncio.rst: detail exception behaviour in cancel/timeout
- library/machine.Timer.rst: document 'id' as positional-only arg
- library/machine.SPI.rst: add example SPI usage
- library/machine.Timer.rst: document `period` and `callback` args
- library/machine.Pin.rst: add Pin.ANALOG mode constant
- remove trailing spaces and convert tabs to spaces
- library/sys.rst: add note about '.frozen' as an entry in sys.path
- differences: document details of new PEPs/features in Python 3.5+
- update copyright year range to include 2022
- esp32: update RMT quickref example to match latest code
examples: no changes specific to this component/port
tests:
- perf_bench: use math.log instead of math.log2
- basics: add tests for type-checking subclassed exc instances
- micropython/const.py: add comment about required config for test
- cpydiff: clarify f-string diffs regarding concatenation
- basics/int_big_cmp.py: add more tests for big-int comparison
- extmod: skip uselect_poll_udp when poll() is not available
tools:
- autobuild: add auto build for GENERIC_C3_USB
- ci.sh: use IDF v4.4 as part of esp32 CI and build GENERIC_S3
- autobuild: add the MIMXRT1010_EVK board to autobuild
- ci.sh: use a specific ESP IDF v4.4 commit
- autobuild: add script to generate website board metadata
- dfu.py: make tool work with python3 when parsing DFU files
- autobuild: automatically build all mimxrt, rp2 and samd boards
- autobuild: automatically build all stm32 boards
- mpremote: implement seek and flush in ioctl method
- autobuild: automatically build all esp32 boards
- upip.py: support == to specify exact package version
- makemanifest.py: make str conversion compatible with Python 2
- makemanifest.py: merge make-frozen.py
- mpremote: add mkdir and rmdir to RemoteFS
- mpremote: add help command
- mpremote: add link to mpremote docs URL in help message
- upip.py: skip '.frozen' entry in sys.path for install path
- autobuild: build esp8266 OTA image with GENERIC_1M board
- ci.sh: upgrade Zephyr docker image to v0.21.0
- ci.sh: build zephyr nucleo_wb55rg to test zephyr bluetooth build
CI:
- workflows: use Python 3.8 for macos workflow
- workflows: add new workflow to build ports download metadata
The ports
=========
all ports:
- add board.json for all boards
- add images, features and urls to board.json
- add '.frozen' as the first entry in sys.path
- move '.frozen' to second entry in sys.path
bare-arm port:
- mpconfigport.h: use MICROPY_CONFIG_ROM_LEVEL_MINIMUM
- mpconfigport.h: disable remaining optional features
cc3200 port: no changes specific to this component/port
esp8266 port:
- boards/GENERIC: enable f-strings
- extract qstr from object when comparing keys in config()
- etshal.h: remove unneeded function declarations
- allow building a board to any dest directory
esp32 port:
- boards: add new FeatherS2-Neo board definition
- machine_timer: use tx_update member for IDF 4.4 and above
- add support for ESP32-S3 SoCs
- boards: add new GENERIC_S3 board definition
- machine_hw_spi: fix hardware SPI DMA channels for S2/S3
- boards: add board definition for ESP32-S2-WROVER module
- boards: add LOLIN_S2_MINI ESP32-S2 board
- machine_pwm: add support for all PWM timers and channels
- README: updated readme with req IDF vers for ESP32-S2, C3 and S3
- usb: add USB host connection detection for CDC serial output
- machine_pin: block out IO16 and IO17 when using SPIRAM on ESP32
- mpthreadport: fix TCB cleanup function so thread_mutex is ready
- main: add option for a board to hook code into startup sequence
- split out WLAN code from modnetwork.c to network_wlan.c
- enable optimisations and move code to iRAM to boost performance
- usb: improve speed of USB CDC output
- add specific deploy_s2.md instructions for esp32-s2
- boards/LOLIN_S2_MINI: add image to board.json
- boards: update board and deploy metadata for UM_xxx boards
- usb: further improve speed of USB CDC output
- boards/LOLIN_S2_PICO: add LOLIN_S2_PICO board definition files
- boards/ESP32_S2_WROVER: link to specific deploy_s2 instructions
- support building with latest IDF v5
- in machine_i2s, send null samples in underflow situations
- in machine_i2s, make object reference arrays root pointers
- add SDCard support for S3, and a GENERIC_S3_SPIRAM board
- boards/GENERIC_S3: enable BLE on ESP32 S3
- machine_pwm: implement duty_u16() and duty_ns() PWM methods
- extract qstr from object when comparing keys in config()
- machine_pin: make GPIO 26 usable for S2,S3 if SPIRAM not config'd
- machine_hw_spi: fix SPI default pins reordering on ESP32-S2/S3
- machine_hw_spi: set proper default SPI(id=1) pins on S2,S3 and C3
- machine_hw_spi: set proper default SPI(id=2) pins on S2 and S3
- boards: remove SPI pin defaults from GENERIC S2/S3 boards
- modnetwork: synchronize WiFi AUTH_xxx constants with IDF values
- machine_pwm: keep duty constant when changing frequency
- machine_bitstream: replace bit-bang code with RMT-based driver
- machine_i2s: add support for ESP-IDF 4.4
- machine_bitstream: fix signal duplication on output pins
- esp32: enable platform module with IDF version
- boards/GENERIC_D2WD: build with -Os optimisation
- esp32_rmt: install RMT driver on core 1
- machine_bitstream: reinstate bitstream bit-bang implementation
javascript port: no changes specific to this component/port
mimxrt port:
- sdcard: implement SDCard driver
- machine_bitstream: add bitstream function to machine module
- rework flash configuration
- sdram: add SDRAM support
- eth: add LAN support and integrate the network module
- modmachine: implement machine.WDT() and machine.reset_cause()
- boards: fix the D14/D15 pin assignment of MIMXRT1050/60/64_EVK
- hal: remove duplicate definitions from flexspi_hyper_flash.h
- dma_channel: fix the DMA channel management
- fix cycle counter for time.ticks_cpu() and machine.bitstream()
- add dht_readinto() to the mimxrt module, and freeze dht.py
- extend the help() message and README.md
- mpconfigport.h: enable f-strings
- modmachine: implement soft_reset() and unique_id() functions
- boards/make-pins.py: allow empty lines and comments in pins.csv
- optimize the runtime speed
- enable the platform module
- boards: add the Seeed ARCH MIX board
- boards: update the board.json files and add deploy_xx.md files
- fix mp_hal_quiet_timing_enter()/exit() so timer still runs
- support PWM using the FLEXPWM and QTMR modules
- define UART 0 on MIMXRT boards
- support selection of PHY type and address
- re-enable eth checksum creation by HW
- fix a tiny unnoticed bug in sdcard.c
- add a driver for the DP83848 PHY device
- refactor the reading of the machine id
- enable ticks_cpu at boot time for NDEBUG builds only
- use -Og instead of -O0 for DEBUG builds
- tidy up the board flash related files
- hal: allow readSampleClkSrc to be configured by a board
- enable MICROPY_PY_USSL_FINALISER
minimal port:
- mpconfigport.h: use MICROPY_CONFIG_ROM_LEVEL_MINIMUM
- Makefile: don't force a 32-bit build
- mpconfigport.h: disable features that are not needed
nrf port:
- Makefile: improve Black Magic Probe commands
- main: use VFS helper function to mount fs and chdir
pic16bit port: no changes specific to this component/port
powerpc port: no changes specific to this component/port
qemu-arm port: no changes specific to this component/port
rp2 port:
- mpconfigport.h: enable heapq module
- add support for bluetooth module using NimBLE
- add framework for networking
- mpconfigport.h: use the "extra" feature level
- enable optimisations (comp goto, map cache, fast attr)
- machine_i2s: add I2S protocol support
- add support for Nina-W10 WiFi/BT module
- boards: add support for Arduino Nano RP2040
- machine_bitstream: implement the machine.bitstream driver
- boards: add neopixel.py to manifest.py
- rp2_pio: support exec with sideset
- boards/PIMORONI_PICOLIPO_16MB: fix 16MB flash size
- boards: add PYBSTICK26 RP2040 board definition
- machine_uart: handle and clear UART RX timeout IRQ
- boards/ARDUINO_NANO_RP2040_CONNECT: set default I2C pins
- machine_pwm: fix PWM frequency setting
- machine_pwm: keep duty value when changing the frequency
- add support for DHT11 and DHT22 sensors
- CMakeLists.txt: allow a board to override PICO_BOARD
- boards/GARATRONIC_PYBSTICK26_RP2040: use correct pico-sdk board cfg
samd port:
- integrate latest asf4, add help, more time funcs and uPy features
- samd_soc: allow a board to configure the low-level MCU config
- add internal flash block device, filesystem and uos support
- add Pin and LED classes, and machine.unique_id
- boards/ADAFRUIT_FEATHER_M0_EXPRESS: update for flash and pins
- boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS: update for flash and pins
- boards/MINISAM_M4: update for flash and pins
- boards/ADAFRUIT_TRINKET_M0: update for flash and pins
- boards/SAMD21_XPLAINED_PRO: update for flash and pins
- boards/SEEED_WIO_TERMINAL: add new board definition
- boards/SEEED_XIAO: add new board definition
- README.md: update README to reflect new features and boards
stm32 port:
- pin: enable GPIO clock of pin if it's constructed without init
- main: don't unconditionally enable GPIO A,B,C,D clocks
- boards/VCC_GND_H743VI: add board definition for VCC_GND_H743VI
- boards/OLIMEX_E407: add Ethernet RMII support
- boards/LEGO_HUB_NO6: remove user paths from cc2564 init file
- boards: remove trailing spaces, and add newline at end of file
- add basic support for STM32H750
- add support for H7A3(Q)/H7B3(Q), and STM32H73B3I_DK board defn
- suggest putting code in main.py not boot.py
- boards/make-pins.py: allow a CPU pin to be hidden
- boards/make-pins.py: allow empty lines and comments in pins.csv
- dma: add functions for external users of DMA to enable clock
- enable LOAD_ATTR fast path, and map lookup caching on >M0
- boards: add OLIMEX H407 board definition
- enable platform module
- extended flash filesystem space to 512K on H743 boards
- boards/NUCLEO_H743ZI: enable VfsLfs2 on NUCLEO_H743ZI(2) boards
- boards: add PF11-BOOT0 to stm32f091_af.csv
- machine_i2c: use hardware I2C for STM32H7
- sdram: enforce gcc opt, and use volatile and DSB in sdram_test
- usbd_cdc_interface: allow a board to hook into USBD CDC RX events
- mpbthciport: allow a board to hook BT HCI poll functions
- pendsv: allow a board to add entries for pendsv_schedule_dispatch
- boards: add images to board.json for Adafruit and VCC_GND boards
- uart: fix race conditions and clearing status in IRQ handler
- mpconfigport.h: use the "extra" feature level
- in machine_i2s, send null samples in underflow situations
- in machine_i2s, make object reference arrays root pointers
- led: support an extra 2 LEDs in board configuration
- boards/MIKROE_CLICKER2_STM32: add more detail to board.json
- boards: add new board MikroElektronika Quail, and F427 support
- main: run optional frozen module at boot
- sdio: don't explicitly disable DMA2 on deinit of SDIO
- dma: make DMA2_Stream3 exclusive to SDIO when CYW43 enabled
- boards: build NUCLEO_WB55 and STM32F769DISC without mboot enabled
- boards: add PYBSTICK26 F411 board definition
- boards/NADHAT_PYBF405: rename board to GARATRONIC_NADHAT_F405
- usb: use a table of allowed values to simplify usb_mode get/set
- boards/NUCLEO_WB55: update rfcore_firmwre for new WS
- flashbdev: support generic flash storage config via link symbols
- boards: convert F413,F439,H743,L4xx,WB55 to new flash FS config
- add support for F479 MCUs
- include HAL MMC code in F4 builds
- boards/make-pins.py: use cpu pins to define static alt-fun macros
- boards/NUCLEO_WB55: fix LED ordering
- boards/LEGO_HUB_NO6: set filesystem label as HUB_NO6
- boards: remove stray '+' characters at start of lines in ld files
- boards: remove unused MICROPY_HW_ENABLE_TIMER config
- boards: enable MICROPY_HW_ENABLE_SERVO on various boards
- update L4 code to build with latest stm32lib and L4 HAL 1.17.0
- main: call sdcard_init when only MICROPY_HW_ENABLE_MMCARD enabled
- sdcard: support 8-bit wide SDIO bus
- sdcard: add config option to force MM card capacity
- factoryreset: init vfs flags before calling pyb_flash_init_vfs
- qspi: fix typo in address comment
- boards/make-pins.py: generate empty ADC table if needed
- boards/OLIMEX_H407: fix typo in OLIMEX H407 board.json
- network_wiznet5k: fix build error with wiznet5k and lwip enabled
- enable MICROPY_PY_USSL_FINALISER
teensy port:
- switch to use manifest.py instead of FROZEN_DIR
unix port:
- enable LOAD_ATTR fast path, and map lookup caching
- modusocket: support MP_STREAM_POLL in unix socket_ioctl
- modos: add support for uos.urandom(n)
- coverage: change remaining printf to mp_printf
- Makefile: use -Og instead of -O0 for debug builds
windows port:
- README: remove unsupported Python instructions for Cygwin
- mpconfigport.h: enable help and help("modules")
- add support for build variants to windows port
- run tests via Makefile
- appveyor: build both standard and dev variants
- appveyor: build mpy-cross only once for mingw-w64
- msvc: run qstr preprocessing phase in parallel
zephyr port:
- mphalport.h: remove unused and unimplemented C-level pin API
- increase minimum CMake version to 3.20.0
- update include path to reboot.h
- get UART console device from devicetree instead of Kconfig
- use CONFIG_USB_DEVICE_STACK for conditional USB device support
- upgrade to Zephyr v2.7.0
- modbluetooth_zephyr: provide dummy connect_cancel function
938 lines
34 KiB
C
938 lines
34 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
|
|
*
|
|
* 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 <stdint.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
|
|
#include "py/mpstate.h"
|
|
#include "py/emit.h"
|
|
#include "py/bc0.h"
|
|
|
|
#if MICROPY_ENABLE_COMPILER
|
|
|
|
#define BYTES_FOR_INT ((MP_BYTES_PER_OBJ_WORD * 8 + 6) / 7)
|
|
#define DUMMY_DATA_SIZE (BYTES_FOR_INT)
|
|
|
|
struct _emit_t {
|
|
// Accessed as mp_obj_t, so must be aligned as such, and we rely on the
|
|
// memory allocator returning a suitably aligned pointer.
|
|
// Should work for cases when mp_obj_t is 64-bit on a 32-bit machine.
|
|
byte dummy_data[DUMMY_DATA_SIZE];
|
|
|
|
pass_kind_t pass : 8;
|
|
mp_uint_t last_emit_was_return_value : 8;
|
|
|
|
int stack_size;
|
|
|
|
scope_t *scope;
|
|
|
|
mp_uint_t last_source_line_offset;
|
|
mp_uint_t last_source_line;
|
|
|
|
mp_uint_t max_num_labels;
|
|
mp_uint_t *label_offsets;
|
|
|
|
size_t code_info_offset;
|
|
size_t code_info_size;
|
|
size_t bytecode_offset;
|
|
size_t bytecode_size;
|
|
byte *code_base; // stores both byte code and code info
|
|
|
|
size_t n_info;
|
|
size_t n_cell;
|
|
|
|
#if MICROPY_PERSISTENT_CODE
|
|
uint16_t ct_cur_obj;
|
|
uint16_t ct_num_obj;
|
|
uint16_t ct_cur_raw_code;
|
|
#endif
|
|
mp_uint_t *const_table;
|
|
};
|
|
|
|
emit_t *emit_bc_new(void) {
|
|
emit_t *emit = m_new0(emit_t, 1);
|
|
return emit;
|
|
}
|
|
|
|
void emit_bc_set_max_num_labels(emit_t *emit, mp_uint_t max_num_labels) {
|
|
emit->max_num_labels = max_num_labels;
|
|
emit->label_offsets = m_new(mp_uint_t, emit->max_num_labels);
|
|
}
|
|
|
|
void emit_bc_free(emit_t *emit) {
|
|
m_del(mp_uint_t, emit->label_offsets, emit->max_num_labels);
|
|
m_del_obj(emit_t, emit);
|
|
}
|
|
|
|
typedef byte *(*emit_allocator_t)(emit_t *emit, int nbytes);
|
|
|
|
STATIC void emit_write_uint(emit_t *emit, emit_allocator_t allocator, mp_uint_t val) {
|
|
// We store each 7 bits in a separate byte, and that's how many bytes needed
|
|
byte buf[BYTES_FOR_INT];
|
|
byte *p = buf + sizeof(buf);
|
|
// We encode in little-ending order, but store in big-endian, to help decoding
|
|
do {
|
|
*--p = val & 0x7f;
|
|
val >>= 7;
|
|
} while (val != 0);
|
|
byte *c = allocator(emit, buf + sizeof(buf) - p);
|
|
while (p != buf + sizeof(buf) - 1) {
|
|
*c++ = *p++ | 0x80;
|
|
}
|
|
*c = *p;
|
|
}
|
|
|
|
// all functions must go through this one to emit code info
|
|
STATIC byte *emit_get_cur_to_write_code_info(emit_t *emit, int num_bytes_to_write) {
|
|
if (emit->pass < MP_PASS_EMIT) {
|
|
emit->code_info_offset += num_bytes_to_write;
|
|
return emit->dummy_data;
|
|
} else {
|
|
assert(emit->code_info_offset + num_bytes_to_write <= emit->code_info_size);
|
|
byte *c = emit->code_base + emit->code_info_offset;
|
|
emit->code_info_offset += num_bytes_to_write;
|
|
return c;
|
|
}
|
|
}
|
|
|
|
STATIC void emit_write_code_info_byte(emit_t *emit, byte val) {
|
|
*emit_get_cur_to_write_code_info(emit, 1) = val;
|
|
}
|
|
|
|
STATIC void emit_write_code_info_qstr(emit_t *emit, qstr qst) {
|
|
#if MICROPY_PERSISTENT_CODE
|
|
assert((qst >> 16) == 0);
|
|
byte *c = emit_get_cur_to_write_code_info(emit, 2);
|
|
c[0] = qst;
|
|
c[1] = qst >> 8;
|
|
#else
|
|
emit_write_uint(emit, emit_get_cur_to_write_code_info, qst);
|
|
#endif
|
|
}
|
|
|
|
#if MICROPY_ENABLE_SOURCE_LINE
|
|
STATIC void emit_write_code_info_bytes_lines(emit_t *emit, mp_uint_t bytes_to_skip, mp_uint_t lines_to_skip) {
|
|
assert(bytes_to_skip > 0 || lines_to_skip > 0);
|
|
while (bytes_to_skip > 0 || lines_to_skip > 0) {
|
|
mp_uint_t b, l;
|
|
if (lines_to_skip <= 6 || bytes_to_skip > 0xf) {
|
|
// use 0b0LLBBBBB encoding
|
|
b = MIN(bytes_to_skip, 0x1f);
|
|
if (b < bytes_to_skip) {
|
|
// we can't skip any lines until we skip all the bytes
|
|
l = 0;
|
|
} else {
|
|
l = MIN(lines_to_skip, 0x3);
|
|
}
|
|
*emit_get_cur_to_write_code_info(emit, 1) = b | (l << 5);
|
|
} else {
|
|
// use 0b1LLLBBBB 0bLLLLLLLL encoding (l's LSB in second byte)
|
|
b = MIN(bytes_to_skip, 0xf);
|
|
l = MIN(lines_to_skip, 0x7ff);
|
|
byte *ci = emit_get_cur_to_write_code_info(emit, 2);
|
|
ci[0] = 0x80 | b | ((l >> 4) & 0x70);
|
|
ci[1] = l;
|
|
}
|
|
bytes_to_skip -= b;
|
|
lines_to_skip -= l;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
// all functions must go through this one to emit byte code
|
|
STATIC byte *emit_get_cur_to_write_bytecode(emit_t *emit, int num_bytes_to_write) {
|
|
if (emit->pass < MP_PASS_EMIT) {
|
|
emit->bytecode_offset += num_bytes_to_write;
|
|
return emit->dummy_data;
|
|
} else {
|
|
assert(emit->bytecode_offset + num_bytes_to_write <= emit->bytecode_size);
|
|
byte *c = emit->code_base + emit->code_info_size + emit->bytecode_offset;
|
|
emit->bytecode_offset += num_bytes_to_write;
|
|
return c;
|
|
}
|
|
}
|
|
|
|
STATIC void emit_write_bytecode_raw_byte(emit_t *emit, byte b1) {
|
|
byte *c = emit_get_cur_to_write_bytecode(emit, 1);
|
|
c[0] = b1;
|
|
}
|
|
|
|
STATIC void emit_write_bytecode_byte(emit_t *emit, int stack_adj, byte b1) {
|
|
mp_emit_bc_adjust_stack_size(emit, stack_adj);
|
|
byte *c = emit_get_cur_to_write_bytecode(emit, 1);
|
|
c[0] = b1;
|
|
}
|
|
|
|
// Similar to emit_write_bytecode_uint(), just some extra handling to encode sign
|
|
STATIC void emit_write_bytecode_byte_int(emit_t *emit, int stack_adj, byte b1, mp_int_t num) {
|
|
emit_write_bytecode_byte(emit, stack_adj, b1);
|
|
|
|
// We store each 7 bits in a separate byte, and that's how many bytes needed
|
|
byte buf[BYTES_FOR_INT];
|
|
byte *p = buf + sizeof(buf);
|
|
// We encode in little-ending order, but store in big-endian, to help decoding
|
|
do {
|
|
*--p = num & 0x7f;
|
|
num >>= 7;
|
|
} while (num != 0 && num != -1);
|
|
// Make sure that highest bit we stored (mask 0x40) matches sign
|
|
// of the number. If not, store extra byte just to encode sign
|
|
if (num == -1 && (*p & 0x40) == 0) {
|
|
*--p = 0x7f;
|
|
} else if (num == 0 && (*p & 0x40) != 0) {
|
|
*--p = 0;
|
|
}
|
|
|
|
byte *c = emit_get_cur_to_write_bytecode(emit, buf + sizeof(buf) - p);
|
|
while (p != buf + sizeof(buf) - 1) {
|
|
*c++ = *p++ | 0x80;
|
|
}
|
|
*c = *p;
|
|
}
|
|
|
|
STATIC void emit_write_bytecode_byte_uint(emit_t *emit, int stack_adj, byte b, mp_uint_t val) {
|
|
emit_write_bytecode_byte(emit, stack_adj, b);
|
|
emit_write_uint(emit, emit_get_cur_to_write_bytecode, val);
|
|
}
|
|
|
|
#if MICROPY_PERSISTENT_CODE
|
|
STATIC void emit_write_bytecode_byte_const(emit_t *emit, int stack_adj, byte b, mp_uint_t n, mp_uint_t c) {
|
|
if (emit->pass == MP_PASS_EMIT) {
|
|
emit->const_table[n] = c;
|
|
}
|
|
emit_write_bytecode_byte_uint(emit, stack_adj, b, n);
|
|
}
|
|
#endif
|
|
|
|
STATIC void emit_write_bytecode_byte_qstr(emit_t *emit, int stack_adj, byte b, qstr qst) {
|
|
#if MICROPY_PERSISTENT_CODE
|
|
assert((qst >> 16) == 0);
|
|
mp_emit_bc_adjust_stack_size(emit, stack_adj);
|
|
byte *c = emit_get_cur_to_write_bytecode(emit, 3);
|
|
c[0] = b;
|
|
c[1] = qst;
|
|
c[2] = qst >> 8;
|
|
#else
|
|
emit_write_bytecode_byte_uint(emit, stack_adj, b, qst);
|
|
#endif
|
|
}
|
|
|
|
STATIC void emit_write_bytecode_byte_obj(emit_t *emit, int stack_adj, byte b, mp_obj_t obj) {
|
|
#if MICROPY_PERSISTENT_CODE
|
|
emit_write_bytecode_byte_const(emit, stack_adj, b,
|
|
emit->scope->num_pos_args + emit->scope->num_kwonly_args
|
|
+ emit->ct_cur_obj++, (mp_uint_t)obj);
|
|
#else
|
|
// aligns the pointer so it is friendly to GC
|
|
emit_write_bytecode_byte(emit, stack_adj, b);
|
|
emit->bytecode_offset = (size_t)MP_ALIGN(emit->bytecode_offset, sizeof(mp_obj_t));
|
|
mp_obj_t *c = (mp_obj_t *)emit_get_cur_to_write_bytecode(emit, sizeof(mp_obj_t));
|
|
// Verify thar c is already uint-aligned
|
|
assert(c == MP_ALIGN(c, sizeof(mp_obj_t)));
|
|
*c = obj;
|
|
#endif
|
|
}
|
|
|
|
STATIC void emit_write_bytecode_byte_raw_code(emit_t *emit, int stack_adj, byte b, mp_raw_code_t *rc) {
|
|
#if MICROPY_PERSISTENT_CODE
|
|
emit_write_bytecode_byte_const(emit, stack_adj, b,
|
|
emit->scope->num_pos_args + emit->scope->num_kwonly_args
|
|
+ emit->ct_num_obj + emit->ct_cur_raw_code++, (mp_uint_t)(uintptr_t)rc);
|
|
#else
|
|
// aligns the pointer so it is friendly to GC
|
|
emit_write_bytecode_byte(emit, stack_adj, b);
|
|
emit->bytecode_offset = (size_t)MP_ALIGN(emit->bytecode_offset, sizeof(void *));
|
|
void **c = (void **)emit_get_cur_to_write_bytecode(emit, sizeof(void *));
|
|
// Verify thar c is already uint-aligned
|
|
assert(c == MP_ALIGN(c, sizeof(void *)));
|
|
*c = rc;
|
|
#endif
|
|
#if MICROPY_PY_SYS_SETTRACE
|
|
rc->line_of_definition = emit->last_source_line;
|
|
#endif
|
|
}
|
|
|
|
// unsigned labels are relative to ip following this instruction, stored as 16 bits
|
|
STATIC void emit_write_bytecode_byte_unsigned_label(emit_t *emit, int stack_adj, byte b1, mp_uint_t label) {
|
|
mp_emit_bc_adjust_stack_size(emit, stack_adj);
|
|
mp_uint_t bytecode_offset;
|
|
if (emit->pass < MP_PASS_EMIT) {
|
|
bytecode_offset = 0;
|
|
} else {
|
|
bytecode_offset = emit->label_offsets[label] - emit->bytecode_offset - 3;
|
|
}
|
|
byte *c = emit_get_cur_to_write_bytecode(emit, 3);
|
|
c[0] = b1;
|
|
c[1] = bytecode_offset;
|
|
c[2] = bytecode_offset >> 8;
|
|
}
|
|
|
|
// signed labels are relative to ip following this instruction, stored as 16 bits, in excess
|
|
STATIC void emit_write_bytecode_byte_signed_label(emit_t *emit, int stack_adj, byte b1, mp_uint_t label) {
|
|
mp_emit_bc_adjust_stack_size(emit, stack_adj);
|
|
int bytecode_offset;
|
|
if (emit->pass < MP_PASS_EMIT) {
|
|
bytecode_offset = 0;
|
|
} else {
|
|
bytecode_offset = emit->label_offsets[label] - emit->bytecode_offset - 3 + 0x8000;
|
|
}
|
|
byte *c = emit_get_cur_to_write_bytecode(emit, 3);
|
|
c[0] = b1;
|
|
c[1] = bytecode_offset;
|
|
c[2] = bytecode_offset >> 8;
|
|
}
|
|
|
|
void mp_emit_bc_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scope) {
|
|
emit->pass = pass;
|
|
emit->stack_size = 0;
|
|
emit->last_emit_was_return_value = false;
|
|
emit->scope = scope;
|
|
emit->last_source_line_offset = 0;
|
|
emit->last_source_line = 1;
|
|
#ifndef NDEBUG
|
|
// With debugging enabled labels are checked for unique assignment
|
|
if (pass < MP_PASS_EMIT && emit->label_offsets != NULL) {
|
|
memset(emit->label_offsets, -1, emit->max_num_labels * sizeof(mp_uint_t));
|
|
}
|
|
#endif
|
|
emit->bytecode_offset = 0;
|
|
emit->code_info_offset = 0;
|
|
|
|
// Write local state size, exception stack size, scope flags and number of arguments
|
|
{
|
|
mp_uint_t n_state = scope->num_locals + scope->stack_size;
|
|
if (n_state == 0) {
|
|
// Need at least 1 entry in the state, in the case an exception is
|
|
// propagated through this function, the exception is returned in
|
|
// the highest slot in the state (fastn[0], see vm.c).
|
|
n_state = 1;
|
|
}
|
|
#if MICROPY_DEBUG_VM_STACK_OVERFLOW
|
|
// An extra slot in the stack is needed to detect VM stack overflow
|
|
n_state += 1;
|
|
#endif
|
|
|
|
size_t n_exc_stack = scope->exc_stack_size;
|
|
MP_BC_PRELUDE_SIG_ENCODE(n_state, n_exc_stack, scope, emit_write_code_info_byte, emit);
|
|
}
|
|
|
|
// Write number of cells and size of the source code info
|
|
if (pass >= MP_PASS_CODE_SIZE) {
|
|
MP_BC_PRELUDE_SIZE_ENCODE(emit->n_info, emit->n_cell, emit_write_code_info_byte, emit);
|
|
}
|
|
|
|
emit->n_info = emit->code_info_offset;
|
|
|
|
// Write the name and source file of this function.
|
|
emit_write_code_info_qstr(emit, scope->simple_name);
|
|
emit_write_code_info_qstr(emit, scope->source_file);
|
|
|
|
#if MICROPY_PERSISTENT_CODE
|
|
emit->ct_cur_obj = 0;
|
|
emit->ct_cur_raw_code = 0;
|
|
#endif
|
|
|
|
if (pass == MP_PASS_EMIT) {
|
|
// Write argument names (needed to resolve positional args passed as
|
|
// keywords). We store them as full word-sized objects for efficient access
|
|
// in mp_setup_code_state this is the start of the prelude and is guaranteed
|
|
// to be aligned on a word boundary.
|
|
|
|
// For a given argument position (indexed by i) we need to find the
|
|
// corresponding id_info which is a parameter, as it has the correct
|
|
// qstr name to use as the argument name. Note that it's not a simple
|
|
// 1-1 mapping (ie i!=j in general) because of possible closed-over
|
|
// variables. In the case that the argument i has no corresponding
|
|
// parameter we use "*" as its name (since no argument can ever be named
|
|
// "*"). We could use a blank qstr but "*" is better for debugging.
|
|
// Note: there is some wasted RAM here for the case of storing a qstr
|
|
// for each closed-over variable, and maybe there is a better way to do
|
|
// it, but that would require changes to mp_setup_code_state.
|
|
for (int i = 0; i < scope->num_pos_args + scope->num_kwonly_args; i++) {
|
|
qstr qst = MP_QSTR__star_;
|
|
for (int j = 0; j < scope->id_info_len; ++j) {
|
|
id_info_t *id = &scope->id_info[j];
|
|
if ((id->flags & ID_FLAG_IS_PARAM) && id->local_num == i) {
|
|
qst = id->qst;
|
|
break;
|
|
}
|
|
}
|
|
emit->const_table[i] = (mp_uint_t)MP_OBJ_NEW_QSTR(qst);
|
|
}
|
|
}
|
|
}
|
|
|
|
void mp_emit_bc_end_pass(emit_t *emit) {
|
|
if (emit->pass == MP_PASS_SCOPE) {
|
|
return;
|
|
}
|
|
|
|
// check stack is back to zero size
|
|
assert(emit->stack_size == 0);
|
|
|
|
emit_write_code_info_byte(emit, 0); // end of line number info
|
|
|
|
// Calculate size of source code info section
|
|
emit->n_info = emit->code_info_offset - emit->n_info;
|
|
|
|
// Emit closure section of prelude
|
|
emit->n_cell = 0;
|
|
for (size_t i = 0; i < emit->scope->id_info_len; ++i) {
|
|
id_info_t *id = &emit->scope->id_info[i];
|
|
if (id->kind == ID_INFO_KIND_CELL) {
|
|
assert(id->local_num <= 255);
|
|
emit_write_code_info_byte(emit, id->local_num); // write the local which should be converted to a cell
|
|
++emit->n_cell;
|
|
}
|
|
}
|
|
|
|
#if MICROPY_PERSISTENT_CODE
|
|
assert(emit->pass <= MP_PASS_STACK_SIZE || (emit->ct_num_obj == emit->ct_cur_obj));
|
|
emit->ct_num_obj = emit->ct_cur_obj;
|
|
#endif
|
|
|
|
if (emit->pass == MP_PASS_CODE_SIZE) {
|
|
#if !MICROPY_PERSISTENT_CODE
|
|
// so bytecode is aligned
|
|
emit->code_info_offset = (size_t)MP_ALIGN(emit->code_info_offset, sizeof(mp_uint_t));
|
|
#endif
|
|
|
|
// calculate size of total code-info + bytecode, in bytes
|
|
emit->code_info_size = emit->code_info_offset;
|
|
emit->bytecode_size = emit->bytecode_offset;
|
|
emit->code_base = m_new0(byte, emit->code_info_size + emit->bytecode_size);
|
|
|
|
#if MICROPY_PERSISTENT_CODE
|
|
emit->const_table = m_new0(mp_uint_t,
|
|
emit->scope->num_pos_args + emit->scope->num_kwonly_args
|
|
+ emit->ct_cur_obj + emit->ct_cur_raw_code);
|
|
#else
|
|
emit->const_table = m_new0(mp_uint_t,
|
|
emit->scope->num_pos_args + emit->scope->num_kwonly_args);
|
|
#endif
|
|
|
|
} else if (emit->pass == MP_PASS_EMIT) {
|
|
mp_emit_glue_assign_bytecode(emit->scope->raw_code, emit->code_base,
|
|
#if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
|
|
emit->code_info_size + emit->bytecode_size,
|
|
#endif
|
|
emit->const_table,
|
|
#if MICROPY_PERSISTENT_CODE_SAVE
|
|
emit->ct_cur_obj, emit->ct_cur_raw_code,
|
|
#endif
|
|
emit->scope->scope_flags);
|
|
}
|
|
}
|
|
|
|
bool mp_emit_bc_last_emit_was_return_value(emit_t *emit) {
|
|
return emit->last_emit_was_return_value;
|
|
}
|
|
|
|
void mp_emit_bc_adjust_stack_size(emit_t *emit, mp_int_t delta) {
|
|
if (emit->pass == MP_PASS_SCOPE) {
|
|
return;
|
|
}
|
|
assert((mp_int_t)emit->stack_size + delta >= 0);
|
|
emit->stack_size += delta;
|
|
if (emit->stack_size > emit->scope->stack_size) {
|
|
emit->scope->stack_size = emit->stack_size;
|
|
}
|
|
emit->last_emit_was_return_value = false;
|
|
}
|
|
|
|
void mp_emit_bc_set_source_line(emit_t *emit, mp_uint_t source_line) {
|
|
#if MICROPY_ENABLE_SOURCE_LINE
|
|
if (MP_STATE_VM(mp_optimise_value) >= 3) {
|
|
// If we compile with -O3, don't store line numbers.
|
|
return;
|
|
}
|
|
if (source_line > emit->last_source_line) {
|
|
mp_uint_t bytes_to_skip = emit->bytecode_offset - emit->last_source_line_offset;
|
|
mp_uint_t lines_to_skip = source_line - emit->last_source_line;
|
|
emit_write_code_info_bytes_lines(emit, bytes_to_skip, lines_to_skip);
|
|
emit->last_source_line_offset = emit->bytecode_offset;
|
|
emit->last_source_line = source_line;
|
|
}
|
|
#else
|
|
(void)emit;
|
|
(void)source_line;
|
|
#endif
|
|
}
|
|
|
|
void mp_emit_bc_label_assign(emit_t *emit, mp_uint_t l) {
|
|
mp_emit_bc_adjust_stack_size(emit, 0);
|
|
if (emit->pass == MP_PASS_SCOPE) {
|
|
return;
|
|
}
|
|
assert(l < emit->max_num_labels);
|
|
if (emit->pass < MP_PASS_EMIT) {
|
|
// assign label offset
|
|
assert(emit->label_offsets[l] == (mp_uint_t)-1);
|
|
emit->label_offsets[l] = emit->bytecode_offset;
|
|
} else {
|
|
// ensure label offset has not changed from MP_PASS_CODE_SIZE to MP_PASS_EMIT
|
|
assert(emit->label_offsets[l] == emit->bytecode_offset);
|
|
}
|
|
}
|
|
|
|
void mp_emit_bc_import(emit_t *emit, qstr qst, int kind) {
|
|
MP_STATIC_ASSERT(MP_BC_IMPORT_NAME + MP_EMIT_IMPORT_NAME == MP_BC_IMPORT_NAME);
|
|
MP_STATIC_ASSERT(MP_BC_IMPORT_NAME + MP_EMIT_IMPORT_FROM == MP_BC_IMPORT_FROM);
|
|
int stack_adj = kind == MP_EMIT_IMPORT_FROM ? 1 : -1;
|
|
if (kind == MP_EMIT_IMPORT_STAR) {
|
|
emit_write_bytecode_byte(emit, stack_adj, MP_BC_IMPORT_STAR);
|
|
} else {
|
|
emit_write_bytecode_byte_qstr(emit, stack_adj, MP_BC_IMPORT_NAME + kind, qst);
|
|
}
|
|
}
|
|
|
|
void mp_emit_bc_load_const_tok(emit_t *emit, mp_token_kind_t tok) {
|
|
MP_STATIC_ASSERT(MP_BC_LOAD_CONST_FALSE + (MP_TOKEN_KW_NONE - MP_TOKEN_KW_FALSE) == MP_BC_LOAD_CONST_NONE);
|
|
MP_STATIC_ASSERT(MP_BC_LOAD_CONST_FALSE + (MP_TOKEN_KW_TRUE - MP_TOKEN_KW_FALSE) == MP_BC_LOAD_CONST_TRUE);
|
|
if (tok == MP_TOKEN_ELLIPSIS) {
|
|
emit_write_bytecode_byte_obj(emit, 1, MP_BC_LOAD_CONST_OBJ, MP_OBJ_FROM_PTR(&mp_const_ellipsis_obj));
|
|
} else {
|
|
emit_write_bytecode_byte(emit, 1, MP_BC_LOAD_CONST_FALSE + (tok - MP_TOKEN_KW_FALSE));
|
|
}
|
|
}
|
|
|
|
void mp_emit_bc_load_const_small_int(emit_t *emit, mp_int_t arg) {
|
|
if (-MP_BC_LOAD_CONST_SMALL_INT_MULTI_EXCESS <= arg
|
|
&& arg < MP_BC_LOAD_CONST_SMALL_INT_MULTI_NUM - MP_BC_LOAD_CONST_SMALL_INT_MULTI_EXCESS) {
|
|
emit_write_bytecode_byte(emit, 1,
|
|
MP_BC_LOAD_CONST_SMALL_INT_MULTI + MP_BC_LOAD_CONST_SMALL_INT_MULTI_EXCESS + arg);
|
|
} else {
|
|
emit_write_bytecode_byte_int(emit, 1, MP_BC_LOAD_CONST_SMALL_INT, arg);
|
|
}
|
|
}
|
|
|
|
void mp_emit_bc_load_const_str(emit_t *emit, qstr qst) {
|
|
emit_write_bytecode_byte_qstr(emit, 1, MP_BC_LOAD_CONST_STRING, qst);
|
|
}
|
|
|
|
void mp_emit_bc_load_const_obj(emit_t *emit, mp_obj_t obj) {
|
|
emit_write_bytecode_byte_obj(emit, 1, MP_BC_LOAD_CONST_OBJ, obj);
|
|
}
|
|
|
|
void mp_emit_bc_load_null(emit_t *emit) {
|
|
emit_write_bytecode_byte(emit, 1, MP_BC_LOAD_NULL);
|
|
}
|
|
|
|
void mp_emit_bc_load_local(emit_t *emit, qstr qst, mp_uint_t local_num, int kind) {
|
|
MP_STATIC_ASSERT(MP_BC_LOAD_FAST_N + MP_EMIT_IDOP_LOCAL_FAST == MP_BC_LOAD_FAST_N);
|
|
MP_STATIC_ASSERT(MP_BC_LOAD_FAST_N + MP_EMIT_IDOP_LOCAL_DEREF == MP_BC_LOAD_DEREF);
|
|
(void)qst;
|
|
if (kind == MP_EMIT_IDOP_LOCAL_FAST && local_num <= 15) {
|
|
emit_write_bytecode_byte(emit, 1, MP_BC_LOAD_FAST_MULTI + local_num);
|
|
} else {
|
|
emit_write_bytecode_byte_uint(emit, 1, MP_BC_LOAD_FAST_N + kind, local_num);
|
|
}
|
|
}
|
|
|
|
void mp_emit_bc_load_global(emit_t *emit, qstr qst, int kind) {
|
|
MP_STATIC_ASSERT(MP_BC_LOAD_NAME + MP_EMIT_IDOP_GLOBAL_NAME == MP_BC_LOAD_NAME);
|
|
MP_STATIC_ASSERT(MP_BC_LOAD_NAME + MP_EMIT_IDOP_GLOBAL_GLOBAL == MP_BC_LOAD_GLOBAL);
|
|
(void)qst;
|
|
emit_write_bytecode_byte_qstr(emit, 1, MP_BC_LOAD_NAME + kind, qst);
|
|
}
|
|
|
|
void mp_emit_bc_load_method(emit_t *emit, qstr qst, bool is_super) {
|
|
int stack_adj = 1 - 2 * is_super;
|
|
emit_write_bytecode_byte_qstr(emit, stack_adj, is_super ? MP_BC_LOAD_SUPER_METHOD : MP_BC_LOAD_METHOD, qst);
|
|
}
|
|
|
|
void mp_emit_bc_load_build_class(emit_t *emit) {
|
|
emit_write_bytecode_byte(emit, 1, MP_BC_LOAD_BUILD_CLASS);
|
|
}
|
|
|
|
void mp_emit_bc_subscr(emit_t *emit, int kind) {
|
|
if (kind == MP_EMIT_SUBSCR_LOAD) {
|
|
emit_write_bytecode_byte(emit, -1, MP_BC_LOAD_SUBSCR);
|
|
} else {
|
|
if (kind == MP_EMIT_SUBSCR_DELETE) {
|
|
mp_emit_bc_load_null(emit);
|
|
mp_emit_bc_rot_three(emit);
|
|
}
|
|
emit_write_bytecode_byte(emit, -3, MP_BC_STORE_SUBSCR);
|
|
}
|
|
}
|
|
|
|
void mp_emit_bc_attr(emit_t *emit, qstr qst, int kind) {
|
|
if (kind == MP_EMIT_ATTR_LOAD) {
|
|
emit_write_bytecode_byte_qstr(emit, 0, MP_BC_LOAD_ATTR, qst);
|
|
} else {
|
|
if (kind == MP_EMIT_ATTR_DELETE) {
|
|
mp_emit_bc_load_null(emit);
|
|
mp_emit_bc_rot_two(emit);
|
|
}
|
|
emit_write_bytecode_byte_qstr(emit, -2, MP_BC_STORE_ATTR, qst);
|
|
}
|
|
}
|
|
|
|
void mp_emit_bc_store_local(emit_t *emit, qstr qst, mp_uint_t local_num, int kind) {
|
|
MP_STATIC_ASSERT(MP_BC_STORE_FAST_N + MP_EMIT_IDOP_LOCAL_FAST == MP_BC_STORE_FAST_N);
|
|
MP_STATIC_ASSERT(MP_BC_STORE_FAST_N + MP_EMIT_IDOP_LOCAL_DEREF == MP_BC_STORE_DEREF);
|
|
(void)qst;
|
|
if (kind == MP_EMIT_IDOP_LOCAL_FAST && local_num <= 15) {
|
|
emit_write_bytecode_byte(emit, -1, MP_BC_STORE_FAST_MULTI + local_num);
|
|
} else {
|
|
emit_write_bytecode_byte_uint(emit, -1, MP_BC_STORE_FAST_N + kind, local_num);
|
|
}
|
|
}
|
|
|
|
void mp_emit_bc_store_global(emit_t *emit, qstr qst, int kind) {
|
|
MP_STATIC_ASSERT(MP_BC_STORE_NAME + MP_EMIT_IDOP_GLOBAL_NAME == MP_BC_STORE_NAME);
|
|
MP_STATIC_ASSERT(MP_BC_STORE_NAME + MP_EMIT_IDOP_GLOBAL_GLOBAL == MP_BC_STORE_GLOBAL);
|
|
emit_write_bytecode_byte_qstr(emit, -1, MP_BC_STORE_NAME + kind, qst);
|
|
}
|
|
|
|
void mp_emit_bc_delete_local(emit_t *emit, qstr qst, mp_uint_t local_num, int kind) {
|
|
MP_STATIC_ASSERT(MP_BC_DELETE_FAST + MP_EMIT_IDOP_LOCAL_FAST == MP_BC_DELETE_FAST);
|
|
MP_STATIC_ASSERT(MP_BC_DELETE_FAST + MP_EMIT_IDOP_LOCAL_DEREF == MP_BC_DELETE_DEREF);
|
|
(void)qst;
|
|
emit_write_bytecode_byte_uint(emit, 0, MP_BC_DELETE_FAST + kind, local_num);
|
|
}
|
|
|
|
void mp_emit_bc_delete_global(emit_t *emit, qstr qst, int kind) {
|
|
MP_STATIC_ASSERT(MP_BC_DELETE_NAME + MP_EMIT_IDOP_GLOBAL_NAME == MP_BC_DELETE_NAME);
|
|
MP_STATIC_ASSERT(MP_BC_DELETE_NAME + MP_EMIT_IDOP_GLOBAL_GLOBAL == MP_BC_DELETE_GLOBAL);
|
|
emit_write_bytecode_byte_qstr(emit, 0, MP_BC_DELETE_NAME + kind, qst);
|
|
}
|
|
|
|
void mp_emit_bc_dup_top(emit_t *emit) {
|
|
emit_write_bytecode_byte(emit, 1, MP_BC_DUP_TOP);
|
|
}
|
|
|
|
void mp_emit_bc_dup_top_two(emit_t *emit) {
|
|
emit_write_bytecode_byte(emit, 2, MP_BC_DUP_TOP_TWO);
|
|
}
|
|
|
|
void mp_emit_bc_pop_top(emit_t *emit) {
|
|
emit_write_bytecode_byte(emit, -1, MP_BC_POP_TOP);
|
|
}
|
|
|
|
void mp_emit_bc_rot_two(emit_t *emit) {
|
|
emit_write_bytecode_byte(emit, 0, MP_BC_ROT_TWO);
|
|
}
|
|
|
|
void mp_emit_bc_rot_three(emit_t *emit) {
|
|
emit_write_bytecode_byte(emit, 0, MP_BC_ROT_THREE);
|
|
}
|
|
|
|
void mp_emit_bc_jump(emit_t *emit, mp_uint_t label) {
|
|
emit_write_bytecode_byte_signed_label(emit, 0, MP_BC_JUMP, label);
|
|
}
|
|
|
|
void mp_emit_bc_pop_jump_if(emit_t *emit, bool cond, mp_uint_t label) {
|
|
if (cond) {
|
|
emit_write_bytecode_byte_signed_label(emit, -1, MP_BC_POP_JUMP_IF_TRUE, label);
|
|
} else {
|
|
emit_write_bytecode_byte_signed_label(emit, -1, MP_BC_POP_JUMP_IF_FALSE, label);
|
|
}
|
|
}
|
|
|
|
void mp_emit_bc_jump_if_or_pop(emit_t *emit, bool cond, mp_uint_t label) {
|
|
if (cond) {
|
|
emit_write_bytecode_byte_signed_label(emit, -1, MP_BC_JUMP_IF_TRUE_OR_POP, label);
|
|
} else {
|
|
emit_write_bytecode_byte_signed_label(emit, -1, MP_BC_JUMP_IF_FALSE_OR_POP, label);
|
|
}
|
|
}
|
|
|
|
void mp_emit_bc_unwind_jump(emit_t *emit, mp_uint_t label, mp_uint_t except_depth) {
|
|
if (except_depth == 0) {
|
|
if (label & MP_EMIT_BREAK_FROM_FOR) {
|
|
// need to pop the iterator if we are breaking out of a for loop
|
|
emit_write_bytecode_raw_byte(emit, MP_BC_POP_TOP);
|
|
// also pop the iter_buf
|
|
for (size_t i = 0; i < MP_OBJ_ITER_BUF_NSLOTS - 1; ++i) {
|
|
emit_write_bytecode_raw_byte(emit, MP_BC_POP_TOP);
|
|
}
|
|
}
|
|
emit_write_bytecode_byte_signed_label(emit, 0, MP_BC_JUMP, label & ~MP_EMIT_BREAK_FROM_FOR);
|
|
} else {
|
|
emit_write_bytecode_byte_signed_label(emit, 0, MP_BC_UNWIND_JUMP, label & ~MP_EMIT_BREAK_FROM_FOR);
|
|
emit_write_bytecode_raw_byte(emit, ((label & MP_EMIT_BREAK_FROM_FOR) ? 0x80 : 0) | except_depth);
|
|
}
|
|
}
|
|
|
|
void mp_emit_bc_setup_block(emit_t *emit, mp_uint_t label, int kind) {
|
|
MP_STATIC_ASSERT(MP_BC_SETUP_WITH + MP_EMIT_SETUP_BLOCK_WITH == MP_BC_SETUP_WITH);
|
|
MP_STATIC_ASSERT(MP_BC_SETUP_WITH + MP_EMIT_SETUP_BLOCK_EXCEPT == MP_BC_SETUP_EXCEPT);
|
|
MP_STATIC_ASSERT(MP_BC_SETUP_WITH + MP_EMIT_SETUP_BLOCK_FINALLY == MP_BC_SETUP_FINALLY);
|
|
// The SETUP_WITH opcode pops ctx_mgr from the top of the stack
|
|
// and then pushes 3 entries: __exit__, ctx_mgr, as_value.
|
|
int stack_adj = kind == MP_EMIT_SETUP_BLOCK_WITH ? 2 : 0;
|
|
emit_write_bytecode_byte_unsigned_label(emit, stack_adj, MP_BC_SETUP_WITH + kind, label);
|
|
}
|
|
|
|
void mp_emit_bc_with_cleanup(emit_t *emit, mp_uint_t label) {
|
|
mp_emit_bc_load_const_tok(emit, MP_TOKEN_KW_NONE);
|
|
mp_emit_bc_label_assign(emit, label);
|
|
// The +2 is to ensure we have enough stack space to call the __exit__ method
|
|
emit_write_bytecode_byte(emit, 2, MP_BC_WITH_CLEANUP);
|
|
// Cancel the +2 above, plus the +2 from mp_emit_bc_setup_block(MP_EMIT_SETUP_BLOCK_WITH)
|
|
mp_emit_bc_adjust_stack_size(emit, -4);
|
|
}
|
|
|
|
void mp_emit_bc_end_finally(emit_t *emit) {
|
|
emit_write_bytecode_byte(emit, -1, MP_BC_END_FINALLY);
|
|
}
|
|
|
|
void mp_emit_bc_get_iter(emit_t *emit, bool use_stack) {
|
|
int stack_adj = use_stack ? MP_OBJ_ITER_BUF_NSLOTS - 1 : 0;
|
|
emit_write_bytecode_byte(emit, stack_adj, use_stack ? MP_BC_GET_ITER_STACK : MP_BC_GET_ITER);
|
|
}
|
|
|
|
void mp_emit_bc_for_iter(emit_t *emit, mp_uint_t label) {
|
|
emit_write_bytecode_byte_unsigned_label(emit, 1, MP_BC_FOR_ITER, label);
|
|
}
|
|
|
|
void mp_emit_bc_for_iter_end(emit_t *emit) {
|
|
mp_emit_bc_adjust_stack_size(emit, -MP_OBJ_ITER_BUF_NSLOTS);
|
|
}
|
|
|
|
void mp_emit_bc_pop_except_jump(emit_t *emit, mp_uint_t label, bool within_exc_handler) {
|
|
(void)within_exc_handler;
|
|
emit_write_bytecode_byte_unsigned_label(emit, 0, MP_BC_POP_EXCEPT_JUMP, label);
|
|
}
|
|
|
|
void mp_emit_bc_unary_op(emit_t *emit, mp_unary_op_t op) {
|
|
emit_write_bytecode_byte(emit, 0, MP_BC_UNARY_OP_MULTI + op);
|
|
}
|
|
|
|
void mp_emit_bc_binary_op(emit_t *emit, mp_binary_op_t op) {
|
|
bool invert = false;
|
|
if (op == MP_BINARY_OP_NOT_IN) {
|
|
invert = true;
|
|
op = MP_BINARY_OP_IN;
|
|
} else if (op == MP_BINARY_OP_IS_NOT) {
|
|
invert = true;
|
|
op = MP_BINARY_OP_IS;
|
|
}
|
|
emit_write_bytecode_byte(emit, -1, MP_BC_BINARY_OP_MULTI + op);
|
|
if (invert) {
|
|
emit_write_bytecode_byte(emit, 0, MP_BC_UNARY_OP_MULTI + MP_UNARY_OP_NOT);
|
|
}
|
|
}
|
|
|
|
void mp_emit_bc_build(emit_t *emit, mp_uint_t n_args, int kind) {
|
|
MP_STATIC_ASSERT(MP_BC_BUILD_TUPLE + MP_EMIT_BUILD_TUPLE == MP_BC_BUILD_TUPLE);
|
|
MP_STATIC_ASSERT(MP_BC_BUILD_TUPLE + MP_EMIT_BUILD_LIST == MP_BC_BUILD_LIST);
|
|
MP_STATIC_ASSERT(MP_BC_BUILD_TUPLE + MP_EMIT_BUILD_MAP == MP_BC_BUILD_MAP);
|
|
MP_STATIC_ASSERT(MP_BC_BUILD_TUPLE + MP_EMIT_BUILD_SET == MP_BC_BUILD_SET);
|
|
MP_STATIC_ASSERT(MP_BC_BUILD_TUPLE + MP_EMIT_BUILD_SLICE == MP_BC_BUILD_SLICE);
|
|
int stack_adj = kind == MP_EMIT_BUILD_MAP ? 1 : 1 - n_args;
|
|
emit_write_bytecode_byte_uint(emit, stack_adj, MP_BC_BUILD_TUPLE + kind, n_args);
|
|
}
|
|
|
|
void mp_emit_bc_store_map(emit_t *emit) {
|
|
emit_write_bytecode_byte(emit, -2, MP_BC_STORE_MAP);
|
|
}
|
|
|
|
void mp_emit_bc_store_comp(emit_t *emit, scope_kind_t kind, mp_uint_t collection_stack_index) {
|
|
int t;
|
|
int n;
|
|
if (kind == SCOPE_LIST_COMP) {
|
|
n = 0;
|
|
t = 0;
|
|
} else if (!MICROPY_PY_BUILTINS_SET || kind == SCOPE_DICT_COMP) {
|
|
n = 1;
|
|
t = 1;
|
|
} else if (MICROPY_PY_BUILTINS_SET) {
|
|
n = 0;
|
|
t = 2;
|
|
}
|
|
// the lower 2 bits of the opcode argument indicate the collection type
|
|
emit_write_bytecode_byte_uint(emit, -1 - n, MP_BC_STORE_COMP, ((collection_stack_index + n) << 2) | t);
|
|
}
|
|
|
|
void mp_emit_bc_unpack_sequence(emit_t *emit, mp_uint_t n_args) {
|
|
emit_write_bytecode_byte_uint(emit, -1 + n_args, MP_BC_UNPACK_SEQUENCE, n_args);
|
|
}
|
|
|
|
void mp_emit_bc_unpack_ex(emit_t *emit, mp_uint_t n_left, mp_uint_t n_right) {
|
|
emit_write_bytecode_byte_uint(emit, -1 + n_left + n_right + 1, MP_BC_UNPACK_EX, n_left | (n_right << 8));
|
|
}
|
|
|
|
void mp_emit_bc_make_function(emit_t *emit, scope_t *scope, mp_uint_t n_pos_defaults, mp_uint_t n_kw_defaults) {
|
|
if (n_pos_defaults == 0 && n_kw_defaults == 0) {
|
|
emit_write_bytecode_byte_raw_code(emit, 1, MP_BC_MAKE_FUNCTION, scope->raw_code);
|
|
} else {
|
|
emit_write_bytecode_byte_raw_code(emit, -1, MP_BC_MAKE_FUNCTION_DEFARGS, scope->raw_code);
|
|
}
|
|
}
|
|
|
|
void mp_emit_bc_make_closure(emit_t *emit, scope_t *scope, mp_uint_t n_closed_over, mp_uint_t n_pos_defaults, mp_uint_t n_kw_defaults) {
|
|
if (n_pos_defaults == 0 && n_kw_defaults == 0) {
|
|
int stack_adj = -n_closed_over + 1;
|
|
emit_write_bytecode_byte_raw_code(emit, stack_adj, MP_BC_MAKE_CLOSURE, scope->raw_code);
|
|
emit_write_bytecode_raw_byte(emit, n_closed_over);
|
|
} else {
|
|
assert(n_closed_over <= 255);
|
|
int stack_adj = -2 - (mp_int_t)n_closed_over + 1;
|
|
emit_write_bytecode_byte_raw_code(emit, stack_adj, MP_BC_MAKE_CLOSURE_DEFARGS, scope->raw_code);
|
|
emit_write_bytecode_raw_byte(emit, n_closed_over);
|
|
}
|
|
}
|
|
|
|
STATIC void emit_bc_call_function_method_helper(emit_t *emit, int stack_adj, mp_uint_t bytecode_base, mp_uint_t n_positional, mp_uint_t n_keyword, mp_uint_t star_flags) {
|
|
if (star_flags) {
|
|
stack_adj -= (int)n_positional + 2 * (int)n_keyword + 2;
|
|
emit_write_bytecode_byte_uint(emit, stack_adj, bytecode_base + 1, (n_keyword << 8) | n_positional); // TODO make it 2 separate uints?
|
|
} else {
|
|
stack_adj -= (int)n_positional + 2 * (int)n_keyword;
|
|
emit_write_bytecode_byte_uint(emit, stack_adj, bytecode_base, (n_keyword << 8) | n_positional); // TODO make it 2 separate uints?
|
|
}
|
|
}
|
|
|
|
void mp_emit_bc_call_function(emit_t *emit, mp_uint_t n_positional, mp_uint_t n_keyword, mp_uint_t star_flags) {
|
|
emit_bc_call_function_method_helper(emit, 0, MP_BC_CALL_FUNCTION, n_positional, n_keyword, star_flags);
|
|
}
|
|
|
|
void mp_emit_bc_call_method(emit_t *emit, mp_uint_t n_positional, mp_uint_t n_keyword, mp_uint_t star_flags) {
|
|
emit_bc_call_function_method_helper(emit, -1, MP_BC_CALL_METHOD, n_positional, n_keyword, star_flags);
|
|
}
|
|
|
|
void mp_emit_bc_return_value(emit_t *emit) {
|
|
emit_write_bytecode_byte(emit, -1, MP_BC_RETURN_VALUE);
|
|
emit->last_emit_was_return_value = true;
|
|
}
|
|
|
|
void mp_emit_bc_raise_varargs(emit_t *emit, mp_uint_t n_args) {
|
|
MP_STATIC_ASSERT(MP_BC_RAISE_LAST + 1 == MP_BC_RAISE_OBJ);
|
|
MP_STATIC_ASSERT(MP_BC_RAISE_LAST + 2 == MP_BC_RAISE_FROM);
|
|
assert(n_args <= 2);
|
|
emit_write_bytecode_byte(emit, -n_args, MP_BC_RAISE_LAST + n_args);
|
|
}
|
|
|
|
void mp_emit_bc_yield(emit_t *emit, int kind) {
|
|
MP_STATIC_ASSERT(MP_BC_YIELD_VALUE + 1 == MP_BC_YIELD_FROM);
|
|
emit_write_bytecode_byte(emit, -kind, MP_BC_YIELD_VALUE + kind);
|
|
emit->scope->scope_flags |= MP_SCOPE_FLAG_GENERATOR;
|
|
}
|
|
|
|
void mp_emit_bc_start_except_handler(emit_t *emit) {
|
|
mp_emit_bc_adjust_stack_size(emit, 4); // stack adjust for the exception instance, +3 for possible UNWIND_JUMP state
|
|
}
|
|
|
|
void mp_emit_bc_end_except_handler(emit_t *emit) {
|
|
mp_emit_bc_adjust_stack_size(emit, -3); // stack adjust
|
|
}
|
|
|
|
#if MICROPY_EMIT_NATIVE
|
|
const emit_method_table_t emit_bc_method_table = {
|
|
#if MICROPY_DYNAMIC_COMPILER
|
|
NULL,
|
|
NULL,
|
|
#endif
|
|
|
|
mp_emit_bc_start_pass,
|
|
mp_emit_bc_end_pass,
|
|
mp_emit_bc_last_emit_was_return_value,
|
|
mp_emit_bc_adjust_stack_size,
|
|
mp_emit_bc_set_source_line,
|
|
|
|
{
|
|
mp_emit_bc_load_local,
|
|
mp_emit_bc_load_global,
|
|
},
|
|
{
|
|
mp_emit_bc_store_local,
|
|
mp_emit_bc_store_global,
|
|
},
|
|
{
|
|
mp_emit_bc_delete_local,
|
|
mp_emit_bc_delete_global,
|
|
},
|
|
|
|
mp_emit_bc_label_assign,
|
|
mp_emit_bc_import,
|
|
mp_emit_bc_load_const_tok,
|
|
mp_emit_bc_load_const_small_int,
|
|
mp_emit_bc_load_const_str,
|
|
mp_emit_bc_load_const_obj,
|
|
mp_emit_bc_load_null,
|
|
mp_emit_bc_load_method,
|
|
mp_emit_bc_load_build_class,
|
|
mp_emit_bc_subscr,
|
|
mp_emit_bc_attr,
|
|
mp_emit_bc_dup_top,
|
|
mp_emit_bc_dup_top_two,
|
|
mp_emit_bc_pop_top,
|
|
mp_emit_bc_rot_two,
|
|
mp_emit_bc_rot_three,
|
|
mp_emit_bc_jump,
|
|
mp_emit_bc_pop_jump_if,
|
|
mp_emit_bc_jump_if_or_pop,
|
|
mp_emit_bc_unwind_jump,
|
|
mp_emit_bc_setup_block,
|
|
mp_emit_bc_with_cleanup,
|
|
mp_emit_bc_end_finally,
|
|
mp_emit_bc_get_iter,
|
|
mp_emit_bc_for_iter,
|
|
mp_emit_bc_for_iter_end,
|
|
mp_emit_bc_pop_except_jump,
|
|
mp_emit_bc_unary_op,
|
|
mp_emit_bc_binary_op,
|
|
mp_emit_bc_build,
|
|
mp_emit_bc_store_map,
|
|
mp_emit_bc_store_comp,
|
|
mp_emit_bc_unpack_sequence,
|
|
mp_emit_bc_unpack_ex,
|
|
mp_emit_bc_make_function,
|
|
mp_emit_bc_make_closure,
|
|
mp_emit_bc_call_function,
|
|
mp_emit_bc_call_method,
|
|
mp_emit_bc_return_value,
|
|
mp_emit_bc_raise_varargs,
|
|
mp_emit_bc_yield,
|
|
|
|
mp_emit_bc_start_except_handler,
|
|
mp_emit_bc_end_except_handler,
|
|
};
|
|
#else
|
|
const mp_emit_method_table_id_ops_t mp_emit_bc_method_table_load_id_ops = {
|
|
mp_emit_bc_load_local,
|
|
mp_emit_bc_load_global,
|
|
};
|
|
|
|
const mp_emit_method_table_id_ops_t mp_emit_bc_method_table_store_id_ops = {
|
|
mp_emit_bc_store_local,
|
|
mp_emit_bc_store_global,
|
|
};
|
|
|
|
const mp_emit_method_table_id_ops_t mp_emit_bc_method_table_delete_id_ops = {
|
|
mp_emit_bc_delete_local,
|
|
mp_emit_bc_delete_global,
|
|
};
|
|
#endif
|
|
|
|
#endif // MICROPY_ENABLE_COMPILER
|