01cabb0324
Boosted performance, board.json metadata, more mimxrt, rp2, samd features
This release of MicroPython sees a boost to the overall performance of the
VM and runtime. This is achieved by the addition of an optional cache to
speed up general hash table lookups, as well as a fast path in the VM for
the LOAD_ATTR opcode on instance types. The new configuration options are
MICROPY_OPT_MAP_LOOKUP_CACHE and MICROPY_OPT_LOAD_ATTR_FAST_PATH. As part
of this improvement the MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE option has
been removed, which provided a similar map caching mechanism but with the
cache stored in the bytecode, which made it not useful on bare metal ports.
The new mechanism is measured to be at least as good as the old one,
applies to more map lookups, has a constant RAM overhead, and applies to
native code as well as bytecode.
These performance options are enabled on the esp32, mimxrt, rp2, stm32 and
unix ports. For esp32 and mimxrt some code is also moved to RAM to further
boost performance. On stm32, performance increases by about 20% for
benchmarks that are heavy on name lookups, like misc_pystone.py and
misc_raytrace.py. On esp32 performance can increase by 2-3x, and on mimxrt
it is up to 6x.
All boards in all ports now have a board.json metadata file, which is used
to automatically build firmware and generate a webpage for that board
(among other possibilities). Auto-build scripts have been added for this
purpose and they build all esp32, mimxrt, rp2, samd and stm32 boards. The
generated output is available at https://micropython.org/download.
Support for FROZEN_DIR and FROZEN_MPY_DIR has been deprecated for some time
and was finally removed in this release. Instead of these, FROZEN_MANIFEST
can be used. The io.resource_stream() function is also removed, replaced
by the pure Python version in micropython-lib.
The search order for importing frozen Python modules is now controlled by
the ".frozen" entry in sys.path. This string is added by default in the
second position in sys.path. User code should adjust sys.path depending on
the desired behaviour. Putting ".frozen" first in sys.path will speed up
importing frozen modules.
A bug in multiple precision integers with bitwise of -0 was fixed in commit
2c139bbf4e
.
The platform module has been added to allow querying the compiler and
underlying SDK/HAL/libc version. This is enabled on esp32, mimxrt and
stm32 ports.
The mpremote tool now supports seek, flush, mkdir and rmdir on PC-mounted
filesystems. And a help command has been added.
The documentation has seen many additions and improvements thanks (for a
second time) to the Google Season of Docs project. The rp2 documentation
now includes a reference for PIO assembly instructions, a PIO quick
reference and a PIO tutorial. The random and stm modules have been
documented, along with sys.settrace, manifest.py files and mpremote. There
is also now more detail about the differences between MicroPython and
standard Python 3.5 and above.
The esp32 port sees support for ESP32-S3 SoCs, and new boards GENERIC_S3,
ESP32_S2_WROVER, LOLIN_S2_MINI, LOLIN_S2_PICO and UM_FEATHERS2NEO. The PWM
driver has been improved and now supports all PWM timers and channels, and
the duty_u16() and duty_ns() methods, and it keeps the duty constant when
changing frequency. The machine.bitstream() function has been improved to
use RMT, with an option to select the original bit-banging implementation.
The mimxrt port gained new hardware features: SDRAM and SD card support, as
well as network integration with a LAN driver. The machine.WDT class was
added along with the machine.reset_cause(), machine.soft_reset(),
machine.unique_id() add machine.bitstream() functions. DHT sensor support
was added, and f-strings were enabled.
The rp2 port now has support for networking, and bluetooth using NimBLE.
The Nina-W10 WiFi/BT driver is fully integrated and supported by the new
Arduino Nano RP2040 connect board. I2S protocol support is added along
with a machine.bitstream() driver and DHT sensor support. The PWM driver
had a bug fix with the accuracy of setting/getting the frequency, and the
duty value is now retained when changing the frequency.
On the samd port there is now support for the internal flash being a block
device, and for filesystems and the os module. Pin and LED classes have
been implemented. There are more time functions, more Python features
enabled, and the help() function is added. SEEED_WIO_TERMINAL and
SEEED_XIAO board definitions are now available.
The stm32 port now has support for F427, F479 and H7A3(Q)/H7B3(Q) MCUs, and
new board definitions for VCC_GND_H743VI, OLIMEX_H407, MIKROE_QUAIL,
GARATRONIC_PYBSTICK26_F411, STM32H73B3I_DK. A bug was fixed in the SPI
driver where a SPI transfer could fail if the CYW43 WiFi driver was also
active at the same time.
On the windows port the help() function has been enabled, and support for
build variants added, to match the unix port.
The zephyr port upgraded Zephyr to v2.7.0.
The change in code size since the previous release for various ports is
(absolute and percentage change in the text section):
bare-arm: -1520 -2.605%
minimal x86: -2256 -1.531%
unix x64: -457 -0.089%
unix nanbox: -925 -0.204%
stm32: +312 +0.079% PYBV10
cc3200: -176 -0.096%
esp8266: +532 +0.076% GENERIC
esp32: +27096 +1.820% GENERIC
nrf: -212 -0.121% pca10040
rp2: +9904 +2.051% PICO
samd: +35332 +33.969% ADAFRUIT_ITSYBITSY_M4_EXPRESS
The changes that dominate these numbers are:
- bare-arm, minimal: use of new MICROPY_CONFIG_ROM_LEVEL_MINIMUM option and
subsequent disabling of remaining optional features
- unix, cc3200, nrf: general code size reductions of the core
- stm32: performance improvements, addition of platform module
- esp8266: enabling f-strings
- esp32: use of -O2 instead of -Os
- rp2: machine.I2S and other new hardware features
- samd: filesystem support and other new hardware features
Thanks to everyone who contributed to this release: Alan Dragomirecký,
Alexey Shvetsov, Andrew Leech, Andrew Scheller, Antoine Aubert, Boris
Vinogradov, Chris Boudacoff, Chris Fiege, Christian Decker, Damien George,
Daniel Gorny, Dave Hylands, David Michieli, Emilie Feral, Frédéric Pierson,
gibbonsc, Henk Vergonet, iabdalkader, Ihor Nehrutsa, Jan Hrudka, Jan Staal,
jc_.kim, Jim Mussared, Jonathan Hogg, Laurens Valk, leo chung, Lorenzo
Cappelletti, Magnus von Wachenfeldt, Matt Trentini, Matt van de Werken,
Maureen Helm, Michael Bentley, Michael Buesch, Mike Causer, Mike Teachman,
Mike Wadsten, Ned Konz, NitiKaur, oli, patrick, Patrick Van Oosterwijck,
Peter Boin, Peter Hinch, Peter van der Burg, Philipp Ebensberger, Pooya
Moradi, retsyo, robert-hh, roland van straten, Scott Armitage, Sebastian
Wicki, Seon Rozenblum, Sergei Silnov, Simon Baatz, Stewart Bonnick, stijn,
Tobias Thyrrestrup, Tomas Vanek, YoungJoon Chun.
What follows is a detailed list of changes, generated from the git commit
history, and organised into sections.
Main components
===============
all:
- remove MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
- update Python formatting to latest Black version 21.12b0
- remove support for FROZEN_DIR and FROZEN_MPY_DIR
py core:
- parse: simplify parse nodes representing a list
- emitnative: ensure load_subscr does not clobber existing REG_RET
- mpconfig.h: define initial templates for "feature levels"
- vm: add a fast path for LOAD_ATTR on instance types
- map: add an optional cache of (map+index) to speed up map lookups
- builtinimport: forward all debug printing to MICROPY_DEBUG_PRINTER
- add wrapper macros so hot VM functions can go in fast code location
- runtime: fix crash when exc __new__ doesn't return an exc instance
- mpconfig.h: define the "extra" feature level
- mpconfig.h: revert MICROPY_REPL_INFO to disabled at all levels
- gc: add hook to run code during time consuming GC operations
- showbc: print unary-op string when dumping bytecode
- modsys: replace non-ASCII quote char with ASCII char
- runtime: allow types to use both .attr and .locals_dict
- lexer: support nested [] and {} characters within f-string params
- objfun.h: remove obsolete comments about entries in extra_args
- builtinimport: refactor module importing
- showbc: fix printing of raw bytecode header on nanbox builds
- modio: remove io.resource_stream function
- only search frozen modules when '.frozen' is found in sys.path
- mkrules.cmake: set frozen preprocessor defs early
- runtime: allow initialising sys.path/argv with defaults
- mpstate.h: only include sys.path/argv objects in state when enabled
- mpz: fix bugs with bitwise of -0 by ensuring all 0's are positive
- qstr: reset mpstate.qstr_last_chunk before raising an error
- modbuiltins: add additional macro for extending builtins
- mpconfig.h: define MICROPY_PY_USSL_FINALISER only if not defined
extmod:
- machine_i2c: make SoftI2C configurable via macro option
- machine_spi: make SoftSPI configurable via macro option
- modonewire: make _onewire module configurable via macro option
- machine_pwm: factor out machine.PWM bindings to common code
- move modnetwork and modusocket from stm32 to extmod
- modnetwork: add STA_IF and AP_IF constants
- modnetwork: add extended socket state
- modusocket: add read/write stream methods to socket object
- modnetwork: define network interfaces in port config files
- network_cyw43: make consistent use of STA and AP constants
- modnetwork: remove STM32 references
- modnetwork: remove modnetwork socket u_state member
- mpbthci.h: add mp_bluetooth_hci_uart_any prototype
- nimble: add nimble CMake fragment file
- add platform module
- moduplatform: improve implementation for PC ports
- vfs_posix_file: support MP_STREAM_POLL in vfs_posix_file_ioctl
- modbluetooth: add connection interval to gap_connect
- nimble: update to NimBLE v1.4
- nimble: remove workaround for OS_ENOMEM
- uasyncio: fix gather returning exceptions from a cancelled task
- uplatform: remove unused definitions
- uplatform: use generic custom platform string
- network_ninaw10: fix scan list order to match other NICs
- modbluetooth: support gap_connect(None) to cancel a connection
- modure: redirect regex debug printing to mp_printf
- network_ninaw10: fix config of AP mode
- network_ninaw10: disable active connections before connecting
- network_ninaw10: make NIC state persistent
- network_ninaw10: return -1 on timeout from recv/send
- network_ninaw10: make recv/recvfrom interchangeable
- moduplatform: detect xtensa arch
- modusocket: allow setting timeout on unbound sockets
- modusocket: initialise accepted socket state
- network_ninaw10: use socket timeout preset in modusocket
- modbluetooth: fix conditional compilation of ringbuf_put_uuid
- modbluetooth: put declaration of connect_cancel in correct place
shared:
- libc/string0: don't include string.h, and provide __memcpy_chk
- runtime/pyexec: cleanup EXEC_FLAG flag constants
drivers:
- ninaw10: add ublox Nina-W10 WiFi/BT module driver
- lsm6dsox: add LSM6DSOX driver and examples
- neopixel: avoid heap alloc in fill()
- ninaw10: fix BSSID byte order, and add null byte to ESSID
- ninaw10/nina_wifi_drv: fix DNS resolution
mpy-cross: no changes specific to this component/port
lib:
- mynewt-nimble: switch to the MicroPython fork of NimBLE
- asf4: point submodule to latest commit on circuitpython branch
- update pico-sdk to 1.3.0 and tinyusb to 0.12.0
- stm32lib: update library for L4 v1.17.0, new G4, WL, and MMC fixes
- stm32lib: update library for fix to F7 USB HS
Support components
==================
docs:
- library/os.rst: clarify littlefs requirements for block erase
- library/bluetooth.rst: update incorrect link to gatts_write
- make.bat: change Windows output dir from '_build' to 'build'
- library/machine.I2S.rst: specify that I2S.shift args are kw-only
- esp32: explain ESP32 PWM modes, timers, and channels
- rp2: add reference for PIO assembly instructions, and PIO tutorial
- library/random.rst: document the random module
- reference/mpremote.rst: add docs for mpremote
- reference/manifest.rst: add docs for manifest.py files
- library/stm.rst: document the stm module
- esp32/tutorial: add an example of peripheral control via regs
- rp2/general.rst: fix typo with missing spaces
- library/framebuf.rst: adjust dimensions in example
- library/rp2.rst: update function asm_pio_encode to add sideset_opt
- reference/filesystem.rst: add detail on how to use littlefs fuse
- rp2/quickref.rst: add section on PIO
- library/sys.rst: add docs for sys.settrace
- esp8266/tutorial: fix comments of FrameBuffer examples
- library/uasyncio.rst: detail exception behaviour in cancel/timeout
- library/machine.Timer.rst: document 'id' as positional-only arg
- library/machine.SPI.rst: add example SPI usage
- library/machine.Timer.rst: document `period` and `callback` args
- library/machine.Pin.rst: add Pin.ANALOG mode constant
- remove trailing spaces and convert tabs to spaces
- library/sys.rst: add note about '.frozen' as an entry in sys.path
- differences: document details of new PEPs/features in Python 3.5+
- update copyright year range to include 2022
- esp32: update RMT quickref example to match latest code
examples: no changes specific to this component/port
tests:
- perf_bench: use math.log instead of math.log2
- basics: add tests for type-checking subclassed exc instances
- micropython/const.py: add comment about required config for test
- cpydiff: clarify f-string diffs regarding concatenation
- basics/int_big_cmp.py: add more tests for big-int comparison
- extmod: skip uselect_poll_udp when poll() is not available
tools:
- autobuild: add auto build for GENERIC_C3_USB
- ci.sh: use IDF v4.4 as part of esp32 CI and build GENERIC_S3
- autobuild: add the MIMXRT1010_EVK board to autobuild
- ci.sh: use a specific ESP IDF v4.4 commit
- autobuild: add script to generate website board metadata
- dfu.py: make tool work with python3 when parsing DFU files
- autobuild: automatically build all mimxrt, rp2 and samd boards
- autobuild: automatically build all stm32 boards
- mpremote: implement seek and flush in ioctl method
- autobuild: automatically build all esp32 boards
- upip.py: support == to specify exact package version
- makemanifest.py: make str conversion compatible with Python 2
- makemanifest.py: merge make-frozen.py
- mpremote: add mkdir and rmdir to RemoteFS
- mpremote: add help command
- mpremote: add link to mpremote docs URL in help message
- upip.py: skip '.frozen' entry in sys.path for install path
- autobuild: build esp8266 OTA image with GENERIC_1M board
- ci.sh: upgrade Zephyr docker image to v0.21.0
- ci.sh: build zephyr nucleo_wb55rg to test zephyr bluetooth build
CI:
- workflows: use Python 3.8 for macos workflow
- workflows: add new workflow to build ports download metadata
The ports
=========
all ports:
- add board.json for all boards
- add images, features and urls to board.json
- add '.frozen' as the first entry in sys.path
- move '.frozen' to second entry in sys.path
bare-arm port:
- mpconfigport.h: use MICROPY_CONFIG_ROM_LEVEL_MINIMUM
- mpconfigport.h: disable remaining optional features
cc3200 port: no changes specific to this component/port
esp8266 port:
- boards/GENERIC: enable f-strings
- extract qstr from object when comparing keys in config()
- etshal.h: remove unneeded function declarations
- allow building a board to any dest directory
esp32 port:
- boards: add new FeatherS2-Neo board definition
- machine_timer: use tx_update member for IDF 4.4 and above
- add support for ESP32-S3 SoCs
- boards: add new GENERIC_S3 board definition
- machine_hw_spi: fix hardware SPI DMA channels for S2/S3
- boards: add board definition for ESP32-S2-WROVER module
- boards: add LOLIN_S2_MINI ESP32-S2 board
- machine_pwm: add support for all PWM timers and channels
- README: updated readme with req IDF vers for ESP32-S2, C3 and S3
- usb: add USB host connection detection for CDC serial output
- machine_pin: block out IO16 and IO17 when using SPIRAM on ESP32
- mpthreadport: fix TCB cleanup function so thread_mutex is ready
- main: add option for a board to hook code into startup sequence
- split out WLAN code from modnetwork.c to network_wlan.c
- enable optimisations and move code to iRAM to boost performance
- usb: improve speed of USB CDC output
- add specific deploy_s2.md instructions for esp32-s2
- boards/LOLIN_S2_MINI: add image to board.json
- boards: update board and deploy metadata for UM_xxx boards
- usb: further improve speed of USB CDC output
- boards/LOLIN_S2_PICO: add LOLIN_S2_PICO board definition files
- boards/ESP32_S2_WROVER: link to specific deploy_s2 instructions
- support building with latest IDF v5
- in machine_i2s, send null samples in underflow situations
- in machine_i2s, make object reference arrays root pointers
- add SDCard support for S3, and a GENERIC_S3_SPIRAM board
- boards/GENERIC_S3: enable BLE on ESP32 S3
- machine_pwm: implement duty_u16() and duty_ns() PWM methods
- extract qstr from object when comparing keys in config()
- machine_pin: make GPIO 26 usable for S2,S3 if SPIRAM not config'd
- machine_hw_spi: fix SPI default pins reordering on ESP32-S2/S3
- machine_hw_spi: set proper default SPI(id=1) pins on S2,S3 and C3
- machine_hw_spi: set proper default SPI(id=2) pins on S2 and S3
- boards: remove SPI pin defaults from GENERIC S2/S3 boards
- modnetwork: synchronize WiFi AUTH_xxx constants with IDF values
- machine_pwm: keep duty constant when changing frequency
- machine_bitstream: replace bit-bang code with RMT-based driver
- machine_i2s: add support for ESP-IDF 4.4
- machine_bitstream: fix signal duplication on output pins
- esp32: enable platform module with IDF version
- boards/GENERIC_D2WD: build with -Os optimisation
- esp32_rmt: install RMT driver on core 1
- machine_bitstream: reinstate bitstream bit-bang implementation
javascript port: no changes specific to this component/port
mimxrt port:
- sdcard: implement SDCard driver
- machine_bitstream: add bitstream function to machine module
- rework flash configuration
- sdram: add SDRAM support
- eth: add LAN support and integrate the network module
- modmachine: implement machine.WDT() and machine.reset_cause()
- boards: fix the D14/D15 pin assignment of MIMXRT1050/60/64_EVK
- hal: remove duplicate definitions from flexspi_hyper_flash.h
- dma_channel: fix the DMA channel management
- fix cycle counter for time.ticks_cpu() and machine.bitstream()
- add dht_readinto() to the mimxrt module, and freeze dht.py
- extend the help() message and README.md
- mpconfigport.h: enable f-strings
- modmachine: implement soft_reset() and unique_id() functions
- boards/make-pins.py: allow empty lines and comments in pins.csv
- optimize the runtime speed
- enable the platform module
- boards: add the Seeed ARCH MIX board
- boards: update the board.json files and add deploy_xx.md files
- fix mp_hal_quiet_timing_enter()/exit() so timer still runs
- support PWM using the FLEXPWM and QTMR modules
- define UART 0 on MIMXRT boards
- support selection of PHY type and address
- re-enable eth checksum creation by HW
- fix a tiny unnoticed bug in sdcard.c
- add a driver for the DP83848 PHY device
- refactor the reading of the machine id
- enable ticks_cpu at boot time for NDEBUG builds only
- use -Og instead of -O0 for DEBUG builds
- tidy up the board flash related files
- hal: allow readSampleClkSrc to be configured by a board
- enable MICROPY_PY_USSL_FINALISER
minimal port:
- mpconfigport.h: use MICROPY_CONFIG_ROM_LEVEL_MINIMUM
- Makefile: don't force a 32-bit build
- mpconfigport.h: disable features that are not needed
nrf port:
- Makefile: improve Black Magic Probe commands
- main: use VFS helper function to mount fs and chdir
pic16bit port: no changes specific to this component/port
powerpc port: no changes specific to this component/port
qemu-arm port: no changes specific to this component/port
rp2 port:
- mpconfigport.h: enable heapq module
- add support for bluetooth module using NimBLE
- add framework for networking
- mpconfigport.h: use the "extra" feature level
- enable optimisations (comp goto, map cache, fast attr)
- machine_i2s: add I2S protocol support
- add support for Nina-W10 WiFi/BT module
- boards: add support for Arduino Nano RP2040
- machine_bitstream: implement the machine.bitstream driver
- boards: add neopixel.py to manifest.py
- rp2_pio: support exec with sideset
- boards/PIMORONI_PICOLIPO_16MB: fix 16MB flash size
- boards: add PYBSTICK26 RP2040 board definition
- machine_uart: handle and clear UART RX timeout IRQ
- boards/ARDUINO_NANO_RP2040_CONNECT: set default I2C pins
- machine_pwm: fix PWM frequency setting
- machine_pwm: keep duty value when changing the frequency
- add support for DHT11 and DHT22 sensors
- CMakeLists.txt: allow a board to override PICO_BOARD
- boards/GARATRONIC_PYBSTICK26_RP2040: use correct pico-sdk board cfg
samd port:
- integrate latest asf4, add help, more time funcs and uPy features
- samd_soc: allow a board to configure the low-level MCU config
- add internal flash block device, filesystem and uos support
- add Pin and LED classes, and machine.unique_id
- boards/ADAFRUIT_FEATHER_M0_EXPRESS: update for flash and pins
- boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS: update for flash and pins
- boards/MINISAM_M4: update for flash and pins
- boards/ADAFRUIT_TRINKET_M0: update for flash and pins
- boards/SAMD21_XPLAINED_PRO: update for flash and pins
- boards/SEEED_WIO_TERMINAL: add new board definition
- boards/SEEED_XIAO: add new board definition
- README.md: update README to reflect new features and boards
stm32 port:
- pin: enable GPIO clock of pin if it's constructed without init
- main: don't unconditionally enable GPIO A,B,C,D clocks
- boards/VCC_GND_H743VI: add board definition for VCC_GND_H743VI
- boards/OLIMEX_E407: add Ethernet RMII support
- boards/LEGO_HUB_NO6: remove user paths from cc2564 init file
- boards: remove trailing spaces, and add newline at end of file
- add basic support for STM32H750
- add support for H7A3(Q)/H7B3(Q), and STM32H73B3I_DK board defn
- suggest putting code in main.py not boot.py
- boards/make-pins.py: allow a CPU pin to be hidden
- boards/make-pins.py: allow empty lines and comments in pins.csv
- dma: add functions for external users of DMA to enable clock
- enable LOAD_ATTR fast path, and map lookup caching on >M0
- boards: add OLIMEX H407 board definition
- enable platform module
- extended flash filesystem space to 512K on H743 boards
- boards/NUCLEO_H743ZI: enable VfsLfs2 on NUCLEO_H743ZI(2) boards
- boards: add PF11-BOOT0 to stm32f091_af.csv
- machine_i2c: use hardware I2C for STM32H7
- sdram: enforce gcc opt, and use volatile and DSB in sdram_test
- usbd_cdc_interface: allow a board to hook into USBD CDC RX events
- mpbthciport: allow a board to hook BT HCI poll functions
- pendsv: allow a board to add entries for pendsv_schedule_dispatch
- boards: add images to board.json for Adafruit and VCC_GND boards
- uart: fix race conditions and clearing status in IRQ handler
- mpconfigport.h: use the "extra" feature level
- in machine_i2s, send null samples in underflow situations
- in machine_i2s, make object reference arrays root pointers
- led: support an extra 2 LEDs in board configuration
- boards/MIKROE_CLICKER2_STM32: add more detail to board.json
- boards: add new board MikroElektronika Quail, and F427 support
- main: run optional frozen module at boot
- sdio: don't explicitly disable DMA2 on deinit of SDIO
- dma: make DMA2_Stream3 exclusive to SDIO when CYW43 enabled
- boards: build NUCLEO_WB55 and STM32F769DISC without mboot enabled
- boards: add PYBSTICK26 F411 board definition
- boards/NADHAT_PYBF405: rename board to GARATRONIC_NADHAT_F405
- usb: use a table of allowed values to simplify usb_mode get/set
- boards/NUCLEO_WB55: update rfcore_firmwre for new WS
- flashbdev: support generic flash storage config via link symbols
- boards: convert F413,F439,H743,L4xx,WB55 to new flash FS config
- add support for F479 MCUs
- include HAL MMC code in F4 builds
- boards/make-pins.py: use cpu pins to define static alt-fun macros
- boards/NUCLEO_WB55: fix LED ordering
- boards/LEGO_HUB_NO6: set filesystem label as HUB_NO6
- boards: remove stray '+' characters at start of lines in ld files
- boards: remove unused MICROPY_HW_ENABLE_TIMER config
- boards: enable MICROPY_HW_ENABLE_SERVO on various boards
- update L4 code to build with latest stm32lib and L4 HAL 1.17.0
- main: call sdcard_init when only MICROPY_HW_ENABLE_MMCARD enabled
- sdcard: support 8-bit wide SDIO bus
- sdcard: add config option to force MM card capacity
- factoryreset: init vfs flags before calling pyb_flash_init_vfs
- qspi: fix typo in address comment
- boards/make-pins.py: generate empty ADC table if needed
- boards/OLIMEX_H407: fix typo in OLIMEX H407 board.json
- network_wiznet5k: fix build error with wiznet5k and lwip enabled
- enable MICROPY_PY_USSL_FINALISER
teensy port:
- switch to use manifest.py instead of FROZEN_DIR
unix port:
- enable LOAD_ATTR fast path, and map lookup caching
- modusocket: support MP_STREAM_POLL in unix socket_ioctl
- modos: add support for uos.urandom(n)
- coverage: change remaining printf to mp_printf
- Makefile: use -Og instead of -O0 for debug builds
windows port:
- README: remove unsupported Python instructions for Cygwin
- mpconfigport.h: enable help and help("modules")
- add support for build variants to windows port
- run tests via Makefile
- appveyor: build both standard and dev variants
- appveyor: build mpy-cross only once for mingw-w64
- msvc: run qstr preprocessing phase in parallel
zephyr port:
- mphalport.h: remove unused and unimplemented C-level pin API
- increase minimum CMake version to 3.20.0
- update include path to reboot.h
- get UART console device from devicetree instead of Kconfig
- use CONFIG_USB_DEVICE_STACK for conditional USB device support
- upgrade to Zephyr v2.7.0
- modbluetooth_zephyr: provide dummy connect_cancel function
1751 lines
47 KiB
C
1751 lines
47 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* SPDX-FileCopyrightText: Copyright (c) 2013, 2014 Damien P. George
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
|
|
#include "py/mpz.h"
|
|
|
|
#if MICROPY_LONGINT_IMPL == MICROPY_LONGINT_IMPL_MPZ
|
|
|
|
#define DIG_SIZE (MPZ_DIG_SIZE)
|
|
#define DIG_MASK ((MPZ_LONG_1 << DIG_SIZE) - 1)
|
|
#define DIG_MSB (MPZ_LONG_1 << (DIG_SIZE - 1))
|
|
#define DIG_BASE (MPZ_LONG_1 << DIG_SIZE)
|
|
|
|
/*
|
|
mpz is an arbitrary precision integer type with a public API.
|
|
|
|
mpn functions act on non-negative integers represented by an array of generalised
|
|
digits (eg a word per digit). You also need to specify separately the length of the
|
|
array. There is no public API for mpn. Rather, the functions are used by mpz to
|
|
implement its features.
|
|
|
|
Integer values are stored little endian (first digit is first in memory).
|
|
|
|
Definition of normalise: ?
|
|
*/
|
|
|
|
STATIC size_t mpn_remove_trailing_zeros(mpz_dig_t *oidig, mpz_dig_t *idig) {
|
|
for (--idig; idig >= oidig && *idig == 0; --idig) {
|
|
}
|
|
return idig + 1 - oidig;
|
|
}
|
|
|
|
/* compares i with j
|
|
returns sign(i - j)
|
|
assumes i, j are normalised
|
|
*/
|
|
STATIC int mpn_cmp(const mpz_dig_t *idig, size_t ilen, const mpz_dig_t *jdig, size_t jlen) {
|
|
if (ilen < jlen) {
|
|
return -1;
|
|
}
|
|
if (ilen > jlen) {
|
|
return 1;
|
|
}
|
|
|
|
for (idig += ilen, jdig += ilen; ilen > 0; --ilen) {
|
|
mpz_dbl_dig_signed_t cmp = (mpz_dbl_dig_t)*(--idig) - (mpz_dbl_dig_t)*(--jdig);
|
|
if (cmp < 0) {
|
|
return -1;
|
|
}
|
|
if (cmp > 0) {
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* computes i = j << n
|
|
returns number of digits in i
|
|
assumes enough memory in i; assumes normalised j; assumes n > 0
|
|
can have i, j pointing to same memory
|
|
*/
|
|
STATIC size_t mpn_shl(mpz_dig_t *idig, mpz_dig_t *jdig, size_t jlen, mp_uint_t n) {
|
|
mp_uint_t n_whole = (n + DIG_SIZE - 1) / DIG_SIZE;
|
|
mp_uint_t n_part = n % DIG_SIZE;
|
|
if (n_part == 0) {
|
|
n_part = DIG_SIZE;
|
|
}
|
|
|
|
// start from the high end of the digit arrays
|
|
idig += jlen + n_whole - 1;
|
|
jdig += jlen - 1;
|
|
|
|
// shift the digits
|
|
mpz_dbl_dig_t d = 0;
|
|
for (size_t i = jlen; i > 0; i--, idig--, jdig--) {
|
|
d |= *jdig;
|
|
*idig = (d >> (DIG_SIZE - n_part)) & DIG_MASK;
|
|
d <<= DIG_SIZE;
|
|
}
|
|
|
|
// store remaining bits
|
|
*idig = (d >> (DIG_SIZE - n_part)) & DIG_MASK;
|
|
idig -= n_whole - 1;
|
|
memset(idig, 0, (n_whole - 1) * sizeof(mpz_dig_t));
|
|
|
|
// work out length of result
|
|
jlen += n_whole;
|
|
while (jlen != 0 && idig[jlen - 1] == 0) {
|
|
jlen--;
|
|
}
|
|
|
|
// return length of result
|
|
return jlen;
|
|
}
|
|
|
|
/* computes i = j >> n
|
|
returns number of digits in i
|
|
assumes enough memory in i; assumes normalised j; assumes n > 0
|
|
can have i, j pointing to same memory
|
|
*/
|
|
STATIC size_t mpn_shr(mpz_dig_t *idig, mpz_dig_t *jdig, size_t jlen, mp_uint_t n) {
|
|
mp_uint_t n_whole = n / DIG_SIZE;
|
|
mp_uint_t n_part = n % DIG_SIZE;
|
|
|
|
if (n_whole >= jlen) {
|
|
return 0;
|
|
}
|
|
|
|
jdig += n_whole;
|
|
jlen -= n_whole;
|
|
|
|
for (size_t i = jlen; i > 0; i--, idig++, jdig++) {
|
|
mpz_dbl_dig_t d = *jdig;
|
|
if (i > 1) {
|
|
d |= (mpz_dbl_dig_t)jdig[1] << DIG_SIZE;
|
|
}
|
|
d >>= n_part;
|
|
*idig = d & DIG_MASK;
|
|
}
|
|
|
|
if (idig[-1] == 0) {
|
|
jlen--;
|
|
}
|
|
|
|
return jlen;
|
|
}
|
|
|
|
/* computes i = j + k
|
|
returns number of digits in i
|
|
assumes enough memory in i; assumes normalised j, k; assumes jlen >= klen
|
|
can have i, j, k pointing to same memory
|
|
*/
|
|
STATIC size_t mpn_add(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen) {
|
|
mpz_dig_t *oidig = idig;
|
|
mpz_dbl_dig_t carry = 0;
|
|
|
|
jlen -= klen;
|
|
|
|
for (; klen > 0; --klen, ++idig, ++jdig, ++kdig) {
|
|
carry += (mpz_dbl_dig_t)*jdig + (mpz_dbl_dig_t)*kdig;
|
|
*idig = carry & DIG_MASK;
|
|
carry >>= DIG_SIZE;
|
|
}
|
|
|
|
for (; jlen > 0; --jlen, ++idig, ++jdig) {
|
|
carry += *jdig;
|
|
*idig = carry & DIG_MASK;
|
|
carry >>= DIG_SIZE;
|
|
}
|
|
|
|
if (carry != 0) {
|
|
*idig++ = carry;
|
|
}
|
|
|
|
return idig - oidig;
|
|
}
|
|
|
|
/* computes i = j - k
|
|
returns number of digits in i
|
|
assumes enough memory in i; assumes normalised j, k; assumes j >= k
|
|
can have i, j, k pointing to same memory
|
|
*/
|
|
STATIC size_t mpn_sub(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen) {
|
|
mpz_dig_t *oidig = idig;
|
|
mpz_dbl_dig_signed_t borrow = 0;
|
|
|
|
jlen -= klen;
|
|
|
|
for (; klen > 0; --klen, ++idig, ++jdig, ++kdig) {
|
|
borrow += (mpz_dbl_dig_t)*jdig - (mpz_dbl_dig_t)*kdig;
|
|
*idig = borrow & DIG_MASK;
|
|
borrow >>= DIG_SIZE;
|
|
}
|
|
|
|
for (; jlen > 0; --jlen, ++idig, ++jdig) {
|
|
borrow += *jdig;
|
|
*idig = borrow & DIG_MASK;
|
|
borrow >>= DIG_SIZE;
|
|
}
|
|
|
|
return mpn_remove_trailing_zeros(oidig, idig);
|
|
}
|
|
|
|
#if MICROPY_OPT_MPZ_BITWISE
|
|
|
|
/* computes i = j & k
|
|
returns number of digits in i
|
|
assumes enough memory in i; assumes normalised j, k; assumes jlen >= klen (jlen argument not needed)
|
|
can have i, j, k pointing to same memory
|
|
*/
|
|
STATIC size_t mpn_and(mpz_dig_t *idig, const mpz_dig_t *jdig, const mpz_dig_t *kdig, size_t klen) {
|
|
mpz_dig_t *oidig = idig;
|
|
|
|
for (; klen > 0; --klen, ++idig, ++jdig, ++kdig) {
|
|
*idig = *jdig & *kdig;
|
|
}
|
|
|
|
return mpn_remove_trailing_zeros(oidig, idig);
|
|
}
|
|
|
|
#endif
|
|
|
|
/* i = -((-j) & (-k)) = ~((~j + 1) & (~k + 1)) + 1
|
|
i = (j & (-k)) = (j & (~k + 1)) = ( j & (~k + 1))
|
|
i = ((-j) & k) = ((~j + 1) & k) = ((~j + 1) & k )
|
|
computes general form:
|
|
i = (im ^ (((j ^ jm) + jc) & ((k ^ km) + kc))) + ic where Xm = Xc == 0 ? 0 : DIG_MASK
|
|
returns number of digits in i
|
|
assumes enough memory in i; assumes normalised j, k; assumes length j >= length k
|
|
can have i, j, k pointing to same memory
|
|
*/
|
|
STATIC size_t mpn_and_neg(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen,
|
|
mpz_dbl_dig_t carryi, mpz_dbl_dig_t carryj, mpz_dbl_dig_t carryk) {
|
|
mpz_dig_t *oidig = idig;
|
|
mpz_dig_t imask = (0 == carryi) ? 0 : DIG_MASK;
|
|
mpz_dig_t jmask = (0 == carryj) ? 0 : DIG_MASK;
|
|
mpz_dig_t kmask = (0 == carryk) ? 0 : DIG_MASK;
|
|
|
|
for (; jlen > 0; ++idig, ++jdig) {
|
|
carryj += *jdig ^ jmask;
|
|
carryk += (--klen <= --jlen) ? (*kdig++ ^ kmask) : kmask;
|
|
carryi += ((carryj & carryk) ^ imask) & DIG_MASK;
|
|
*idig = carryi & DIG_MASK;
|
|
carryk >>= DIG_SIZE;
|
|
carryj >>= DIG_SIZE;
|
|
carryi >>= DIG_SIZE;
|
|
}
|
|
|
|
if (0 != carryi) {
|
|
*idig++ = carryi;
|
|
}
|
|
|
|
return mpn_remove_trailing_zeros(oidig, idig);
|
|
}
|
|
|
|
#if MICROPY_OPT_MPZ_BITWISE
|
|
|
|
/* computes i = j | k
|
|
returns number of digits in i
|
|
assumes enough memory in i; assumes normalised j, k; assumes jlen >= klen
|
|
can have i, j, k pointing to same memory
|
|
*/
|
|
STATIC size_t mpn_or(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen) {
|
|
mpz_dig_t *oidig = idig;
|
|
|
|
jlen -= klen;
|
|
|
|
for (; klen > 0; --klen, ++idig, ++jdig, ++kdig) {
|
|
*idig = *jdig | *kdig;
|
|
}
|
|
|
|
for (; jlen > 0; --jlen, ++idig, ++jdig) {
|
|
*idig = *jdig;
|
|
}
|
|
|
|
return idig - oidig;
|
|
}
|
|
|
|
#endif
|
|
|
|
/* i = -((-j) | (-k)) = ~((~j + 1) | (~k + 1)) + 1
|
|
i = -(j | (-k)) = -(j | (~k + 1)) = ~( j | (~k + 1)) + 1
|
|
i = -((-j) | k) = -((~j + 1) | k) = ~((~j + 1) | k ) + 1
|
|
computes general form:
|
|
i = ~(((j ^ jm) + jc) | ((k ^ km) + kc)) + 1 where Xm = Xc == 0 ? 0 : DIG_MASK
|
|
returns number of digits in i
|
|
assumes enough memory in i; assumes normalised j, k; assumes length j >= length k
|
|
can have i, j, k pointing to same memory
|
|
*/
|
|
|
|
#if MICROPY_OPT_MPZ_BITWISE
|
|
|
|
STATIC size_t mpn_or_neg(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen,
|
|
mpz_dbl_dig_t carryj, mpz_dbl_dig_t carryk) {
|
|
mpz_dig_t *oidig = idig;
|
|
mpz_dbl_dig_t carryi = 1;
|
|
mpz_dig_t jmask = (0 == carryj) ? 0 : DIG_MASK;
|
|
mpz_dig_t kmask = (0 == carryk) ? 0 : DIG_MASK;
|
|
|
|
for (; jlen > 0; ++idig, ++jdig) {
|
|
carryj += *jdig ^ jmask;
|
|
carryk += (--klen <= --jlen) ? (*kdig++ ^ kmask) : kmask;
|
|
carryi += ((carryj | carryk) ^ DIG_MASK) & DIG_MASK;
|
|
*idig = carryi & DIG_MASK;
|
|
carryk >>= DIG_SIZE;
|
|
carryj >>= DIG_SIZE;
|
|
carryi >>= DIG_SIZE;
|
|
}
|
|
|
|
// At least one of j,k must be negative so the above for-loop runs at least
|
|
// once. For carryi to be non-zero here it must be equal to 1 at the end of
|
|
// each iteration of the loop. So the accumulation of carryi must overflow
|
|
// each time, ie carryi += 0xff..ff. So carryj|carryk must be 0 in the
|
|
// DIG_MASK bits on each iteration. But considering all cases of signs of
|
|
// j,k one sees that this is not possible.
|
|
assert(carryi == 0);
|
|
|
|
return mpn_remove_trailing_zeros(oidig, idig);
|
|
}
|
|
|
|
#else
|
|
|
|
STATIC size_t mpn_or_neg(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen,
|
|
mpz_dbl_dig_t carryi, mpz_dbl_dig_t carryj, mpz_dbl_dig_t carryk) {
|
|
mpz_dig_t *oidig = idig;
|
|
mpz_dig_t imask = (0 == carryi) ? 0 : DIG_MASK;
|
|
mpz_dig_t jmask = (0 == carryj) ? 0 : DIG_MASK;
|
|
mpz_dig_t kmask = (0 == carryk) ? 0 : DIG_MASK;
|
|
|
|
for (; jlen > 0; ++idig, ++jdig) {
|
|
carryj += *jdig ^ jmask;
|
|
carryk += (--klen <= --jlen) ? (*kdig++ ^ kmask) : kmask;
|
|
carryi += ((carryj | carryk) ^ imask) & DIG_MASK;
|
|
*idig = carryi & DIG_MASK;
|
|
carryk >>= DIG_SIZE;
|
|
carryj >>= DIG_SIZE;
|
|
carryi >>= DIG_SIZE;
|
|
}
|
|
|
|
// See comment in above mpn_or_neg for why carryi must be 0.
|
|
assert(carryi == 0);
|
|
|
|
return mpn_remove_trailing_zeros(oidig, idig);
|
|
}
|
|
|
|
#endif
|
|
|
|
#if MICROPY_OPT_MPZ_BITWISE
|
|
|
|
/* computes i = j ^ k
|
|
returns number of digits in i
|
|
assumes enough memory in i; assumes normalised j, k; assumes jlen >= klen
|
|
can have i, j, k pointing to same memory
|
|
*/
|
|
STATIC size_t mpn_xor(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen) {
|
|
mpz_dig_t *oidig = idig;
|
|
|
|
jlen -= klen;
|
|
|
|
for (; klen > 0; --klen, ++idig, ++jdig, ++kdig) {
|
|
*idig = *jdig ^ *kdig;
|
|
}
|
|
|
|
for (; jlen > 0; --jlen, ++idig, ++jdig) {
|
|
*idig = *jdig;
|
|
}
|
|
|
|
return mpn_remove_trailing_zeros(oidig, idig);
|
|
}
|
|
|
|
#endif
|
|
|
|
/* i = (-j) ^ (-k) = ~(j - 1) ^ ~(k - 1) = (j - 1) ^ (k - 1)
|
|
i = -(j ^ (-k)) = -(j ^ ~(k - 1)) = ~(j ^ ~(k - 1)) + 1 = (j ^ (k - 1)) + 1
|
|
i = -((-j) ^ k) = -(~(j - 1) ^ k) = ~(~(j - 1) ^ k) + 1 = ((j - 1) ^ k) + 1
|
|
computes general form:
|
|
i = ((j - 1 + jc) ^ (k - 1 + kc)) + ic
|
|
returns number of digits in i
|
|
assumes enough memory in i; assumes normalised j, k; assumes length j >= length k
|
|
can have i, j, k pointing to same memory
|
|
*/
|
|
STATIC size_t mpn_xor_neg(mpz_dig_t *idig, const mpz_dig_t *jdig, size_t jlen, const mpz_dig_t *kdig, size_t klen,
|
|
mpz_dbl_dig_t carryi, mpz_dbl_dig_t carryj, mpz_dbl_dig_t carryk) {
|
|
mpz_dig_t *oidig = idig;
|
|
|
|
for (; jlen > 0; ++idig, ++jdig) {
|
|
carryj += *jdig + DIG_MASK;
|
|
carryk += (--klen <= --jlen) ? (*kdig++ + DIG_MASK) : DIG_MASK;
|
|
carryi += (carryj ^ carryk) & DIG_MASK;
|
|
*idig = carryi & DIG_MASK;
|
|
carryk >>= DIG_SIZE;
|
|
carryj >>= DIG_SIZE;
|
|
carryi >>= DIG_SIZE;
|
|
}
|
|
|
|
if (0 != carryi) {
|
|
*idig++ = carryi;
|
|
}
|
|
|
|
return mpn_remove_trailing_zeros(oidig, idig);
|
|
}
|
|
|
|
/* computes i = i * d1 + d2
|
|
returns number of digits in i
|
|
assumes enough memory in i; assumes normalised i; assumes dmul != 0
|
|
*/
|
|
STATIC size_t mpn_mul_dig_add_dig(mpz_dig_t *idig, size_t ilen, mpz_dig_t dmul, mpz_dig_t dadd) {
|
|
mpz_dig_t *oidig = idig;
|
|
mpz_dbl_dig_t carry = dadd;
|
|
|
|
for (; ilen > 0; --ilen, ++idig) {
|
|
carry += (mpz_dbl_dig_t)*idig * (mpz_dbl_dig_t)dmul; // will never overflow so long as DIG_SIZE <= 8*sizeof(mpz_dbl_dig_t)/2
|
|
*idig = carry & DIG_MASK;
|
|
carry >>= DIG_SIZE;
|
|
}
|
|
|
|
if (carry != 0) {
|
|
*idig++ = carry;
|
|
}
|
|
|
|
return idig - oidig;
|
|
}
|
|
|
|
/* computes i = j * k
|
|
returns number of digits in i
|
|
assumes enough memory in i; assumes i is zeroed; assumes normalised j, k
|
|
can have j, k point to same memory
|
|
*/
|
|
STATIC size_t mpn_mul(mpz_dig_t *idig, mpz_dig_t *jdig, size_t jlen, mpz_dig_t *kdig, size_t klen) {
|
|
mpz_dig_t *oidig = idig;
|
|
size_t ilen = 0;
|
|
|
|
for (; klen > 0; --klen, ++idig, ++kdig) {
|
|
mpz_dig_t *id = idig;
|
|
mpz_dbl_dig_t carry = 0;
|
|
|
|
size_t jl = jlen;
|
|
for (mpz_dig_t *jd = jdig; jl > 0; --jl, ++jd, ++id) {
|
|
carry += (mpz_dbl_dig_t)*id + (mpz_dbl_dig_t)*jd * (mpz_dbl_dig_t)*kdig; // will never overflow so long as DIG_SIZE <= 8*sizeof(mpz_dbl_dig_t)/2
|
|
*id = carry & DIG_MASK;
|
|
carry >>= DIG_SIZE;
|
|
}
|
|
|
|
if (carry != 0) {
|
|
*id++ = carry;
|
|
}
|
|
|
|
ilen = id - oidig;
|
|
// check to prevent usb starvation
|
|
#ifdef RUN_BACKGROUND_TASKS
|
|
RUN_BACKGROUND_TASKS;
|
|
#endif
|
|
}
|
|
|
|
return ilen;
|
|
}
|
|
|
|
/* natural_div - quo * den + new_num = old_num (ie num is replaced with rem)
|
|
assumes den != 0
|
|
assumes num_dig has enough memory to be extended by 1 digit
|
|
assumes quo_dig has enough memory (as many digits as num)
|
|
assumes quo_dig is filled with zeros
|
|
*/
|
|
STATIC void mpn_div(mpz_dig_t *num_dig, size_t *num_len, const mpz_dig_t *den_dig, size_t den_len, mpz_dig_t *quo_dig, size_t *quo_len) {
|
|
mpz_dig_t *orig_num_dig = num_dig;
|
|
mpz_dig_t *orig_quo_dig = quo_dig;
|
|
mpz_dig_t norm_shift = 0;
|
|
mpz_dbl_dig_t lead_den_digit;
|
|
|
|
// handle simple cases
|
|
{
|
|
int cmp = mpn_cmp(num_dig, *num_len, den_dig, den_len);
|
|
if (cmp == 0) {
|
|
*num_len = 0;
|
|
quo_dig[0] = 1;
|
|
*quo_len = 1;
|
|
return;
|
|
} else if (cmp < 0) {
|
|
// numerator remains the same
|
|
*quo_len = 0;
|
|
return;
|
|
}
|
|
}
|
|
|
|
// We need to normalise the denominator (leading bit of leading digit is 1)
|
|
// so that the division routine works. Since the denominator memory is
|
|
// read-only we do the normalisation on the fly, each time a digit of the
|
|
// denominator is needed. We need to know is how many bits to shift by.
|
|
|
|
// count number of leading zeros in leading digit of denominator
|
|
{
|
|
mpz_dig_t d = den_dig[den_len - 1];
|
|
while ((d & DIG_MSB) == 0) {
|
|
d <<= 1;
|
|
++norm_shift;
|
|
}
|
|
}
|
|
|
|
// now need to shift numerator by same amount as denominator
|
|
// first, increase length of numerator in case we need more room to shift
|
|
num_dig[*num_len] = 0;
|
|
++(*num_len);
|
|
for (mpz_dig_t *num = num_dig, carry = 0; num < num_dig + *num_len; ++num) {
|
|
mpz_dig_t n = *num;
|
|
*num = ((n << norm_shift) | carry) & DIG_MASK;
|
|
carry = (mpz_dbl_dig_t)n >> (DIG_SIZE - norm_shift);
|
|
}
|
|
|
|
// cache the leading digit of the denominator
|
|
lead_den_digit = (mpz_dbl_dig_t)den_dig[den_len - 1] << norm_shift;
|
|
if (den_len >= 2) {
|
|
lead_den_digit |= (mpz_dbl_dig_t)den_dig[den_len - 2] >> (DIG_SIZE - norm_shift);
|
|
}
|
|
|
|
// point num_dig to last digit in numerator
|
|
num_dig += *num_len - 1;
|
|
|
|
// calculate number of digits in quotient
|
|
*quo_len = *num_len - den_len;
|
|
|
|
// point to last digit to store for quotient
|
|
quo_dig += *quo_len - 1;
|
|
|
|
// keep going while we have enough digits to divide
|
|
while (*num_len > den_len) {
|
|
mpz_dbl_dig_t quo = ((mpz_dbl_dig_t)*num_dig << DIG_SIZE) | num_dig[-1];
|
|
|
|
// get approximate quotient
|
|
quo /= lead_den_digit;
|
|
|
|
// Multiply quo by den and subtract from num to get remainder.
|
|
// Must be careful with overflow of the borrow variable. Both
|
|
// borrow and low_digs are signed values and need signed right-shift,
|
|
// but x is unsigned and may take a full-range value.
|
|
const mpz_dig_t *d = den_dig;
|
|
mpz_dbl_dig_t d_norm = 0;
|
|
mpz_dbl_dig_signed_t borrow = 0;
|
|
for (mpz_dig_t *n = num_dig - den_len; n < num_dig; ++n, ++d) {
|
|
// Get the next digit in (den).
|
|
d_norm = ((mpz_dbl_dig_t)*d << norm_shift) | (d_norm >> DIG_SIZE);
|
|
// Multiply the next digit in (quo * den).
|
|
mpz_dbl_dig_t x = (mpz_dbl_dig_t)quo * (d_norm & DIG_MASK);
|
|
// Compute the low DIG_MASK bits of the next digit in (num - quo * den)
|
|
mpz_dbl_dig_signed_t low_digs = (borrow & DIG_MASK) + *n - (x & DIG_MASK);
|
|
// Store the digit result for (num).
|
|
*n = low_digs & DIG_MASK;
|
|
// Compute the borrow, shifted right before summing to avoid overflow.
|
|
borrow = (borrow >> DIG_SIZE) - (x >> DIG_SIZE) + (low_digs >> DIG_SIZE);
|
|
}
|
|
|
|
// At this point we have either:
|
|
//
|
|
// 1. quo was the correct value and the most-sig-digit of num is exactly
|
|
// cancelled by borrow (borrow + *num_dig == 0). In this case there is
|
|
// nothing more to do.
|
|
//
|
|
// 2. quo was too large, we subtracted too many den from num, and the
|
|
// most-sig-digit of num is less than needed (borrow + *num_dig < 0).
|
|
// In this case we must reduce quo and add back den to num until the
|
|
// carry from this operation cancels out the borrow.
|
|
//
|
|
borrow += *num_dig;
|
|
for (; borrow != 0; --quo) {
|
|
d = den_dig;
|
|
d_norm = 0;
|
|
mpz_dbl_dig_t carry = 0;
|
|
for (mpz_dig_t *n = num_dig - den_len; n < num_dig; ++n, ++d) {
|
|
d_norm = ((mpz_dbl_dig_t)*d << norm_shift) | (d_norm >> DIG_SIZE);
|
|
carry += (mpz_dbl_dig_t)*n + (d_norm & DIG_MASK);
|
|
*n = carry & DIG_MASK;
|
|
carry >>= DIG_SIZE;
|
|
}
|
|
borrow += carry;
|
|
}
|
|
|
|
// store this digit of the quotient
|
|
*quo_dig = quo & DIG_MASK;
|
|
--quo_dig;
|
|
|
|
// move down to next digit of numerator
|
|
--num_dig;
|
|
--(*num_len);
|
|
}
|
|
|
|
// unnormalise numerator (remainder now)
|
|
for (mpz_dig_t *num = orig_num_dig + *num_len - 1, carry = 0; num >= orig_num_dig; --num) {
|
|
mpz_dig_t n = *num;
|
|
*num = ((n >> norm_shift) | carry) & DIG_MASK;
|
|
carry = (mpz_dbl_dig_t)n << (DIG_SIZE - norm_shift);
|
|
}
|
|
|
|
// strip trailing zeros
|
|
|
|
while (*quo_len > 0 && orig_quo_dig[*quo_len - 1] == 0) {
|
|
--(*quo_len);
|
|
}
|
|
|
|
while (*num_len > 0 && orig_num_dig[*num_len - 1] == 0) {
|
|
--(*num_len);
|
|
}
|
|
}
|
|
|
|
#define MIN_ALLOC (2)
|
|
|
|
void mpz_init_zero(mpz_t *z) {
|
|
z->neg = 0;
|
|
z->fixed_dig = 0;
|
|
z->alloc = 0;
|
|
z->len = 0;
|
|
z->dig = NULL;
|
|
}
|
|
|
|
void mpz_init_from_int(mpz_t *z, mp_int_t val) {
|
|
mpz_init_zero(z);
|
|
mpz_set_from_int(z, val);
|
|
}
|
|
|
|
void mpz_init_fixed_from_int(mpz_t *z, mpz_dig_t *dig, size_t alloc, mp_int_t val) {
|
|
z->neg = 0;
|
|
z->fixed_dig = 1;
|
|
z->alloc = alloc;
|
|
z->len = 0;
|
|
z->dig = dig;
|
|
mpz_set_from_int(z, val);
|
|
}
|
|
|
|
void mpz_deinit(mpz_t *z) {
|
|
if (z != NULL && !z->fixed_dig) {
|
|
m_del(mpz_dig_t, z->dig, z->alloc);
|
|
}
|
|
}
|
|
|
|
#if 0
|
|
these functions are unused
|
|
|
|
mpz_t *mpz_zero(void) {
|
|
mpz_t *z = m_new_obj(mpz_t);
|
|
mpz_init_zero(z);
|
|
return z;
|
|
}
|
|
|
|
mpz_t *mpz_from_int(mp_int_t val) {
|
|
mpz_t *z = mpz_zero();
|
|
mpz_set_from_int(z, val);
|
|
return z;
|
|
}
|
|
|
|
mpz_t *mpz_from_ll(long long val, bool is_signed) {
|
|
mpz_t *z = mpz_zero();
|
|
mpz_set_from_ll(z, val, is_signed);
|
|
return z;
|
|
}
|
|
|
|
#if MICROPY_PY_BUILTINS_FLOAT
|
|
mpz_t *mpz_from_float(mp_float_t val) {
|
|
mpz_t *z = mpz_zero();
|
|
mpz_set_from_float(z, val);
|
|
return z;
|
|
}
|
|
#endif
|
|
|
|
mpz_t *mpz_from_str(const char *str, size_t len, bool neg, unsigned int base) {
|
|
mpz_t *z = mpz_zero();
|
|
mpz_set_from_str(z, str, len, neg, base);
|
|
return z;
|
|
}
|
|
#endif
|
|
|
|
STATIC void mpz_free(mpz_t *z) {
|
|
if (z != NULL) {
|
|
m_del(mpz_dig_t, z->dig, z->alloc);
|
|
m_del_obj(mpz_t, z);
|
|
}
|
|
}
|
|
|
|
STATIC void mpz_need_dig(mpz_t *z, size_t need) {
|
|
if (need < MIN_ALLOC) {
|
|
need = MIN_ALLOC;
|
|
}
|
|
|
|
if (z->dig == NULL || z->alloc < need) {
|
|
// if z has fixed digit buffer there's not much we can do as the caller will
|
|
// be expecting a buffer with at least "need" bytes (but it shouldn't happen)
|
|
assert(!z->fixed_dig);
|
|
z->dig = m_renew(mpz_dig_t, z->dig, z->alloc, need);
|
|
z->alloc = need;
|
|
}
|
|
}
|
|
|
|
STATIC mpz_t *mpz_clone(const mpz_t *src) {
|
|
assert(src->alloc != 0);
|
|
mpz_t *z = m_new_obj(mpz_t);
|
|
z->neg = src->neg;
|
|
z->fixed_dig = 0;
|
|
z->alloc = src->alloc;
|
|
z->len = src->len;
|
|
z->dig = m_new(mpz_dig_t, z->alloc);
|
|
memcpy(z->dig, src->dig, src->alloc * sizeof(mpz_dig_t));
|
|
return z;
|
|
}
|
|
|
|
/* sets dest = src
|
|
can have dest, src the same
|
|
*/
|
|
void mpz_set(mpz_t *dest, const mpz_t *src) {
|
|
mpz_need_dig(dest, src->len);
|
|
dest->neg = src->neg;
|
|
dest->len = src->len;
|
|
memcpy(dest->dig, src->dig, src->len * sizeof(mpz_dig_t));
|
|
}
|
|
|
|
void mpz_set_from_int(mpz_t *z, mp_int_t val) {
|
|
if (val == 0) {
|
|
z->neg = 0;
|
|
z->len = 0;
|
|
return;
|
|
}
|
|
|
|
mpz_need_dig(z, MPZ_NUM_DIG_FOR_INT);
|
|
|
|
mp_uint_t uval;
|
|
if (val < 0) {
|
|
z->neg = 1;
|
|
uval = -val;
|
|
} else {
|
|
z->neg = 0;
|
|
uval = val;
|
|
}
|
|
|
|
z->len = 0;
|
|
while (uval > 0) {
|
|
z->dig[z->len++] = uval & DIG_MASK;
|
|
uval >>= DIG_SIZE;
|
|
}
|
|
}
|
|
|
|
void mpz_set_from_ll(mpz_t *z, long long val, bool is_signed) {
|
|
mpz_need_dig(z, MPZ_NUM_DIG_FOR_LL);
|
|
|
|
unsigned long long uval;
|
|
if (is_signed && val < 0) {
|
|
z->neg = 1;
|
|
uval = -(unsigned long long)val;
|
|
} else {
|
|
z->neg = 0;
|
|
uval = val;
|
|
}
|
|
|
|
z->len = 0;
|
|
while (uval > 0) {
|
|
z->dig[z->len++] = uval & DIG_MASK;
|
|
uval >>= DIG_SIZE;
|
|
}
|
|
}
|
|
|
|
#if MICROPY_PY_BUILTINS_FLOAT
|
|
void mpz_set_from_float(mpz_t *z, mp_float_t src) {
|
|
mp_float_union_t u = {src};
|
|
z->neg = u.p.sgn;
|
|
if (u.p.exp == 0) {
|
|
// value == 0 || value < 1
|
|
mpz_set_from_int(z, 0);
|
|
} else if (u.p.exp == ((1 << MP_FLOAT_EXP_BITS) - 1)) {
|
|
// u.p.frc == 0 indicates inf, else NaN
|
|
// should be handled by caller
|
|
mpz_set_from_int(z, 0);
|
|
} else {
|
|
const int adj_exp = (int)u.p.exp - MP_FLOAT_EXP_BIAS;
|
|
if (adj_exp < 0) {
|
|
// value < 1 , truncates to 0
|
|
mpz_set_from_int(z, 0);
|
|
} else if (adj_exp == 0) {
|
|
// 1 <= value < 2 , so truncates to 1
|
|
mpz_set_from_int(z, 1);
|
|
} else {
|
|
// 2 <= value
|
|
const int dig_cnt = (adj_exp + 1 + (DIG_SIZE - 1)) / DIG_SIZE;
|
|
const unsigned int rem = adj_exp % DIG_SIZE;
|
|
int dig_ind, shft;
|
|
mp_float_uint_t frc = u.p.frc | ((mp_float_uint_t)1 << MP_FLOAT_FRAC_BITS);
|
|
|
|
if (adj_exp < MP_FLOAT_FRAC_BITS) {
|
|
shft = 0;
|
|
dig_ind = 0;
|
|
frc >>= MP_FLOAT_FRAC_BITS - adj_exp;
|
|
} else {
|
|
shft = (rem - MP_FLOAT_FRAC_BITS) % DIG_SIZE;
|
|
dig_ind = (adj_exp - MP_FLOAT_FRAC_BITS) / DIG_SIZE;
|
|
}
|
|
mpz_need_dig(z, dig_cnt);
|
|
z->len = dig_cnt;
|
|
if (dig_ind != 0) {
|
|
memset(z->dig, 0, dig_ind * sizeof(mpz_dig_t));
|
|
}
|
|
if (shft != 0) {
|
|
z->dig[dig_ind++] = (frc << shft) & DIG_MASK;
|
|
frc >>= DIG_SIZE - shft;
|
|
}
|
|
#if DIG_SIZE < (MP_FLOAT_FRAC_BITS + 1)
|
|
while (dig_ind != dig_cnt) {
|
|
z->dig[dig_ind++] = frc & DIG_MASK;
|
|
frc >>= DIG_SIZE;
|
|
}
|
|
#else
|
|
if (dig_ind != dig_cnt) {
|
|
z->dig[dig_ind] = frc;
|
|
}
|
|
#endif
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
|
|
// returns number of bytes from str that were processed
|
|
size_t mpz_set_from_str(mpz_t *z, const char *str, size_t len, bool neg, unsigned int base) {
|
|
assert(base <= 36);
|
|
|
|
const char *cur = str;
|
|
const char *top = str + len;
|
|
|
|
mpz_need_dig(z, len * 8 / DIG_SIZE + 1);
|
|
|
|
if (neg) {
|
|
z->neg = 1;
|
|
} else {
|
|
z->neg = 0;
|
|
}
|
|
|
|
z->len = 0;
|
|
for (; cur < top; ++cur) { // XXX UTF8 next char
|
|
// mp_uint_t v = char_to_numeric(cur#); // XXX UTF8 get char
|
|
mp_uint_t v = *cur;
|
|
if ('0' <= v && v <= '9') {
|
|
v -= '0';
|
|
} else if ('A' <= v && v <= 'Z') {
|
|
v -= 'A' - 10;
|
|
} else if ('a' <= v && v <= 'z') {
|
|
v -= 'a' - 10;
|
|
} else {
|
|
break;
|
|
}
|
|
if (v >= base) {
|
|
break;
|
|
}
|
|
z->len = mpn_mul_dig_add_dig(z->dig, z->len, base, v);
|
|
}
|
|
|
|
return cur - str;
|
|
}
|
|
|
|
void mpz_set_from_bytes(mpz_t *z, bool big_endian, size_t len, const byte *buf) {
|
|
int delta = 1;
|
|
if (big_endian) {
|
|
buf += len - 1;
|
|
delta = -1;
|
|
}
|
|
|
|
mpz_need_dig(z, (len * 8 + DIG_SIZE - 1) / DIG_SIZE);
|
|
|
|
mpz_dig_t d = 0;
|
|
int num_bits = 0;
|
|
z->neg = 0;
|
|
z->len = 0;
|
|
while (len) {
|
|
while (len && num_bits < DIG_SIZE) {
|
|
d |= *buf << num_bits;
|
|
num_bits += 8;
|
|
buf += delta;
|
|
len--;
|
|
}
|
|
z->dig[z->len++] = d & DIG_MASK;
|
|
// Need this #if because it's C undefined behavior to do: uint32_t >> 32
|
|
#if DIG_SIZE != 8 && DIG_SIZE != 16 && DIG_SIZE != 32
|
|
d >>= DIG_SIZE;
|
|
#else
|
|
d = 0;
|
|
#endif
|
|
num_bits -= DIG_SIZE;
|
|
}
|
|
|
|
z->len = mpn_remove_trailing_zeros(z->dig, z->dig + z->len);
|
|
}
|
|
|
|
#if 0
|
|
these functions are unused
|
|
|
|
bool mpz_is_pos(const mpz_t *z) {
|
|
return z->len > 0 && z->neg == 0;
|
|
}
|
|
|
|
bool mpz_is_odd(const mpz_t *z) {
|
|
return z->len > 0 && (z->dig[0] & 1) != 0;
|
|
}
|
|
|
|
bool mpz_is_even(const mpz_t *z) {
|
|
return z->len == 0 || (z->dig[0] & 1) == 0;
|
|
}
|
|
#endif
|
|
|
|
int mpz_cmp(const mpz_t *z1, const mpz_t *z2) {
|
|
int cmp = (int)z2->neg - (int)z1->neg;
|
|
if (cmp != 0) {
|
|
return cmp;
|
|
}
|
|
cmp = mpn_cmp(z1->dig, z1->len, z2->dig, z2->len);
|
|
if (z1->neg != 0) {
|
|
cmp = -cmp;
|
|
}
|
|
return cmp;
|
|
}
|
|
|
|
#if 0
|
|
// obsolete
|
|
// compares mpz with an integer that fits within DIG_SIZE bits
|
|
mp_int_t mpz_cmp_sml_int(const mpz_t *z, mp_int_t sml_int) {
|
|
mp_int_t cmp;
|
|
if (z->neg == 0) {
|
|
if (sml_int < 0) {
|
|
return 1;
|
|
}
|
|
if (sml_int == 0) {
|
|
if (z->len == 0) {
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
if (z->len == 0) {
|
|
return -1;
|
|
}
|
|
assert(sml_int < (1 << DIG_SIZE));
|
|
if (z->len != 1) {
|
|
return 1;
|
|
}
|
|
cmp = z->dig[0] - sml_int;
|
|
} else {
|
|
if (sml_int > 0) {
|
|
return -1;
|
|
}
|
|
if (sml_int == 0) {
|
|
if (z->len == 0) {
|
|
return 0;
|
|
}
|
|
return -1;
|
|
}
|
|
if (z->len == 0) {
|
|
return 1;
|
|
}
|
|
assert(sml_int > -(1 << DIG_SIZE));
|
|
if (z->len != 1) {
|
|
return -1;
|
|
}
|
|
cmp = -z->dig[0] - sml_int;
|
|
}
|
|
if (cmp < 0) {
|
|
return -1;
|
|
}
|
|
if (cmp > 0) {
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#if 0
|
|
these functions are unused
|
|
|
|
/* returns abs(z)
|
|
*/
|
|
mpz_t *mpz_abs(const mpz_t *z) {
|
|
// TODO: handle case of z->alloc=0
|
|
mpz_t *z2 = mpz_clone(z);
|
|
z2->neg = 0;
|
|
return z2;
|
|
}
|
|
|
|
/* returns -z
|
|
*/
|
|
mpz_t *mpz_neg(const mpz_t *z) {
|
|
// TODO: handle case of z->alloc=0
|
|
mpz_t *z2 = mpz_clone(z);
|
|
z2->neg = 1 - z2->neg;
|
|
return z2;
|
|
}
|
|
|
|
/* returns lhs + rhs
|
|
can have lhs, rhs the same
|
|
*/
|
|
mpz_t *mpz_add(const mpz_t *lhs, const mpz_t *rhs) {
|
|
mpz_t *z = mpz_zero();
|
|
mpz_add_inpl(z, lhs, rhs);
|
|
return z;
|
|
}
|
|
|
|
/* returns lhs - rhs
|
|
can have lhs, rhs the same
|
|
*/
|
|
mpz_t *mpz_sub(const mpz_t *lhs, const mpz_t *rhs) {
|
|
mpz_t *z = mpz_zero();
|
|
mpz_sub_inpl(z, lhs, rhs);
|
|
return z;
|
|
}
|
|
|
|
/* returns lhs * rhs
|
|
can have lhs, rhs the same
|
|
*/
|
|
mpz_t *mpz_mul(const mpz_t *lhs, const mpz_t *rhs) {
|
|
mpz_t *z = mpz_zero();
|
|
mpz_mul_inpl(z, lhs, rhs);
|
|
return z;
|
|
}
|
|
|
|
/* returns lhs ** rhs
|
|
can have lhs, rhs the same
|
|
*/
|
|
mpz_t *mpz_pow(const mpz_t *lhs, const mpz_t *rhs) {
|
|
mpz_t *z = mpz_zero();
|
|
mpz_pow_inpl(z, lhs, rhs);
|
|
return z;
|
|
}
|
|
|
|
/* computes new integers in quo and rem such that:
|
|
quo * rhs + rem = lhs
|
|
0 <= rem < rhs
|
|
can have lhs, rhs the same
|
|
*/
|
|
void mpz_divmod(const mpz_t *lhs, const mpz_t *rhs, mpz_t **quo, mpz_t **rem) {
|
|
*quo = mpz_zero();
|
|
*rem = mpz_zero();
|
|
mpz_divmod_inpl(*quo, *rem, lhs, rhs);
|
|
}
|
|
#endif
|
|
|
|
/* computes dest = abs(z)
|
|
can have dest, z the same
|
|
*/
|
|
void mpz_abs_inpl(mpz_t *dest, const mpz_t *z) {
|
|
if (dest != z) {
|
|
mpz_set(dest, z);
|
|
}
|
|
dest->neg = 0;
|
|
}
|
|
|
|
/* computes dest = -z
|
|
can have dest, z the same
|
|
*/
|
|
void mpz_neg_inpl(mpz_t *dest, const mpz_t *z) {
|
|
if (dest != z) {
|
|
mpz_set(dest, z);
|
|
}
|
|
if (dest->len) {
|
|
dest->neg = 1 - dest->neg;
|
|
}
|
|
}
|
|
|
|
/* computes dest = ~z (= -z - 1)
|
|
can have dest, z the same
|
|
*/
|
|
void mpz_not_inpl(mpz_t *dest, const mpz_t *z) {
|
|
if (dest != z) {
|
|
mpz_set(dest, z);
|
|
}
|
|
if (dest->len == 0) {
|
|
mpz_need_dig(dest, 1);
|
|
dest->dig[0] = 1;
|
|
dest->len = 1;
|
|
dest->neg = 1;
|
|
} else if (dest->neg) {
|
|
dest->neg = 0;
|
|
mpz_dig_t k = 1;
|
|
dest->len = mpn_sub(dest->dig, dest->dig, dest->len, &k, 1);
|
|
} else {
|
|
mpz_need_dig(dest, dest->len + 1);
|
|
mpz_dig_t k = 1;
|
|
dest->len = mpn_add(dest->dig, dest->dig, dest->len, &k, 1);
|
|
dest->neg = 1;
|
|
}
|
|
}
|
|
|
|
/* computes dest = lhs << rhs
|
|
can have dest, lhs the same
|
|
*/
|
|
void mpz_shl_inpl(mpz_t *dest, const mpz_t *lhs, mp_uint_t rhs) {
|
|
if (lhs->len == 0 || rhs == 0) {
|
|
mpz_set(dest, lhs);
|
|
} else {
|
|
mpz_need_dig(dest, lhs->len + (rhs + DIG_SIZE - 1) / DIG_SIZE);
|
|
dest->len = mpn_shl(dest->dig, lhs->dig, lhs->len, rhs);
|
|
dest->neg = lhs->neg;
|
|
}
|
|
}
|
|
|
|
/* computes dest = lhs >> rhs
|
|
can have dest, lhs the same
|
|
*/
|
|
void mpz_shr_inpl(mpz_t *dest, const mpz_t *lhs, mp_uint_t rhs) {
|
|
if (lhs->len == 0 || rhs == 0) {
|
|
mpz_set(dest, lhs);
|
|
} else {
|
|
mpz_need_dig(dest, lhs->len);
|
|
dest->len = mpn_shr(dest->dig, lhs->dig, lhs->len, rhs);
|
|
dest->neg = lhs->neg;
|
|
if (dest->neg) {
|
|
// arithmetic shift right, rounding to negative infinity
|
|
mp_uint_t n_whole = rhs / DIG_SIZE;
|
|
mp_uint_t n_part = rhs % DIG_SIZE;
|
|
mpz_dig_t round_up = 0;
|
|
for (size_t i = 0; i < lhs->len && i < n_whole; i++) {
|
|
if (lhs->dig[i] != 0) {
|
|
round_up = 1;
|
|
break;
|
|
}
|
|
}
|
|
if (n_whole < lhs->len && (lhs->dig[n_whole] & ((1 << n_part) - 1)) != 0) {
|
|
round_up = 1;
|
|
}
|
|
if (round_up) {
|
|
if (dest->len == 0) {
|
|
// dest == 0, so need to add 1 by hand (answer will be -1)
|
|
dest->dig[0] = 1;
|
|
dest->len = 1;
|
|
} else {
|
|
// dest > 0, so can use mpn_add to add 1
|
|
dest->len = mpn_add(dest->dig, dest->dig, dest->len, &round_up, 1);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/* computes dest = lhs + rhs
|
|
can have dest, lhs, rhs the same
|
|
*/
|
|
void mpz_add_inpl(mpz_t *dest, const mpz_t *lhs, const mpz_t *rhs) {
|
|
if (mpn_cmp(lhs->dig, lhs->len, rhs->dig, rhs->len) < 0) {
|
|
const mpz_t *temp = lhs;
|
|
lhs = rhs;
|
|
rhs = temp;
|
|
}
|
|
|
|
if (lhs->neg == rhs->neg) {
|
|
mpz_need_dig(dest, lhs->len + 1);
|
|
dest->len = mpn_add(dest->dig, lhs->dig, lhs->len, rhs->dig, rhs->len);
|
|
} else {
|
|
mpz_need_dig(dest, lhs->len);
|
|
dest->len = mpn_sub(dest->dig, lhs->dig, lhs->len, rhs->dig, rhs->len);
|
|
}
|
|
|
|
dest->neg = lhs->neg & !!dest->len;
|
|
}
|
|
|
|
/* computes dest = lhs - rhs
|
|
can have dest, lhs, rhs the same
|
|
*/
|
|
void mpz_sub_inpl(mpz_t *dest, const mpz_t *lhs, const mpz_t *rhs) {
|
|
bool neg = false;
|
|
|
|
if (mpn_cmp(lhs->dig, lhs->len, rhs->dig, rhs->len) < 0) {
|
|
const mpz_t *temp = lhs;
|
|
lhs = rhs;
|
|
rhs = temp;
|
|
neg = true;
|
|
}
|
|
|
|
if (lhs->neg != rhs->neg) {
|
|
mpz_need_dig(dest, lhs->len + 1);
|
|
dest->len = mpn_add(dest->dig, lhs->dig, lhs->len, rhs->dig, rhs->len);
|
|
} else {
|
|
mpz_need_dig(dest, lhs->len);
|
|
dest->len = mpn_sub(dest->dig, lhs->dig, lhs->len, rhs->dig, rhs->len);
|
|
}
|
|
|
|
if (dest->len == 0) {
|
|
dest->neg = 0;
|
|
} else if (neg) {
|
|
dest->neg = 1 - lhs->neg;
|
|
} else {
|
|
dest->neg = lhs->neg;
|
|
}
|
|
}
|
|
|
|
/* computes dest = lhs & rhs
|
|
can have dest, lhs, rhs the same
|
|
*/
|
|
void mpz_and_inpl(mpz_t *dest, const mpz_t *lhs, const mpz_t *rhs) {
|
|
// make sure lhs has the most digits
|
|
if (lhs->len < rhs->len) {
|
|
const mpz_t *temp = lhs;
|
|
lhs = rhs;
|
|
rhs = temp;
|
|
}
|
|
|
|
#if MICROPY_OPT_MPZ_BITWISE
|
|
|
|
if ((0 == lhs->neg) && (0 == rhs->neg)) {
|
|
mpz_need_dig(dest, lhs->len);
|
|
dest->len = mpn_and(dest->dig, lhs->dig, rhs->dig, rhs->len);
|
|
dest->neg = 0;
|
|
} else {
|
|
mpz_need_dig(dest, lhs->len + 1);
|
|
dest->len = mpn_and_neg(dest->dig, lhs->dig, lhs->len, rhs->dig, rhs->len,
|
|
lhs->neg == rhs->neg, 0 != lhs->neg, 0 != rhs->neg);
|
|
dest->neg = lhs->neg & rhs->neg;
|
|
}
|
|
|
|
#else
|
|
|
|
mpz_need_dig(dest, lhs->len + (lhs->neg || rhs->neg));
|
|
dest->len = mpn_and_neg(dest->dig, lhs->dig, lhs->len, rhs->dig, rhs->len,
|
|
(lhs->neg == rhs->neg) ? lhs->neg : 0, lhs->neg, rhs->neg);
|
|
dest->neg = lhs->neg & rhs->neg;
|
|
|
|
#endif
|
|
}
|
|
|
|
/* computes dest = lhs | rhs
|
|
can have dest, lhs, rhs the same
|
|
*/
|
|
void mpz_or_inpl(mpz_t *dest, const mpz_t *lhs, const mpz_t *rhs) {
|
|
// make sure lhs has the most digits
|
|
if (lhs->len < rhs->len) {
|
|
const mpz_t *temp = lhs;
|
|
lhs = rhs;
|
|
rhs = temp;
|
|
}
|
|
|
|
#if MICROPY_OPT_MPZ_BITWISE
|
|
|
|
if ((0 == lhs->neg) && (0 == rhs->neg)) {
|
|
mpz_need_dig(dest, lhs->len);
|
|
dest->len = mpn_or(dest->dig, lhs->dig, lhs->len, rhs->dig, rhs->len);
|
|
dest->neg = 0;
|
|
} else {
|
|
mpz_need_dig(dest, lhs->len + 1);
|
|
dest->len = mpn_or_neg(dest->dig, lhs->dig, lhs->len, rhs->dig, rhs->len,
|
|
0 != lhs->neg, 0 != rhs->neg);
|
|
dest->neg = 1;
|
|
}
|
|
|
|
#else
|
|
|
|
mpz_need_dig(dest, lhs->len + (lhs->neg || rhs->neg));
|
|
dest->len = mpn_or_neg(dest->dig, lhs->dig, lhs->len, rhs->dig, rhs->len,
|
|
(lhs->neg || rhs->neg), lhs->neg, rhs->neg);
|
|
dest->neg = lhs->neg | rhs->neg;
|
|
|
|
#endif
|
|
}
|
|
|
|
/* computes dest = lhs ^ rhs
|
|
can have dest, lhs, rhs the same
|
|
*/
|
|
void mpz_xor_inpl(mpz_t *dest, const mpz_t *lhs, const mpz_t *rhs) {
|
|
// make sure lhs has the most digits
|
|
if (lhs->len < rhs->len) {
|
|
const mpz_t *temp = lhs;
|
|
lhs = rhs;
|
|
rhs = temp;
|
|
}
|
|
|
|
#if MICROPY_OPT_MPZ_BITWISE
|
|
|
|
if (lhs->neg == rhs->neg) {
|
|
mpz_need_dig(dest, lhs->len);
|
|
if (lhs->neg == 0) {
|
|
dest->len = mpn_xor(dest->dig, lhs->dig, lhs->len, rhs->dig, rhs->len);
|
|
} else {
|
|
dest->len = mpn_xor_neg(dest->dig, lhs->dig, lhs->len, rhs->dig, rhs->len, 0, 0, 0);
|
|
}
|
|
dest->neg = 0;
|
|
} else {
|
|
mpz_need_dig(dest, lhs->len + 1);
|
|
dest->len = mpn_xor_neg(dest->dig, lhs->dig, lhs->len, rhs->dig, rhs->len, 1,
|
|
0 == lhs->neg, 0 == rhs->neg);
|
|
dest->neg = 1;
|
|
}
|
|
|
|
#else
|
|
|
|
mpz_need_dig(dest, lhs->len + (lhs->neg || rhs->neg));
|
|
dest->len = mpn_xor_neg(dest->dig, lhs->dig, lhs->len, rhs->dig, rhs->len,
|
|
(lhs->neg != rhs->neg), 0 == lhs->neg, 0 == rhs->neg);
|
|
dest->neg = lhs->neg ^ rhs->neg;
|
|
|
|
#endif
|
|
}
|
|
|
|
/* computes dest = lhs * rhs
|
|
can have dest, lhs, rhs the same
|
|
*/
|
|
void mpz_mul_inpl(mpz_t *dest, const mpz_t *lhs, const mpz_t *rhs) {
|
|
if (lhs->len == 0 || rhs->len == 0) {
|
|
mpz_set_from_int(dest, 0);
|
|
return;
|
|
}
|
|
|
|
mpz_t *temp = NULL;
|
|
if (lhs == dest) {
|
|
lhs = temp = mpz_clone(lhs);
|
|
if (rhs == dest) {
|
|
rhs = lhs;
|
|
}
|
|
} else if (rhs == dest) {
|
|
rhs = temp = mpz_clone(rhs);
|
|
}
|
|
|
|
mpz_need_dig(dest, lhs->len + rhs->len); // min mem l+r-1, max mem l+r
|
|
memset(dest->dig, 0, dest->alloc * sizeof(mpz_dig_t));
|
|
dest->len = mpn_mul(dest->dig, lhs->dig, lhs->len, rhs->dig, rhs->len);
|
|
|
|
if (lhs->neg == rhs->neg) {
|
|
dest->neg = 0;
|
|
} else {
|
|
dest->neg = 1;
|
|
}
|
|
|
|
mpz_free(temp);
|
|
}
|
|
|
|
/* computes dest = lhs ** rhs
|
|
can have dest, lhs, rhs the same
|
|
*/
|
|
void mpz_pow_inpl(mpz_t *dest, const mpz_t *lhs, const mpz_t *rhs) {
|
|
if (lhs->len == 0 || rhs->neg != 0) {
|
|
mpz_set_from_int(dest, 0);
|
|
return;
|
|
}
|
|
|
|
if (rhs->len == 0) {
|
|
mpz_set_from_int(dest, 1);
|
|
return;
|
|
}
|
|
|
|
mpz_t *x = mpz_clone(lhs);
|
|
mpz_t *n = mpz_clone(rhs);
|
|
|
|
mpz_set_from_int(dest, 1);
|
|
|
|
while (n->len > 0) {
|
|
if ((n->dig[0] & 1) != 0) {
|
|
mpz_mul_inpl(dest, dest, x);
|
|
}
|
|
n->len = mpn_shr(n->dig, n->dig, n->len, 1);
|
|
if (n->len == 0) {
|
|
break;
|
|
}
|
|
mpz_mul_inpl(x, x, x);
|
|
}
|
|
|
|
mpz_free(x);
|
|
mpz_free(n);
|
|
}
|
|
|
|
/* computes dest = (lhs ** rhs) % mod
|
|
can have dest, lhs, rhs the same; mod can't be the same as dest
|
|
*/
|
|
void mpz_pow3_inpl(mpz_t *dest, const mpz_t *lhs, const mpz_t *rhs, const mpz_t *mod) {
|
|
if (lhs->len == 0 || rhs->neg != 0 || (mod->len == 1 && mod->dig[0] == 1)) {
|
|
mpz_set_from_int(dest, 0);
|
|
return;
|
|
}
|
|
|
|
mpz_set_from_int(dest, 1);
|
|
|
|
if (rhs->len == 0) {
|
|
return;
|
|
}
|
|
|
|
mpz_t *x = mpz_clone(lhs);
|
|
mpz_t *n = mpz_clone(rhs);
|
|
mpz_t quo;
|
|
mpz_init_zero(&quo);
|
|
|
|
while (n->len > 0) {
|
|
if ((n->dig[0] & 1) != 0) {
|
|
mpz_mul_inpl(dest, dest, x);
|
|
mpz_divmod_inpl(&quo, dest, dest, mod);
|
|
}
|
|
n->len = mpn_shr(n->dig, n->dig, n->len, 1);
|
|
if (n->len == 0) {
|
|
break;
|
|
}
|
|
mpz_mul_inpl(x, x, x);
|
|
mpz_divmod_inpl(&quo, x, x, mod);
|
|
}
|
|
|
|
mpz_deinit(&quo);
|
|
mpz_free(x);
|
|
mpz_free(n);
|
|
}
|
|
|
|
#if 0
|
|
these functions are unused
|
|
|
|
/* computes gcd(z1, z2)
|
|
based on Knuth's modified gcd algorithm (I think?)
|
|
gcd(z1, z2) >= 0
|
|
gcd(0, 0) = 0
|
|
gcd(z, 0) = abs(z)
|
|
*/
|
|
mpz_t *mpz_gcd(const mpz_t *z1, const mpz_t *z2) {
|
|
if (z1->len == 0) {
|
|
// TODO: handle case of z2->alloc=0
|
|
mpz_t *a = mpz_clone(z2);
|
|
a->neg = 0;
|
|
return a;
|
|
} else if (z2->len == 0) {
|
|
mpz_t *a = mpz_clone(z1);
|
|
a->neg = 0;
|
|
return a;
|
|
}
|
|
|
|
mpz_t *a = mpz_clone(z1);
|
|
mpz_t *b = mpz_clone(z2);
|
|
mpz_t c;
|
|
mpz_init_zero(&c);
|
|
a->neg = 0;
|
|
b->neg = 0;
|
|
|
|
for (;;) {
|
|
if (mpz_cmp(a, b) < 0) {
|
|
if (a->len == 0) {
|
|
mpz_free(a);
|
|
mpz_deinit(&c);
|
|
return b;
|
|
}
|
|
mpz_t *t = a;
|
|
a = b;
|
|
b = t;
|
|
}
|
|
if (!(b->len >= 2 || (b->len == 1 && b->dig[0] > 1))) { // compute b > 0; could be mpz_cmp_small_int(b, 1) > 0
|
|
break;
|
|
}
|
|
mpz_set(&c, b);
|
|
do {
|
|
mpz_add_inpl(&c, &c, &c);
|
|
} while (mpz_cmp(&c, a) <= 0);
|
|
c.len = mpn_shr(c.dig, c.dig, c.len, 1);
|
|
mpz_sub_inpl(a, a, &c);
|
|
}
|
|
|
|
mpz_deinit(&c);
|
|
|
|
if (b->len == 1 && b->dig[0] == 1) { // compute b == 1; could be mpz_cmp_small_int(b, 1) == 0
|
|
mpz_free(a);
|
|
return b;
|
|
} else {
|
|
mpz_free(b);
|
|
return a;
|
|
}
|
|
}
|
|
|
|
/* computes lcm(z1, z2)
|
|
= abs(z1) / gcd(z1, z2) * abs(z2)
|
|
lcm(z1, z1) >= 0
|
|
lcm(0, 0) = 0
|
|
lcm(z, 0) = 0
|
|
*/
|
|
mpz_t *mpz_lcm(const mpz_t *z1, const mpz_t *z2) {
|
|
if (z1->len == 0 || z2->len == 0) {
|
|
return mpz_zero();
|
|
}
|
|
|
|
mpz_t *gcd = mpz_gcd(z1, z2);
|
|
mpz_t *quo = mpz_zero();
|
|
mpz_t *rem = mpz_zero();
|
|
mpz_divmod_inpl(quo, rem, z1, gcd);
|
|
mpz_mul_inpl(rem, quo, z2);
|
|
mpz_free(gcd);
|
|
mpz_free(quo);
|
|
rem->neg = 0;
|
|
return rem;
|
|
}
|
|
#endif
|
|
|
|
/* computes new integers in quo and rem such that:
|
|
quo * rhs + rem = lhs
|
|
0 <= rem < rhs
|
|
can have lhs, rhs the same
|
|
assumes rhs != 0 (undefined behaviour if it is)
|
|
*/
|
|
void mpz_divmod_inpl(mpz_t *dest_quo, mpz_t *dest_rem, const mpz_t *lhs, const mpz_t *rhs) {
|
|
assert(!mpz_is_zero(rhs));
|
|
|
|
mpz_need_dig(dest_quo, lhs->len + 1); // +1 necessary?
|
|
memset(dest_quo->dig, 0, (lhs->len + 1) * sizeof(mpz_dig_t));
|
|
dest_quo->neg = 0;
|
|
dest_quo->len = 0;
|
|
mpz_need_dig(dest_rem, lhs->len + 1); // +1 necessary?
|
|
mpz_set(dest_rem, lhs);
|
|
mpn_div(dest_rem->dig, &dest_rem->len, rhs->dig, rhs->len, dest_quo->dig, &dest_quo->len);
|
|
dest_rem->neg &= !!dest_rem->len;
|
|
|
|
// check signs and do Python style modulo
|
|
if (lhs->neg != rhs->neg) {
|
|
dest_quo->neg = !!dest_quo->len;
|
|
if (!mpz_is_zero(dest_rem)) {
|
|
mpz_t mpzone;
|
|
mpz_init_from_int(&mpzone, -1);
|
|
mpz_add_inpl(dest_quo, dest_quo, &mpzone);
|
|
mpz_add_inpl(dest_rem, dest_rem, rhs);
|
|
}
|
|
}
|
|
}
|
|
|
|
#if 0
|
|
these functions are unused
|
|
|
|
/* computes floor(lhs / rhs)
|
|
can have lhs, rhs the same
|
|
*/
|
|
mpz_t *mpz_div(const mpz_t *lhs, const mpz_t *rhs) {
|
|
mpz_t *quo = mpz_zero();
|
|
mpz_t rem;
|
|
mpz_init_zero(&rem);
|
|
mpz_divmod_inpl(quo, &rem, lhs, rhs);
|
|
mpz_deinit(&rem);
|
|
return quo;
|
|
}
|
|
|
|
/* computes lhs % rhs ( >= 0)
|
|
can have lhs, rhs the same
|
|
*/
|
|
mpz_t *mpz_mod(const mpz_t *lhs, const mpz_t *rhs) {
|
|
mpz_t quo;
|
|
mpz_init_zero(&quo);
|
|
mpz_t *rem = mpz_zero();
|
|
mpz_divmod_inpl(&quo, rem, lhs, rhs);
|
|
mpz_deinit(&quo);
|
|
return rem;
|
|
}
|
|
#endif
|
|
|
|
// must return actual int value if it fits in mp_int_t
|
|
mp_int_t mpz_hash(const mpz_t *z) {
|
|
mp_uint_t val = 0;
|
|
mpz_dig_t *d = z->dig + z->len;
|
|
|
|
while (d-- > z->dig) {
|
|
val = (val << DIG_SIZE) | *d;
|
|
}
|
|
|
|
if (z->neg != 0) {
|
|
val = -val;
|
|
}
|
|
|
|
return val;
|
|
}
|
|
|
|
bool mpz_as_int_checked(const mpz_t *i, mp_int_t *value) {
|
|
mp_uint_t val = 0;
|
|
mpz_dig_t *d = i->dig + i->len;
|
|
|
|
while (d-- > i->dig) {
|
|
if (val > (~(MP_OBJ_WORD_MSBIT_HIGH) >> DIG_SIZE)) {
|
|
// will overflow
|
|
return false;
|
|
}
|
|
val = (val << DIG_SIZE) | *d;
|
|
}
|
|
|
|
if (i->neg != 0) {
|
|
val = -val;
|
|
}
|
|
|
|
*value = val;
|
|
return true;
|
|
}
|
|
|
|
bool mpz_as_uint_checked(const mpz_t *i, mp_uint_t *value) {
|
|
if (i->neg != 0) {
|
|
// can't represent signed values
|
|
return false;
|
|
}
|
|
|
|
mp_uint_t val = 0;
|
|
mpz_dig_t *d = i->dig + i->len;
|
|
|
|
while (d-- > i->dig) {
|
|
if (val > (~(MP_OBJ_WORD_MSBIT_HIGH) >> (DIG_SIZE - 1))) {
|
|
// will overflow
|
|
return false;
|
|
}
|
|
val = (val << DIG_SIZE) | *d;
|
|
}
|
|
|
|
*value = val;
|
|
return true;
|
|
}
|
|
|
|
void mpz_as_bytes(const mpz_t *z, bool big_endian, size_t len, byte *buf) {
|
|
byte *b = buf;
|
|
if (big_endian) {
|
|
b += len;
|
|
}
|
|
mpz_dig_t *zdig = z->dig;
|
|
int bits = 0;
|
|
mpz_dbl_dig_t d = 0;
|
|
mpz_dbl_dig_t carry = 1;
|
|
for (size_t zlen = z->len; zlen > 0; --zlen) {
|
|
bits += DIG_SIZE;
|
|
d = (d << DIG_SIZE) | *zdig++;
|
|
for (; bits >= 8; bits -= 8, d >>= 8) {
|
|
mpz_dig_t val = d;
|
|
if (z->neg) {
|
|
val = (~val & 0xff) + carry;
|
|
carry = val >> 8;
|
|
}
|
|
if (big_endian) {
|
|
*--b = val;
|
|
if (b == buf) {
|
|
return;
|
|
}
|
|
} else {
|
|
*b++ = val;
|
|
if (b == buf + len) {
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// fill remainder of buf with zero/sign extension of the integer
|
|
if (big_endian) {
|
|
len = b - buf;
|
|
} else {
|
|
len = buf + len - b;
|
|
buf = b;
|
|
}
|
|
memset(buf, z->neg ? 0xff : 0x00, len);
|
|
}
|
|
|
|
#if MICROPY_PY_BUILTINS_FLOAT
|
|
mp_float_t mpz_as_float(const mpz_t *i) {
|
|
mp_float_t val = 0;
|
|
mpz_dig_t *d = i->dig + i->len;
|
|
|
|
while (d-- > i->dig) {
|
|
val = val * DIG_BASE + *d;
|
|
}
|
|
|
|
if (i->neg != 0) {
|
|
val = -val;
|
|
}
|
|
|
|
return val;
|
|
}
|
|
#endif
|
|
|
|
#if 0
|
|
this function is unused
|
|
char *mpz_as_str(const mpz_t *i, unsigned int base) {
|
|
char *s = m_new(char, mp_int_format_size(mpz_max_num_bits(i), base, NULL, '\0'));
|
|
mpz_as_str_inpl(i, base, NULL, 'a', '\0', s);
|
|
return s;
|
|
}
|
|
#endif
|
|
|
|
// assumes enough space in str as calculated by mp_int_format_size
|
|
// base must be between 2 and 32 inclusive
|
|
// returns length of string, not including null byte
|
|
size_t mpz_as_str_inpl(const mpz_t *i, unsigned int base, const char *prefix, char base_char, char comma, char *str) {
|
|
assert(str != NULL);
|
|
assert(2 <= base && base <= 32);
|
|
|
|
size_t ilen = i->len;
|
|
|
|
char *s = str;
|
|
if (ilen == 0) {
|
|
if (prefix) {
|
|
while (*prefix) {
|
|
*s++ = *prefix++;
|
|
}
|
|
}
|
|
*s++ = '0';
|
|
*s = '\0';
|
|
return s - str;
|
|
}
|
|
|
|
// make a copy of mpz digits, so we can do the div/mod calculation
|
|
mpz_dig_t *dig = m_new(mpz_dig_t, ilen);
|
|
memcpy(dig, i->dig, ilen * sizeof(mpz_dig_t));
|
|
|
|
// convert
|
|
char *last_comma = str;
|
|
bool done;
|
|
do {
|
|
mpz_dig_t *d = dig + ilen;
|
|
mpz_dbl_dig_t a = 0;
|
|
|
|
// compute next remainder
|
|
while (--d >= dig) {
|
|
a = (a << DIG_SIZE) | *d;
|
|
*d = a / base;
|
|
a %= base;
|
|
}
|
|
|
|
// convert to character
|
|
a += '0';
|
|
if (a > '9') {
|
|
a += base_char - '9' - 1;
|
|
}
|
|
*s++ = a;
|
|
|
|
// check if number is zero
|
|
done = true;
|
|
for (d = dig; d < dig + ilen; ++d) {
|
|
if (*d != 0) {
|
|
done = false;
|
|
break;
|
|
}
|
|
}
|
|
if (comma && (s - last_comma) == 3) {
|
|
*s++ = comma;
|
|
last_comma = s;
|
|
}
|
|
}
|
|
while (!done);
|
|
|
|
// free the copy of the digits array
|
|
m_del(mpz_dig_t, dig, ilen);
|
|
|
|
if (prefix) {
|
|
const char *p = &prefix[strlen(prefix)];
|
|
while (p > prefix) {
|
|
*s++ = *--p;
|
|
}
|
|
}
|
|
if (i->neg != 0) {
|
|
*s++ = '-';
|
|
}
|
|
|
|
// reverse string
|
|
for (char *u = str, *v = s - 1; u < v; ++u, --v) {
|
|
char temp = *u;
|
|
*u = *v;
|
|
*v = temp;
|
|
}
|
|
|
|
*s = '\0'; // null termination
|
|
|
|
return s - str;
|
|
}
|
|
|
|
#endif // MICROPY_LONGINT_IMPL == MICROPY_LONGINT_IMPL_MPZ
|