2014-05-03 18:27:38 -04:00
|
|
|
/*
|
2017-06-30 03:22:17 -04:00
|
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
2014-05-03 18:27:38 -04:00
|
|
|
*
|
|
|
|
* The MIT License (MIT)
|
|
|
|
*
|
2020-06-03 18:40:05 -04:00
|
|
|
* SPDX-FileCopyrightText: Copyright (c) 2013-2018 Damien P. George
|
2021-04-22 20:55:39 -04:00
|
|
|
* SPDX-FileCopyrightText: Copyright (c) 2014-2018 Paul Sokolovsky
|
2014-05-03 18:27:38 -04:00
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
2014-04-28 19:42:28 -04:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stddef.h>
|
2014-01-09 15:57:50 -05:00
|
|
|
#include <string.h>
|
|
|
|
#include <assert.h>
|
2013-12-21 13:17:45 -05:00
|
|
|
|
2018-01-23 19:22:05 -05:00
|
|
|
#include "py/gc_long_lived.h"
|
2015-01-01 15:27:54 -05:00
|
|
|
#include "py/objtype.h"
|
|
|
|
#include "py/runtime.h"
|
2014-01-09 15:57:50 -05:00
|
|
|
|
2019-12-13 13:32:58 -05:00
|
|
|
#include "supervisor/shared/stack.h"
|
2018-08-08 21:24:49 -04:00
|
|
|
#include "supervisor/shared/translate.h"
|
|
|
|
|
2017-07-24 12:55:14 -04:00
|
|
|
#if MICROPY_DEBUG_VERBOSE // print debugging info
|
2014-04-28 19:42:28 -04:00
|
|
|
#define DEBUG_PRINT (1)
|
|
|
|
#define DEBUG_printf DEBUG_printf
|
|
|
|
#else // don't print debugging info
|
2014-11-05 16:16:41 -05:00
|
|
|
#define DEBUG_PRINT (0)
|
2014-04-28 19:42:28 -04:00
|
|
|
#define DEBUG_printf(...) (void)0
|
|
|
|
#endif
|
|
|
|
|
py/objtype: Optimise instance get/set/del by skipping special accessors.
This patch is a code optimisation, trading text bytes for speed. On
pyboard it's an increase of 0.06% in code size for a gain (in pystone
performance) of roughly 6.5%.
The patch optimises load/store/delete of attributes in user defined classes
by not looking up special accessors (@property, __get__, __delete__,
__set__, __setattr__ and __getattr_) if they are guaranteed not to exist in
the class.
Currently, if you do my_obj.foo() then the runtime has to do a few checks
to see if foo is a property or has __get__, and if so delegate the call.
And for stores things like my_obj.foo = 1 has to first check if foo is a
property or has __set__ defined on it.
Doing all those checks each and every time the attribute is accessed has a
performance penalty. This patch eliminates all those checks for cases when
it's guaranteed that the checks will always fail, ie no attributes are
properties nor have any special accessor methods defined on them.
To make this guarantee it checks all attributes of a user-defined class
when it is first created. If any of the attributes of the user class are
properties or have special accessors, or any of the base classes of the
user class have them, then it sets a flag in the class to indicate that
special accessors must be checked for. Then in the load/store/delete code
it checks this flag to see if it can take the shortcut and optimise the
lookup.
It's an optimisation that's pretty widely applicable because it improves
lookup performance for all methods of user defined classes, and stores of
attributes, at least for those that don't have special accessors. And, it
allows to enable descriptors with minimal additional runtime overhead if
they are not used for a particular user class.
There is one restriction on dynamic class creation that has been introduced
by this patch: a user-defined class cannot go from zero special accessors
to one special accessor (or more) after that class has been subclassed. If
the script attempts this an AttributeError is raised (see addition to
tests/misc/non_compliant.py for an example of this case).
The cost in code space bytes for the optimisation in this patch is:
unix x64: +528
unix nanbox: +508
stm32: +192
cc3200: +200
esp8266: +332
esp32: +244
Performance tests that were done:
- on unix x86-64, pystone improved by about 5%
- on pyboard, pystone improved by about 6.5%, from 1683 up to 1794
- on pyboard, bm_chaos (from CPython benchmark suite) improved by about 5%
- on esp32, pystone improved by about 30% (but there are caching effects)
- on esp32, bm_chaos improved by about 11%
2018-05-25 03:09:54 -04:00
|
|
|
#define ENABLE_SPECIAL_ACCESSORS \
|
2021-03-15 09:57:36 -04:00
|
|
|
(MICROPY_PY_DESCRIPTORS || MICROPY_PY_DELATTR_SETATTR || MICROPY_PY_BUILTINS_PROPERTY)
|
py/objtype: Optimise instance get/set/del by skipping special accessors.
This patch is a code optimisation, trading text bytes for speed. On
pyboard it's an increase of 0.06% in code size for a gain (in pystone
performance) of roughly 6.5%.
The patch optimises load/store/delete of attributes in user defined classes
by not looking up special accessors (@property, __get__, __delete__,
__set__, __setattr__ and __getattr_) if they are guaranteed not to exist in
the class.
Currently, if you do my_obj.foo() then the runtime has to do a few checks
to see if foo is a property or has __get__, and if so delegate the call.
And for stores things like my_obj.foo = 1 has to first check if foo is a
property or has __set__ defined on it.
Doing all those checks each and every time the attribute is accessed has a
performance penalty. This patch eliminates all those checks for cases when
it's guaranteed that the checks will always fail, ie no attributes are
properties nor have any special accessor methods defined on them.
To make this guarantee it checks all attributes of a user-defined class
when it is first created. If any of the attributes of the user class are
properties or have special accessors, or any of the base classes of the
user class have them, then it sets a flag in the class to indicate that
special accessors must be checked for. Then in the load/store/delete code
it checks this flag to see if it can take the shortcut and optimise the
lookup.
It's an optimisation that's pretty widely applicable because it improves
lookup performance for all methods of user defined classes, and stores of
attributes, at least for those that don't have special accessors. And, it
allows to enable descriptors with minimal additional runtime overhead if
they are not used for a particular user class.
There is one restriction on dynamic class creation that has been introduced
by this patch: a user-defined class cannot go from zero special accessors
to one special accessor (or more) after that class has been subclassed. If
the script attempts this an AttributeError is raised (see addition to
tests/misc/non_compliant.py for an example of this case).
The cost in code space bytes for the optimisation in this patch is:
unix x64: +528
unix nanbox: +508
stm32: +192
cc3200: +200
esp8266: +332
esp32: +244
Performance tests that were done:
- on unix x86-64, pystone improved by about 5%
- on pyboard, pystone improved by about 6.5%, from 1683 up to 1794
- on pyboard, bm_chaos (from CPython benchmark suite) improved by about 5%
- on esp32, pystone improved by about 30% (but there are caching effects)
- on esp32, bm_chaos improved by about 11%
2018-05-25 03:09:54 -04:00
|
|
|
|
Merge tag 'v1.17' into merge-1.17
F-strings, new machine.I2S class, ESP32-C3 support and LEGO_HUB_NO6 board
This release of MicroPython adds support for f-strings (PEP-498), with a
few limitations compared to normal Python. F-strings are essentially
syntactic sugar for "".format() and make formatting strings a lot more
convenient. Other improvements to the core runtime include pretty printing
OSError when it has two arguments (an errno code and a string), scheduling
of KeyboardInterrupt on the main thread, and support for a single argument
to the optimised form of StopIteration.
In the machine module a new I2S class has been added, with support for
esp32 and stm32 ports. This provides a consistent API for transmit and
receive of audio data in blocking, non-blocking and asyncio-based
operation. Also, the json module has support for the "separators" argument
in the dump and dumps functions, and framebuf now includes a way to blit
between frame buffers of different formats using a palette. A new,
portable machine.bitstream function is also added which can output a stream
of bits with configurable timing, and is used as the basis for driving
WS2812 LEDs in a common way across ports.
There has been some restructuring of the repository directory layout, with
all third-party code now in the lib/ directory. And a new top-level
directory shared/ has been added with first-party code that was previously
in lib/ moved there.
The docs have seen further improvement with enhancements and additions to
the rp2 parts, as well as a new quick reference for the zephyr port.
The terms master/slave have been replaced with controller/peripheral,
mainly relating to I2C and SPI usage. And u-module references have been
replaced with just the module name without the u-prefix to help clear up
the intended usage of modules in MicroPython.
For the esp8266 and esp32 ports, hidden networks are now included in WLAN
scan results. On the esp32 the RMT class is enhanced with idle_level and
write_pulses modes. There is initial support for ESP32-C3 chips with
GENERIC_C3 and GENERIC_C3_USB boards.
The javascript port has had its Makefile and garbage collector
implementation reworked so it compiles and runs with latest the Emscripten
using asyncify.
The mimxrt port sees the addition of hardware I2C and SPI support, as well
as some additional methods to the machine module. There is also support
for Hyperflash chips.
The nrf port now has full VFS storage support, enables source-line on
traceback, and has .mpy features consistent with other ports.
For the rp2 port there is now more configurability for boards, and more
boards added.
The stm32 port has a new LEGO_HUB_NO6 board definition with detailed
information how to get this LEGO Hub running stock MicroPython. There is
also now support to change the CPU frequency on STM32WB MCUs. And USBD_xxx
descriptor options have been renamed to MICROPY_HW_USB_xxx.
Thanks to everyone who contributed to this release: Amir Gonnen, Andrew
Scheller, Bryan Tong Minh, Chris Wilson, Damien George, Daniel Mizyrycki,
David Lechner, David P, Fernando, finefoot, Frank Pilhofer, Glenn Ruben
Bakke, iabdalkader, Jeff Epler, Jim Mussared, Jonathan Hogg, Josh Klar,
Josh Lloyd, Julia Hathaway, Krzysztof Adamski, Matúš Olekšák, Michael
Weiss, Michel Bouwmans, Mike Causer, Mike Teachman, Ned Konz, NitiKaur,
oclyke, Patrick Van Oosterwijck, Peter Hinch, Peter Züger, Philipp
Ebensberger, robert-hh, Roberto Colistete Jr, Sashkoiv, Seon Rozenblum,
Tobias Thyrrestrup, Tom McDermott, Will Sowerbutts, Yonatan Goldschmidt.
What follows is a detailed list of changes, generated from the git commit
history, and organised into sections.
Main components
===============
all:
- fix signed shifts and NULL access errors from -fsanitize=undefined
- update to point to files in new shared/ directory
py core:
- mpstate: make exceptions thread-local
- mpstate: schedule KeyboardInterrupt on main thread
- mperrno: add MP_ECANCELED error code
- makeqstrdefs.py: don't include .h files explicitly in preprocessing
- mark unused arguments from bytecode decoding macros
- objexcept: pretty print OSError also when it has 2 arguments
- makeversionhdr: add --tags arg to git describe
- vm: simplify handling of MP_OBJ_STOP_ITERATION in yield-from opcode
- objexcept: make mp_obj_exception_get_value support subclassed excs
- support single argument to optimised MP_OBJ_STOP_ITERATION
- introduce and use mp_raise_type_arg helper
- modsys: optimise sys.exit for code size by using exception helpers
- objexcept: make mp_obj_new_exception_arg1 inline
- obj: fix formatting of comment for mp_obj_is_integer
- emitnative: reuse need_reg_all func in need_stack_settled
- emitnative: ensure stack settling is safe mid-branch
- runtime: fix bool unary op for subclasses of native types
- builtinimport: fix condition for including do_execute_raw_code()
- mkrules: automatically build mpy-cross if it doesn't exist
- implement partial PEP-498 (f-string) support
- lexer: clear fstring_args vstr on lexer free
- mkrules.mk: do submodule sync in "make submodules"
extmod:
- btstack: add missing call to mp_bluetooth_hci_uart_deinit
- btstack: check that BLE is active before performing operations
- uasyncio: get addr and bind server socket before creating task
- axtls-include: add axtls_os_port.h to customise axTLS
- update for move of crypto-algorithms, re1.5, uzlib to lib
- moduselect: conditionally compile select()
- nimble: fix leak in l2cap_send if send-while-stalled
- btstack/btstack.mk: use -Wno-implicit-fallthrough, not =0
- utime: always invoke mp_hal_delay_ms when >= to 0ms
- modbluetooth: clamp MTU values to 32->UINT16_MAX
- nimble: allow modbluetooth binding to hook "sent HCI packet"
- nimble: add "memory stalling" mechanism for l2cap_send
- uasyncio: in open_connection use address info in socket creation
- modujson: add support for dump/dumps separators keyword-argument
- modlwip: fix close and clean up of UDP and raw sockets
- modbluetooth: add send_update arg to gatts_write
- add machine.bitstream
- modframebuf: enable blit between different formats via a palette
lib:
- tinyusb: update to version 0.10.1
- pico-sdk: update to version 1.2.0
- utils/stdout_helpers: make mp_hal_stdout_tx_strn_cooked efficient
- axtls: switch to repo at micropython/axtls
- axtls: update to latest axtls 2.1.5 wih additional commits
- re1.5: move re1.5 code from extmod to lib
- uzlib: move uzlib code from extmod to lib
- crypto-algorithms: move crypto-algorithms code from extmod to lib
- update README's based on contents of these dirs
drivers:
- neopixel: add common machine.bitstream-based neopixel module
- neopixel: optimize fill() for speed
- neopixel: reduce code size of driver
- cyw43: fix cyw43_deinit so it can be called many times in a row
- cyw43: make wifi join fail if interface is not active
mpy-cross:
- disable stack check when building with Emscripten
Support components
==================
docs:
- library: document new esp32.RMT features and fix wait_done
- library: warn that ustruct doesn't handle spaces in format strings
- esp8266/tutorial: change flash mode from dio to dout
- replace master/slave with controller/peripheral in I2C and SPI
- rp2: enhance quickref and change image to Pico pinout
- rp2: update general section to give a brief technical overview
- library/utime.rst: clarify behaviour and precision of sleep ms/us
- library/uasyncio.rst: document stream readexactly() method
- library/machine.I2S.rst: fix use of sd pin in examples
- zephyr: add quick reference for the Zephyr port
- library/zephyr: add libraries specific to the Zephyr port
- templates: add unix and zephyr quickref links to top-index
- rename ufoo.rst to foo.rst
- replace ufoo with foo in all docs
- library/index.rst: clarify module naming and purpose
- library/builtins.rst: add module title
- library/network.rst: simplify socket import
- add docs for machine.bitstream and neopixel module
- library: fix usage of :term: for frozen module reference
- esp8266: use monospace for software tools
- reference: mention that slicing a memoryview causes allocation
examples: no changes specific to this component/port
tests:
- extmod: make uasyncio_heaplock test more deterministic
- cpydiff/modules_struct_whitespace_in_format: run black
- extmod/ujson: add tests for dump/dumps separators argument
- run-multitests.py: add broadcast and wait facility
- multi_bluetooth/ble_subscribe.py: add test for subscription
- extmod/vfs_fat_finaliser.py: ensure alloc at never-used GC blocks
- basics: split f-string debug printing to separate file with .exp
- pybnative: make while.py test run on boards without pyb.delay
tools:
- autobuild: add scripts to build release firmware
- remove obsolete build-stm-latest.sh script
- ci.sh: run apt-get update in ci_powerpc_setup
- makemanifest.py: allow passing flags to mpy-tool.py
- autobuild: add mimxrt port to build scripts for nightly builds
- pyboard.py: add cmd-line option to make soft reset configurable
- mpremote: swap order of PID and VID in connect-list output
- ci.sh: build unix dev variant as part of macOS CI
- ci.sh: build GENERIC_C3 board as part of esp32 CI
- autobuild: use separate IDF version to build newer esp32 SoCs
- autobuild: add FeatherS2 and TinyS2 to esp32 auto builds
- mpremote: add seek whence for mounted files
- mpremote: raise OSError on unsupported RemoteFile.seek
- autobuild: add the MIMXRT1050_EVKB board to the daily builds
- ci.sh: add mpy-cross build to nrf port
- codeformat.py: include ports/nrf/modules/nrf in code formatting
- gen-cpydiff.py: don't rename foo to ufoo in diff output
- autobuild: add auto build for Silicognition wESP32
- mpremote: fix connect-list in case VID/PID are None
- mpremote: add "devs" shortcut for "connect list"
- mpremote: remove support for pyb.USB_VCP in/out specialisation
- autobuild: don't use "-B" for make, it's already a fresh build
- pyboard.py: move --no-exclusive/--soft-reset out of mutex group
- pyboard.py: make --no-follow use same variable as --follow
- pyboard.py: add --exclusive to match --no-exclusive
- pyboard.py: make --no-soft-reset consistent with other args
- uncrustify: force 1 newline at end of file
- mpremote: bump version to 0.0.6
CI:
- workflows: add workflow to build and test javascript port
- workflows: switch from Coveralls to Codecov
- workflows: switch from lcov to gcov
- workflows: add workflow to build and test unix dev variant
The ports
=========
all ports:
- use common mp_hal_stdout_tx_strn_cooked instead of custom one
- update for move of crypto-algorithms, uzlib to lib
- rename USBD_VID/PID config macros to MICROPY_HW_USB_VID/PID
bare-arm port: no changes specific to this component/port
cc3200 port: no changes specific to this component/port
esp8266 port:
- add __len__ to NeoPixel driver to support iterating
- Makefile: add more libm files to build
- include hidden networks in WLAN.scan results
- replace esp.neopixel with machine.bitstream
- remove dead code for end_ticks in machine_bitstream
esp32 port:
- boards/sdkconfig.base: disable MEMPROT_FEATURE to alloc from IRAM
- add __len__ to NeoPixel driver to support iterating
- main: allow MICROPY_DIR to be overridden
- esp32_rmt: fix RMT looping in newer IDF versions
- esp32_rmt: enhance RMT with idle_level and write_pulses modes
- add new machine.I2S class for I2S protocol support
- machine_spi: calculate actual attained baudrate
- machine_hw_spi: use a 2 item SPI queue for long transfers
- machine_dac: add MICROPY_PY_MACHINE_DAC option, enable by default
- machine_i2s: add MICROPY_PY_MACHINE_I2S option, enable by default
- fix use of mp_int_t, size_t and uintptr_t
- add initial support for ESP32C3 SoCs
- boards/GENERIC_C3: add generic C3-based board
- modmachine: release the GIL in machine.idle()
- mphalport: always yield at least once in delay_ms
- machine_uart: add flow kw-arg to enable hardware flow control
- boards: add Silicognition wESP32 board configuration
- mpconfigport.h: enable reverse and inplace special methods
- include hidden networks in WLAN.scan results
- makeimg.py: get bootloader and partition offset from sdkconfig
- enable MICROPY_PY_FSTRINGS by default
- machine_hw_spi: release GIL during transfers
- machine_pin: make check for non-output pins respect chip variant
- replace esp.neopixel with machine.bitstream
- remove dead code for end_ticks in machine_bitstream
- boards: add GENERIC_C3_USB board with USB serial/JTAG support
javascript port:
- rework Makefile and GC so it works with latest Emscripten
- Makefile: suppress compiler errors from array bounds
- Makefile: change variable to EXPORTED_RUNTIME_METHODS
mimxrt port:
- move calc_weekday helper function to timeutils
- machine_spi: add the SPI class to the machine module
- moduos: seed the PRNG on boot using the TRNG
- boards: set vfs partition start to 1 MBbyte
- main: skip running main.py if boot.py failed
- main: extend the information returned by help()
- mimxrt_flash: remove commented-out code
- modmachine: add a few minor methods to the machine module
- machine_led: use mp_raise_msg_varg helper
- machine_i2c: add hardware-based machine.I2C to machine module
- add support for Hyperflash chips
- boards: add support for the MIMXRT1050_EVKB board
- machine_pin: implement ioctl for Pin
minimal port:
- Makefile: add support for building with user C modules
nrf port:
- modules: replace master/slave with controller/peripheral in SPI
- boards/common.ld: calculate unused flash region
- modules/nrf: add new nrf module with flash block device
- drivers: add support for using flash block device with SoftDevice
- mpconfigport.h: expose nrf module when MICROPY_PY_NRF is set
- README: update README.md to reflect internal file systems
- mpconfigport.h: tune FAT FS configuration
- Makefile: add _fs_size linker script override from make
- modules/uos: allow a board to configure MICROPY_VFS_FAT/LFS1/LFS2
- mpconfigport.h: enable MICROPY_PY_IO_FILEIO when an FS is enabled
- qstrdefsport.h: add entries for in-built FS mount points
- main: add auto mount and auto format hook for internal flash FS
- boards: enable needed features for FAT/LFS1/LFS2
- facilitate use of freeze manifest
- boards: set FROZEN_MANIFEST blank when SD present on nrf51 targets
- modules/scripts: add file system formatting script
- Makefile: set default manifest file for all targets
- mphalport: add dummy function for mp_hal_time_ns()
- boards: enable MICROPY_VFS_LFS2 for all target boards
- modules/uos: add ilistdir to uos module
- modules/nrf: add function to enable/disable DCDC
- enable source line on tracebacks
- set .mpy features consistent with documentation and other ports
pic16bit port: no changes specific to this component/port
powerpc port: no changes specific to this component/port
qemu-arm port: no changes specific to this component/port
rp2 port:
- use 0=Monday datetime convention in RTC
- machine_rtc: in RTC.datetime, compute weekday automatically
- CMakeLists.txt: suppress compiler errors for pico-sdk and tinyusb
- tusb_config.h: set CFG_TUD_CDC_EP_BUFSIZE to 256
- machine_uart: add hardware flow control support
- machine_uart: allow overriding default machine UART pins
- machine_i2c: allow boards to configure I2C pins using new macros
- machine_spi: allow boards to configure SPI pins using new macros
- machine_uart: fix poll ioctl to also check hardware FIFO
- machine_uart: fix read when FIFO has chars but ringbuf doesn't
- tusb_port: allow boards to configure USB VID and PID
- boards/ADAFRUIT_FEATHER_RP2040: configure custom VID/PID
- boards/ADAFRUIT_FEATHER_RP2040: configure I2C/SPI default pins
- boards/SPARKFUN_PROMICRO: configure UART/I2C/SPI default pins
- boards/SPARKFUN_THINGPLUS: configure I2C/SPI default pins
- boards: add Adafruit ItsyBitsy RP2040
- boards: add Adafruit QT Py RP2040
- boards: add Pimoroni Pico LiPo 4MB
- boards: add Pimoroni Pico LiPo 16MB
- boards: add Pimoroni Tiny 2040
- CMakeLists.txt: allow a board's cmake to set the manifest path
- enable MICROPY_PY_FSTRINGS by default
- Makefile: add "submodules" target, to match other ports
- rp2_flash: disable IRQs while calling flash_erase/program
- CMakeLists.txt: add option to enable double tap reset to bootrom
- mpconfigport.h: allow boards to add root pointers
samd port:
- add support for building with user C modules
stm32 port:
- softtimer: add soft_timer_reinsert() helper function
- mpbthciport: change from systick to soft-timer for BT scheduling
- provide a custom BTstack runloop that integrates with soft timer
- usb: make irq's default trigger enable all events
- boardctrl: skip running main.py if boot.py had an error
- sdio: fix undefined reference to DMA stream on H7
- dma: add DMAMUX configuration for H7 to fix dma_nohal_init
- main: call mp_deinit() at end of main
- adc: allow using ADC12 and ADC3 for H7
- adc: define the ADC instance used for internal channels
- adc: simplify and generalise how pin_adcX table is defined
- add new machine.I2S class for I2S protocol support
- boards/NUCLEO_F446RE: fix I2C1 pin assignment to match datasheet
- replace master/slave with controller/peripheral in I2C and SPI
- systick: always POLL_HOOK when delaying for milliseconds
- sdram: make SDRAM test cache aware, and optional failure with msg
- boards/NUCLEO_F446RE: enable CAN bus support
- boards: add support for SparkFun STM32 MicroMod Processor board
- uart: fix LPUART1 baudrate set/get
- uart: support low baudrates on LPUART1
- boards/STM32F429DISC: set correct UART2 pins and add UART3/6
- boards/NUCLEO_F439ZI: add board definition for NUCLEO_F439ZI
- boards/LEGO_HUB_NO6: add board definition for LEGO_HUB_NO6
- Makefile: update to only pull in used Bluetooth library
- README.md: update supported MCUs, and submodule and mboot use
- usbd_desc: rename USBD_xxx descriptor opts to MICROPY_HW_USB_xxx
- usbd_cdc_interface: rename USBD_CDC_xx opts to MICROPY_HW_USB_xx
- powerctrl: support changing frequency on WB MCUs
- boards/NUCLEO_H743ZI2: add modified version of NUCLEO_H743ZI
- mbedtls: fix compile warning about uninitialized val
- enable MICROPY_PY_FSTRINGS by default
- add implementation of machine.bitstream
- Makefile: allow GIT_SUBMODULES and LIBS to be extended
- stm32_it: support TIM17 IRQs on WB MCUs
- disable computed goto on constrained boards
- storage: make extended-block-device more configurable
- boards/LEGO_HUB_NO6: change SPI flash storage to use hardware SPI
- boards/LEGO_HUB_NO6: skip first 1MiB of SPI flash for storage
- boards/LEGO_HUB_NO6: add make commands to backup/restore firmware
teensy port: no changes specific to this component/port
unix port:
- modffi: add option to lock GC in callback, and cfun access
- Makefile: add back LIB_SRC_C to list of object files
- variants: enable help and help("modules") on standard and dev
- Makefile: disable error compression on arm-linux-gnueabi-gcc
windows port:
- Makefile: add .exe extension to executables name
- appveyor: update to VS 2017 and use Python 3.8 for build/test
zephyr port:
- machine_spi: add support for hardware SPI
2021-10-14 15:38:41 -04:00
|
|
|
STATIC mp_obj_t static_class_method_make_new(const mp_obj_type_t *self, size_t n_args, size_t n_kw, const mp_obj_t *args);
|
2014-07-05 00:55:00 -04:00
|
|
|
|
2014-01-09 15:57:50 -05:00
|
|
|
/******************************************************************************/
|
2014-05-01 19:13:04 -04:00
|
|
|
// instance object
|
2014-01-09 15:57:50 -05:00
|
|
|
|
2014-05-03 12:19:35 -04:00
|
|
|
STATIC int instance_count_native_bases(const mp_obj_type_t *type, const mp_obj_type_t **last_native_base) {
|
2014-04-28 19:42:28 -04:00
|
|
|
int count = 0;
|
2017-04-05 22:09:01 -04:00
|
|
|
for (;;) {
|
|
|
|
if (type == &mp_type_object) {
|
|
|
|
// Not a "real" type, end search here.
|
|
|
|
return count;
|
2021-07-06 10:08:57 -04:00
|
|
|
}
|
|
|
|
if (mp_obj_is_native_type(type)) {
|
2017-04-05 22:09:01 -04:00
|
|
|
// Native types don't have parents (at least not from our perspective) so end.
|
|
|
|
*last_native_base = type;
|
|
|
|
return count + 1;
|
2021-07-06 10:08:57 -04:00
|
|
|
}
|
2021-07-12 08:30:16 -04:00
|
|
|
const void *parent = mp_type_get_parent_slot(type);
|
2021-07-06 10:08:57 -04:00
|
|
|
if (parent == NULL) {
|
2017-04-05 22:09:01 -04:00
|
|
|
// No parents so end search here.
|
|
|
|
return count;
|
2017-04-01 08:52:24 -04:00
|
|
|
#if MICROPY_MULTIPLE_INHERITANCE
|
2021-07-06 10:08:57 -04:00
|
|
|
} else if (((mp_obj_base_t *)parent)->type == &mp_type_tuple) {
|
2017-04-05 22:09:01 -04:00
|
|
|
// Multiple parents, search through them all recursively.
|
2021-07-06 10:08:57 -04:00
|
|
|
const mp_obj_tuple_t *parent_tuple = parent;
|
2017-04-05 22:09:01 -04:00
|
|
|
const mp_obj_t *item = parent_tuple->items;
|
|
|
|
const mp_obj_t *top = item + parent_tuple->len;
|
|
|
|
for (; item < top; ++item) {
|
2021-04-22 20:55:39 -04:00
|
|
|
assert(mp_obj_is_type(*item, &mp_type_type));
|
2017-04-05 22:09:01 -04:00
|
|
|
const mp_obj_type_t *bt = (const mp_obj_type_t *)MP_OBJ_TO_PTR(*item);
|
|
|
|
count += instance_count_native_bases(bt, last_native_base);
|
|
|
|
}
|
|
|
|
return count;
|
2017-04-01 08:52:24 -04:00
|
|
|
#endif
|
2014-04-28 19:42:28 -04:00
|
|
|
} else {
|
2017-04-05 22:09:01 -04:00
|
|
|
// A single parent, use iteration to continue the search.
|
2021-07-06 10:08:57 -04:00
|
|
|
type = parent;
|
2014-04-28 19:42:28 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-11-29 18:31:42 -05:00
|
|
|
// This wrapper function is allows a subclass of a native type to call the
|
|
|
|
// __init__() method (corresponding to type->make_new) of the native type.
|
2019-01-14 18:14:40 -05:00
|
|
|
STATIC mp_obj_t native_base_init_wrapper(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
|
|
|
|
mp_obj_instance_t *self = MP_OBJ_TO_PTR(pos_args[0]);
|
2017-11-29 18:31:42 -05:00
|
|
|
const mp_obj_type_t *native_base = NULL;
|
|
|
|
instance_count_native_bases(self->base.type, &native_base);
|
Merge tag 'v1.17' into merge-1.17
F-strings, new machine.I2S class, ESP32-C3 support and LEGO_HUB_NO6 board
This release of MicroPython adds support for f-strings (PEP-498), with a
few limitations compared to normal Python. F-strings are essentially
syntactic sugar for "".format() and make formatting strings a lot more
convenient. Other improvements to the core runtime include pretty printing
OSError when it has two arguments (an errno code and a string), scheduling
of KeyboardInterrupt on the main thread, and support for a single argument
to the optimised form of StopIteration.
In the machine module a new I2S class has been added, with support for
esp32 and stm32 ports. This provides a consistent API for transmit and
receive of audio data in blocking, non-blocking and asyncio-based
operation. Also, the json module has support for the "separators" argument
in the dump and dumps functions, and framebuf now includes a way to blit
between frame buffers of different formats using a palette. A new,
portable machine.bitstream function is also added which can output a stream
of bits with configurable timing, and is used as the basis for driving
WS2812 LEDs in a common way across ports.
There has been some restructuring of the repository directory layout, with
all third-party code now in the lib/ directory. And a new top-level
directory shared/ has been added with first-party code that was previously
in lib/ moved there.
The docs have seen further improvement with enhancements and additions to
the rp2 parts, as well as a new quick reference for the zephyr port.
The terms master/slave have been replaced with controller/peripheral,
mainly relating to I2C and SPI usage. And u-module references have been
replaced with just the module name without the u-prefix to help clear up
the intended usage of modules in MicroPython.
For the esp8266 and esp32 ports, hidden networks are now included in WLAN
scan results. On the esp32 the RMT class is enhanced with idle_level and
write_pulses modes. There is initial support for ESP32-C3 chips with
GENERIC_C3 and GENERIC_C3_USB boards.
The javascript port has had its Makefile and garbage collector
implementation reworked so it compiles and runs with latest the Emscripten
using asyncify.
The mimxrt port sees the addition of hardware I2C and SPI support, as well
as some additional methods to the machine module. There is also support
for Hyperflash chips.
The nrf port now has full VFS storage support, enables source-line on
traceback, and has .mpy features consistent with other ports.
For the rp2 port there is now more configurability for boards, and more
boards added.
The stm32 port has a new LEGO_HUB_NO6 board definition with detailed
information how to get this LEGO Hub running stock MicroPython. There is
also now support to change the CPU frequency on STM32WB MCUs. And USBD_xxx
descriptor options have been renamed to MICROPY_HW_USB_xxx.
Thanks to everyone who contributed to this release: Amir Gonnen, Andrew
Scheller, Bryan Tong Minh, Chris Wilson, Damien George, Daniel Mizyrycki,
David Lechner, David P, Fernando, finefoot, Frank Pilhofer, Glenn Ruben
Bakke, iabdalkader, Jeff Epler, Jim Mussared, Jonathan Hogg, Josh Klar,
Josh Lloyd, Julia Hathaway, Krzysztof Adamski, Matúš Olekšák, Michael
Weiss, Michel Bouwmans, Mike Causer, Mike Teachman, Ned Konz, NitiKaur,
oclyke, Patrick Van Oosterwijck, Peter Hinch, Peter Züger, Philipp
Ebensberger, robert-hh, Roberto Colistete Jr, Sashkoiv, Seon Rozenblum,
Tobias Thyrrestrup, Tom McDermott, Will Sowerbutts, Yonatan Goldschmidt.
What follows is a detailed list of changes, generated from the git commit
history, and organised into sections.
Main components
===============
all:
- fix signed shifts and NULL access errors from -fsanitize=undefined
- update to point to files in new shared/ directory
py core:
- mpstate: make exceptions thread-local
- mpstate: schedule KeyboardInterrupt on main thread
- mperrno: add MP_ECANCELED error code
- makeqstrdefs.py: don't include .h files explicitly in preprocessing
- mark unused arguments from bytecode decoding macros
- objexcept: pretty print OSError also when it has 2 arguments
- makeversionhdr: add --tags arg to git describe
- vm: simplify handling of MP_OBJ_STOP_ITERATION in yield-from opcode
- objexcept: make mp_obj_exception_get_value support subclassed excs
- support single argument to optimised MP_OBJ_STOP_ITERATION
- introduce and use mp_raise_type_arg helper
- modsys: optimise sys.exit for code size by using exception helpers
- objexcept: make mp_obj_new_exception_arg1 inline
- obj: fix formatting of comment for mp_obj_is_integer
- emitnative: reuse need_reg_all func in need_stack_settled
- emitnative: ensure stack settling is safe mid-branch
- runtime: fix bool unary op for subclasses of native types
- builtinimport: fix condition for including do_execute_raw_code()
- mkrules: automatically build mpy-cross if it doesn't exist
- implement partial PEP-498 (f-string) support
- lexer: clear fstring_args vstr on lexer free
- mkrules.mk: do submodule sync in "make submodules"
extmod:
- btstack: add missing call to mp_bluetooth_hci_uart_deinit
- btstack: check that BLE is active before performing operations
- uasyncio: get addr and bind server socket before creating task
- axtls-include: add axtls_os_port.h to customise axTLS
- update for move of crypto-algorithms, re1.5, uzlib to lib
- moduselect: conditionally compile select()
- nimble: fix leak in l2cap_send if send-while-stalled
- btstack/btstack.mk: use -Wno-implicit-fallthrough, not =0
- utime: always invoke mp_hal_delay_ms when >= to 0ms
- modbluetooth: clamp MTU values to 32->UINT16_MAX
- nimble: allow modbluetooth binding to hook "sent HCI packet"
- nimble: add "memory stalling" mechanism for l2cap_send
- uasyncio: in open_connection use address info in socket creation
- modujson: add support for dump/dumps separators keyword-argument
- modlwip: fix close and clean up of UDP and raw sockets
- modbluetooth: add send_update arg to gatts_write
- add machine.bitstream
- modframebuf: enable blit between different formats via a palette
lib:
- tinyusb: update to version 0.10.1
- pico-sdk: update to version 1.2.0
- utils/stdout_helpers: make mp_hal_stdout_tx_strn_cooked efficient
- axtls: switch to repo at micropython/axtls
- axtls: update to latest axtls 2.1.5 wih additional commits
- re1.5: move re1.5 code from extmod to lib
- uzlib: move uzlib code from extmod to lib
- crypto-algorithms: move crypto-algorithms code from extmod to lib
- update README's based on contents of these dirs
drivers:
- neopixel: add common machine.bitstream-based neopixel module
- neopixel: optimize fill() for speed
- neopixel: reduce code size of driver
- cyw43: fix cyw43_deinit so it can be called many times in a row
- cyw43: make wifi join fail if interface is not active
mpy-cross:
- disable stack check when building with Emscripten
Support components
==================
docs:
- library: document new esp32.RMT features and fix wait_done
- library: warn that ustruct doesn't handle spaces in format strings
- esp8266/tutorial: change flash mode from dio to dout
- replace master/slave with controller/peripheral in I2C and SPI
- rp2: enhance quickref and change image to Pico pinout
- rp2: update general section to give a brief technical overview
- library/utime.rst: clarify behaviour and precision of sleep ms/us
- library/uasyncio.rst: document stream readexactly() method
- library/machine.I2S.rst: fix use of sd pin in examples
- zephyr: add quick reference for the Zephyr port
- library/zephyr: add libraries specific to the Zephyr port
- templates: add unix and zephyr quickref links to top-index
- rename ufoo.rst to foo.rst
- replace ufoo with foo in all docs
- library/index.rst: clarify module naming and purpose
- library/builtins.rst: add module title
- library/network.rst: simplify socket import
- add docs for machine.bitstream and neopixel module
- library: fix usage of :term: for frozen module reference
- esp8266: use monospace for software tools
- reference: mention that slicing a memoryview causes allocation
examples: no changes specific to this component/port
tests:
- extmod: make uasyncio_heaplock test more deterministic
- cpydiff/modules_struct_whitespace_in_format: run black
- extmod/ujson: add tests for dump/dumps separators argument
- run-multitests.py: add broadcast and wait facility
- multi_bluetooth/ble_subscribe.py: add test for subscription
- extmod/vfs_fat_finaliser.py: ensure alloc at never-used GC blocks
- basics: split f-string debug printing to separate file with .exp
- pybnative: make while.py test run on boards without pyb.delay
tools:
- autobuild: add scripts to build release firmware
- remove obsolete build-stm-latest.sh script
- ci.sh: run apt-get update in ci_powerpc_setup
- makemanifest.py: allow passing flags to mpy-tool.py
- autobuild: add mimxrt port to build scripts for nightly builds
- pyboard.py: add cmd-line option to make soft reset configurable
- mpremote: swap order of PID and VID in connect-list output
- ci.sh: build unix dev variant as part of macOS CI
- ci.sh: build GENERIC_C3 board as part of esp32 CI
- autobuild: use separate IDF version to build newer esp32 SoCs
- autobuild: add FeatherS2 and TinyS2 to esp32 auto builds
- mpremote: add seek whence for mounted files
- mpremote: raise OSError on unsupported RemoteFile.seek
- autobuild: add the MIMXRT1050_EVKB board to the daily builds
- ci.sh: add mpy-cross build to nrf port
- codeformat.py: include ports/nrf/modules/nrf in code formatting
- gen-cpydiff.py: don't rename foo to ufoo in diff output
- autobuild: add auto build for Silicognition wESP32
- mpremote: fix connect-list in case VID/PID are None
- mpremote: add "devs" shortcut for "connect list"
- mpremote: remove support for pyb.USB_VCP in/out specialisation
- autobuild: don't use "-B" for make, it's already a fresh build
- pyboard.py: move --no-exclusive/--soft-reset out of mutex group
- pyboard.py: make --no-follow use same variable as --follow
- pyboard.py: add --exclusive to match --no-exclusive
- pyboard.py: make --no-soft-reset consistent with other args
- uncrustify: force 1 newline at end of file
- mpremote: bump version to 0.0.6
CI:
- workflows: add workflow to build and test javascript port
- workflows: switch from Coveralls to Codecov
- workflows: switch from lcov to gcov
- workflows: add workflow to build and test unix dev variant
The ports
=========
all ports:
- use common mp_hal_stdout_tx_strn_cooked instead of custom one
- update for move of crypto-algorithms, uzlib to lib
- rename USBD_VID/PID config macros to MICROPY_HW_USB_VID/PID
bare-arm port: no changes specific to this component/port
cc3200 port: no changes specific to this component/port
esp8266 port:
- add __len__ to NeoPixel driver to support iterating
- Makefile: add more libm files to build
- include hidden networks in WLAN.scan results
- replace esp.neopixel with machine.bitstream
- remove dead code for end_ticks in machine_bitstream
esp32 port:
- boards/sdkconfig.base: disable MEMPROT_FEATURE to alloc from IRAM
- add __len__ to NeoPixel driver to support iterating
- main: allow MICROPY_DIR to be overridden
- esp32_rmt: fix RMT looping in newer IDF versions
- esp32_rmt: enhance RMT with idle_level and write_pulses modes
- add new machine.I2S class for I2S protocol support
- machine_spi: calculate actual attained baudrate
- machine_hw_spi: use a 2 item SPI queue for long transfers
- machine_dac: add MICROPY_PY_MACHINE_DAC option, enable by default
- machine_i2s: add MICROPY_PY_MACHINE_I2S option, enable by default
- fix use of mp_int_t, size_t and uintptr_t
- add initial support for ESP32C3 SoCs
- boards/GENERIC_C3: add generic C3-based board
- modmachine: release the GIL in machine.idle()
- mphalport: always yield at least once in delay_ms
- machine_uart: add flow kw-arg to enable hardware flow control
- boards: add Silicognition wESP32 board configuration
- mpconfigport.h: enable reverse and inplace special methods
- include hidden networks in WLAN.scan results
- makeimg.py: get bootloader and partition offset from sdkconfig
- enable MICROPY_PY_FSTRINGS by default
- machine_hw_spi: release GIL during transfers
- machine_pin: make check for non-output pins respect chip variant
- replace esp.neopixel with machine.bitstream
- remove dead code for end_ticks in machine_bitstream
- boards: add GENERIC_C3_USB board with USB serial/JTAG support
javascript port:
- rework Makefile and GC so it works with latest Emscripten
- Makefile: suppress compiler errors from array bounds
- Makefile: change variable to EXPORTED_RUNTIME_METHODS
mimxrt port:
- move calc_weekday helper function to timeutils
- machine_spi: add the SPI class to the machine module
- moduos: seed the PRNG on boot using the TRNG
- boards: set vfs partition start to 1 MBbyte
- main: skip running main.py if boot.py failed
- main: extend the information returned by help()
- mimxrt_flash: remove commented-out code
- modmachine: add a few minor methods to the machine module
- machine_led: use mp_raise_msg_varg helper
- machine_i2c: add hardware-based machine.I2C to machine module
- add support for Hyperflash chips
- boards: add support for the MIMXRT1050_EVKB board
- machine_pin: implement ioctl for Pin
minimal port:
- Makefile: add support for building with user C modules
nrf port:
- modules: replace master/slave with controller/peripheral in SPI
- boards/common.ld: calculate unused flash region
- modules/nrf: add new nrf module with flash block device
- drivers: add support for using flash block device with SoftDevice
- mpconfigport.h: expose nrf module when MICROPY_PY_NRF is set
- README: update README.md to reflect internal file systems
- mpconfigport.h: tune FAT FS configuration
- Makefile: add _fs_size linker script override from make
- modules/uos: allow a board to configure MICROPY_VFS_FAT/LFS1/LFS2
- mpconfigport.h: enable MICROPY_PY_IO_FILEIO when an FS is enabled
- qstrdefsport.h: add entries for in-built FS mount points
- main: add auto mount and auto format hook for internal flash FS
- boards: enable needed features for FAT/LFS1/LFS2
- facilitate use of freeze manifest
- boards: set FROZEN_MANIFEST blank when SD present on nrf51 targets
- modules/scripts: add file system formatting script
- Makefile: set default manifest file for all targets
- mphalport: add dummy function for mp_hal_time_ns()
- boards: enable MICROPY_VFS_LFS2 for all target boards
- modules/uos: add ilistdir to uos module
- modules/nrf: add function to enable/disable DCDC
- enable source line on tracebacks
- set .mpy features consistent with documentation and other ports
pic16bit port: no changes specific to this component/port
powerpc port: no changes specific to this component/port
qemu-arm port: no changes specific to this component/port
rp2 port:
- use 0=Monday datetime convention in RTC
- machine_rtc: in RTC.datetime, compute weekday automatically
- CMakeLists.txt: suppress compiler errors for pico-sdk and tinyusb
- tusb_config.h: set CFG_TUD_CDC_EP_BUFSIZE to 256
- machine_uart: add hardware flow control support
- machine_uart: allow overriding default machine UART pins
- machine_i2c: allow boards to configure I2C pins using new macros
- machine_spi: allow boards to configure SPI pins using new macros
- machine_uart: fix poll ioctl to also check hardware FIFO
- machine_uart: fix read when FIFO has chars but ringbuf doesn't
- tusb_port: allow boards to configure USB VID and PID
- boards/ADAFRUIT_FEATHER_RP2040: configure custom VID/PID
- boards/ADAFRUIT_FEATHER_RP2040: configure I2C/SPI default pins
- boards/SPARKFUN_PROMICRO: configure UART/I2C/SPI default pins
- boards/SPARKFUN_THINGPLUS: configure I2C/SPI default pins
- boards: add Adafruit ItsyBitsy RP2040
- boards: add Adafruit QT Py RP2040
- boards: add Pimoroni Pico LiPo 4MB
- boards: add Pimoroni Pico LiPo 16MB
- boards: add Pimoroni Tiny 2040
- CMakeLists.txt: allow a board's cmake to set the manifest path
- enable MICROPY_PY_FSTRINGS by default
- Makefile: add "submodules" target, to match other ports
- rp2_flash: disable IRQs while calling flash_erase/program
- CMakeLists.txt: add option to enable double tap reset to bootrom
- mpconfigport.h: allow boards to add root pointers
samd port:
- add support for building with user C modules
stm32 port:
- softtimer: add soft_timer_reinsert() helper function
- mpbthciport: change from systick to soft-timer for BT scheduling
- provide a custom BTstack runloop that integrates with soft timer
- usb: make irq's default trigger enable all events
- boardctrl: skip running main.py if boot.py had an error
- sdio: fix undefined reference to DMA stream on H7
- dma: add DMAMUX configuration for H7 to fix dma_nohal_init
- main: call mp_deinit() at end of main
- adc: allow using ADC12 and ADC3 for H7
- adc: define the ADC instance used for internal channels
- adc: simplify and generalise how pin_adcX table is defined
- add new machine.I2S class for I2S protocol support
- boards/NUCLEO_F446RE: fix I2C1 pin assignment to match datasheet
- replace master/slave with controller/peripheral in I2C and SPI
- systick: always POLL_HOOK when delaying for milliseconds
- sdram: make SDRAM test cache aware, and optional failure with msg
- boards/NUCLEO_F446RE: enable CAN bus support
- boards: add support for SparkFun STM32 MicroMod Processor board
- uart: fix LPUART1 baudrate set/get
- uart: support low baudrates on LPUART1
- boards/STM32F429DISC: set correct UART2 pins and add UART3/6
- boards/NUCLEO_F439ZI: add board definition for NUCLEO_F439ZI
- boards/LEGO_HUB_NO6: add board definition for LEGO_HUB_NO6
- Makefile: update to only pull in used Bluetooth library
- README.md: update supported MCUs, and submodule and mboot use
- usbd_desc: rename USBD_xxx descriptor opts to MICROPY_HW_USB_xxx
- usbd_cdc_interface: rename USBD_CDC_xx opts to MICROPY_HW_USB_xx
- powerctrl: support changing frequency on WB MCUs
- boards/NUCLEO_H743ZI2: add modified version of NUCLEO_H743ZI
- mbedtls: fix compile warning about uninitialized val
- enable MICROPY_PY_FSTRINGS by default
- add implementation of machine.bitstream
- Makefile: allow GIT_SUBMODULES and LIBS to be extended
- stm32_it: support TIM17 IRQs on WB MCUs
- disable computed goto on constrained boards
- storage: make extended-block-device more configurable
- boards/LEGO_HUB_NO6: change SPI flash storage to use hardware SPI
- boards/LEGO_HUB_NO6: skip first 1MiB of SPI flash for storage
- boards/LEGO_HUB_NO6: add make commands to backup/restore firmware
teensy port: no changes specific to this component/port
unix port:
- modffi: add option to lock GC in callback, and cfun access
- Makefile: add back LIB_SRC_C to list of object files
- variants: enable help and help("modules") on standard and dev
- Makefile: disable error compression on arm-linux-gnueabi-gcc
windows port:
- Makefile: add .exe extension to executables name
- appveyor: update to VS 2017 and use Python 3.8 for build/test
zephyr port:
- machine_spi: add support for hardware SPI
2021-10-14 15:38:41 -04:00
|
|
|
|
|
|
|
size_t n_kw = kw_args ? kw_args->used : 0;
|
|
|
|
|
|
|
|
// consume the type object
|
|
|
|
pos_args++;
|
|
|
|
n_args--;
|
|
|
|
|
|
|
|
mp_obj_t *args2 = m_new(mp_obj_t, n_args + 2 * n_kw);
|
|
|
|
// copy in args
|
|
|
|
memcpy(args2, pos_args, n_args * sizeof(mp_obj_t));
|
|
|
|
// copy in kwargs
|
|
|
|
memcpy(args2 + n_args, kw_args->table, 2 * n_kw * sizeof(mp_obj_t));
|
|
|
|
self->subobj[0] = native_base->make_new(native_base, n_args, n_kw, args2);
|
|
|
|
m_del(mp_obj_t, args2, n_args + 2 * n_kw);
|
|
|
|
|
2017-11-29 18:31:42 -05:00
|
|
|
return mp_const_none;
|
|
|
|
}
|
Merge tag 'v1.17' into merge-1.17
F-strings, new machine.I2S class, ESP32-C3 support and LEGO_HUB_NO6 board
This release of MicroPython adds support for f-strings (PEP-498), with a
few limitations compared to normal Python. F-strings are essentially
syntactic sugar for "".format() and make formatting strings a lot more
convenient. Other improvements to the core runtime include pretty printing
OSError when it has two arguments (an errno code and a string), scheduling
of KeyboardInterrupt on the main thread, and support for a single argument
to the optimised form of StopIteration.
In the machine module a new I2S class has been added, with support for
esp32 and stm32 ports. This provides a consistent API for transmit and
receive of audio data in blocking, non-blocking and asyncio-based
operation. Also, the json module has support for the "separators" argument
in the dump and dumps functions, and framebuf now includes a way to blit
between frame buffers of different formats using a palette. A new,
portable machine.bitstream function is also added which can output a stream
of bits with configurable timing, and is used as the basis for driving
WS2812 LEDs in a common way across ports.
There has been some restructuring of the repository directory layout, with
all third-party code now in the lib/ directory. And a new top-level
directory shared/ has been added with first-party code that was previously
in lib/ moved there.
The docs have seen further improvement with enhancements and additions to
the rp2 parts, as well as a new quick reference for the zephyr port.
The terms master/slave have been replaced with controller/peripheral,
mainly relating to I2C and SPI usage. And u-module references have been
replaced with just the module name without the u-prefix to help clear up
the intended usage of modules in MicroPython.
For the esp8266 and esp32 ports, hidden networks are now included in WLAN
scan results. On the esp32 the RMT class is enhanced with idle_level and
write_pulses modes. There is initial support for ESP32-C3 chips with
GENERIC_C3 and GENERIC_C3_USB boards.
The javascript port has had its Makefile and garbage collector
implementation reworked so it compiles and runs with latest the Emscripten
using asyncify.
The mimxrt port sees the addition of hardware I2C and SPI support, as well
as some additional methods to the machine module. There is also support
for Hyperflash chips.
The nrf port now has full VFS storage support, enables source-line on
traceback, and has .mpy features consistent with other ports.
For the rp2 port there is now more configurability for boards, and more
boards added.
The stm32 port has a new LEGO_HUB_NO6 board definition with detailed
information how to get this LEGO Hub running stock MicroPython. There is
also now support to change the CPU frequency on STM32WB MCUs. And USBD_xxx
descriptor options have been renamed to MICROPY_HW_USB_xxx.
Thanks to everyone who contributed to this release: Amir Gonnen, Andrew
Scheller, Bryan Tong Minh, Chris Wilson, Damien George, Daniel Mizyrycki,
David Lechner, David P, Fernando, finefoot, Frank Pilhofer, Glenn Ruben
Bakke, iabdalkader, Jeff Epler, Jim Mussared, Jonathan Hogg, Josh Klar,
Josh Lloyd, Julia Hathaway, Krzysztof Adamski, Matúš Olekšák, Michael
Weiss, Michel Bouwmans, Mike Causer, Mike Teachman, Ned Konz, NitiKaur,
oclyke, Patrick Van Oosterwijck, Peter Hinch, Peter Züger, Philipp
Ebensberger, robert-hh, Roberto Colistete Jr, Sashkoiv, Seon Rozenblum,
Tobias Thyrrestrup, Tom McDermott, Will Sowerbutts, Yonatan Goldschmidt.
What follows is a detailed list of changes, generated from the git commit
history, and organised into sections.
Main components
===============
all:
- fix signed shifts and NULL access errors from -fsanitize=undefined
- update to point to files in new shared/ directory
py core:
- mpstate: make exceptions thread-local
- mpstate: schedule KeyboardInterrupt on main thread
- mperrno: add MP_ECANCELED error code
- makeqstrdefs.py: don't include .h files explicitly in preprocessing
- mark unused arguments from bytecode decoding macros
- objexcept: pretty print OSError also when it has 2 arguments
- makeversionhdr: add --tags arg to git describe
- vm: simplify handling of MP_OBJ_STOP_ITERATION in yield-from opcode
- objexcept: make mp_obj_exception_get_value support subclassed excs
- support single argument to optimised MP_OBJ_STOP_ITERATION
- introduce and use mp_raise_type_arg helper
- modsys: optimise sys.exit for code size by using exception helpers
- objexcept: make mp_obj_new_exception_arg1 inline
- obj: fix formatting of comment for mp_obj_is_integer
- emitnative: reuse need_reg_all func in need_stack_settled
- emitnative: ensure stack settling is safe mid-branch
- runtime: fix bool unary op for subclasses of native types
- builtinimport: fix condition for including do_execute_raw_code()
- mkrules: automatically build mpy-cross if it doesn't exist
- implement partial PEP-498 (f-string) support
- lexer: clear fstring_args vstr on lexer free
- mkrules.mk: do submodule sync in "make submodules"
extmod:
- btstack: add missing call to mp_bluetooth_hci_uart_deinit
- btstack: check that BLE is active before performing operations
- uasyncio: get addr and bind server socket before creating task
- axtls-include: add axtls_os_port.h to customise axTLS
- update for move of crypto-algorithms, re1.5, uzlib to lib
- moduselect: conditionally compile select()
- nimble: fix leak in l2cap_send if send-while-stalled
- btstack/btstack.mk: use -Wno-implicit-fallthrough, not =0
- utime: always invoke mp_hal_delay_ms when >= to 0ms
- modbluetooth: clamp MTU values to 32->UINT16_MAX
- nimble: allow modbluetooth binding to hook "sent HCI packet"
- nimble: add "memory stalling" mechanism for l2cap_send
- uasyncio: in open_connection use address info in socket creation
- modujson: add support for dump/dumps separators keyword-argument
- modlwip: fix close and clean up of UDP and raw sockets
- modbluetooth: add send_update arg to gatts_write
- add machine.bitstream
- modframebuf: enable blit between different formats via a palette
lib:
- tinyusb: update to version 0.10.1
- pico-sdk: update to version 1.2.0
- utils/stdout_helpers: make mp_hal_stdout_tx_strn_cooked efficient
- axtls: switch to repo at micropython/axtls
- axtls: update to latest axtls 2.1.5 wih additional commits
- re1.5: move re1.5 code from extmod to lib
- uzlib: move uzlib code from extmod to lib
- crypto-algorithms: move crypto-algorithms code from extmod to lib
- update README's based on contents of these dirs
drivers:
- neopixel: add common machine.bitstream-based neopixel module
- neopixel: optimize fill() for speed
- neopixel: reduce code size of driver
- cyw43: fix cyw43_deinit so it can be called many times in a row
- cyw43: make wifi join fail if interface is not active
mpy-cross:
- disable stack check when building with Emscripten
Support components
==================
docs:
- library: document new esp32.RMT features and fix wait_done
- library: warn that ustruct doesn't handle spaces in format strings
- esp8266/tutorial: change flash mode from dio to dout
- replace master/slave with controller/peripheral in I2C and SPI
- rp2: enhance quickref and change image to Pico pinout
- rp2: update general section to give a brief technical overview
- library/utime.rst: clarify behaviour and precision of sleep ms/us
- library/uasyncio.rst: document stream readexactly() method
- library/machine.I2S.rst: fix use of sd pin in examples
- zephyr: add quick reference for the Zephyr port
- library/zephyr: add libraries specific to the Zephyr port
- templates: add unix and zephyr quickref links to top-index
- rename ufoo.rst to foo.rst
- replace ufoo with foo in all docs
- library/index.rst: clarify module naming and purpose
- library/builtins.rst: add module title
- library/network.rst: simplify socket import
- add docs for machine.bitstream and neopixel module
- library: fix usage of :term: for frozen module reference
- esp8266: use monospace for software tools
- reference: mention that slicing a memoryview causes allocation
examples: no changes specific to this component/port
tests:
- extmod: make uasyncio_heaplock test more deterministic
- cpydiff/modules_struct_whitespace_in_format: run black
- extmod/ujson: add tests for dump/dumps separators argument
- run-multitests.py: add broadcast and wait facility
- multi_bluetooth/ble_subscribe.py: add test for subscription
- extmod/vfs_fat_finaliser.py: ensure alloc at never-used GC blocks
- basics: split f-string debug printing to separate file with .exp
- pybnative: make while.py test run on boards without pyb.delay
tools:
- autobuild: add scripts to build release firmware
- remove obsolete build-stm-latest.sh script
- ci.sh: run apt-get update in ci_powerpc_setup
- makemanifest.py: allow passing flags to mpy-tool.py
- autobuild: add mimxrt port to build scripts for nightly builds
- pyboard.py: add cmd-line option to make soft reset configurable
- mpremote: swap order of PID and VID in connect-list output
- ci.sh: build unix dev variant as part of macOS CI
- ci.sh: build GENERIC_C3 board as part of esp32 CI
- autobuild: use separate IDF version to build newer esp32 SoCs
- autobuild: add FeatherS2 and TinyS2 to esp32 auto builds
- mpremote: add seek whence for mounted files
- mpremote: raise OSError on unsupported RemoteFile.seek
- autobuild: add the MIMXRT1050_EVKB board to the daily builds
- ci.sh: add mpy-cross build to nrf port
- codeformat.py: include ports/nrf/modules/nrf in code formatting
- gen-cpydiff.py: don't rename foo to ufoo in diff output
- autobuild: add auto build for Silicognition wESP32
- mpremote: fix connect-list in case VID/PID are None
- mpremote: add "devs" shortcut for "connect list"
- mpremote: remove support for pyb.USB_VCP in/out specialisation
- autobuild: don't use "-B" for make, it's already a fresh build
- pyboard.py: move --no-exclusive/--soft-reset out of mutex group
- pyboard.py: make --no-follow use same variable as --follow
- pyboard.py: add --exclusive to match --no-exclusive
- pyboard.py: make --no-soft-reset consistent with other args
- uncrustify: force 1 newline at end of file
- mpremote: bump version to 0.0.6
CI:
- workflows: add workflow to build and test javascript port
- workflows: switch from Coveralls to Codecov
- workflows: switch from lcov to gcov
- workflows: add workflow to build and test unix dev variant
The ports
=========
all ports:
- use common mp_hal_stdout_tx_strn_cooked instead of custom one
- update for move of crypto-algorithms, uzlib to lib
- rename USBD_VID/PID config macros to MICROPY_HW_USB_VID/PID
bare-arm port: no changes specific to this component/port
cc3200 port: no changes specific to this component/port
esp8266 port:
- add __len__ to NeoPixel driver to support iterating
- Makefile: add more libm files to build
- include hidden networks in WLAN.scan results
- replace esp.neopixel with machine.bitstream
- remove dead code for end_ticks in machine_bitstream
esp32 port:
- boards/sdkconfig.base: disable MEMPROT_FEATURE to alloc from IRAM
- add __len__ to NeoPixel driver to support iterating
- main: allow MICROPY_DIR to be overridden
- esp32_rmt: fix RMT looping in newer IDF versions
- esp32_rmt: enhance RMT with idle_level and write_pulses modes
- add new machine.I2S class for I2S protocol support
- machine_spi: calculate actual attained baudrate
- machine_hw_spi: use a 2 item SPI queue for long transfers
- machine_dac: add MICROPY_PY_MACHINE_DAC option, enable by default
- machine_i2s: add MICROPY_PY_MACHINE_I2S option, enable by default
- fix use of mp_int_t, size_t and uintptr_t
- add initial support for ESP32C3 SoCs
- boards/GENERIC_C3: add generic C3-based board
- modmachine: release the GIL in machine.idle()
- mphalport: always yield at least once in delay_ms
- machine_uart: add flow kw-arg to enable hardware flow control
- boards: add Silicognition wESP32 board configuration
- mpconfigport.h: enable reverse and inplace special methods
- include hidden networks in WLAN.scan results
- makeimg.py: get bootloader and partition offset from sdkconfig
- enable MICROPY_PY_FSTRINGS by default
- machine_hw_spi: release GIL during transfers
- machine_pin: make check for non-output pins respect chip variant
- replace esp.neopixel with machine.bitstream
- remove dead code for end_ticks in machine_bitstream
- boards: add GENERIC_C3_USB board with USB serial/JTAG support
javascript port:
- rework Makefile and GC so it works with latest Emscripten
- Makefile: suppress compiler errors from array bounds
- Makefile: change variable to EXPORTED_RUNTIME_METHODS
mimxrt port:
- move calc_weekday helper function to timeutils
- machine_spi: add the SPI class to the machine module
- moduos: seed the PRNG on boot using the TRNG
- boards: set vfs partition start to 1 MBbyte
- main: skip running main.py if boot.py failed
- main: extend the information returned by help()
- mimxrt_flash: remove commented-out code
- modmachine: add a few minor methods to the machine module
- machine_led: use mp_raise_msg_varg helper
- machine_i2c: add hardware-based machine.I2C to machine module
- add support for Hyperflash chips
- boards: add support for the MIMXRT1050_EVKB board
- machine_pin: implement ioctl for Pin
minimal port:
- Makefile: add support for building with user C modules
nrf port:
- modules: replace master/slave with controller/peripheral in SPI
- boards/common.ld: calculate unused flash region
- modules/nrf: add new nrf module with flash block device
- drivers: add support for using flash block device with SoftDevice
- mpconfigport.h: expose nrf module when MICROPY_PY_NRF is set
- README: update README.md to reflect internal file systems
- mpconfigport.h: tune FAT FS configuration
- Makefile: add _fs_size linker script override from make
- modules/uos: allow a board to configure MICROPY_VFS_FAT/LFS1/LFS2
- mpconfigport.h: enable MICROPY_PY_IO_FILEIO when an FS is enabled
- qstrdefsport.h: add entries for in-built FS mount points
- main: add auto mount and auto format hook for internal flash FS
- boards: enable needed features for FAT/LFS1/LFS2
- facilitate use of freeze manifest
- boards: set FROZEN_MANIFEST blank when SD present on nrf51 targets
- modules/scripts: add file system formatting script
- Makefile: set default manifest file for all targets
- mphalport: add dummy function for mp_hal_time_ns()
- boards: enable MICROPY_VFS_LFS2 for all target boards
- modules/uos: add ilistdir to uos module
- modules/nrf: add function to enable/disable DCDC
- enable source line on tracebacks
- set .mpy features consistent with documentation and other ports
pic16bit port: no changes specific to this component/port
powerpc port: no changes specific to this component/port
qemu-arm port: no changes specific to this component/port
rp2 port:
- use 0=Monday datetime convention in RTC
- machine_rtc: in RTC.datetime, compute weekday automatically
- CMakeLists.txt: suppress compiler errors for pico-sdk and tinyusb
- tusb_config.h: set CFG_TUD_CDC_EP_BUFSIZE to 256
- machine_uart: add hardware flow control support
- machine_uart: allow overriding default machine UART pins
- machine_i2c: allow boards to configure I2C pins using new macros
- machine_spi: allow boards to configure SPI pins using new macros
- machine_uart: fix poll ioctl to also check hardware FIFO
- machine_uart: fix read when FIFO has chars but ringbuf doesn't
- tusb_port: allow boards to configure USB VID and PID
- boards/ADAFRUIT_FEATHER_RP2040: configure custom VID/PID
- boards/ADAFRUIT_FEATHER_RP2040: configure I2C/SPI default pins
- boards/SPARKFUN_PROMICRO: configure UART/I2C/SPI default pins
- boards/SPARKFUN_THINGPLUS: configure I2C/SPI default pins
- boards: add Adafruit ItsyBitsy RP2040
- boards: add Adafruit QT Py RP2040
- boards: add Pimoroni Pico LiPo 4MB
- boards: add Pimoroni Pico LiPo 16MB
- boards: add Pimoroni Tiny 2040
- CMakeLists.txt: allow a board's cmake to set the manifest path
- enable MICROPY_PY_FSTRINGS by default
- Makefile: add "submodules" target, to match other ports
- rp2_flash: disable IRQs while calling flash_erase/program
- CMakeLists.txt: add option to enable double tap reset to bootrom
- mpconfigport.h: allow boards to add root pointers
samd port:
- add support for building with user C modules
stm32 port:
- softtimer: add soft_timer_reinsert() helper function
- mpbthciport: change from systick to soft-timer for BT scheduling
- provide a custom BTstack runloop that integrates with soft timer
- usb: make irq's default trigger enable all events
- boardctrl: skip running main.py if boot.py had an error
- sdio: fix undefined reference to DMA stream on H7
- dma: add DMAMUX configuration for H7 to fix dma_nohal_init
- main: call mp_deinit() at end of main
- adc: allow using ADC12 and ADC3 for H7
- adc: define the ADC instance used for internal channels
- adc: simplify and generalise how pin_adcX table is defined
- add new machine.I2S class for I2S protocol support
- boards/NUCLEO_F446RE: fix I2C1 pin assignment to match datasheet
- replace master/slave with controller/peripheral in I2C and SPI
- systick: always POLL_HOOK when delaying for milliseconds
- sdram: make SDRAM test cache aware, and optional failure with msg
- boards/NUCLEO_F446RE: enable CAN bus support
- boards: add support for SparkFun STM32 MicroMod Processor board
- uart: fix LPUART1 baudrate set/get
- uart: support low baudrates on LPUART1
- boards/STM32F429DISC: set correct UART2 pins and add UART3/6
- boards/NUCLEO_F439ZI: add board definition for NUCLEO_F439ZI
- boards/LEGO_HUB_NO6: add board definition for LEGO_HUB_NO6
- Makefile: update to only pull in used Bluetooth library
- README.md: update supported MCUs, and submodule and mboot use
- usbd_desc: rename USBD_xxx descriptor opts to MICROPY_HW_USB_xxx
- usbd_cdc_interface: rename USBD_CDC_xx opts to MICROPY_HW_USB_xx
- powerctrl: support changing frequency on WB MCUs
- boards/NUCLEO_H743ZI2: add modified version of NUCLEO_H743ZI
- mbedtls: fix compile warning about uninitialized val
- enable MICROPY_PY_FSTRINGS by default
- add implementation of machine.bitstream
- Makefile: allow GIT_SUBMODULES and LIBS to be extended
- stm32_it: support TIM17 IRQs on WB MCUs
- disable computed goto on constrained boards
- storage: make extended-block-device more configurable
- boards/LEGO_HUB_NO6: change SPI flash storage to use hardware SPI
- boards/LEGO_HUB_NO6: skip first 1MiB of SPI flash for storage
- boards/LEGO_HUB_NO6: add make commands to backup/restore firmware
teensy port: no changes specific to this component/port
unix port:
- modffi: add option to lock GC in callback, and cfun access
- Makefile: add back LIB_SRC_C to list of object files
- variants: enable help and help("modules") on standard and dev
- Makefile: disable error compression on arm-linux-gnueabi-gcc
windows port:
- Makefile: add .exe extension to executables name
- appveyor: update to VS 2017 and use Python 3.8 for build/test
zephyr port:
- machine_spi: add support for hardware SPI
2021-10-14 15:38:41 -04:00
|
|
|
|
2019-01-14 18:14:40 -05:00
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(native_base_init_wrapper_obj, 1, native_base_init_wrapper);
|
2017-11-29 18:31:42 -05:00
|
|
|
|
2017-12-11 23:22:03 -05:00
|
|
|
#if !MICROPY_CPYTHON_COMPAT
|
|
|
|
STATIC
|
|
|
|
#endif
|
|
|
|
mp_obj_instance_t *mp_obj_new_instance(const mp_obj_type_t *class, const mp_obj_type_t **native_base) {
|
|
|
|
size_t num_native_bases = instance_count_native_bases(class, native_base);
|
|
|
|
assert(num_native_bases < 2);
|
|
|
|
mp_obj_instance_t *o = m_new_obj_var(mp_obj_instance_t, mp_obj_t, num_native_bases);
|
2017-11-29 18:31:42 -05:00
|
|
|
o->base.type = class;
|
|
|
|
mp_map_init(&o->members, 0);
|
|
|
|
// Initialise the native base-class slot (should be 1 at most) with a valid
|
|
|
|
// object. It doesn't matter which object, so long as it can be uniquely
|
|
|
|
// distinguished from a native class that is initialised.
|
2017-12-11 23:22:03 -05:00
|
|
|
if (num_native_bases != 0) {
|
2017-11-29 18:31:42 -05:00
|
|
|
o->subobj[0] = MP_OBJ_FROM_PTR(&native_base_init_wrapper_obj);
|
|
|
|
}
|
2017-12-11 23:22:03 -05:00
|
|
|
return o;
|
2017-11-29 18:31:42 -05:00
|
|
|
}
|
|
|
|
|
2019-05-13 20:31:30 -04:00
|
|
|
// When instances are first created they have the base_init wrapper as their native parent's
|
|
|
|
// instance because make_new combines __new__ and __init__. This object is invalid for the native
|
|
|
|
// code so it must call this method to ensure that the given object has been __init__'d and is
|
|
|
|
// valid.
|
|
|
|
void mp_obj_assert_native_inited(mp_obj_t native_object) {
|
|
|
|
if (native_object == MP_OBJ_FROM_PTR(&native_base_init_wrapper_obj)) {
|
2021-05-05 20:51:52 -04:00
|
|
|
mp_raise_NotImplementedError(MP_ERROR_TEXT("Call super().__init__() before accessing native object."));
|
2019-05-13 20:31:30 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-28 19:42:28 -04:00
|
|
|
// TODO
|
|
|
|
// This implements depth-first left-to-right MRO, which is not compliant with Python3 MRO
|
|
|
|
// http://python-history.blogspot.com/2010/06/method-resolution-order.html
|
|
|
|
// https://www.python.org/download/releases/2.3/mro/
|
|
|
|
//
|
2015-03-16 07:32:03 -04:00
|
|
|
// will keep lookup->dest[0]'s value (should be MP_OBJ_NULL on invocation) if attribute
|
|
|
|
// is not found
|
|
|
|
// will set lookup->dest[0] to MP_OBJ_SENTINEL if special method was found in a native
|
|
|
|
// type base via slot id (as specified by lookup->meth_offset). As there can be only one
|
|
|
|
// native base, it's known that it applies to instance->subobj[0]. In most cases, we also
|
|
|
|
// don't need to know which type it was - because instance->subobj[0] is of that type.
|
|
|
|
// The only exception is when object is not yet constructed, then we need to know base
|
|
|
|
// native type to construct its instance->subobj[0] from. But this case is handled via
|
|
|
|
// instance_count_native_bases(), which returns a native base which it saw.
|
2014-06-08 13:50:12 -04:00
|
|
|
struct class_lookup_data {
|
|
|
|
mp_obj_instance_t *obj;
|
|
|
|
qstr attr;
|
2017-03-24 01:58:13 -04:00
|
|
|
size_t meth_offset;
|
2014-06-08 13:50:12 -04:00
|
|
|
mp_obj_t *dest;
|
2014-06-08 15:28:44 -04:00
|
|
|
bool is_type;
|
2014-06-08 13:50:12 -04:00
|
|
|
};
|
|
|
|
|
2021-03-15 09:57:36 -04:00
|
|
|
STATIC void mp_obj_class_lookup(struct class_lookup_data *lookup, const mp_obj_type_t *type) {
|
2015-11-27 12:01:44 -05:00
|
|
|
assert(lookup->dest[0] == MP_OBJ_NULL);
|
|
|
|
assert(lookup->dest[1] == MP_OBJ_NULL);
|
2014-01-09 16:43:51 -05:00
|
|
|
for (;;) {
|
2017-08-30 17:44:51 -04:00
|
|
|
DEBUG_printf("mp_obj_class_lookup: Looking up %s in %s\n", qstr_str(lookup->attr), qstr_str(type->name));
|
2014-04-28 19:42:28 -04:00
|
|
|
// Optimize special method lookup for native types
|
|
|
|
// This avoids extra method_name => slot lookup. On the other hand,
|
|
|
|
// this should not be applied to class types, as will result in extra
|
|
|
|
// lookup either.
|
2015-05-03 18:23:18 -04:00
|
|
|
if (lookup->meth_offset != 0 && mp_obj_is_native_type(type)) {
|
2021-03-15 09:57:36 -04:00
|
|
|
#pragma GCC diagnostic push
|
|
|
|
#pragma GCC diagnostic ignored "-Wcast-align"
|
2021-07-06 10:08:57 -04:00
|
|
|
size_t sz = mp_type_size(type);
|
|
|
|
if (lookup->meth_offset < sz && *(void **)((char *)type + lookup->meth_offset) != NULL) {
|
2021-03-15 09:57:36 -04:00
|
|
|
#pragma GCC diagnostic pop
|
2017-08-30 17:44:51 -04:00
|
|
|
DEBUG_printf("mp_obj_class_lookup: Matched special meth slot (off=%d) for %s\n",
|
|
|
|
lookup->meth_offset, qstr_str(lookup->attr));
|
2014-06-08 13:50:12 -04:00
|
|
|
lookup->dest[0] = MP_OBJ_SENTINEL;
|
2014-04-29 19:14:30 -04:00
|
|
|
return;
|
2014-04-28 19:42:28 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-18 12:52:41 -05:00
|
|
|
if (type->locals_dict != NULL) {
|
2014-03-26 18:35:10 -04:00
|
|
|
// search locals_dict (the set of methods/attributes)
|
2020-06-21 03:25:44 -04:00
|
|
|
assert(mp_obj_is_dict_or_ordereddict(MP_OBJ_FROM_PTR(type->locals_dict))); // MicroPython restriction, for now
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_map_t *locals_map = &type->locals_dict->map;
|
2014-06-08 13:50:12 -04:00
|
|
|
mp_map_elem_t *elem = mp_map_lookup(locals_map, MP_OBJ_NEW_QSTR(lookup->attr), MP_MAP_LOOKUP);
|
2014-01-18 12:52:41 -05:00
|
|
|
if (elem != NULL) {
|
2014-06-08 15:28:44 -04:00
|
|
|
if (lookup->is_type) {
|
2015-03-19 18:51:26 -04:00
|
|
|
// If we look up a class method, we need to return original type for which we
|
|
|
|
// do a lookup, not a (base) type in which we found the class method.
|
2021-03-15 09:57:36 -04:00
|
|
|
const mp_obj_type_t *org_type = (const mp_obj_type_t *)lookup->obj;
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_convert_member_lookup(MP_OBJ_NULL, org_type, elem->value, lookup->dest);
|
2021-04-22 20:55:39 -04:00
|
|
|
} else if (mp_obj_is_type(elem->value, &mp_type_property)) {
|
2019-02-06 15:13:17 -05:00
|
|
|
lookup->dest[0] = elem->value;
|
|
|
|
return;
|
2014-05-18 13:37:18 -04:00
|
|
|
} else {
|
2015-03-16 07:58:08 -04:00
|
|
|
mp_obj_instance_t *obj = lookup->obj;
|
2020-01-24 21:22:28 -05:00
|
|
|
mp_convert_member_lookup(MP_OBJ_FROM_PTR(obj), type, elem->value, lookup->dest);
|
2014-04-29 19:14:30 -04:00
|
|
|
}
|
2021-03-15 09:57:36 -04:00
|
|
|
#if DEBUG_PRINT
|
2018-08-02 00:17:24 -04:00
|
|
|
DEBUG_printf("mp_obj_class_lookup: Returning: ");
|
|
|
|
mp_obj_print_helper(MICROPY_DEBUG_PRINTER, lookup->dest[0], PRINT_REPR);
|
|
|
|
if (lookup->dest[1] != MP_OBJ_NULL) {
|
|
|
|
// Don't try to repr() lookup->dest[1], as we can be called recursively
|
|
|
|
DEBUG_printf(" <%s @%p>", mp_obj_get_type_str(lookup->dest[1]), MP_OBJ_TO_PTR(lookup->dest[1]));
|
|
|
|
}
|
|
|
|
DEBUG_printf("\n");
|
2021-03-15 09:57:36 -04:00
|
|
|
#endif
|
2014-04-29 19:14:30 -04:00
|
|
|
return;
|
2014-01-18 12:52:41 -05:00
|
|
|
}
|
2014-01-09 16:43:51 -05:00
|
|
|
}
|
|
|
|
|
2015-03-16 20:07:00 -04:00
|
|
|
// Previous code block takes care about attributes defined in .locals_dict,
|
|
|
|
// but some attributes of native types may be handled using .load_attr method,
|
|
|
|
// so make sure we try to lookup those too.
|
2015-11-27 12:01:44 -05:00
|
|
|
if (lookup->obj != NULL && !lookup->is_type && mp_obj_is_native_type(type) && type != &mp_type_object /* object is not a real type */) {
|
2014-06-08 13:50:12 -04:00
|
|
|
mp_load_method_maybe(lookup->obj->subobj[0], lookup->attr, lookup->dest);
|
|
|
|
if (lookup->dest[0] != MP_OBJ_NULL) {
|
2014-04-29 19:14:30 -04:00
|
|
|
return;
|
2014-04-28 20:16:38 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-09 16:43:51 -05:00
|
|
|
// attribute not found, keep searching base classes
|
|
|
|
|
2021-07-12 08:30:16 -04:00
|
|
|
const void *parent = mp_type_get_parent_slot(type);
|
2021-07-06 10:08:57 -04:00
|
|
|
if (parent == NULL) {
|
2017-08-30 17:44:51 -04:00
|
|
|
DEBUG_printf("mp_obj_class_lookup: No more parents\n");
|
2014-04-29 19:14:30 -04:00
|
|
|
return;
|
2021-07-06 10:08:57 -04:00
|
|
|
}
|
2017-04-01 08:52:24 -04:00
|
|
|
#if MICROPY_MULTIPLE_INHERITANCE
|
2021-07-06 10:08:57 -04:00
|
|
|
if (((mp_obj_base_t *)parent)->type == &mp_type_tuple) {
|
|
|
|
const mp_obj_tuple_t *parent_tuple = parent;
|
2017-04-05 22:09:01 -04:00
|
|
|
const mp_obj_t *item = parent_tuple->items;
|
|
|
|
const mp_obj_t *top = item + parent_tuple->len - 1;
|
|
|
|
for (; item < top; ++item) {
|
2021-04-22 20:55:39 -04:00
|
|
|
assert(mp_obj_is_type(*item, &mp_type_type));
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_obj_type_t *bt = (mp_obj_type_t *)MP_OBJ_TO_PTR(*item);
|
2017-04-05 22:09:01 -04:00
|
|
|
if (bt == &mp_type_object) {
|
|
|
|
// Not a "real" type
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
mp_obj_class_lookup(lookup, bt);
|
|
|
|
if (lookup->dest[0] != MP_OBJ_NULL) {
|
|
|
|
return;
|
|
|
|
}
|
2014-01-09 16:43:51 -05:00
|
|
|
}
|
|
|
|
|
2017-04-05 22:09:01 -04:00
|
|
|
// search last base (simple tail recursion elimination)
|
2021-04-22 20:55:39 -04:00
|
|
|
assert(mp_obj_is_type(*item, &mp_type_type));
|
2021-03-15 09:57:36 -04:00
|
|
|
type = (mp_obj_type_t *)MP_OBJ_TO_PTR(*item);
|
2021-07-06 10:08:57 -04:00
|
|
|
continue;
|
2017-04-05 22:09:01 -04:00
|
|
|
}
|
2021-07-06 10:08:57 -04:00
|
|
|
#endif
|
|
|
|
type = parent;
|
2014-05-09 19:03:43 -04:00
|
|
|
if (type == &mp_type_object) {
|
|
|
|
// Not a "real" type
|
|
|
|
return;
|
|
|
|
}
|
2014-01-09 16:43:51 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-04-09 18:56:15 -04:00
|
|
|
STATIC void instance_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_instance_t *self = MP_OBJ_TO_PTR(self_in);
|
2014-03-16 09:16:54 -04:00
|
|
|
qstr meth = (kind == PRINT_STR) ? MP_QSTR___str__ : MP_QSTR___repr__;
|
2014-04-29 19:14:30 -04:00
|
|
|
mp_obj_t member[2] = {MP_OBJ_NULL};
|
2014-06-08 13:50:12 -04:00
|
|
|
struct class_lookup_data lookup = {
|
|
|
|
.obj = self,
|
|
|
|
.attr = meth,
|
|
|
|
.meth_offset = offsetof(mp_obj_type_t, print),
|
|
|
|
.dest = member,
|
2014-11-03 11:18:51 -05:00
|
|
|
.is_type = false,
|
2014-06-08 13:50:12 -04:00
|
|
|
};
|
|
|
|
mp_obj_class_lookup(&lookup, self->base.type);
|
2014-04-29 19:14:30 -04:00
|
|
|
if (member[0] == MP_OBJ_NULL && kind == PRINT_STR) {
|
2014-03-16 09:16:54 -04:00
|
|
|
// If there's no __str__, fall back to __repr__
|
2014-06-08 13:50:12 -04:00
|
|
|
lookup.attr = MP_QSTR___repr__;
|
|
|
|
lookup.meth_offset = 0;
|
|
|
|
mp_obj_class_lookup(&lookup, self->base.type);
|
2014-04-28 19:42:28 -04:00
|
|
|
}
|
|
|
|
|
2014-04-29 19:14:30 -04:00
|
|
|
if (member[0] == MP_OBJ_SENTINEL) {
|
2014-05-01 18:51:25 -04:00
|
|
|
// Handle Exception subclasses specially
|
|
|
|
if (mp_obj_is_native_exception_instance(self->subobj[0])) {
|
|
|
|
if (kind != PRINT_STR) {
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_str(print, qstr_str(self->base.type->name));
|
2014-05-01 18:51:25 -04:00
|
|
|
}
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_obj_print_helper(print, self->subobj[0], kind | PRINT_EXC_SUBCLASS);
|
2014-05-01 18:51:25 -04:00
|
|
|
} else {
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_obj_print_helper(print, self->subobj[0], kind);
|
2014-05-01 18:51:25 -04:00
|
|
|
}
|
2014-04-28 19:42:28 -04:00
|
|
|
return;
|
2014-03-16 09:16:54 -04:00
|
|
|
}
|
|
|
|
|
2014-04-29 19:14:30 -04:00
|
|
|
if (member[0] != MP_OBJ_NULL) {
|
|
|
|
mp_obj_t r = mp_call_function_1(member[0], self_in);
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_obj_print_helper(print, r, PRINT_STR);
|
2014-03-16 09:16:54 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// TODO: CPython prints fully-qualified type name
|
2020-08-04 12:15:22 -04:00
|
|
|
mp_printf(print, "<%q object at %p>", mp_obj_get_type_qstr(self_in), self);
|
2014-01-09 15:57:50 -05:00
|
|
|
}
|
|
|
|
|
2016-01-03 10:55:55 -05:00
|
|
|
mp_obj_t mp_obj_instance_make_new(const mp_obj_type_t *self, size_t n_args, size_t n_kw, const mp_obj_t *args) {
|
2015-05-03 18:23:18 -04:00
|
|
|
assert(mp_obj_is_instance_type(self));
|
2014-01-09 15:57:50 -05:00
|
|
|
|
2014-05-18 13:37:18 -04:00
|
|
|
// look for __new__ function
|
2014-04-29 19:14:30 -04:00
|
|
|
mp_obj_t init_fn[2] = {MP_OBJ_NULL};
|
2014-06-08 13:50:12 -04:00
|
|
|
struct class_lookup_data lookup = {
|
|
|
|
.obj = NULL,
|
|
|
|
.attr = MP_QSTR___new__,
|
|
|
|
.meth_offset = offsetof(mp_obj_type_t, make_new),
|
|
|
|
.dest = init_fn,
|
2014-11-03 11:18:51 -05:00
|
|
|
.is_type = false,
|
2014-06-08 13:50:12 -04:00
|
|
|
};
|
|
|
|
mp_obj_class_lookup(&lookup, self);
|
2014-04-28 19:42:28 -04:00
|
|
|
|
2017-12-11 23:22:03 -05:00
|
|
|
const mp_obj_type_t *native_base = NULL;
|
|
|
|
mp_obj_instance_t *o;
|
|
|
|
if (init_fn[0] == MP_OBJ_NULL || init_fn[0] == MP_OBJ_SENTINEL) {
|
|
|
|
// Either there is no __new__() method defined or there is a native
|
|
|
|
// constructor. In both cases create a blank instance.
|
|
|
|
o = mp_obj_new_instance(self, &native_base);
|
2017-11-29 18:31:42 -05:00
|
|
|
|
|
|
|
// Since type->make_new() implements both __new__() and __init__() in
|
|
|
|
// one go, of which the latter may be overridden by the Python subclass,
|
|
|
|
// we defer (see the end of this function) the call of the native
|
|
|
|
// constructor to give a chance for the Python __init__() method to call
|
|
|
|
// said native constructor.
|
|
|
|
|
2017-12-11 23:22:03 -05:00
|
|
|
} else {
|
|
|
|
// Call Python class __new__ function with all args to create an instance
|
|
|
|
mp_obj_t new_ret;
|
2014-01-18 09:10:48 -05:00
|
|
|
if (n_args == 0 && n_kw == 0) {
|
2016-01-03 10:55:55 -05:00
|
|
|
mp_obj_t args2[1] = {MP_OBJ_FROM_PTR(self)};
|
|
|
|
new_ret = mp_call_function_n_kw(init_fn[0], 1, 0, args2);
|
2014-01-09 15:57:50 -05:00
|
|
|
} else {
|
2019-01-14 18:14:40 -05:00
|
|
|
// TODO(tannewt): Could this be on the stack? It's deleted below.
|
2014-01-18 09:10:48 -05:00
|
|
|
mp_obj_t *args2 = m_new(mp_obj_t, 1 + n_args + 2 * n_kw);
|
2016-01-03 10:55:55 -05:00
|
|
|
args2[0] = MP_OBJ_FROM_PTR(self);
|
2014-01-18 09:10:48 -05:00
|
|
|
memcpy(args2 + 1, args, (n_args + 2 * n_kw) * sizeof(mp_obj_t));
|
2014-05-18 13:37:18 -04:00
|
|
|
new_ret = mp_call_function_n_kw(init_fn[0], n_args + 1, n_kw, args2);
|
2014-01-18 09:10:48 -05:00
|
|
|
m_del(mp_obj_t, args2, 1 + n_args + 2 * n_kw);
|
2014-01-09 15:57:50 -05:00
|
|
|
}
|
2014-05-18 13:37:18 -04:00
|
|
|
|
2017-12-11 23:22:03 -05:00
|
|
|
// https://docs.python.org/3.4/reference/datamodel.html#object.__new__
|
|
|
|
// "If __new__() does not return an instance of cls, then the new
|
|
|
|
// instance's __init__() method will not be invoked."
|
|
|
|
if (mp_obj_get_type(new_ret) != self) {
|
|
|
|
return new_ret;
|
|
|
|
}
|
2014-05-18 13:37:18 -04:00
|
|
|
|
2017-12-11 23:22:03 -05:00
|
|
|
// The instance returned by __new__() becomes the new object
|
|
|
|
o = MP_OBJ_TO_PTR(new_ret);
|
2014-05-18 13:37:18 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// now call Python class __init__ function with all args
|
2017-11-29 18:31:42 -05:00
|
|
|
// This method has a chance to call super().__init__() to construct a
|
|
|
|
// possible native base class.
|
2014-10-23 07:06:53 -04:00
|
|
|
init_fn[0] = init_fn[1] = MP_OBJ_NULL;
|
2014-06-08 13:50:12 -04:00
|
|
|
lookup.obj = o;
|
|
|
|
lookup.attr = MP_QSTR___init__;
|
|
|
|
lookup.meth_offset = 0;
|
|
|
|
mp_obj_class_lookup(&lookup, self);
|
2014-05-18 13:37:18 -04:00
|
|
|
if (init_fn[0] != MP_OBJ_NULL) {
|
|
|
|
mp_obj_t init_ret;
|
|
|
|
if (n_args == 0 && n_kw == 0) {
|
|
|
|
init_ret = mp_call_method_n_kw(0, 0, init_fn);
|
|
|
|
} else {
|
2019-01-14 18:14:40 -05:00
|
|
|
// TODO(tannewt): Could this be on the stack? It's deleted below.
|
2014-05-18 13:37:18 -04:00
|
|
|
mp_obj_t *args2 = m_new(mp_obj_t, 2 + n_args + 2 * n_kw);
|
|
|
|
args2[0] = init_fn[0];
|
|
|
|
args2[1] = init_fn[1];
|
2019-01-14 18:14:40 -05:00
|
|
|
// copy in kwargs
|
2014-05-18 13:37:18 -04:00
|
|
|
memcpy(args2 + 2, args, (n_args + 2 * n_kw) * sizeof(mp_obj_t));
|
|
|
|
init_ret = mp_call_method_n_kw(n_args, n_kw, args2);
|
|
|
|
m_del(mp_obj_t, args2, 2 + n_args + 2 * n_kw);
|
|
|
|
}
|
2014-01-09 15:57:50 -05:00
|
|
|
if (init_ret != mp_const_none) {
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("__init__() should return None"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_TypeError_varg(MP_ERROR_TEXT("__init__() should return None, not '%q'"),
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_obj_get_type_qstr(init_ret));
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-01-09 15:57:50 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-11-29 18:31:42 -05:00
|
|
|
// If the type had a native base that was not explicitly initialised
|
|
|
|
// (constructed) by the Python __init__() method then construct it now.
|
|
|
|
if (native_base != NULL && o->subobj[0] == MP_OBJ_FROM_PTR(&native_base_init_wrapper_obj)) {
|
|
|
|
o->subobj[0] = native_base->make_new(native_base, n_args, n_kw, args);
|
|
|
|
}
|
|
|
|
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(o);
|
2014-01-09 15:57:50 -05:00
|
|
|
}
|
|
|
|
|
2017-10-21 04:06:32 -04:00
|
|
|
// Qstrs for special methods are guaranteed to have a small value, so we use byte
|
|
|
|
// type to represent them.
|
|
|
|
const byte mp_unary_op_method_name[MP_UNARY_OP_NUM_RUNTIME] = {
|
2014-03-30 08:35:08 -04:00
|
|
|
[MP_UNARY_OP_BOOL] = MP_QSTR___bool__,
|
|
|
|
[MP_UNARY_OP_LEN] = MP_QSTR___len__,
|
2015-05-11 08:25:19 -04:00
|
|
|
[MP_UNARY_OP_HASH] = MP_QSTR___hash__,
|
2018-08-29 10:59:36 -04:00
|
|
|
[MP_UNARY_OP_INT] = MP_QSTR___int__,
|
2015-03-29 19:29:59 -04:00
|
|
|
#if MICROPY_PY_ALL_SPECIAL_METHODS
|
|
|
|
[MP_UNARY_OP_POSITIVE] = MP_QSTR___pos__,
|
|
|
|
[MP_UNARY_OP_NEGATIVE] = MP_QSTR___neg__,
|
|
|
|
[MP_UNARY_OP_INVERT] = MP_QSTR___invert__,
|
2017-10-21 06:55:02 -04:00
|
|
|
[MP_UNARY_OP_ABS] = MP_QSTR___abs__,
|
2015-03-29 19:29:59 -04:00
|
|
|
#endif
|
2017-08-11 02:42:39 -04:00
|
|
|
#if MICROPY_PY_SYS_GETSIZEOF
|
2017-10-19 05:40:41 -04:00
|
|
|
[MP_UNARY_OP_SIZEOF] = MP_QSTR___sizeof__,
|
2017-08-11 02:42:39 -04:00
|
|
|
#endif
|
2014-01-30 05:05:33 -05:00
|
|
|
};
|
|
|
|
|
2017-08-28 23:04:01 -04:00
|
|
|
STATIC mp_obj_t instance_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_instance_t *self = MP_OBJ_TO_PTR(self_in);
|
2017-08-11 02:42:39 -04:00
|
|
|
|
|
|
|
#if MICROPY_PY_SYS_GETSIZEOF
|
|
|
|
if (MP_UNLIKELY(op == MP_UNARY_OP_SIZEOF)) {
|
|
|
|
// TODO: This doesn't count inherited objects (self->subobj)
|
|
|
|
const mp_obj_type_t *native_base;
|
|
|
|
size_t num_native_bases = instance_count_native_bases(mp_obj_get_type(self_in), &native_base);
|
|
|
|
|
|
|
|
size_t sz = sizeof(*self) + sizeof(*self->subobj) * num_native_bases
|
|
|
|
+ sizeof(*self->members.table) * self->members.alloc;
|
|
|
|
return MP_OBJ_NEW_SMALL_INT(sz);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2015-01-27 13:02:25 -05:00
|
|
|
qstr op_name = mp_unary_op_method_name[op];
|
2014-04-28 19:42:28 -04:00
|
|
|
/* Still try to lookup native slot
|
2014-01-30 05:05:33 -05:00
|
|
|
if (op_name == 0) {
|
2014-05-21 14:42:43 -04:00
|
|
|
return MP_OBJ_NULL;
|
2014-01-30 05:05:33 -05:00
|
|
|
}
|
2014-04-28 19:42:28 -04:00
|
|
|
*/
|
2014-04-29 19:14:30 -04:00
|
|
|
mp_obj_t member[2] = {MP_OBJ_NULL};
|
2014-06-08 13:50:12 -04:00
|
|
|
struct class_lookup_data lookup = {
|
|
|
|
.obj = self,
|
|
|
|
.attr = op_name,
|
2021-07-06 10:25:56 -04:00
|
|
|
.meth_offset = offsetof(mp_obj_type_t, ext[0].unary_op),
|
2014-06-08 13:50:12 -04:00
|
|
|
.dest = member,
|
2014-11-03 11:18:51 -05:00
|
|
|
.is_type = false,
|
2014-06-08 13:50:12 -04:00
|
|
|
};
|
|
|
|
mp_obj_class_lookup(&lookup, self->base.type);
|
2014-04-29 19:14:30 -04:00
|
|
|
if (member[0] == MP_OBJ_SENTINEL) {
|
2014-04-28 19:42:28 -04:00
|
|
|
return mp_unary_op(op, self->subobj[0]);
|
2014-04-29 19:14:30 -04:00
|
|
|
} else if (member[0] != MP_OBJ_NULL) {
|
2015-05-11 08:25:19 -04:00
|
|
|
mp_obj_t val = mp_call_function_1(member[0], self_in);
|
2018-08-29 10:59:36 -04:00
|
|
|
|
|
|
|
switch (op) {
|
|
|
|
case MP_UNARY_OP_HASH:
|
|
|
|
// __hash__ must return a small int
|
|
|
|
val = MP_OBJ_NEW_SMALL_INT(mp_obj_get_int_truncated(val));
|
|
|
|
break;
|
|
|
|
case MP_UNARY_OP_INT:
|
|
|
|
// Must return int
|
2021-04-22 20:55:39 -04:00
|
|
|
if (!mp_obj_is_int(val)) {
|
2018-08-29 10:59:36 -04:00
|
|
|
mp_raise_TypeError(NULL);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
// No need to do anything
|
|
|
|
;
|
2015-05-11 08:25:19 -04:00
|
|
|
}
|
|
|
|
return val;
|
2014-01-30 05:05:33 -05:00
|
|
|
} else {
|
2015-05-11 08:25:19 -04:00
|
|
|
if (op == MP_UNARY_OP_HASH) {
|
|
|
|
lookup.attr = MP_QSTR___eq__;
|
|
|
|
mp_obj_class_lookup(&lookup, self->base.type);
|
|
|
|
if (member[0] == MP_OBJ_NULL) {
|
|
|
|
// https://docs.python.org/3/reference/datamodel.html#object.__hash__
|
|
|
|
// "User-defined classes have __eq__() and __hash__() methods by default;
|
2016-11-03 18:50:59 -04:00
|
|
|
// with them, all objects compare unequal (except with themselves) and
|
2015-05-11 08:25:19 -04:00
|
|
|
// x.__hash__() returns an appropriate value such that x == y implies
|
|
|
|
// both that x is y and hash(x) == hash(y)."
|
|
|
|
return MP_OBJ_NEW_SMALL_INT((mp_uint_t)self_in);
|
|
|
|
}
|
|
|
|
// "A class that overrides __eq__() and does not define __hash__() will have its __hash__() implicitly set to None.
|
|
|
|
// When the __hash__() method of a class is None, instances of the class will raise an appropriate TypeError"
|
|
|
|
}
|
|
|
|
|
2014-05-21 14:42:43 -04:00
|
|
|
return MP_OBJ_NULL; // op not supported
|
2014-01-30 05:05:33 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-10-04 19:47:22 -04:00
|
|
|
// Binary-op enum values not listed here will have the default value of 0 in the
|
2021-04-23 15:26:42 -04:00
|
|
|
// table, corresponding to MP_QSTRnull, and are therefore unsupported (a lookup will
|
2017-10-04 19:47:22 -04:00
|
|
|
// fail). They can be added at the expense of code size for the qstr.
|
2017-10-21 04:06:32 -04:00
|
|
|
// Qstrs for special methods are guaranteed to have a small value, so we use byte
|
|
|
|
// type to represent them.
|
|
|
|
const byte mp_binary_op_method_name[MP_BINARY_OP_NUM_RUNTIME] = {
|
2017-10-04 19:47:22 -04:00
|
|
|
[MP_BINARY_OP_LESS] = MP_QSTR___lt__,
|
|
|
|
[MP_BINARY_OP_MORE] = MP_QSTR___gt__,
|
|
|
|
[MP_BINARY_OP_EQUAL] = MP_QSTR___eq__,
|
|
|
|
[MP_BINARY_OP_LESS_EQUAL] = MP_QSTR___le__,
|
|
|
|
[MP_BINARY_OP_MORE_EQUAL] = MP_QSTR___ge__,
|
2019-12-31 17:19:12 -05:00
|
|
|
[MP_BINARY_OP_NOT_EQUAL] = MP_QSTR___ne__,
|
2017-11-23 21:04:24 -05:00
|
|
|
[MP_BINARY_OP_CONTAINS] = MP_QSTR___contains__,
|
2017-10-04 19:47:22 -04:00
|
|
|
|
2018-09-19 21:42:56 -04:00
|
|
|
// If an inplace method is not found a normal method will be used as a fallback
|
2017-10-04 19:47:22 -04:00
|
|
|
[MP_BINARY_OP_INPLACE_ADD] = MP_QSTR___iadd__,
|
|
|
|
[MP_BINARY_OP_INPLACE_SUBTRACT] = MP_QSTR___isub__,
|
2017-10-27 15:29:15 -04:00
|
|
|
#if MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS
|
2017-10-21 06:55:02 -04:00
|
|
|
[MP_BINARY_OP_INPLACE_MULTIPLY] = MP_QSTR___imul__,
|
2021-04-23 15:26:42 -04:00
|
|
|
[MP_BINARY_OP_INPLACE_MAT_MULTIPLY] = MP_QSTR___imatmul__,
|
2017-10-21 06:55:02 -04:00
|
|
|
[MP_BINARY_OP_INPLACE_FLOOR_DIVIDE] = MP_QSTR___ifloordiv__,
|
|
|
|
[MP_BINARY_OP_INPLACE_TRUE_DIVIDE] = MP_QSTR___itruediv__,
|
|
|
|
[MP_BINARY_OP_INPLACE_MODULO] = MP_QSTR___imod__,
|
|
|
|
[MP_BINARY_OP_INPLACE_POWER] = MP_QSTR___ipow__,
|
|
|
|
[MP_BINARY_OP_INPLACE_OR] = MP_QSTR___ior__,
|
|
|
|
[MP_BINARY_OP_INPLACE_XOR] = MP_QSTR___ixor__,
|
|
|
|
[MP_BINARY_OP_INPLACE_AND] = MP_QSTR___iand__,
|
|
|
|
[MP_BINARY_OP_INPLACE_LSHIFT] = MP_QSTR___ilshift__,
|
|
|
|
[MP_BINARY_OP_INPLACE_RSHIFT] = MP_QSTR___irshift__,
|
2017-10-04 19:47:22 -04:00
|
|
|
#endif
|
|
|
|
|
2014-03-30 08:35:08 -04:00
|
|
|
[MP_BINARY_OP_ADD] = MP_QSTR___add__,
|
|
|
|
[MP_BINARY_OP_SUBTRACT] = MP_QSTR___sub__,
|
2015-02-21 12:35:09 -05:00
|
|
|
#if MICROPY_PY_ALL_SPECIAL_METHODS
|
|
|
|
[MP_BINARY_OP_MULTIPLY] = MP_QSTR___mul__,
|
2021-04-23 15:26:42 -04:00
|
|
|
[MP_BINARY_OP_MAT_MULTIPLY] = MP_QSTR___matmul__,
|
2015-02-21 12:35:09 -05:00
|
|
|
[MP_BINARY_OP_FLOOR_DIVIDE] = MP_QSTR___floordiv__,
|
|
|
|
[MP_BINARY_OP_TRUE_DIVIDE] = MP_QSTR___truediv__,
|
2017-10-21 06:55:02 -04:00
|
|
|
[MP_BINARY_OP_MODULO] = MP_QSTR___mod__,
|
|
|
|
[MP_BINARY_OP_DIVMOD] = MP_QSTR___divmod__,
|
|
|
|
[MP_BINARY_OP_POWER] = MP_QSTR___pow__,
|
|
|
|
[MP_BINARY_OP_OR] = MP_QSTR___or__,
|
|
|
|
[MP_BINARY_OP_XOR] = MP_QSTR___xor__,
|
|
|
|
[MP_BINARY_OP_AND] = MP_QSTR___and__,
|
|
|
|
[MP_BINARY_OP_LSHIFT] = MP_QSTR___lshift__,
|
|
|
|
[MP_BINARY_OP_RSHIFT] = MP_QSTR___rshift__,
|
2015-02-21 12:35:09 -05:00
|
|
|
#endif
|
2017-09-10 10:05:20 -04:00
|
|
|
|
|
|
|
#if MICROPY_PY_REVERSE_SPECIAL_METHODS
|
|
|
|
[MP_BINARY_OP_REVERSE_ADD] = MP_QSTR___radd__,
|
|
|
|
[MP_BINARY_OP_REVERSE_SUBTRACT] = MP_QSTR___rsub__,
|
2017-10-21 06:55:02 -04:00
|
|
|
#if MICROPY_PY_ALL_SPECIAL_METHODS
|
2017-09-10 10:05:20 -04:00
|
|
|
[MP_BINARY_OP_REVERSE_MULTIPLY] = MP_QSTR___rmul__,
|
2021-04-23 15:26:42 -04:00
|
|
|
[MP_BINARY_OP_REVERSE_MAT_MULTIPLY] = MP_QSTR___rmatmul__,
|
2017-10-21 06:55:02 -04:00
|
|
|
[MP_BINARY_OP_REVERSE_FLOOR_DIVIDE] = MP_QSTR___rfloordiv__,
|
|
|
|
[MP_BINARY_OP_REVERSE_TRUE_DIVIDE] = MP_QSTR___rtruediv__,
|
|
|
|
[MP_BINARY_OP_REVERSE_MODULO] = MP_QSTR___rmod__,
|
|
|
|
[MP_BINARY_OP_REVERSE_POWER] = MP_QSTR___rpow__,
|
|
|
|
[MP_BINARY_OP_REVERSE_OR] = MP_QSTR___ror__,
|
|
|
|
[MP_BINARY_OP_REVERSE_XOR] = MP_QSTR___rxor__,
|
|
|
|
[MP_BINARY_OP_REVERSE_AND] = MP_QSTR___rand__,
|
|
|
|
[MP_BINARY_OP_REVERSE_LSHIFT] = MP_QSTR___rlshift__,
|
|
|
|
[MP_BINARY_OP_REVERSE_RSHIFT] = MP_QSTR___rrshift__,
|
|
|
|
#endif
|
2017-09-10 10:05:20 -04:00
|
|
|
#endif
|
2014-01-18 10:31:13 -05:00
|
|
|
};
|
|
|
|
|
2017-08-28 23:04:01 -04:00
|
|
|
STATIC mp_obj_t instance_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
|
2014-04-02 09:13:26 -04:00
|
|
|
// Note: For ducktyping, CPython does not look in the instance members or use
|
|
|
|
// __getattr__ or __getattribute__. It only looks in the class dictionary.
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_instance_t *lhs = MP_OBJ_TO_PTR(lhs_in);
|
2017-09-01 19:39:27 -04:00
|
|
|
retry:;
|
2014-12-28 14:41:58 -05:00
|
|
|
qstr op_name = mp_binary_op_method_name[op];
|
2014-04-28 19:42:28 -04:00
|
|
|
/* Still try to lookup native slot
|
2014-01-24 19:17:36 -05:00
|
|
|
if (op_name == 0) {
|
2014-05-21 14:42:43 -04:00
|
|
|
return MP_OBJ_NULL;
|
2014-01-18 10:31:13 -05:00
|
|
|
}
|
2014-04-28 19:42:28 -04:00
|
|
|
*/
|
2014-05-18 13:37:18 -04:00
|
|
|
mp_obj_t dest[3] = {MP_OBJ_NULL};
|
2014-06-08 13:50:12 -04:00
|
|
|
struct class_lookup_data lookup = {
|
|
|
|
.obj = lhs,
|
|
|
|
.attr = op_name,
|
2021-07-06 10:25:56 -04:00
|
|
|
.meth_offset = offsetof(mp_obj_type_t, ext[0].binary_op),
|
2014-06-08 13:50:12 -04:00
|
|
|
.dest = dest,
|
2014-11-03 11:18:51 -05:00
|
|
|
.is_type = false,
|
2014-06-08 13:50:12 -04:00
|
|
|
};
|
|
|
|
mp_obj_class_lookup(&lookup, lhs->base.type);
|
2017-08-29 18:35:48 -04:00
|
|
|
|
|
|
|
mp_obj_t res;
|
2014-05-18 13:37:18 -04:00
|
|
|
if (dest[0] == MP_OBJ_SENTINEL) {
|
2017-08-29 18:35:48 -04:00
|
|
|
res = mp_binary_op(op, lhs->subobj[0], rhs_in);
|
2014-05-18 13:37:18 -04:00
|
|
|
} else if (dest[0] != MP_OBJ_NULL) {
|
2014-04-02 09:13:26 -04:00
|
|
|
dest[2] = rhs_in;
|
2017-08-29 18:35:48 -04:00
|
|
|
res = mp_call_method_n_kw(1, 0, dest);
|
2014-01-18 10:31:13 -05:00
|
|
|
} else {
|
2017-09-01 19:39:27 -04:00
|
|
|
// If this was an inplace method, fallback to normal method
|
|
|
|
// https://docs.python.org/3/reference/datamodel.html#object.__iadd__ :
|
|
|
|
// "If a specific method is not defined, the augmented assignment
|
|
|
|
// falls back to the normal methods."
|
|
|
|
if (op >= MP_BINARY_OP_INPLACE_OR && op <= MP_BINARY_OP_INPLACE_POWER) {
|
|
|
|
op -= MP_BINARY_OP_INPLACE_OR - MP_BINARY_OP_OR;
|
|
|
|
goto retry;
|
|
|
|
}
|
2014-05-21 14:42:43 -04:00
|
|
|
return MP_OBJ_NULL; // op not supported
|
2014-01-18 10:31:13 -05:00
|
|
|
}
|
2017-08-29 18:35:48 -04:00
|
|
|
|
|
|
|
#if MICROPY_PY_BUILTINS_NOTIMPLEMENTED
|
|
|
|
// NotImplemented means "try other fallbacks (like calling __rop__
|
|
|
|
// instead of __op__) and if nothing works, raise TypeError". As
|
|
|
|
// MicroPython doesn't implement any fallbacks, signal to raise
|
|
|
|
// TypeError right away.
|
|
|
|
if (res == mp_const_notimplemented) {
|
|
|
|
return MP_OBJ_NULL; // op not supported
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return res;
|
2014-01-18 10:31:13 -05:00
|
|
|
}
|
|
|
|
|
2015-04-01 10:10:50 -04:00
|
|
|
STATIC void mp_obj_instance_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
|
2015-01-08 12:48:44 -05:00
|
|
|
// logic: look in instance members then class locals
|
2015-05-03 18:23:18 -04:00
|
|
|
assert(mp_obj_is_instance_type(mp_obj_get_type(self_in)));
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_instance_t *self = MP_OBJ_TO_PTR(self_in);
|
2014-04-13 13:59:45 -04:00
|
|
|
|
2014-01-09 15:57:50 -05:00
|
|
|
mp_map_elem_t *elem = mp_map_lookup(&self->members, MP_OBJ_NEW_QSTR(attr), MP_MAP_LOOKUP);
|
|
|
|
if (elem != NULL) {
|
|
|
|
// object member, always treated as a value
|
2014-01-18 09:10:48 -05:00
|
|
|
dest[0] = elem->value;
|
2014-01-09 15:57:50 -05:00
|
|
|
return;
|
|
|
|
}
|
2021-03-15 09:57:36 -04:00
|
|
|
#if MICROPY_CPYTHON_COMPAT
|
2014-12-23 08:06:55 -05:00
|
|
|
if (attr == MP_QSTR___dict__) {
|
|
|
|
// Create a new dict with a copy of the instance's map items.
|
2020-06-09 20:46:38 -04:00
|
|
|
// This creates, unlike CPython, a read-only __dict__ that can't be modified.
|
|
|
|
mp_obj_dict_t dict;
|
|
|
|
dict.base.type = &mp_type_dict;
|
|
|
|
dict.map = self->members;
|
|
|
|
dest[0] = mp_obj_dict_copy(MP_OBJ_FROM_PTR(&dict));
|
|
|
|
mp_obj_dict_t *dest_dict = MP_OBJ_TO_PTR(dest[0]);
|
|
|
|
dest_dict->map.is_fixed = 1;
|
2014-12-23 08:06:55 -05:00
|
|
|
return;
|
|
|
|
}
|
2021-03-15 09:57:36 -04:00
|
|
|
#endif
|
2014-06-08 13:50:12 -04:00
|
|
|
struct class_lookup_data lookup = {
|
|
|
|
.obj = self,
|
|
|
|
.attr = attr,
|
|
|
|
.meth_offset = 0,
|
|
|
|
.dest = dest,
|
2014-11-03 11:18:51 -05:00
|
|
|
.is_type = false,
|
2014-06-08 13:50:12 -04:00
|
|
|
};
|
|
|
|
mp_obj_class_lookup(&lookup, self->base.type);
|
2014-04-29 19:14:30 -04:00
|
|
|
mp_obj_t member = dest[0];
|
2014-01-18 12:52:41 -05:00
|
|
|
if (member != MP_OBJ_NULL) {
|
2020-01-29 08:15:26 -05:00
|
|
|
if (!(self->base.type->flags & MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS)) {
|
py/objtype: Optimise instance get/set/del by skipping special accessors.
This patch is a code optimisation, trading text bytes for speed. On
pyboard it's an increase of 0.06% in code size for a gain (in pystone
performance) of roughly 6.5%.
The patch optimises load/store/delete of attributes in user defined classes
by not looking up special accessors (@property, __get__, __delete__,
__set__, __setattr__ and __getattr_) if they are guaranteed not to exist in
the class.
Currently, if you do my_obj.foo() then the runtime has to do a few checks
to see if foo is a property or has __get__, and if so delegate the call.
And for stores things like my_obj.foo = 1 has to first check if foo is a
property or has __set__ defined on it.
Doing all those checks each and every time the attribute is accessed has a
performance penalty. This patch eliminates all those checks for cases when
it's guaranteed that the checks will always fail, ie no attributes are
properties nor have any special accessor methods defined on them.
To make this guarantee it checks all attributes of a user-defined class
when it is first created. If any of the attributes of the user class are
properties or have special accessors, or any of the base classes of the
user class have them, then it sets a flag in the class to indicate that
special accessors must be checked for. Then in the load/store/delete code
it checks this flag to see if it can take the shortcut and optimise the
lookup.
It's an optimisation that's pretty widely applicable because it improves
lookup performance for all methods of user defined classes, and stores of
attributes, at least for those that don't have special accessors. And, it
allows to enable descriptors with minimal additional runtime overhead if
they are not used for a particular user class.
There is one restriction on dynamic class creation that has been introduced
by this patch: a user-defined class cannot go from zero special accessors
to one special accessor (or more) after that class has been subclassed. If
the script attempts this an AttributeError is raised (see addition to
tests/misc/non_compliant.py for an example of this case).
The cost in code space bytes for the optimisation in this patch is:
unix x64: +528
unix nanbox: +508
stm32: +192
cc3200: +200
esp8266: +332
esp32: +244
Performance tests that were done:
- on unix x86-64, pystone improved by about 5%
- on pyboard, pystone improved by about 6.5%, from 1683 up to 1794
- on pyboard, bm_chaos (from CPython benchmark suite) improved by about 5%
- on esp32, pystone improved by about 30% (but there are caching effects)
- on esp32, bm_chaos improved by about 11%
2018-05-25 03:09:54 -04:00
|
|
|
// Class doesn't have any special accessors to check so return straightaway
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-02-14 12:43:54 -05:00
|
|
|
#if MICROPY_PY_BUILTINS_PROPERTY
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_type(member, &mp_type_property)) {
|
2015-02-14 12:43:54 -05:00
|
|
|
// object member is a property; delegate the load to the property
|
|
|
|
// Note: This is an optimisation for code size and execution time.
|
|
|
|
// The proper way to do it is have the functionality just below
|
|
|
|
// in a __get__ method of the property object, and then it would
|
|
|
|
// be called by the descriptor code down below. But that way
|
|
|
|
// requires overhead for the nested mp_call's and overhead for
|
|
|
|
// the code.
|
2014-04-13 13:59:45 -04:00
|
|
|
const mp_obj_t *proxy = mp_obj_property_get(member);
|
|
|
|
if (proxy[0] == mp_const_none) {
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_AttributeError(MP_ERROR_TEXT("unreadable attribute"));
|
2014-04-13 13:59:45 -04:00
|
|
|
} else {
|
|
|
|
dest[0] = mp_call_function_n_kw(proxy[0], 1, 0, &self_in);
|
|
|
|
}
|
2015-02-14 12:43:54 -05:00
|
|
|
return;
|
2014-04-13 13:59:45 -04:00
|
|
|
}
|
2015-02-14 12:43:54 -05:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#if MICROPY_PY_DESCRIPTORS
|
|
|
|
// found a class attribute; if it has a __get__ method then call it with the
|
|
|
|
// class instance and class as arguments and return the result
|
|
|
|
// Note that this is functionally correct but very slow: each load_attr
|
|
|
|
// requires an extra mp_load_method_maybe to check for the __get__.
|
|
|
|
mp_obj_t attr_get_method[4];
|
|
|
|
mp_load_method_maybe(member, MP_QSTR___get__, attr_get_method);
|
|
|
|
if (attr_get_method[0] != MP_OBJ_NULL) {
|
|
|
|
attr_get_method[2] = self_in;
|
2015-11-27 12:01:44 -05:00
|
|
|
attr_get_method[3] = MP_OBJ_FROM_PTR(mp_obj_get_type(self_in));
|
2015-02-14 12:43:54 -05:00
|
|
|
dest[0] = mp_call_method_n_kw(2, 0, attr_get_method);
|
|
|
|
}
|
|
|
|
#endif
|
2014-03-31 17:57:56 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// try __getattr__
|
|
|
|
if (attr != MP_QSTR___getattr__) {
|
2017-01-03 05:00:12 -05:00
|
|
|
#if MICROPY_PY_DELATTR_SETATTR
|
|
|
|
// If the requested attr is __setattr__/__delattr__ then don't delegate the lookup
|
|
|
|
// to __getattr__. If we followed CPython's behaviour then __setattr__/__delattr__
|
|
|
|
// would have already been found in the "object" base class.
|
|
|
|
if (attr == MP_QSTR___setattr__ || attr == MP_QSTR___delattr__) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2014-03-31 17:57:56 -04:00
|
|
|
mp_obj_t dest2[3];
|
|
|
|
mp_load_method_maybe(self_in, MP_QSTR___getattr__, dest2);
|
|
|
|
if (dest2[0] != MP_OBJ_NULL) {
|
|
|
|
// __getattr__ exists, call it and return its result
|
|
|
|
dest2[2] = MP_OBJ_NEW_QSTR(attr);
|
|
|
|
dest[0] = mp_call_method_n_kw(1, 0, dest2);
|
2014-01-09 15:57:50 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-04-01 10:10:50 -04:00
|
|
|
STATIC bool mp_obj_instance_store_attr(mp_obj_t self_in, qstr attr, mp_obj_t value) {
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_instance_t *self = MP_OBJ_TO_PTR(self_in);
|
2014-04-13 13:59:45 -04:00
|
|
|
|
2020-01-29 08:15:26 -05:00
|
|
|
if (!(self->base.type->flags & MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS)) {
|
py/objtype: Optimise instance get/set/del by skipping special accessors.
This patch is a code optimisation, trading text bytes for speed. On
pyboard it's an increase of 0.06% in code size for a gain (in pystone
performance) of roughly 6.5%.
The patch optimises load/store/delete of attributes in user defined classes
by not looking up special accessors (@property, __get__, __delete__,
__set__, __setattr__ and __getattr_) if they are guaranteed not to exist in
the class.
Currently, if you do my_obj.foo() then the runtime has to do a few checks
to see if foo is a property or has __get__, and if so delegate the call.
And for stores things like my_obj.foo = 1 has to first check if foo is a
property or has __set__ defined on it.
Doing all those checks each and every time the attribute is accessed has a
performance penalty. This patch eliminates all those checks for cases when
it's guaranteed that the checks will always fail, ie no attributes are
properties nor have any special accessor methods defined on them.
To make this guarantee it checks all attributes of a user-defined class
when it is first created. If any of the attributes of the user class are
properties or have special accessors, or any of the base classes of the
user class have them, then it sets a flag in the class to indicate that
special accessors must be checked for. Then in the load/store/delete code
it checks this flag to see if it can take the shortcut and optimise the
lookup.
It's an optimisation that's pretty widely applicable because it improves
lookup performance for all methods of user defined classes, and stores of
attributes, at least for those that don't have special accessors. And, it
allows to enable descriptors with minimal additional runtime overhead if
they are not used for a particular user class.
There is one restriction on dynamic class creation that has been introduced
by this patch: a user-defined class cannot go from zero special accessors
to one special accessor (or more) after that class has been subclassed. If
the script attempts this an AttributeError is raised (see addition to
tests/misc/non_compliant.py for an example of this case).
The cost in code space bytes for the optimisation in this patch is:
unix x64: +528
unix nanbox: +508
stm32: +192
cc3200: +200
esp8266: +332
esp32: +244
Performance tests that were done:
- on unix x86-64, pystone improved by about 5%
- on pyboard, pystone improved by about 6.5%, from 1683 up to 1794
- on pyboard, bm_chaos (from CPython benchmark suite) improved by about 5%
- on esp32, pystone improved by about 30% (but there are caching effects)
- on esp32, bm_chaos improved by about 11%
2018-05-25 03:09:54 -04:00
|
|
|
// Class doesn't have any special accessors so skip their checks
|
|
|
|
goto skip_special_accessors;
|
|
|
|
}
|
|
|
|
|
2015-02-14 12:43:54 -05:00
|
|
|
#if MICROPY_PY_BUILTINS_PROPERTY || MICROPY_PY_DESCRIPTORS
|
|
|
|
// With property and/or descriptors enabled we need to do a lookup
|
|
|
|
// first in the class dict for the attribute to see if the store should
|
|
|
|
// be delegated.
|
2014-04-29 19:14:30 -04:00
|
|
|
mp_obj_t member[2] = {MP_OBJ_NULL};
|
2014-06-08 13:50:12 -04:00
|
|
|
struct class_lookup_data lookup = {
|
|
|
|
.obj = self,
|
|
|
|
.attr = attr,
|
|
|
|
.meth_offset = 0,
|
|
|
|
.dest = member,
|
2014-11-03 11:18:51 -05:00
|
|
|
.is_type = false,
|
2014-06-08 13:50:12 -04:00
|
|
|
};
|
|
|
|
mp_obj_class_lookup(&lookup, self->base.type);
|
2015-02-14 12:43:54 -05:00
|
|
|
|
|
|
|
if (member[0] != MP_OBJ_NULL) {
|
|
|
|
#if MICROPY_PY_BUILTINS_PROPERTY
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_type(member[0], &mp_type_property)) {
|
2015-04-04 15:15:31 -04:00
|
|
|
// attribute exists and is a property; delegate the store/delete
|
2015-02-14 12:43:54 -05:00
|
|
|
// Note: This is an optimisation for code size and execution time.
|
2015-04-04 15:15:31 -04:00
|
|
|
// The proper way to do it is have the functionality just below in
|
|
|
|
// a __set__/__delete__ method of the property object, and then it
|
|
|
|
// would be called by the descriptor code down below. But that way
|
2015-02-14 12:43:54 -05:00
|
|
|
// requires overhead for the nested mp_call's and overhead for
|
|
|
|
// the code.
|
|
|
|
const mp_obj_t *proxy = mp_obj_property_get(member[0]);
|
2015-04-04 15:15:31 -04:00
|
|
|
mp_obj_t dest[2] = {self_in, value};
|
|
|
|
if (value == MP_OBJ_NULL) {
|
|
|
|
// delete attribute
|
|
|
|
if (proxy[2] == mp_const_none) {
|
|
|
|
// TODO better error message?
|
|
|
|
return false;
|
|
|
|
} else {
|
|
|
|
mp_call_function_n_kw(proxy[2], 1, 0, dest);
|
|
|
|
return true;
|
|
|
|
}
|
2015-02-14 12:43:54 -05:00
|
|
|
} else {
|
2015-04-04 15:15:31 -04:00
|
|
|
// store attribute
|
|
|
|
if (proxy[1] == mp_const_none) {
|
|
|
|
// TODO better error message?
|
|
|
|
return false;
|
|
|
|
} else {
|
|
|
|
mp_call_function_n_kw(proxy[1], 2, 0, dest);
|
|
|
|
return true;
|
|
|
|
}
|
2015-02-14 12:43:54 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if MICROPY_PY_DESCRIPTORS
|
2015-04-04 15:15:31 -04:00
|
|
|
// found a class attribute; if it has a __set__/__delete__ method then
|
|
|
|
// call it with the class instance (and value) as arguments
|
|
|
|
if (value == MP_OBJ_NULL) {
|
|
|
|
// delete attribute
|
|
|
|
mp_obj_t attr_delete_method[3];
|
|
|
|
mp_load_method_maybe(member[0], MP_QSTR___delete__, attr_delete_method);
|
|
|
|
if (attr_delete_method[0] != MP_OBJ_NULL) {
|
|
|
|
attr_delete_method[2] = self_in;
|
|
|
|
mp_call_method_n_kw(1, 0, attr_delete_method);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// store attribute
|
|
|
|
mp_obj_t attr_set_method[4];
|
|
|
|
mp_load_method_maybe(member[0], MP_QSTR___set__, attr_set_method);
|
|
|
|
if (attr_set_method[0] != MP_OBJ_NULL) {
|
|
|
|
attr_set_method[2] = self_in;
|
|
|
|
attr_set_method[3] = value;
|
|
|
|
mp_call_method_n_kw(2, 0, attr_set_method);
|
|
|
|
return true;
|
|
|
|
}
|
2014-04-13 13:59:45 -04:00
|
|
|
}
|
2015-02-14 12:43:54 -05:00
|
|
|
#endif
|
2014-04-13 13:59:45 -04:00
|
|
|
}
|
2015-02-14 12:43:54 -05:00
|
|
|
#endif
|
2014-04-13 13:59:45 -04:00
|
|
|
|
py/objtype: Optimise instance get/set/del by skipping special accessors.
This patch is a code optimisation, trading text bytes for speed. On
pyboard it's an increase of 0.06% in code size for a gain (in pystone
performance) of roughly 6.5%.
The patch optimises load/store/delete of attributes in user defined classes
by not looking up special accessors (@property, __get__, __delete__,
__set__, __setattr__ and __getattr_) if they are guaranteed not to exist in
the class.
Currently, if you do my_obj.foo() then the runtime has to do a few checks
to see if foo is a property or has __get__, and if so delegate the call.
And for stores things like my_obj.foo = 1 has to first check if foo is a
property or has __set__ defined on it.
Doing all those checks each and every time the attribute is accessed has a
performance penalty. This patch eliminates all those checks for cases when
it's guaranteed that the checks will always fail, ie no attributes are
properties nor have any special accessor methods defined on them.
To make this guarantee it checks all attributes of a user-defined class
when it is first created. If any of the attributes of the user class are
properties or have special accessors, or any of the base classes of the
user class have them, then it sets a flag in the class to indicate that
special accessors must be checked for. Then in the load/store/delete code
it checks this flag to see if it can take the shortcut and optimise the
lookup.
It's an optimisation that's pretty widely applicable because it improves
lookup performance for all methods of user defined classes, and stores of
attributes, at least for those that don't have special accessors. And, it
allows to enable descriptors with minimal additional runtime overhead if
they are not used for a particular user class.
There is one restriction on dynamic class creation that has been introduced
by this patch: a user-defined class cannot go from zero special accessors
to one special accessor (or more) after that class has been subclassed. If
the script attempts this an AttributeError is raised (see addition to
tests/misc/non_compliant.py for an example of this case).
The cost in code space bytes for the optimisation in this patch is:
unix x64: +528
unix nanbox: +508
stm32: +192
cc3200: +200
esp8266: +332
esp32: +244
Performance tests that were done:
- on unix x86-64, pystone improved by about 5%
- on pyboard, pystone improved by about 6.5%, from 1683 up to 1794
- on pyboard, bm_chaos (from CPython benchmark suite) improved by about 5%
- on esp32, pystone improved by about 30% (but there are caching effects)
- on esp32, bm_chaos improved by about 11%
2018-05-25 03:09:54 -04:00
|
|
|
#if MICROPY_PY_DELATTR_SETATTR
|
2014-04-08 16:11:49 -04:00
|
|
|
if (value == MP_OBJ_NULL) {
|
|
|
|
// delete attribute
|
2017-01-03 05:00:12 -05:00
|
|
|
// try __delattr__ first
|
|
|
|
mp_obj_t attr_delattr_method[3];
|
|
|
|
mp_load_method_maybe(self_in, MP_QSTR___delattr__, attr_delattr_method);
|
|
|
|
if (attr_delattr_method[0] != MP_OBJ_NULL) {
|
|
|
|
// __delattr__ exists, so call it
|
|
|
|
attr_delattr_method[2] = MP_OBJ_NEW_QSTR(attr);
|
|
|
|
mp_call_method_n_kw(1, 0, attr_delattr_method);
|
|
|
|
return true;
|
|
|
|
}
|
2014-04-08 16:11:49 -04:00
|
|
|
} else {
|
|
|
|
// store attribute
|
2017-01-03 05:00:12 -05:00
|
|
|
// try __setattr__ first
|
|
|
|
mp_obj_t attr_setattr_method[4];
|
|
|
|
mp_load_method_maybe(self_in, MP_QSTR___setattr__, attr_setattr_method);
|
|
|
|
if (attr_setattr_method[0] != MP_OBJ_NULL) {
|
|
|
|
// __setattr__ exists, so call it
|
|
|
|
attr_setattr_method[2] = MP_OBJ_NEW_QSTR(attr);
|
|
|
|
attr_setattr_method[3] = value;
|
|
|
|
mp_call_method_n_kw(2, 0, attr_setattr_method);
|
|
|
|
return true;
|
|
|
|
}
|
py/objtype: Optimise instance get/set/del by skipping special accessors.
This patch is a code optimisation, trading text bytes for speed. On
pyboard it's an increase of 0.06% in code size for a gain (in pystone
performance) of roughly 6.5%.
The patch optimises load/store/delete of attributes in user defined classes
by not looking up special accessors (@property, __get__, __delete__,
__set__, __setattr__ and __getattr_) if they are guaranteed not to exist in
the class.
Currently, if you do my_obj.foo() then the runtime has to do a few checks
to see if foo is a property or has __get__, and if so delegate the call.
And for stores things like my_obj.foo = 1 has to first check if foo is a
property or has __set__ defined on it.
Doing all those checks each and every time the attribute is accessed has a
performance penalty. This patch eliminates all those checks for cases when
it's guaranteed that the checks will always fail, ie no attributes are
properties nor have any special accessor methods defined on them.
To make this guarantee it checks all attributes of a user-defined class
when it is first created. If any of the attributes of the user class are
properties or have special accessors, or any of the base classes of the
user class have them, then it sets a flag in the class to indicate that
special accessors must be checked for. Then in the load/store/delete code
it checks this flag to see if it can take the shortcut and optimise the
lookup.
It's an optimisation that's pretty widely applicable because it improves
lookup performance for all methods of user defined classes, and stores of
attributes, at least for those that don't have special accessors. And, it
allows to enable descriptors with minimal additional runtime overhead if
they are not used for a particular user class.
There is one restriction on dynamic class creation that has been introduced
by this patch: a user-defined class cannot go from zero special accessors
to one special accessor (or more) after that class has been subclassed. If
the script attempts this an AttributeError is raised (see addition to
tests/misc/non_compliant.py for an example of this case).
The cost in code space bytes for the optimisation in this patch is:
unix x64: +528
unix nanbox: +508
stm32: +192
cc3200: +200
esp8266: +332
esp32: +244
Performance tests that were done:
- on unix x86-64, pystone improved by about 5%
- on pyboard, pystone improved by about 6.5%, from 1683 up to 1794
- on pyboard, bm_chaos (from CPython benchmark suite) improved by about 5%
- on esp32, pystone improved by about 30% (but there are caching effects)
- on esp32, bm_chaos improved by about 11%
2018-05-25 03:09:54 -04:00
|
|
|
}
|
|
|
|
#endif
|
2017-01-03 05:00:12 -05:00
|
|
|
|
py/objtype: Optimise instance get/set/del by skipping special accessors.
This patch is a code optimisation, trading text bytes for speed. On
pyboard it's an increase of 0.06% in code size for a gain (in pystone
performance) of roughly 6.5%.
The patch optimises load/store/delete of attributes in user defined classes
by not looking up special accessors (@property, __get__, __delete__,
__set__, __setattr__ and __getattr_) if they are guaranteed not to exist in
the class.
Currently, if you do my_obj.foo() then the runtime has to do a few checks
to see if foo is a property or has __get__, and if so delegate the call.
And for stores things like my_obj.foo = 1 has to first check if foo is a
property or has __set__ defined on it.
Doing all those checks each and every time the attribute is accessed has a
performance penalty. This patch eliminates all those checks for cases when
it's guaranteed that the checks will always fail, ie no attributes are
properties nor have any special accessor methods defined on them.
To make this guarantee it checks all attributes of a user-defined class
when it is first created. If any of the attributes of the user class are
properties or have special accessors, or any of the base classes of the
user class have them, then it sets a flag in the class to indicate that
special accessors must be checked for. Then in the load/store/delete code
it checks this flag to see if it can take the shortcut and optimise the
lookup.
It's an optimisation that's pretty widely applicable because it improves
lookup performance for all methods of user defined classes, and stores of
attributes, at least for those that don't have special accessors. And, it
allows to enable descriptors with minimal additional runtime overhead if
they are not used for a particular user class.
There is one restriction on dynamic class creation that has been introduced
by this patch: a user-defined class cannot go from zero special accessors
to one special accessor (or more) after that class has been subclassed. If
the script attempts this an AttributeError is raised (see addition to
tests/misc/non_compliant.py for an example of this case).
The cost in code space bytes for the optimisation in this patch is:
unix x64: +528
unix nanbox: +508
stm32: +192
cc3200: +200
esp8266: +332
esp32: +244
Performance tests that were done:
- on unix x86-64, pystone improved by about 5%
- on pyboard, pystone improved by about 6.5%, from 1683 up to 1794
- on pyboard, bm_chaos (from CPython benchmark suite) improved by about 5%
- on esp32, pystone improved by about 30% (but there are caching effects)
- on esp32, bm_chaos improved by about 11%
2018-05-25 03:09:54 -04:00
|
|
|
skip_special_accessors:
|
2017-01-03 05:00:12 -05:00
|
|
|
|
py/objtype: Optimise instance get/set/del by skipping special accessors.
This patch is a code optimisation, trading text bytes for speed. On
pyboard it's an increase of 0.06% in code size for a gain (in pystone
performance) of roughly 6.5%.
The patch optimises load/store/delete of attributes in user defined classes
by not looking up special accessors (@property, __get__, __delete__,
__set__, __setattr__ and __getattr_) if they are guaranteed not to exist in
the class.
Currently, if you do my_obj.foo() then the runtime has to do a few checks
to see if foo is a property or has __get__, and if so delegate the call.
And for stores things like my_obj.foo = 1 has to first check if foo is a
property or has __set__ defined on it.
Doing all those checks each and every time the attribute is accessed has a
performance penalty. This patch eliminates all those checks for cases when
it's guaranteed that the checks will always fail, ie no attributes are
properties nor have any special accessor methods defined on them.
To make this guarantee it checks all attributes of a user-defined class
when it is first created. If any of the attributes of the user class are
properties or have special accessors, or any of the base classes of the
user class have them, then it sets a flag in the class to indicate that
special accessors must be checked for. Then in the load/store/delete code
it checks this flag to see if it can take the shortcut and optimise the
lookup.
It's an optimisation that's pretty widely applicable because it improves
lookup performance for all methods of user defined classes, and stores of
attributes, at least for those that don't have special accessors. And, it
allows to enable descriptors with minimal additional runtime overhead if
they are not used for a particular user class.
There is one restriction on dynamic class creation that has been introduced
by this patch: a user-defined class cannot go from zero special accessors
to one special accessor (or more) after that class has been subclassed. If
the script attempts this an AttributeError is raised (see addition to
tests/misc/non_compliant.py for an example of this case).
The cost in code space bytes for the optimisation in this patch is:
unix x64: +528
unix nanbox: +508
stm32: +192
cc3200: +200
esp8266: +332
esp32: +244
Performance tests that were done:
- on unix x86-64, pystone improved by about 5%
- on pyboard, pystone improved by about 6.5%, from 1683 up to 1794
- on pyboard, bm_chaos (from CPython benchmark suite) improved by about 5%
- on esp32, pystone improved by about 30% (but there are caching effects)
- on esp32, bm_chaos improved by about 11%
2018-05-25 03:09:54 -04:00
|
|
|
if (value == MP_OBJ_NULL) {
|
|
|
|
// delete attribute
|
|
|
|
mp_map_elem_t *elem = mp_map_lookup(&self->members, MP_OBJ_NEW_QSTR(attr), MP_MAP_LOOKUP_REMOVE_IF_FOUND);
|
|
|
|
return elem != NULL;
|
|
|
|
} else {
|
|
|
|
// store attribute
|
2014-04-08 16:11:49 -04:00
|
|
|
mp_map_lookup(&self->members, MP_OBJ_NEW_QSTR(attr), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
|
|
|
|
return true;
|
|
|
|
}
|
2014-01-09 15:57:50 -05:00
|
|
|
}
|
|
|
|
|
2018-05-25 03:08:09 -04:00
|
|
|
STATIC void mp_obj_instance_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
|
2015-04-01 10:10:50 -04:00
|
|
|
if (dest[0] == MP_OBJ_NULL) {
|
|
|
|
mp_obj_instance_load_attr(self_in, attr, dest);
|
|
|
|
} else {
|
|
|
|
if (mp_obj_instance_store_attr(self_in, attr, dest[1])) {
|
|
|
|
dest[0] = MP_OBJ_NULL; // indicate success
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-13 14:29:15 -05:00
|
|
|
STATIC mp_obj_t instance_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_instance_t *self = MP_OBJ_TO_PTR(self_in);
|
2018-09-28 09:16:56 -04:00
|
|
|
mp_obj_t member[4] = {MP_OBJ_NULL, MP_OBJ_NULL, index, value};
|
2014-06-08 13:50:12 -04:00
|
|
|
struct class_lookup_data lookup = {
|
|
|
|
.obj = self,
|
2021-07-06 10:25:56 -04:00
|
|
|
.meth_offset = offsetof(mp_obj_type_t, ext[0].subscr),
|
2014-06-08 13:50:12 -04:00
|
|
|
.dest = member,
|
2014-11-03 11:18:51 -05:00
|
|
|
.is_type = false,
|
2014-06-08 13:50:12 -04:00
|
|
|
};
|
2014-04-08 16:32:29 -04:00
|
|
|
if (value == MP_OBJ_NULL) {
|
|
|
|
// delete item
|
2014-06-08 13:50:12 -04:00
|
|
|
lookup.attr = MP_QSTR___delitem__;
|
2014-04-17 17:10:53 -04:00
|
|
|
} else if (value == MP_OBJ_SENTINEL) {
|
|
|
|
// load item
|
2014-06-08 13:50:12 -04:00
|
|
|
lookup.attr = MP_QSTR___getitem__;
|
2014-04-14 18:20:52 -04:00
|
|
|
} else {
|
2014-04-17 17:10:53 -04:00
|
|
|
// store item
|
2014-06-08 13:50:12 -04:00
|
|
|
lookup.attr = MP_QSTR___setitem__;
|
2014-04-08 16:32:29 -04:00
|
|
|
}
|
2018-09-28 09:16:56 -04:00
|
|
|
mp_obj_class_lookup(&lookup, self->base.type);
|
2014-04-29 19:14:30 -04:00
|
|
|
if (member[0] == MP_OBJ_SENTINEL) {
|
2021-05-04 14:40:55 -04:00
|
|
|
const mp_obj_type_t *subobj_type = mp_obj_get_type(self->subobj[0]);
|
2021-07-06 10:25:56 -04:00
|
|
|
mp_obj_t ret = subobj_type->ext[0].subscr(self_in, index, value);
|
2019-12-13 13:32:58 -05:00
|
|
|
// May have called port specific C code. Make sure it didn't mess up the heap.
|
|
|
|
assert_heap_ok();
|
|
|
|
return ret;
|
2014-04-29 19:14:30 -04:00
|
|
|
} else if (member[0] != MP_OBJ_NULL) {
|
2018-09-28 09:16:56 -04:00
|
|
|
size_t n_args = value == MP_OBJ_NULL || value == MP_OBJ_SENTINEL ? 1 : 2;
|
|
|
|
mp_obj_t ret = mp_call_method_n_kw(n_args, 0, member);
|
2014-04-17 17:10:53 -04:00
|
|
|
if (value == MP_OBJ_SENTINEL) {
|
|
|
|
return ret;
|
|
|
|
} else {
|
|
|
|
return mp_const_none;
|
|
|
|
}
|
2014-01-18 10:31:13 -05:00
|
|
|
} else {
|
2014-05-21 14:42:43 -04:00
|
|
|
return MP_OBJ_NULL; // op not supported
|
2014-01-18 10:31:13 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-11-21 17:33:55 -05:00
|
|
|
STATIC mp_obj_t mp_obj_instance_get_call(mp_obj_t self_in, mp_obj_t *member) {
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_instance_t *self = MP_OBJ_TO_PTR(self_in);
|
2014-06-08 13:50:12 -04:00
|
|
|
struct class_lookup_data lookup = {
|
|
|
|
.obj = self,
|
|
|
|
.attr = MP_QSTR___call__,
|
2021-07-06 10:25:56 -04:00
|
|
|
.meth_offset = offsetof(mp_obj_type_t, ext[0].call),
|
2014-06-08 13:50:12 -04:00
|
|
|
.dest = member,
|
2014-11-03 11:18:51 -05:00
|
|
|
.is_type = false,
|
2014-06-08 13:50:12 -04:00
|
|
|
};
|
|
|
|
mp_obj_class_lookup(&lookup, self->base.type);
|
2015-02-14 12:41:15 -05:00
|
|
|
return member[0];
|
|
|
|
}
|
|
|
|
|
|
|
|
bool mp_obj_instance_is_callable(mp_obj_t self_in) {
|
2016-11-21 17:33:55 -05:00
|
|
|
mp_obj_t member[2] = {MP_OBJ_NULL, MP_OBJ_NULL};
|
|
|
|
return mp_obj_instance_get_call(self_in, member) != MP_OBJ_NULL;
|
2014-11-03 11:09:39 -05:00
|
|
|
}
|
|
|
|
|
2016-01-03 04:59:18 -05:00
|
|
|
mp_obj_t mp_obj_instance_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
|
2016-11-21 17:33:55 -05:00
|
|
|
mp_obj_t member[2] = {MP_OBJ_NULL, MP_OBJ_NULL};
|
|
|
|
mp_obj_t call = mp_obj_instance_get_call(self_in, member);
|
2015-02-14 12:41:15 -05:00
|
|
|
if (call == MP_OBJ_NULL) {
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("object not callable"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_TypeError_varg(MP_ERROR_TEXT("'%q' object is not callable"),
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_obj_get_type_qstr(self_in));
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-04-25 14:15:16 -04:00
|
|
|
}
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_instance_t *self = MP_OBJ_TO_PTR(self_in);
|
2015-02-14 12:41:15 -05:00
|
|
|
if (call == MP_OBJ_SENTINEL) {
|
2014-04-28 19:42:28 -04:00
|
|
|
return mp_call_function_n_kw(self->subobj[0], n_args, n_kw, args);
|
|
|
|
}
|
2016-11-21 17:33:55 -05:00
|
|
|
|
|
|
|
return mp_call_method_self_n_kw(member[0], member[1], n_args, n_kw, args);
|
2014-04-25 14:15:16 -04:00
|
|
|
}
|
|
|
|
|
2019-11-13 05:05:34 -05:00
|
|
|
// Note that iter_buf may be NULL, and needs to be allocated if needed
|
|
|
|
mp_obj_t mp_obj_instance_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_instance_t *self = MP_OBJ_TO_PTR(self_in);
|
2014-05-10 14:09:18 -04:00
|
|
|
mp_obj_t member[2] = {MP_OBJ_NULL};
|
2014-06-08 13:50:12 -04:00
|
|
|
struct class_lookup_data lookup = {
|
|
|
|
.obj = self,
|
|
|
|
.attr = MP_QSTR___iter__,
|
2021-07-06 10:25:56 -04:00
|
|
|
.meth_offset = offsetof(mp_obj_type_t, ext[0].getiter),
|
2014-06-08 13:50:12 -04:00
|
|
|
.dest = member,
|
2014-11-03 11:18:51 -05:00
|
|
|
.is_type = false,
|
2014-06-08 13:50:12 -04:00
|
|
|
};
|
|
|
|
mp_obj_class_lookup(&lookup, self->base.type);
|
2014-05-10 14:09:18 -04:00
|
|
|
if (member[0] == MP_OBJ_NULL) {
|
|
|
|
return MP_OBJ_NULL;
|
2015-02-14 20:10:13 -05:00
|
|
|
} else if (member[0] == MP_OBJ_SENTINEL) {
|
2020-01-08 19:01:14 -05:00
|
|
|
const mp_obj_type_t *type = mp_obj_get_type(self->subobj[0]);
|
2019-11-13 05:05:34 -05:00
|
|
|
if (iter_buf == NULL) {
|
|
|
|
iter_buf = m_new_obj(mp_obj_iter_buf_t);
|
|
|
|
}
|
2021-07-06 10:25:56 -04:00
|
|
|
return type->ext[0].getiter(self->subobj[0], iter_buf);
|
2015-02-14 20:10:13 -05:00
|
|
|
} else {
|
|
|
|
return mp_call_method_n_kw(0, 0, member);
|
2014-05-10 14:09:18 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-09 10:08:00 -05:00
|
|
|
STATIC mp_int_t instance_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_instance_t *self = MP_OBJ_TO_PTR(self_in);
|
2015-02-09 10:08:00 -05:00
|
|
|
mp_obj_t member[2] = {MP_OBJ_NULL};
|
|
|
|
struct class_lookup_data lookup = {
|
|
|
|
.obj = self,
|
|
|
|
.attr = MP_QSTR_, // don't actually look for a method
|
2021-07-06 10:25:56 -04:00
|
|
|
.meth_offset = offsetof(mp_obj_type_t, ext[0].buffer_p.get_buffer),
|
2015-02-09 10:08:00 -05:00
|
|
|
.dest = member,
|
|
|
|
.is_type = false,
|
|
|
|
};
|
|
|
|
mp_obj_class_lookup(&lookup, self->base.type);
|
|
|
|
if (member[0] == MP_OBJ_SENTINEL) {
|
2020-01-08 19:01:14 -05:00
|
|
|
const mp_obj_type_t *type = mp_obj_get_type(self->subobj[0]);
|
2021-07-06 10:25:56 -04:00
|
|
|
return type->ext[0].buffer_p.get_buffer(self->subobj[0], bufinfo, flags);
|
2015-02-09 10:08:00 -05:00
|
|
|
} else {
|
|
|
|
return 1; // object does not support buffer protocol
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-09 15:57:50 -05:00
|
|
|
/******************************************************************************/
|
|
|
|
// type object
|
|
|
|
// - the struct is mp_obj_type_t and is defined in obj.h so const types can be made
|
2014-02-15 11:10:44 -05:00
|
|
|
// - there is a constant mp_obj_type_t (called mp_type_type) for the 'type' object
|
2014-01-09 15:57:50 -05:00
|
|
|
// - creating a new class (a new type) creates a new mp_obj_type_t
|
2013-12-21 13:17:45 -05:00
|
|
|
|
py/objtype: Optimise instance get/set/del by skipping special accessors.
This patch is a code optimisation, trading text bytes for speed. On
pyboard it's an increase of 0.06% in code size for a gain (in pystone
performance) of roughly 6.5%.
The patch optimises load/store/delete of attributes in user defined classes
by not looking up special accessors (@property, __get__, __delete__,
__set__, __setattr__ and __getattr_) if they are guaranteed not to exist in
the class.
Currently, if you do my_obj.foo() then the runtime has to do a few checks
to see if foo is a property or has __get__, and if so delegate the call.
And for stores things like my_obj.foo = 1 has to first check if foo is a
property or has __set__ defined on it.
Doing all those checks each and every time the attribute is accessed has a
performance penalty. This patch eliminates all those checks for cases when
it's guaranteed that the checks will always fail, ie no attributes are
properties nor have any special accessor methods defined on them.
To make this guarantee it checks all attributes of a user-defined class
when it is first created. If any of the attributes of the user class are
properties or have special accessors, or any of the base classes of the
user class have them, then it sets a flag in the class to indicate that
special accessors must be checked for. Then in the load/store/delete code
it checks this flag to see if it can take the shortcut and optimise the
lookup.
It's an optimisation that's pretty widely applicable because it improves
lookup performance for all methods of user defined classes, and stores of
attributes, at least for those that don't have special accessors. And, it
allows to enable descriptors with minimal additional runtime overhead if
they are not used for a particular user class.
There is one restriction on dynamic class creation that has been introduced
by this patch: a user-defined class cannot go from zero special accessors
to one special accessor (or more) after that class has been subclassed. If
the script attempts this an AttributeError is raised (see addition to
tests/misc/non_compliant.py for an example of this case).
The cost in code space bytes for the optimisation in this patch is:
unix x64: +528
unix nanbox: +508
stm32: +192
cc3200: +200
esp8266: +332
esp32: +244
Performance tests that were done:
- on unix x86-64, pystone improved by about 5%
- on pyboard, pystone improved by about 6.5%, from 1683 up to 1794
- on pyboard, bm_chaos (from CPython benchmark suite) improved by about 5%
- on esp32, pystone improved by about 30% (but there are caching effects)
- on esp32, bm_chaos improved by about 11%
2018-05-25 03:09:54 -04:00
|
|
|
#if ENABLE_SPECIAL_ACCESSORS
|
|
|
|
STATIC bool check_for_special_accessors(mp_obj_t key, mp_obj_t value) {
|
|
|
|
#if MICROPY_PY_DELATTR_SETATTR
|
|
|
|
if (key == MP_OBJ_NEW_QSTR(MP_QSTR___setattr__) || key == MP_OBJ_NEW_QSTR(MP_QSTR___delattr__)) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#if MICROPY_PY_BUILTINS_PROPERTY
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_type(value, &mp_type_property)) {
|
py/objtype: Optimise instance get/set/del by skipping special accessors.
This patch is a code optimisation, trading text bytes for speed. On
pyboard it's an increase of 0.06% in code size for a gain (in pystone
performance) of roughly 6.5%.
The patch optimises load/store/delete of attributes in user defined classes
by not looking up special accessors (@property, __get__, __delete__,
__set__, __setattr__ and __getattr_) if they are guaranteed not to exist in
the class.
Currently, if you do my_obj.foo() then the runtime has to do a few checks
to see if foo is a property or has __get__, and if so delegate the call.
And for stores things like my_obj.foo = 1 has to first check if foo is a
property or has __set__ defined on it.
Doing all those checks each and every time the attribute is accessed has a
performance penalty. This patch eliminates all those checks for cases when
it's guaranteed that the checks will always fail, ie no attributes are
properties nor have any special accessor methods defined on them.
To make this guarantee it checks all attributes of a user-defined class
when it is first created. If any of the attributes of the user class are
properties or have special accessors, or any of the base classes of the
user class have them, then it sets a flag in the class to indicate that
special accessors must be checked for. Then in the load/store/delete code
it checks this flag to see if it can take the shortcut and optimise the
lookup.
It's an optimisation that's pretty widely applicable because it improves
lookup performance for all methods of user defined classes, and stores of
attributes, at least for those that don't have special accessors. And, it
allows to enable descriptors with minimal additional runtime overhead if
they are not used for a particular user class.
There is one restriction on dynamic class creation that has been introduced
by this patch: a user-defined class cannot go from zero special accessors
to one special accessor (or more) after that class has been subclassed. If
the script attempts this an AttributeError is raised (see addition to
tests/misc/non_compliant.py for an example of this case).
The cost in code space bytes for the optimisation in this patch is:
unix x64: +528
unix nanbox: +508
stm32: +192
cc3200: +200
esp8266: +332
esp32: +244
Performance tests that were done:
- on unix x86-64, pystone improved by about 5%
- on pyboard, pystone improved by about 6.5%, from 1683 up to 1794
- on pyboard, bm_chaos (from CPython benchmark suite) improved by about 5%
- on esp32, pystone improved by about 30% (but there are caching effects)
- on esp32, bm_chaos improved by about 11%
2018-05-25 03:09:54 -04:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#if MICROPY_PY_DESCRIPTORS
|
|
|
|
static const uint8_t to_check[] = {
|
|
|
|
MP_QSTR___get__, MP_QSTR___set__, MP_QSTR___delete__,
|
|
|
|
};
|
|
|
|
for (size_t i = 0; i < MP_ARRAY_SIZE(to_check); ++i) {
|
|
|
|
mp_obj_t dest_temp[2];
|
|
|
|
mp_load_method_protected(value, to_check[i], dest_temp, true);
|
|
|
|
if (dest_temp[0] != MP_OBJ_NULL) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
return false;
|
|
|
|
}
|
2019-04-05 16:03:03 -04:00
|
|
|
|
|
|
|
STATIC bool map_has_special_accessors(const mp_map_t *map) {
|
2019-04-10 17:48:27 -04:00
|
|
|
if (map == NULL) {
|
|
|
|
return false;
|
|
|
|
}
|
2019-04-05 16:03:03 -04:00
|
|
|
for (size_t i = 0; i < map->alloc; i++) {
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_map_slot_is_filled(map, i)) {
|
2019-04-05 16:03:03 -04:00
|
|
|
const mp_map_elem_t *elem = &map->table[i];
|
|
|
|
if (check_for_special_accessors(elem->key, elem->value)) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
py/objtype: Optimise instance get/set/del by skipping special accessors.
This patch is a code optimisation, trading text bytes for speed. On
pyboard it's an increase of 0.06% in code size for a gain (in pystone
performance) of roughly 6.5%.
The patch optimises load/store/delete of attributes in user defined classes
by not looking up special accessors (@property, __get__, __delete__,
__set__, __setattr__ and __getattr_) if they are guaranteed not to exist in
the class.
Currently, if you do my_obj.foo() then the runtime has to do a few checks
to see if foo is a property or has __get__, and if so delegate the call.
And for stores things like my_obj.foo = 1 has to first check if foo is a
property or has __set__ defined on it.
Doing all those checks each and every time the attribute is accessed has a
performance penalty. This patch eliminates all those checks for cases when
it's guaranteed that the checks will always fail, ie no attributes are
properties nor have any special accessor methods defined on them.
To make this guarantee it checks all attributes of a user-defined class
when it is first created. If any of the attributes of the user class are
properties or have special accessors, or any of the base classes of the
user class have them, then it sets a flag in the class to indicate that
special accessors must be checked for. Then in the load/store/delete code
it checks this flag to see if it can take the shortcut and optimise the
lookup.
It's an optimisation that's pretty widely applicable because it improves
lookup performance for all methods of user defined classes, and stores of
attributes, at least for those that don't have special accessors. And, it
allows to enable descriptors with minimal additional runtime overhead if
they are not used for a particular user class.
There is one restriction on dynamic class creation that has been introduced
by this patch: a user-defined class cannot go from zero special accessors
to one special accessor (or more) after that class has been subclassed. If
the script attempts this an AttributeError is raised (see addition to
tests/misc/non_compliant.py for an example of this case).
The cost in code space bytes for the optimisation in this patch is:
unix x64: +528
unix nanbox: +508
stm32: +192
cc3200: +200
esp8266: +332
esp32: +244
Performance tests that were done:
- on unix x86-64, pystone improved by about 5%
- on pyboard, pystone improved by about 6.5%, from 1683 up to 1794
- on pyboard, bm_chaos (from CPython benchmark suite) improved by about 5%
- on esp32, pystone improved by about 30% (but there are caching effects)
- on esp32, bm_chaos improved by about 11%
2018-05-25 03:09:54 -04:00
|
|
|
#endif
|
|
|
|
|
2015-04-09 18:56:15 -04:00
|
|
|
STATIC void type_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
|
2015-01-20 07:47:20 -05:00
|
|
|
(void)kind;
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_type_t *self = MP_OBJ_TO_PTR(self_in);
|
2015-04-11 08:03:37 -04:00
|
|
|
mp_printf(print, "<class '%q'>", self->name);
|
2014-01-04 15:21:15 -05:00
|
|
|
}
|
|
|
|
|
2016-01-03 10:55:55 -05:00
|
|
|
STATIC mp_obj_t type_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
|
2015-01-20 07:47:20 -05:00
|
|
|
(void)type_in;
|
|
|
|
|
2014-05-11 13:37:21 -04:00
|
|
|
mp_arg_check_num(n_args, n_kw, 1, 3, false);
|
2014-01-18 09:10:48 -05:00
|
|
|
|
2014-01-08 13:48:12 -05:00
|
|
|
switch (n_args) {
|
|
|
|
case 1:
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(mp_obj_get_type(args[0]));
|
2014-01-08 13:48:12 -05:00
|
|
|
|
|
|
|
case 3:
|
2014-01-18 09:10:48 -05:00
|
|
|
// args[0] = name
|
2014-01-08 13:48:12 -05:00
|
|
|
// args[1] = bases tuple
|
2014-01-18 09:10:48 -05:00
|
|
|
// args[2] = locals dict
|
2014-02-15 06:34:50 -05:00
|
|
|
return mp_obj_new_type(mp_obj_str_get_qstr(args[0]), args[1], args[2]);
|
2014-01-08 13:48:12 -05:00
|
|
|
|
|
|
|
default:
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("type takes 1 or 3 arguments"));
|
2014-01-08 13:48:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-03 04:59:18 -05:00
|
|
|
STATIC mp_obj_t type_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
|
2014-01-09 15:57:50 -05:00
|
|
|
// instantiate an instance of a class
|
|
|
|
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_type_t *self = MP_OBJ_TO_PTR(self_in);
|
2014-01-09 15:57:50 -05:00
|
|
|
|
|
|
|
if (self->make_new == NULL) {
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("cannot create instance"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_TypeError_varg(MP_ERROR_TEXT("cannot create '%q' instances"), self->name);
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-01-04 15:21:15 -05:00
|
|
|
}
|
2014-01-09 15:57:50 -05:00
|
|
|
|
2016-01-03 10:55:55 -05:00
|
|
|
mp_obj_t o = self->make_new(self, n_args, n_kw, args);
|
2014-01-09 15:57:50 -05:00
|
|
|
|
|
|
|
// return new instance
|
|
|
|
return o;
|
|
|
|
}
|
|
|
|
|
2015-04-01 10:10:50 -04:00
|
|
|
STATIC void type_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
|
2021-04-22 20:55:39 -04:00
|
|
|
assert(mp_obj_is_type(self_in, &mp_type_type));
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_type_t *self = MP_OBJ_TO_PTR(self_in);
|
2014-01-09 15:57:50 -05:00
|
|
|
|
2015-04-01 10:10:50 -04:00
|
|
|
if (dest[0] == MP_OBJ_NULL) {
|
|
|
|
// load attribute
|
|
|
|
#if MICROPY_CPYTHON_COMPAT
|
|
|
|
if (attr == MP_QSTR___name__) {
|
|
|
|
dest[0] = MP_OBJ_NEW_QSTR(self->name);
|
|
|
|
return;
|
|
|
|
}
|
2020-06-09 20:45:24 -04:00
|
|
|
#if MICROPY_CPYTHON_COMPAT
|
|
|
|
if (attr == MP_QSTR___dict__) {
|
|
|
|
// Returns a read-only dict of the class attributes.
|
|
|
|
// If the internal locals is not fixed, a copy will be created.
|
2020-08-04 00:28:06 -04:00
|
|
|
const mp_obj_dict_t *dict = self->locals_dict;
|
|
|
|
if (!dict) {
|
|
|
|
dict = &mp_const_empty_dict_obj;
|
|
|
|
}
|
2020-06-09 20:45:24 -04:00
|
|
|
if (dict->map.is_fixed) {
|
|
|
|
dest[0] = MP_OBJ_FROM_PTR(dict);
|
|
|
|
} else {
|
|
|
|
dest[0] = mp_obj_dict_copy(MP_OBJ_FROM_PTR(dict));
|
2020-08-04 00:28:06 -04:00
|
|
|
mp_obj_dict_t *dict_copy = MP_OBJ_TO_PTR(dest[0]);
|
|
|
|
dict_copy->map.is_fixed = 1;
|
2020-06-09 20:45:24 -04:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
2021-04-23 15:26:42 -04:00
|
|
|
if (attr == MP_QSTR___bases__) {
|
|
|
|
if (self == &mp_type_object) {
|
|
|
|
dest[0] = mp_const_empty_tuple;
|
|
|
|
return;
|
|
|
|
}
|
2021-07-12 08:30:16 -04:00
|
|
|
const void *parent = mp_type_get_parent_slot(self);
|
2021-07-06 10:08:57 -04:00
|
|
|
mp_obj_t parent_obj = parent ? MP_OBJ_FROM_PTR(parent) : MP_OBJ_FROM_PTR(&mp_type_object);
|
2021-04-23 15:26:42 -04:00
|
|
|
#if MICROPY_MULTIPLE_INHERITANCE
|
|
|
|
if (mp_obj_is_type(parent_obj, &mp_type_tuple)) {
|
|
|
|
dest[0] = parent_obj;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
dest[0] = mp_obj_new_tuple(1, &parent_obj);
|
|
|
|
return;
|
|
|
|
}
|
2015-04-01 10:10:50 -04:00
|
|
|
#endif
|
|
|
|
struct class_lookup_data lookup = {
|
2021-03-15 09:57:36 -04:00
|
|
|
.obj = (mp_obj_instance_t *)self,
|
2015-04-01 10:10:50 -04:00
|
|
|
.attr = attr,
|
|
|
|
.meth_offset = 0,
|
|
|
|
.dest = dest,
|
|
|
|
.is_type = true,
|
|
|
|
};
|
|
|
|
mp_obj_class_lookup(&lookup, self);
|
|
|
|
} else {
|
|
|
|
// delete/store attribute
|
2014-01-11 14:22:29 -05:00
|
|
|
|
2015-04-01 10:10:50 -04:00
|
|
|
if (self->locals_dict != NULL) {
|
2020-06-21 03:25:44 -04:00
|
|
|
assert(mp_obj_is_dict_or_ordereddict(MP_OBJ_FROM_PTR(self->locals_dict))); // MicroPython restriction, for now
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_map_t *locals_map = &self->locals_dict->map;
|
2018-02-06 23:44:29 -05:00
|
|
|
if (locals_map->is_fixed) {
|
|
|
|
// can't apply delete/store to a fixed map
|
|
|
|
return;
|
|
|
|
}
|
2015-04-01 10:10:50 -04:00
|
|
|
if (dest[1] == MP_OBJ_NULL) {
|
|
|
|
// delete attribute
|
|
|
|
mp_map_elem_t *elem = mp_map_lookup(locals_map, MP_OBJ_NEW_QSTR(attr), MP_MAP_LOOKUP_REMOVE_IF_FOUND);
|
|
|
|
if (elem != NULL) {
|
|
|
|
dest[0] = MP_OBJ_NULL; // indicate success
|
|
|
|
}
|
|
|
|
} else {
|
py/objtype: Optimise instance get/set/del by skipping special accessors.
This patch is a code optimisation, trading text bytes for speed. On
pyboard it's an increase of 0.06% in code size for a gain (in pystone
performance) of roughly 6.5%.
The patch optimises load/store/delete of attributes in user defined classes
by not looking up special accessors (@property, __get__, __delete__,
__set__, __setattr__ and __getattr_) if they are guaranteed not to exist in
the class.
Currently, if you do my_obj.foo() then the runtime has to do a few checks
to see if foo is a property or has __get__, and if so delegate the call.
And for stores things like my_obj.foo = 1 has to first check if foo is a
property or has __set__ defined on it.
Doing all those checks each and every time the attribute is accessed has a
performance penalty. This patch eliminates all those checks for cases when
it's guaranteed that the checks will always fail, ie no attributes are
properties nor have any special accessor methods defined on them.
To make this guarantee it checks all attributes of a user-defined class
when it is first created. If any of the attributes of the user class are
properties or have special accessors, or any of the base classes of the
user class have them, then it sets a flag in the class to indicate that
special accessors must be checked for. Then in the load/store/delete code
it checks this flag to see if it can take the shortcut and optimise the
lookup.
It's an optimisation that's pretty widely applicable because it improves
lookup performance for all methods of user defined classes, and stores of
attributes, at least for those that don't have special accessors. And, it
allows to enable descriptors with minimal additional runtime overhead if
they are not used for a particular user class.
There is one restriction on dynamic class creation that has been introduced
by this patch: a user-defined class cannot go from zero special accessors
to one special accessor (or more) after that class has been subclassed. If
the script attempts this an AttributeError is raised (see addition to
tests/misc/non_compliant.py for an example of this case).
The cost in code space bytes for the optimisation in this patch is:
unix x64: +528
unix nanbox: +508
stm32: +192
cc3200: +200
esp8266: +332
esp32: +244
Performance tests that were done:
- on unix x86-64, pystone improved by about 5%
- on pyboard, pystone improved by about 6.5%, from 1683 up to 1794
- on pyboard, bm_chaos (from CPython benchmark suite) improved by about 5%
- on esp32, pystone improved by about 30% (but there are caching effects)
- on esp32, bm_chaos improved by about 11%
2018-05-25 03:09:54 -04:00
|
|
|
#if ENABLE_SPECIAL_ACCESSORS
|
|
|
|
// Check if we add any special accessor methods with this store
|
2020-01-29 08:15:26 -05:00
|
|
|
if (!(self->flags & MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS)) {
|
py/objtype: Optimise instance get/set/del by skipping special accessors.
This patch is a code optimisation, trading text bytes for speed. On
pyboard it's an increase of 0.06% in code size for a gain (in pystone
performance) of roughly 6.5%.
The patch optimises load/store/delete of attributes in user defined classes
by not looking up special accessors (@property, __get__, __delete__,
__set__, __setattr__ and __getattr_) if they are guaranteed not to exist in
the class.
Currently, if you do my_obj.foo() then the runtime has to do a few checks
to see if foo is a property or has __get__, and if so delegate the call.
And for stores things like my_obj.foo = 1 has to first check if foo is a
property or has __set__ defined on it.
Doing all those checks each and every time the attribute is accessed has a
performance penalty. This patch eliminates all those checks for cases when
it's guaranteed that the checks will always fail, ie no attributes are
properties nor have any special accessor methods defined on them.
To make this guarantee it checks all attributes of a user-defined class
when it is first created. If any of the attributes of the user class are
properties or have special accessors, or any of the base classes of the
user class have them, then it sets a flag in the class to indicate that
special accessors must be checked for. Then in the load/store/delete code
it checks this flag to see if it can take the shortcut and optimise the
lookup.
It's an optimisation that's pretty widely applicable because it improves
lookup performance for all methods of user defined classes, and stores of
attributes, at least for those that don't have special accessors. And, it
allows to enable descriptors with minimal additional runtime overhead if
they are not used for a particular user class.
There is one restriction on dynamic class creation that has been introduced
by this patch: a user-defined class cannot go from zero special accessors
to one special accessor (or more) after that class has been subclassed. If
the script attempts this an AttributeError is raised (see addition to
tests/misc/non_compliant.py for an example of this case).
The cost in code space bytes for the optimisation in this patch is:
unix x64: +528
unix nanbox: +508
stm32: +192
cc3200: +200
esp8266: +332
esp32: +244
Performance tests that were done:
- on unix x86-64, pystone improved by about 5%
- on pyboard, pystone improved by about 6.5%, from 1683 up to 1794
- on pyboard, bm_chaos (from CPython benchmark suite) improved by about 5%
- on esp32, pystone improved by about 30% (but there are caching effects)
- on esp32, bm_chaos improved by about 11%
2018-05-25 03:09:54 -04:00
|
|
|
if (check_for_special_accessors(MP_OBJ_NEW_QSTR(attr), dest[1])) {
|
2020-01-29 08:15:26 -05:00
|
|
|
if (self->flags & MP_TYPE_FLAG_IS_SUBCLASSED) {
|
py/objtype: Optimise instance get/set/del by skipping special accessors.
This patch is a code optimisation, trading text bytes for speed. On
pyboard it's an increase of 0.06% in code size for a gain (in pystone
performance) of roughly 6.5%.
The patch optimises load/store/delete of attributes in user defined classes
by not looking up special accessors (@property, __get__, __delete__,
__set__, __setattr__ and __getattr_) if they are guaranteed not to exist in
the class.
Currently, if you do my_obj.foo() then the runtime has to do a few checks
to see if foo is a property or has __get__, and if so delegate the call.
And for stores things like my_obj.foo = 1 has to first check if foo is a
property or has __set__ defined on it.
Doing all those checks each and every time the attribute is accessed has a
performance penalty. This patch eliminates all those checks for cases when
it's guaranteed that the checks will always fail, ie no attributes are
properties nor have any special accessor methods defined on them.
To make this guarantee it checks all attributes of a user-defined class
when it is first created. If any of the attributes of the user class are
properties or have special accessors, or any of the base classes of the
user class have them, then it sets a flag in the class to indicate that
special accessors must be checked for. Then in the load/store/delete code
it checks this flag to see if it can take the shortcut and optimise the
lookup.
It's an optimisation that's pretty widely applicable because it improves
lookup performance for all methods of user defined classes, and stores of
attributes, at least for those that don't have special accessors. And, it
allows to enable descriptors with minimal additional runtime overhead if
they are not used for a particular user class.
There is one restriction on dynamic class creation that has been introduced
by this patch: a user-defined class cannot go from zero special accessors
to one special accessor (or more) after that class has been subclassed. If
the script attempts this an AttributeError is raised (see addition to
tests/misc/non_compliant.py for an example of this case).
The cost in code space bytes for the optimisation in this patch is:
unix x64: +528
unix nanbox: +508
stm32: +192
cc3200: +200
esp8266: +332
esp32: +244
Performance tests that were done:
- on unix x86-64, pystone improved by about 5%
- on pyboard, pystone improved by about 6.5%, from 1683 up to 1794
- on pyboard, bm_chaos (from CPython benchmark suite) improved by about 5%
- on esp32, pystone improved by about 30% (but there are caching effects)
- on esp32, bm_chaos improved by about 11%
2018-05-25 03:09:54 -04:00
|
|
|
// This class is already subclassed so can't have special accessors added
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_msg(&mp_type_AttributeError, MP_ERROR_TEXT("can't add special method to already-subclassed class"));
|
py/objtype: Optimise instance get/set/del by skipping special accessors.
This patch is a code optimisation, trading text bytes for speed. On
pyboard it's an increase of 0.06% in code size for a gain (in pystone
performance) of roughly 6.5%.
The patch optimises load/store/delete of attributes in user defined classes
by not looking up special accessors (@property, __get__, __delete__,
__set__, __setattr__ and __getattr_) if they are guaranteed not to exist in
the class.
Currently, if you do my_obj.foo() then the runtime has to do a few checks
to see if foo is a property or has __get__, and if so delegate the call.
And for stores things like my_obj.foo = 1 has to first check if foo is a
property or has __set__ defined on it.
Doing all those checks each and every time the attribute is accessed has a
performance penalty. This patch eliminates all those checks for cases when
it's guaranteed that the checks will always fail, ie no attributes are
properties nor have any special accessor methods defined on them.
To make this guarantee it checks all attributes of a user-defined class
when it is first created. If any of the attributes of the user class are
properties or have special accessors, or any of the base classes of the
user class have them, then it sets a flag in the class to indicate that
special accessors must be checked for. Then in the load/store/delete code
it checks this flag to see if it can take the shortcut and optimise the
lookup.
It's an optimisation that's pretty widely applicable because it improves
lookup performance for all methods of user defined classes, and stores of
attributes, at least for those that don't have special accessors. And, it
allows to enable descriptors with minimal additional runtime overhead if
they are not used for a particular user class.
There is one restriction on dynamic class creation that has been introduced
by this patch: a user-defined class cannot go from zero special accessors
to one special accessor (or more) after that class has been subclassed. If
the script attempts this an AttributeError is raised (see addition to
tests/misc/non_compliant.py for an example of this case).
The cost in code space bytes for the optimisation in this patch is:
unix x64: +528
unix nanbox: +508
stm32: +192
cc3200: +200
esp8266: +332
esp32: +244
Performance tests that were done:
- on unix x86-64, pystone improved by about 5%
- on pyboard, pystone improved by about 6.5%, from 1683 up to 1794
- on pyboard, bm_chaos (from CPython benchmark suite) improved by about 5%
- on esp32, pystone improved by about 30% (but there are caching effects)
- on esp32, bm_chaos improved by about 11%
2018-05-25 03:09:54 -04:00
|
|
|
}
|
2020-01-29 08:15:26 -05:00
|
|
|
self->flags |= MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS;
|
py/objtype: Optimise instance get/set/del by skipping special accessors.
This patch is a code optimisation, trading text bytes for speed. On
pyboard it's an increase of 0.06% in code size for a gain (in pystone
performance) of roughly 6.5%.
The patch optimises load/store/delete of attributes in user defined classes
by not looking up special accessors (@property, __get__, __delete__,
__set__, __setattr__ and __getattr_) if they are guaranteed not to exist in
the class.
Currently, if you do my_obj.foo() then the runtime has to do a few checks
to see if foo is a property or has __get__, and if so delegate the call.
And for stores things like my_obj.foo = 1 has to first check if foo is a
property or has __set__ defined on it.
Doing all those checks each and every time the attribute is accessed has a
performance penalty. This patch eliminates all those checks for cases when
it's guaranteed that the checks will always fail, ie no attributes are
properties nor have any special accessor methods defined on them.
To make this guarantee it checks all attributes of a user-defined class
when it is first created. If any of the attributes of the user class are
properties or have special accessors, or any of the base classes of the
user class have them, then it sets a flag in the class to indicate that
special accessors must be checked for. Then in the load/store/delete code
it checks this flag to see if it can take the shortcut and optimise the
lookup.
It's an optimisation that's pretty widely applicable because it improves
lookup performance for all methods of user defined classes, and stores of
attributes, at least for those that don't have special accessors. And, it
allows to enable descriptors with minimal additional runtime overhead if
they are not used for a particular user class.
There is one restriction on dynamic class creation that has been introduced
by this patch: a user-defined class cannot go from zero special accessors
to one special accessor (or more) after that class has been subclassed. If
the script attempts this an AttributeError is raised (see addition to
tests/misc/non_compliant.py for an example of this case).
The cost in code space bytes for the optimisation in this patch is:
unix x64: +528
unix nanbox: +508
stm32: +192
cc3200: +200
esp8266: +332
esp32: +244
Performance tests that were done:
- on unix x86-64, pystone improved by about 5%
- on pyboard, pystone improved by about 6.5%, from 1683 up to 1794
- on pyboard, bm_chaos (from CPython benchmark suite) improved by about 5%
- on esp32, pystone improved by about 30% (but there are caching effects)
- on esp32, bm_chaos improved by about 11%
2018-05-25 03:09:54 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2015-04-01 10:10:50 -04:00
|
|
|
// store attribute
|
|
|
|
mp_map_elem_t *elem = mp_map_lookup(locals_map, MP_OBJ_NEW_QSTR(attr), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
|
2019-02-01 19:04:16 -05:00
|
|
|
elem->value = dest[1];
|
2018-02-06 23:44:29 -05:00
|
|
|
dest[0] = MP_OBJ_NULL; // indicate success
|
2014-04-08 16:11:49 -04:00
|
|
|
}
|
2014-03-27 05:32:26 -04:00
|
|
|
}
|
2014-01-09 15:57:50 -05:00
|
|
|
}
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
|
|
|
|
2014-02-15 11:10:44 -05:00
|
|
|
const mp_obj_type_t mp_type_type = {
|
|
|
|
{ &mp_type_type },
|
2021-07-09 15:59:37 -04:00
|
|
|
.flags = MP_TYPE_FLAG_EXTENDED,
|
2014-02-15 06:34:50 -05:00
|
|
|
.name = MP_QSTR_type,
|
2014-01-05 15:34:09 -05:00
|
|
|
.print = type_print,
|
2014-01-08 13:48:12 -05:00
|
|
|
.make_new = type_make_new,
|
2015-04-01 10:10:50 -04:00
|
|
|
.attr = type_attr,
|
2021-07-12 07:57:59 -04:00
|
|
|
MP_TYPE_EXTENDED_FIELDS(
|
2021-07-06 11:37:32 -04:00
|
|
|
.call = type_call,
|
|
|
|
.unary_op = mp_generic_unary_op,
|
|
|
|
),
|
2013-12-21 13:17:45 -05:00
|
|
|
};
|
2014-01-09 15:57:50 -05:00
|
|
|
|
2014-02-15 06:34:50 -05:00
|
|
|
mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict) {
|
2018-03-25 17:05:32 -04:00
|
|
|
// Verify input objects have expected type
|
2021-04-22 20:55:39 -04:00
|
|
|
if (!mp_obj_is_type(bases_tuple, &mp_type_tuple)) {
|
2018-03-25 17:05:32 -04:00
|
|
|
mp_raise_TypeError(NULL);
|
2018-03-25 17:05:32 -04:00
|
|
|
}
|
2020-06-21 03:25:44 -04:00
|
|
|
if (!mp_obj_is_dict_or_ordereddict(locals_dict)) {
|
2018-03-25 17:05:32 -04:00
|
|
|
mp_raise_TypeError(NULL);
|
2018-03-25 17:05:32 -04:00
|
|
|
}
|
2014-04-28 19:42:28 -04:00
|
|
|
|
2014-07-05 00:55:00 -04:00
|
|
|
// TODO might need to make a copy of locals_dict; at least that's how CPython does it
|
|
|
|
|
2014-04-28 19:42:28 -04:00
|
|
|
// Basic validation of base classes
|
2020-02-10 05:41:22 -05:00
|
|
|
uint16_t base_flags = MP_TYPE_FLAG_EQ_NOT_REFLEXIVE
|
2021-07-09 15:59:37 -04:00
|
|
|
| MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_EQ_HAS_NEQ_TEST | MP_TYPE_FLAG_EXTENDED;
|
2017-11-10 17:11:24 -05:00
|
|
|
size_t bases_len;
|
|
|
|
mp_obj_t *bases_items;
|
|
|
|
mp_obj_tuple_get(bases_tuple, &bases_len, &bases_items);
|
|
|
|
for (size_t i = 0; i < bases_len; i++) {
|
2021-04-22 20:55:39 -04:00
|
|
|
if (!mp_obj_is_type(bases_items[i], &mp_type_type)) {
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("type is not an acceptable base type"));
|
2018-03-25 17:05:32 -04:00
|
|
|
}
|
2017-11-10 17:11:24 -05:00
|
|
|
mp_obj_type_t *t = MP_OBJ_TO_PTR(bases_items[i]);
|
2014-04-28 19:42:28 -04:00
|
|
|
// TODO: Verify with CPy, tested on function type
|
|
|
|
if (t->make_new == NULL) {
|
2021-04-21 22:13:58 -04:00
|
|
|
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("type is not an acceptable base type"));
|
2020-11-19 17:18:52 -05:00
|
|
|
#else
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_raise_TypeError_varg(
|
2021-05-04 14:40:55 -04:00
|
|
|
MP_ERROR_TEXT("type '%q' is not an acceptable base type"), t->name);
|
2020-11-19 17:18:52 -05:00
|
|
|
#endif
|
2014-04-28 19:42:28 -04:00
|
|
|
}
|
py/objtype: Optimise instance get/set/del by skipping special accessors.
This patch is a code optimisation, trading text bytes for speed. On
pyboard it's an increase of 0.06% in code size for a gain (in pystone
performance) of roughly 6.5%.
The patch optimises load/store/delete of attributes in user defined classes
by not looking up special accessors (@property, __get__, __delete__,
__set__, __setattr__ and __getattr_) if they are guaranteed not to exist in
the class.
Currently, if you do my_obj.foo() then the runtime has to do a few checks
to see if foo is a property or has __get__, and if so delegate the call.
And for stores things like my_obj.foo = 1 has to first check if foo is a
property or has __set__ defined on it.
Doing all those checks each and every time the attribute is accessed has a
performance penalty. This patch eliminates all those checks for cases when
it's guaranteed that the checks will always fail, ie no attributes are
properties nor have any special accessor methods defined on them.
To make this guarantee it checks all attributes of a user-defined class
when it is first created. If any of the attributes of the user class are
properties or have special accessors, or any of the base classes of the
user class have them, then it sets a flag in the class to indicate that
special accessors must be checked for. Then in the load/store/delete code
it checks this flag to see if it can take the shortcut and optimise the
lookup.
It's an optimisation that's pretty widely applicable because it improves
lookup performance for all methods of user defined classes, and stores of
attributes, at least for those that don't have special accessors. And, it
allows to enable descriptors with minimal additional runtime overhead if
they are not used for a particular user class.
There is one restriction on dynamic class creation that has been introduced
by this patch: a user-defined class cannot go from zero special accessors
to one special accessor (or more) after that class has been subclassed. If
the script attempts this an AttributeError is raised (see addition to
tests/misc/non_compliant.py for an example of this case).
The cost in code space bytes for the optimisation in this patch is:
unix x64: +528
unix nanbox: +508
stm32: +192
cc3200: +200
esp8266: +332
esp32: +244
Performance tests that were done:
- on unix x86-64, pystone improved by about 5%
- on pyboard, pystone improved by about 6.5%, from 1683 up to 1794
- on pyboard, bm_chaos (from CPython benchmark suite) improved by about 5%
- on esp32, pystone improved by about 30% (but there are caching effects)
- on esp32, bm_chaos improved by about 11%
2018-05-25 03:09:54 -04:00
|
|
|
#if ENABLE_SPECIAL_ACCESSORS
|
|
|
|
if (mp_obj_is_instance_type(t)) {
|
2020-01-29 08:15:26 -05:00
|
|
|
t->flags |= MP_TYPE_FLAG_IS_SUBCLASSED;
|
|
|
|
base_flags |= t->flags & MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS;
|
py/objtype: Optimise instance get/set/del by skipping special accessors.
This patch is a code optimisation, trading text bytes for speed. On
pyboard it's an increase of 0.06% in code size for a gain (in pystone
performance) of roughly 6.5%.
The patch optimises load/store/delete of attributes in user defined classes
by not looking up special accessors (@property, __get__, __delete__,
__set__, __setattr__ and __getattr_) if they are guaranteed not to exist in
the class.
Currently, if you do my_obj.foo() then the runtime has to do a few checks
to see if foo is a property or has __get__, and if so delegate the call.
And for stores things like my_obj.foo = 1 has to first check if foo is a
property or has __set__ defined on it.
Doing all those checks each and every time the attribute is accessed has a
performance penalty. This patch eliminates all those checks for cases when
it's guaranteed that the checks will always fail, ie no attributes are
properties nor have any special accessor methods defined on them.
To make this guarantee it checks all attributes of a user-defined class
when it is first created. If any of the attributes of the user class are
properties or have special accessors, or any of the base classes of the
user class have them, then it sets a flag in the class to indicate that
special accessors must be checked for. Then in the load/store/delete code
it checks this flag to see if it can take the shortcut and optimise the
lookup.
It's an optimisation that's pretty widely applicable because it improves
lookup performance for all methods of user defined classes, and stores of
attributes, at least for those that don't have special accessors. And, it
allows to enable descriptors with minimal additional runtime overhead if
they are not used for a particular user class.
There is one restriction on dynamic class creation that has been introduced
by this patch: a user-defined class cannot go from zero special accessors
to one special accessor (or more) after that class has been subclassed. If
the script attempts this an AttributeError is raised (see addition to
tests/misc/non_compliant.py for an example of this case).
The cost in code space bytes for the optimisation in this patch is:
unix x64: +528
unix nanbox: +508
stm32: +192
cc3200: +200
esp8266: +332
esp32: +244
Performance tests that were done:
- on unix x86-64, pystone improved by about 5%
- on pyboard, pystone improved by about 6.5%, from 1683 up to 1794
- on pyboard, bm_chaos (from CPython benchmark suite) improved by about 5%
- on esp32, pystone improved by about 30% (but there are caching effects)
- on esp32, bm_chaos improved by about 11%
2018-05-25 03:09:54 -04:00
|
|
|
}
|
|
|
|
#endif
|
2014-04-28 19:42:28 -04:00
|
|
|
}
|
|
|
|
|
2021-07-06 11:37:32 -04:00
|
|
|
mp_obj_full_type_t *o = m_new0_ll(mp_obj_full_type_t, 1);
|
2014-02-15 11:10:44 -05:00
|
|
|
o->base.type = &mp_type_type;
|
py/objtype: Optimise instance get/set/del by skipping special accessors.
This patch is a code optimisation, trading text bytes for speed. On
pyboard it's an increase of 0.06% in code size for a gain (in pystone
performance) of roughly 6.5%.
The patch optimises load/store/delete of attributes in user defined classes
by not looking up special accessors (@property, __get__, __delete__,
__set__, __setattr__ and __getattr_) if they are guaranteed not to exist in
the class.
Currently, if you do my_obj.foo() then the runtime has to do a few checks
to see if foo is a property or has __get__, and if so delegate the call.
And for stores things like my_obj.foo = 1 has to first check if foo is a
property or has __set__ defined on it.
Doing all those checks each and every time the attribute is accessed has a
performance penalty. This patch eliminates all those checks for cases when
it's guaranteed that the checks will always fail, ie no attributes are
properties nor have any special accessor methods defined on them.
To make this guarantee it checks all attributes of a user-defined class
when it is first created. If any of the attributes of the user class are
properties or have special accessors, or any of the base classes of the
user class have them, then it sets a flag in the class to indicate that
special accessors must be checked for. Then in the load/store/delete code
it checks this flag to see if it can take the shortcut and optimise the
lookup.
It's an optimisation that's pretty widely applicable because it improves
lookup performance for all methods of user defined classes, and stores of
attributes, at least for those that don't have special accessors. And, it
allows to enable descriptors with minimal additional runtime overhead if
they are not used for a particular user class.
There is one restriction on dynamic class creation that has been introduced
by this patch: a user-defined class cannot go from zero special accessors
to one special accessor (or more) after that class has been subclassed. If
the script attempts this an AttributeError is raised (see addition to
tests/misc/non_compliant.py for an example of this case).
The cost in code space bytes for the optimisation in this patch is:
unix x64: +528
unix nanbox: +508
stm32: +192
cc3200: +200
esp8266: +332
esp32: +244
Performance tests that were done:
- on unix x86-64, pystone improved by about 5%
- on pyboard, pystone improved by about 6.5%, from 1683 up to 1794
- on pyboard, bm_chaos (from CPython benchmark suite) improved by about 5%
- on esp32, pystone improved by about 30% (but there are caching effects)
- on esp32, bm_chaos improved by about 11%
2018-05-25 03:09:54 -04:00
|
|
|
o->flags = base_flags;
|
2014-01-22 09:35:10 -05:00
|
|
|
o->name = name;
|
2014-05-03 12:19:35 -04:00
|
|
|
o->print = instance_print;
|
2015-05-03 18:23:18 -04:00
|
|
|
o->make_new = mp_obj_instance_make_new;
|
2015-04-01 10:10:50 -04:00
|
|
|
o->attr = mp_obj_instance_attr;
|
2021-07-06 11:37:32 -04:00
|
|
|
o->MP_TYPE_CALL = mp_obj_instance_call;
|
|
|
|
o->MP_TYPE_UNARY_OP = instance_unary_op;
|
|
|
|
o->MP_TYPE_BINARY_OP = instance_binary_op;
|
|
|
|
o->MP_TYPE_SUBSCR = instance_subscr;
|
|
|
|
o->MP_TYPE_GETITER = mp_obj_instance_getiter;
|
2021-03-15 09:57:36 -04:00
|
|
|
// o->iternext = ; not implemented
|
2021-07-06 11:37:32 -04:00
|
|
|
o->MP_TYPE_GET_BUFFER = instance_get_buffer;
|
2017-04-05 22:09:01 -04:00
|
|
|
|
2017-11-10 17:11:24 -05:00
|
|
|
if (bases_len > 0) {
|
2017-04-05 22:09:01 -04:00
|
|
|
// Inherit protocol from a base class. This allows to define an
|
|
|
|
// abstract base class which would translate C-level protocol to
|
|
|
|
// Python method calls, and any subclass inheriting from it will
|
|
|
|
// support this feature.
|
2021-07-12 08:04:04 -04:00
|
|
|
o->MP_TYPE_PROTOCOL = mp_type_get_protocol_slot((mp_obj_type_t *)MP_OBJ_TO_PTR(bases_items[0]));
|
2017-04-05 22:09:01 -04:00
|
|
|
|
2017-11-10 17:11:24 -05:00
|
|
|
if (bases_len >= 2) {
|
2017-04-01 08:52:24 -04:00
|
|
|
#if MICROPY_MULTIPLE_INHERITANCE
|
2017-04-05 22:09:01 -04:00
|
|
|
o->parent = MP_OBJ_TO_PTR(bases_tuple);
|
2017-04-01 08:52:24 -04:00
|
|
|
#else
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_NotImplementedError(MP_ERROR_TEXT("multiple inheritance not supported"));
|
2017-04-01 08:52:24 -04:00
|
|
|
#endif
|
2017-04-05 22:09:01 -04:00
|
|
|
} else {
|
2017-11-10 17:11:24 -05:00
|
|
|
o->parent = MP_OBJ_TO_PTR(bases_items[0]);
|
2017-04-05 22:09:01 -04:00
|
|
|
}
|
2016-06-18 17:56:06 -04:00
|
|
|
}
|
2017-04-05 22:09:01 -04:00
|
|
|
|
2021-08-04 19:27:54 -04:00
|
|
|
o->locals_dict = make_dict_long_lived(MP_OBJ_TO_PTR(locals_dict), 10);
|
2014-04-28 19:42:28 -04:00
|
|
|
|
py/objtype: Optimise instance get/set/del by skipping special accessors.
This patch is a code optimisation, trading text bytes for speed. On
pyboard it's an increase of 0.06% in code size for a gain (in pystone
performance) of roughly 6.5%.
The patch optimises load/store/delete of attributes in user defined classes
by not looking up special accessors (@property, __get__, __delete__,
__set__, __setattr__ and __getattr_) if they are guaranteed not to exist in
the class.
Currently, if you do my_obj.foo() then the runtime has to do a few checks
to see if foo is a property or has __get__, and if so delegate the call.
And for stores things like my_obj.foo = 1 has to first check if foo is a
property or has __set__ defined on it.
Doing all those checks each and every time the attribute is accessed has a
performance penalty. This patch eliminates all those checks for cases when
it's guaranteed that the checks will always fail, ie no attributes are
properties nor have any special accessor methods defined on them.
To make this guarantee it checks all attributes of a user-defined class
when it is first created. If any of the attributes of the user class are
properties or have special accessors, or any of the base classes of the
user class have them, then it sets a flag in the class to indicate that
special accessors must be checked for. Then in the load/store/delete code
it checks this flag to see if it can take the shortcut and optimise the
lookup.
It's an optimisation that's pretty widely applicable because it improves
lookup performance for all methods of user defined classes, and stores of
attributes, at least for those that don't have special accessors. And, it
allows to enable descriptors with minimal additional runtime overhead if
they are not used for a particular user class.
There is one restriction on dynamic class creation that has been introduced
by this patch: a user-defined class cannot go from zero special accessors
to one special accessor (or more) after that class has been subclassed. If
the script attempts this an AttributeError is raised (see addition to
tests/misc/non_compliant.py for an example of this case).
The cost in code space bytes for the optimisation in this patch is:
unix x64: +528
unix nanbox: +508
stm32: +192
cc3200: +200
esp8266: +332
esp32: +244
Performance tests that were done:
- on unix x86-64, pystone improved by about 5%
- on pyboard, pystone improved by about 6.5%, from 1683 up to 1794
- on pyboard, bm_chaos (from CPython benchmark suite) improved by about 5%
- on esp32, pystone improved by about 30% (but there are caching effects)
- on esp32, bm_chaos improved by about 11%
2018-05-25 03:09:54 -04:00
|
|
|
#if ENABLE_SPECIAL_ACCESSORS
|
|
|
|
// Check if the class has any special accessor methods
|
2020-01-29 08:15:26 -05:00
|
|
|
if (!(o->flags & MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS)) {
|
py/objtype: Optimise instance get/set/del by skipping special accessors.
This patch is a code optimisation, trading text bytes for speed. On
pyboard it's an increase of 0.06% in code size for a gain (in pystone
performance) of roughly 6.5%.
The patch optimises load/store/delete of attributes in user defined classes
by not looking up special accessors (@property, __get__, __delete__,
__set__, __setattr__ and __getattr_) if they are guaranteed not to exist in
the class.
Currently, if you do my_obj.foo() then the runtime has to do a few checks
to see if foo is a property or has __get__, and if so delegate the call.
And for stores things like my_obj.foo = 1 has to first check if foo is a
property or has __set__ defined on it.
Doing all those checks each and every time the attribute is accessed has a
performance penalty. This patch eliminates all those checks for cases when
it's guaranteed that the checks will always fail, ie no attributes are
properties nor have any special accessor methods defined on them.
To make this guarantee it checks all attributes of a user-defined class
when it is first created. If any of the attributes of the user class are
properties or have special accessors, or any of the base classes of the
user class have them, then it sets a flag in the class to indicate that
special accessors must be checked for. Then in the load/store/delete code
it checks this flag to see if it can take the shortcut and optimise the
lookup.
It's an optimisation that's pretty widely applicable because it improves
lookup performance for all methods of user defined classes, and stores of
attributes, at least for those that don't have special accessors. And, it
allows to enable descriptors with minimal additional runtime overhead if
they are not used for a particular user class.
There is one restriction on dynamic class creation that has been introduced
by this patch: a user-defined class cannot go from zero special accessors
to one special accessor (or more) after that class has been subclassed. If
the script attempts this an AttributeError is raised (see addition to
tests/misc/non_compliant.py for an example of this case).
The cost in code space bytes for the optimisation in this patch is:
unix x64: +528
unix nanbox: +508
stm32: +192
cc3200: +200
esp8266: +332
esp32: +244
Performance tests that were done:
- on unix x86-64, pystone improved by about 5%
- on pyboard, pystone improved by about 6.5%, from 1683 up to 1794
- on pyboard, bm_chaos (from CPython benchmark suite) improved by about 5%
- on esp32, pystone improved by about 30% (but there are caching effects)
- on esp32, bm_chaos improved by about 11%
2018-05-25 03:09:54 -04:00
|
|
|
for (size_t i = 0; i < o->locals_dict->map.alloc; i++) {
|
2019-01-30 05:57:29 -05:00
|
|
|
if (mp_map_slot_is_filled(&o->locals_dict->map, i)) {
|
py/objtype: Optimise instance get/set/del by skipping special accessors.
This patch is a code optimisation, trading text bytes for speed. On
pyboard it's an increase of 0.06% in code size for a gain (in pystone
performance) of roughly 6.5%.
The patch optimises load/store/delete of attributes in user defined classes
by not looking up special accessors (@property, __get__, __delete__,
__set__, __setattr__ and __getattr_) if they are guaranteed not to exist in
the class.
Currently, if you do my_obj.foo() then the runtime has to do a few checks
to see if foo is a property or has __get__, and if so delegate the call.
And for stores things like my_obj.foo = 1 has to first check if foo is a
property or has __set__ defined on it.
Doing all those checks each and every time the attribute is accessed has a
performance penalty. This patch eliminates all those checks for cases when
it's guaranteed that the checks will always fail, ie no attributes are
properties nor have any special accessor methods defined on them.
To make this guarantee it checks all attributes of a user-defined class
when it is first created. If any of the attributes of the user class are
properties or have special accessors, or any of the base classes of the
user class have them, then it sets a flag in the class to indicate that
special accessors must be checked for. Then in the load/store/delete code
it checks this flag to see if it can take the shortcut and optimise the
lookup.
It's an optimisation that's pretty widely applicable because it improves
lookup performance for all methods of user defined classes, and stores of
attributes, at least for those that don't have special accessors. And, it
allows to enable descriptors with minimal additional runtime overhead if
they are not used for a particular user class.
There is one restriction on dynamic class creation that has been introduced
by this patch: a user-defined class cannot go from zero special accessors
to one special accessor (or more) after that class has been subclassed. If
the script attempts this an AttributeError is raised (see addition to
tests/misc/non_compliant.py for an example of this case).
The cost in code space bytes for the optimisation in this patch is:
unix x64: +528
unix nanbox: +508
stm32: +192
cc3200: +200
esp8266: +332
esp32: +244
Performance tests that were done:
- on unix x86-64, pystone improved by about 5%
- on pyboard, pystone improved by about 6.5%, from 1683 up to 1794
- on pyboard, bm_chaos (from CPython benchmark suite) improved by about 5%
- on esp32, pystone improved by about 30% (but there are caching effects)
- on esp32, bm_chaos improved by about 11%
2018-05-25 03:09:54 -04:00
|
|
|
const mp_map_elem_t *elem = &o->locals_dict->map.table[i];
|
|
|
|
if (check_for_special_accessors(elem->key, elem->value)) {
|
2020-01-29 08:15:26 -05:00
|
|
|
o->flags |= MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS;
|
py/objtype: Optimise instance get/set/del by skipping special accessors.
This patch is a code optimisation, trading text bytes for speed. On
pyboard it's an increase of 0.06% in code size for a gain (in pystone
performance) of roughly 6.5%.
The patch optimises load/store/delete of attributes in user defined classes
by not looking up special accessors (@property, __get__, __delete__,
__set__, __setattr__ and __getattr_) if they are guaranteed not to exist in
the class.
Currently, if you do my_obj.foo() then the runtime has to do a few checks
to see if foo is a property or has __get__, and if so delegate the call.
And for stores things like my_obj.foo = 1 has to first check if foo is a
property or has __set__ defined on it.
Doing all those checks each and every time the attribute is accessed has a
performance penalty. This patch eliminates all those checks for cases when
it's guaranteed that the checks will always fail, ie no attributes are
properties nor have any special accessor methods defined on them.
To make this guarantee it checks all attributes of a user-defined class
when it is first created. If any of the attributes of the user class are
properties or have special accessors, or any of the base classes of the
user class have them, then it sets a flag in the class to indicate that
special accessors must be checked for. Then in the load/store/delete code
it checks this flag to see if it can take the shortcut and optimise the
lookup.
It's an optimisation that's pretty widely applicable because it improves
lookup performance for all methods of user defined classes, and stores of
attributes, at least for those that don't have special accessors. And, it
allows to enable descriptors with minimal additional runtime overhead if
they are not used for a particular user class.
There is one restriction on dynamic class creation that has been introduced
by this patch: a user-defined class cannot go from zero special accessors
to one special accessor (or more) after that class has been subclassed. If
the script attempts this an AttributeError is raised (see addition to
tests/misc/non_compliant.py for an example of this case).
The cost in code space bytes for the optimisation in this patch is:
unix x64: +528
unix nanbox: +508
stm32: +192
cc3200: +200
esp8266: +332
esp32: +244
Performance tests that were done:
- on unix x86-64, pystone improved by about 5%
- on pyboard, pystone improved by about 6.5%, from 1683 up to 1794
- on pyboard, bm_chaos (from CPython benchmark suite) improved by about 5%
- on esp32, pystone improved by about 30% (but there are caching effects)
- on esp32, bm_chaos improved by about 11%
2018-05-25 03:09:54 -04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2014-04-28 19:42:28 -04:00
|
|
|
const mp_obj_type_t *native_base;
|
2021-07-06 11:37:32 -04:00
|
|
|
size_t num_native_bases = instance_count_native_bases((mp_obj_type_t *)o, &native_base);
|
2014-04-28 19:42:28 -04:00
|
|
|
if (num_native_bases > 1) {
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("multiple bases have instance lay-out conflict"));
|
2014-04-28 19:42:28 -04:00
|
|
|
}
|
|
|
|
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_map_t *locals_map = &o->locals_dict->map;
|
2019-04-05 16:03:03 -04:00
|
|
|
#if ENABLE_SPECIAL_ACCESSORS
|
|
|
|
// Check if the class has any special accessor methods
|
2021-05-04 14:40:55 -04:00
|
|
|
if (!(o->flags & MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS) &&
|
2021-03-15 09:57:36 -04:00
|
|
|
(map_has_special_accessors(locals_map) ||
|
|
|
|
(num_native_bases == 1 &&
|
|
|
|
native_base->locals_dict != NULL &&
|
|
|
|
map_has_special_accessors(&native_base->locals_dict->map)))) {
|
2021-05-04 14:40:55 -04:00
|
|
|
o->flags |= MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS;
|
2019-04-05 16:03:03 -04:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2014-07-05 00:55:00 -04:00
|
|
|
mp_map_elem_t *elem = mp_map_lookup(locals_map, MP_OBJ_NEW_QSTR(MP_QSTR___new__), MP_MAP_LOOKUP);
|
|
|
|
if (elem != NULL) {
|
|
|
|
// __new__ slot exists; check if it is a function
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_fun(elem->value)) {
|
2014-07-05 00:55:00 -04:00
|
|
|
// __new__ is a function, wrap it in a staticmethod decorator
|
2016-01-03 10:55:55 -05:00
|
|
|
elem->value = static_class_method_make_new(&mp_type_staticmethod, 1, 0, &elem->value);
|
2014-07-05 00:55:00 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(o);
|
2014-01-09 15:57:50 -05:00
|
|
|
}
|
2014-01-09 16:43:51 -05:00
|
|
|
|
|
|
|
/******************************************************************************/
|
2014-02-04 19:51:47 -05:00
|
|
|
// super object
|
|
|
|
|
|
|
|
typedef struct _mp_obj_super_t {
|
|
|
|
mp_obj_base_t base;
|
|
|
|
mp_obj_t type;
|
|
|
|
mp_obj_t obj;
|
|
|
|
} mp_obj_super_t;
|
|
|
|
|
2015-04-09 18:56:15 -04:00
|
|
|
STATIC void super_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
|
2015-01-20 07:47:20 -05:00
|
|
|
(void)kind;
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_super_t *self = MP_OBJ_TO_PTR(self_in);
|
2015-04-09 18:56:15 -04:00
|
|
|
mp_print_str(print, "<super: ");
|
|
|
|
mp_obj_print_helper(print, self->type, PRINT_STR);
|
|
|
|
mp_print_str(print, ", ");
|
|
|
|
mp_obj_print_helper(print, self->obj, PRINT_STR);
|
|
|
|
mp_print_str(print, ">");
|
2014-02-04 19:51:47 -05:00
|
|
|
}
|
|
|
|
|
2016-01-03 10:55:55 -05:00
|
|
|
STATIC mp_obj_t super_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
|
2015-01-20 07:47:20 -05:00
|
|
|
(void)type_in;
|
2015-01-20 09:11:27 -05:00
|
|
|
// 0 arguments are turned into 2 in the compiler
|
|
|
|
// 1 argument is not yet implemented
|
|
|
|
mp_arg_check_num(n_args, n_kw, 2, 2, false);
|
2021-04-22 20:55:39 -04:00
|
|
|
if (!mp_obj_is_type(args[0], &mp_type_type)) {
|
2021-05-04 14:40:55 -04:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("first argument to super() must be type"));
|
2018-03-25 17:13:49 -04:00
|
|
|
}
|
2017-04-21 22:14:04 -04:00
|
|
|
mp_obj_super_t *o = m_new_obj(mp_obj_super_t);
|
2021-03-15 09:57:36 -04:00
|
|
|
*o = (mp_obj_super_t) {{type_in}, args[0], args[1]};
|
2017-04-21 22:14:04 -04:00
|
|
|
return MP_OBJ_FROM_PTR(o);
|
2014-02-04 19:51:47 -05:00
|
|
|
}
|
|
|
|
|
2015-04-01 10:10:50 -04:00
|
|
|
STATIC void super_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
|
|
|
|
if (dest[0] != MP_OBJ_NULL) {
|
|
|
|
// not load attribute
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2021-04-22 20:55:39 -04:00
|
|
|
assert(mp_obj_is_type(self_in, &mp_type_super));
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_super_t *self = MP_OBJ_TO_PTR(self_in);
|
2014-02-04 19:51:47 -05:00
|
|
|
|
2021-04-22 20:55:39 -04:00
|
|
|
assert(mp_obj_is_type(self->type, &mp_type_type));
|
2014-02-04 19:51:47 -05:00
|
|
|
|
2015-11-27 12:01:44 -05:00
|
|
|
mp_obj_type_t *type = MP_OBJ_TO_PTR(self->type);
|
2014-02-04 19:51:47 -05:00
|
|
|
|
2014-06-08 13:50:12 -04:00
|
|
|
struct class_lookup_data lookup = {
|
2015-11-27 12:01:44 -05:00
|
|
|
.obj = MP_OBJ_TO_PTR(self->obj),
|
2014-06-08 13:50:12 -04:00
|
|
|
.attr = attr,
|
|
|
|
.meth_offset = 0,
|
|
|
|
.dest = dest,
|
2014-11-03 11:18:51 -05:00
|
|
|
.is_type = false,
|
2014-06-08 13:50:12 -04:00
|
|
|
};
|
2017-04-05 22:09:01 -04:00
|
|
|
|
2017-11-29 18:31:42 -05:00
|
|
|
// Allow a call super().__init__() to reach any native base classes
|
|
|
|
if (attr == MP_QSTR___init__) {
|
|
|
|
lookup.meth_offset = offsetof(mp_obj_type_t, make_new);
|
|
|
|
}
|
|
|
|
|
2021-07-12 08:30:16 -04:00
|
|
|
const void *parent = mp_type_get_parent_slot(type);
|
2021-07-06 10:08:57 -04:00
|
|
|
if (parent == NULL) {
|
2017-04-05 22:09:01 -04:00
|
|
|
// no parents, do nothing
|
2017-04-01 08:52:24 -04:00
|
|
|
#if MICROPY_MULTIPLE_INHERITANCE
|
2021-07-06 10:08:57 -04:00
|
|
|
} else if (((mp_obj_base_t *)parent)->type == &mp_type_tuple) {
|
|
|
|
const mp_obj_tuple_t *parent_tuple = parent;
|
2017-04-05 22:09:01 -04:00
|
|
|
size_t len = parent_tuple->len;
|
|
|
|
const mp_obj_t *items = parent_tuple->items;
|
|
|
|
for (size_t i = 0; i < len; i++) {
|
2021-04-22 20:55:39 -04:00
|
|
|
assert(mp_obj_is_type(items[i], &mp_type_type));
|
2017-11-29 18:31:42 -05:00
|
|
|
if (MP_OBJ_TO_PTR(items[i]) == &mp_type_object) {
|
|
|
|
// The "object" type will be searched at the end of this function,
|
|
|
|
// and we don't want to lookup native methods in object.
|
|
|
|
continue;
|
|
|
|
}
|
2021-03-15 09:57:36 -04:00
|
|
|
mp_obj_class_lookup(&lookup, (mp_obj_type_t *)MP_OBJ_TO_PTR(items[i]));
|
2017-04-05 22:09:01 -04:00
|
|
|
if (dest[0] != MP_OBJ_NULL) {
|
2018-03-25 15:25:32 -04:00
|
|
|
break;
|
2017-04-05 22:09:01 -04:00
|
|
|
}
|
|
|
|
}
|
2017-04-01 08:52:24 -04:00
|
|
|
#endif
|
2021-07-06 10:08:57 -04:00
|
|
|
} else if (parent != &mp_type_object) {
|
|
|
|
mp_obj_class_lookup(&lookup, parent);
|
2018-03-25 15:25:32 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (dest[0] != MP_OBJ_NULL) {
|
2017-11-29 18:31:42 -05:00
|
|
|
if (dest[0] == MP_OBJ_SENTINEL) {
|
|
|
|
// Looked up native __init__ so defer to it
|
|
|
|
dest[0] = MP_OBJ_FROM_PTR(&native_base_init_wrapper_obj);
|
|
|
|
dest[1] = self->obj;
|
2018-07-11 16:45:30 -04:00
|
|
|
} else {
|
|
|
|
mp_obj_t member = dest[0];
|
|
|
|
// changes to mp_obj_instance_load_attr may require changes
|
|
|
|
// here...
|
|
|
|
#if MICROPY_PY_BUILTINS_PROPERTY
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_type(member, &mp_type_property)) {
|
2018-07-11 16:45:30 -04:00
|
|
|
const mp_obj_t *proxy = mp_obj_property_get(member);
|
|
|
|
if (proxy[0] == mp_const_none) {
|
2021-05-05 20:51:52 -04:00
|
|
|
mp_raise_AttributeError(MP_ERROR_TEXT("unreadable attribute"));
|
2018-07-11 16:45:30 -04:00
|
|
|
} else {
|
|
|
|
dest[0] = mp_call_function_n_kw(proxy[0], 1, 0, &self_in);
|
|
|
|
}
|
2018-03-25 15:25:32 -04:00
|
|
|
}
|
2018-07-11 16:45:30 -04:00
|
|
|
#endif
|
|
|
|
#if MICROPY_PY_DESCRIPTORS
|
|
|
|
mp_obj_t attr_get_method[4];
|
|
|
|
mp_load_method_maybe(member, MP_QSTR___get__, attr_get_method);
|
|
|
|
if (attr_get_method[0] != MP_OBJ_NULL) {
|
|
|
|
attr_get_method[2] = self_in;
|
|
|
|
attr_get_method[3] = MP_OBJ_FROM_PTR(mp_obj_get_type(self_in));
|
|
|
|
dest[0] = mp_call_method_n_kw(2, 0, attr_get_method);
|
2018-07-12 14:13:51 -04:00
|
|
|
}
|
|
|
|
#endif
|
2018-07-13 22:51:10 -04:00
|
|
|
}
|
2018-03-25 15:25:32 -04:00
|
|
|
return;
|
2014-02-04 19:51:47 -05:00
|
|
|
}
|
2017-04-05 22:09:01 -04:00
|
|
|
|
2017-11-29 18:31:42 -05:00
|
|
|
// Reset meth_offset so we don't look up any native methods in object,
|
|
|
|
// because object never takes up the native base-class slot.
|
|
|
|
lookup.meth_offset = 0;
|
|
|
|
|
2014-06-08 13:50:12 -04:00
|
|
|
mp_obj_class_lookup(&lookup, &mp_type_object);
|
2014-02-04 19:51:47 -05:00
|
|
|
}
|
|
|
|
|
2014-03-29 09:43:38 -04:00
|
|
|
const mp_obj_type_t mp_type_super = {
|
2014-02-15 11:10:44 -05:00
|
|
|
{ &mp_type_type },
|
2014-02-15 06:34:50 -05:00
|
|
|
.name = MP_QSTR_super,
|
2014-02-04 19:51:47 -05:00
|
|
|
.print = super_print,
|
|
|
|
.make_new = super_make_new,
|
2015-04-01 10:10:50 -04:00
|
|
|
.attr = super_attr,
|
2014-02-04 19:51:47 -05:00
|
|
|
};
|
|
|
|
|
2017-04-18 19:45:59 -04:00
|
|
|
void mp_load_super_method(qstr attr, mp_obj_t *dest) {
|
|
|
|
mp_obj_super_t super = {{&mp_type_super}, dest[1], dest[2]};
|
|
|
|
mp_load_method(MP_OBJ_FROM_PTR(&super), attr, dest);
|
2014-02-04 19:51:47 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************/
|
2014-02-15 11:10:44 -05:00
|
|
|
// subclassing and built-ins specific to types
|
2014-01-09 16:43:51 -05:00
|
|
|
|
2014-03-03 17:38:13 -05:00
|
|
|
// object and classinfo should be type objects
|
|
|
|
// (but the function will fail gracefully if they are not)
|
2014-03-26 14:37:06 -04:00
|
|
|
bool mp_obj_is_subclass_fast(mp_const_obj_t object, mp_const_obj_t classinfo) {
|
2014-01-09 16:43:51 -05:00
|
|
|
for (;;) {
|
|
|
|
if (object == classinfo) {
|
2014-02-15 11:10:44 -05:00
|
|
|
return true;
|
2014-01-09 16:43:51 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// not equivalent classes, keep searching base classes
|
|
|
|
|
2014-03-03 17:38:13 -05:00
|
|
|
// object should always be a type object, but just return false if it's not
|
2021-04-22 20:55:39 -04:00
|
|
|
if (!mp_obj_is_type(object, &mp_type_type)) {
|
2014-03-03 17:38:13 -05:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2015-11-27 12:01:44 -05:00
|
|
|
const mp_obj_type_t *self = MP_OBJ_TO_PTR(object);
|
2021-07-12 08:30:16 -04:00
|
|
|
const void *parent = mp_type_get_parent_slot(self);
|
2014-01-09 16:43:51 -05:00
|
|
|
|
2021-07-06 10:08:57 -04:00
|
|
|
if (parent == NULL) {
|
2017-04-05 22:09:01 -04:00
|
|
|
// type has no parents
|
2014-02-15 11:10:44 -05:00
|
|
|
return false;
|
2017-04-01 08:52:24 -04:00
|
|
|
#if MICROPY_MULTIPLE_INHERITANCE
|
2021-07-06 10:08:57 -04:00
|
|
|
} else if (((mp_obj_base_t *)parent)->type == &mp_type_tuple) {
|
2017-04-05 22:09:01 -04:00
|
|
|
// get the base objects (they should be type objects)
|
2021-07-06 10:08:57 -04:00
|
|
|
const mp_obj_tuple_t *parent_tuple = parent;
|
2017-04-05 22:09:01 -04:00
|
|
|
const mp_obj_t *item = parent_tuple->items;
|
|
|
|
const mp_obj_t *top = item + parent_tuple->len - 1;
|
|
|
|
|
|
|
|
// iterate through the base objects
|
|
|
|
for (; item < top; ++item) {
|
|
|
|
if (mp_obj_is_subclass_fast(*item, classinfo)) {
|
|
|
|
return true;
|
|
|
|
}
|
2014-01-09 16:43:51 -05:00
|
|
|
}
|
|
|
|
|
2017-04-05 22:09:01 -04:00
|
|
|
// search last base (simple tail recursion elimination)
|
|
|
|
object = *item;
|
2017-04-01 08:52:24 -04:00
|
|
|
#endif
|
2017-04-05 22:09:01 -04:00
|
|
|
} else {
|
|
|
|
// type has 1 parent
|
2021-07-06 10:08:57 -04:00
|
|
|
object = MP_OBJ_FROM_PTR(parent);
|
2017-04-05 22:09:01 -04:00
|
|
|
}
|
2014-01-09 16:43:51 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-03 17:38:13 -05:00
|
|
|
STATIC mp_obj_t mp_obj_is_subclass(mp_obj_t object, mp_obj_t classinfo) {
|
2017-03-25 04:35:08 -04:00
|
|
|
size_t len;
|
2014-03-03 17:38:13 -05:00
|
|
|
mp_obj_t *items;
|
2021-04-22 20:55:39 -04:00
|
|
|
if (mp_obj_is_type(classinfo, &mp_type_type)) {
|
2014-03-03 17:38:13 -05:00
|
|
|
len = 1;
|
|
|
|
items = &classinfo;
|
2021-04-22 20:55:39 -04:00
|
|
|
} else if (mp_obj_is_type(classinfo, &mp_type_tuple)) {
|
2014-03-03 17:38:13 -05:00
|
|
|
mp_obj_tuple_get(classinfo, &len, &items);
|
|
|
|
} else {
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("issubclass() arg 2 must be a class or a tuple of classes"));
|
2014-02-27 15:48:25 -05:00
|
|
|
}
|
|
|
|
|
2017-03-24 01:58:13 -04:00
|
|
|
for (size_t i = 0; i < len; i++) {
|
2014-04-05 17:45:23 -04:00
|
|
|
// We explicitly check for 'object' here since no-one explicitly derives from it
|
2015-11-27 12:01:44 -05:00
|
|
|
if (items[i] == MP_OBJ_FROM_PTR(&mp_type_object) || mp_obj_is_subclass_fast(object, items[i])) {
|
2014-03-03 17:38:13 -05:00
|
|
|
return mp_const_true;
|
|
|
|
}
|
2014-02-27 15:48:25 -05:00
|
|
|
}
|
2014-03-03 17:38:13 -05:00
|
|
|
return mp_const_false;
|
2014-02-27 15:48:25 -05:00
|
|
|
}
|
|
|
|
|
2014-02-15 11:10:44 -05:00
|
|
|
STATIC mp_obj_t mp_builtin_issubclass(mp_obj_t object, mp_obj_t classinfo) {
|
2021-04-22 20:55:39 -04:00
|
|
|
if (!mp_obj_is_type(object, &mp_type_type)) {
|
2020-03-02 06:35:22 -05:00
|
|
|
mp_raise_TypeError(MP_ERROR_TEXT("issubclass() arg 1 must be a class"));
|
2014-03-03 17:38:13 -05:00
|
|
|
}
|
|
|
|
return mp_obj_is_subclass(object, classinfo);
|
2014-02-15 11:10:44 -05:00
|
|
|
}
|
|
|
|
|
2014-01-09 16:43:51 -05:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_2(mp_builtin_issubclass_obj, mp_builtin_issubclass);
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t mp_builtin_isinstance(mp_obj_t object, mp_obj_t classinfo) {
|
2015-11-27 12:01:44 -05:00
|
|
|
return mp_obj_is_subclass(MP_OBJ_FROM_PTR(mp_obj_get_type(object)), classinfo);
|
2014-01-09 16:43:51 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
MP_DEFINE_CONST_FUN_OBJ_2(mp_builtin_isinstance_obj, mp_builtin_isinstance);
|
2014-01-11 14:22:29 -05:00
|
|
|
|
2020-02-20 21:15:21 -05:00
|
|
|
mp_obj_t mp_obj_cast_to_native_base(mp_obj_t self_in, mp_const_obj_t native_type) {
|
2020-01-08 19:01:14 -05:00
|
|
|
const mp_obj_type_t *self_type = mp_obj_get_type(self_in);
|
2020-02-20 21:15:21 -05:00
|
|
|
|
2019-01-14 18:14:40 -05:00
|
|
|
if (MP_OBJ_FROM_PTR(self_type) == native_type) {
|
|
|
|
return self_in;
|
2020-02-20 21:15:21 -05:00
|
|
|
} else if (!mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(self_type), native_type)) {
|
2014-05-10 20:16:04 -04:00
|
|
|
return MP_OBJ_NULL;
|
2020-02-20 21:15:21 -05:00
|
|
|
} else {
|
|
|
|
mp_obj_instance_t *self = (mp_obj_instance_t *)MP_OBJ_TO_PTR(self_in);
|
|
|
|
return self->subobj[0];
|
2019-01-14 18:14:40 -05:00
|
|
|
}
|
2014-05-10 20:16:04 -04:00
|
|
|
}
|
|
|
|
|
2014-01-11 14:22:29 -05:00
|
|
|
/******************************************************************************/
|
|
|
|
// staticmethod and classmethod types (probably should go in a different file)
|
|
|
|
|
2016-01-03 10:55:55 -05:00
|
|
|
STATIC mp_obj_t static_class_method_make_new(const mp_obj_type_t *self, size_t n_args, size_t n_kw, const mp_obj_t *args) {
|
2015-11-27 12:01:44 -05:00
|
|
|
assert(self == &mp_type_staticmethod || self == &mp_type_classmethod);
|
2014-02-06 15:31:44 -05:00
|
|
|
|
2014-11-06 12:36:16 -05:00
|
|
|
mp_arg_check_num(n_args, n_kw, 1, 1, false);
|
2014-02-06 15:31:44 -05:00
|
|
|
|
|
|
|
mp_obj_static_class_method_t *o = m_new_obj(mp_obj_static_class_method_t);
|
2021-03-15 09:57:36 -04:00
|
|
|
*o = (mp_obj_static_class_method_t) {{self}, args[0]};
|
2015-11-27 12:01:44 -05:00
|
|
|
return MP_OBJ_FROM_PTR(o);
|
2014-02-06 15:31:44 -05:00
|
|
|
}
|
|
|
|
|
2014-01-11 14:22:29 -05:00
|
|
|
const mp_obj_type_t mp_type_staticmethod = {
|
2014-02-15 11:10:44 -05:00
|
|
|
{ &mp_type_type },
|
2014-02-15 06:34:50 -05:00
|
|
|
.name = MP_QSTR_staticmethod,
|
2015-04-04 10:53:11 -04:00
|
|
|
.make_new = static_class_method_make_new,
|
2014-01-11 14:22:29 -05:00
|
|
|
};
|
|
|
|
|
|
|
|
const mp_obj_type_t mp_type_classmethod = {
|
2014-02-15 11:10:44 -05:00
|
|
|
{ &mp_type_type },
|
2014-02-15 06:34:50 -05:00
|
|
|
.name = MP_QSTR_classmethod,
|
2015-04-04 10:53:11 -04:00
|
|
|
.make_new = static_class_method_make_new,
|
2014-01-11 14:22:29 -05:00
|
|
|
};
|