rp2040js 1.3.3 → 1.4.0

package/LICENSE

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2021 Uri Shaked
-
-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.
+The MIT License (MIT)
+
+Copyright (c) 2021 Uri Shaked
+
+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.

package/README.md

@@ -1,128 +1,128 @@
-![](../../actions/workflows/ci-test.yml/badge.svg) ![](../../actions/workflows/ci-micropython.yml/badge.svg) ![](../../actions/workflows/ci-pico-sdk.yml/badge.svg)
-
-# rp2040js
-
-Raspberry Pi Pico Emulator for the [Wokwi Simulation Platform](https://wokwi.com). It blinks, runs Arduino code, and even the MicroPython REPL!
-
-## Online examples
-
-If you are just looking to play around with the Raspberry Pi Pico Simulator, check out the Wokwi Simulator:
-
-- [Raspberry Pi Pico Traffic Light](https://wokwi.com/arduino/projects/297322571959894536)
-- [LCD1602 Hello World](https://wokwi.com/arduino/projects/297323005822894602)
-- [MicroPython Blink](https://wokwi.com/arduino/projects/300504213470839309)
-- [MicroPython 7-Segment Counter](https://wokwi.com/arduino/projects/300210834979684872)
-
-For more information, take a look at the [wokwi-pi-pico docs](https://docs.wokwi.com/parts/wokwi-pi-pico) and the [Pi Pico MicroPython Guide](https://docs.wokwi.com/guides/micropython).
-
-If you want to develop your own application using the Raspberry Pi Pico simulator, the following examples may be helpful:
-
-- [Blink LEDs with RP2040js, from scratch](https://stackblitz.com/edit/rp2040js-blink?file=index.ts) - Press "Run" and patiently wait for the code to compile ;-)
-
-## Run the demo project
-
-### Native code
-
-You'd need to get `hello_uart.hex` by building it from the [pico-examples repo](https://github.com/raspberrypi/pico-examples/tree/master/uart/hello_uart), then copy it to the rp2040js root directory and run:
-
-```
-npm install
-npm start
-```
-
-You can also specify the path to the image on the command line and/or load an UF2 image:
-
-```sh
-npm run start -- --image ./my-pico-project.uf2
-```
-
-A GDB server will be available on port 3333, and the data written to UART0 will be printed
-to the console.
-
-### MicroPython code
-
-To run the MicroPython demo, first download [RPI_PICO-20230426-v1.20.0.uf2](https://micropython.org/resources/firmware/RPI_PICO-20230426-v1.20.0.uf2), place it in the rp2040js root directory, then run:
-
-```
-npm install
-npm run start:micropython
-```
-
-and enjoy the MicroPython REPL! Quit the REPL with Ctrl+X. A different MicroPython UF2 image can be loaded by supplying the `--image` option:
-
-```
-npm run start:micropython -- --image=my_image.uf2
-```
-
-A GDB server on port 3333 can be enabled by specifying the `--gdb` flag:
-
-```
-npm run start:micropython -- --gdb
-```
-
-For using the MicroPython demo code in tests, the `--expect-text` can come handy: it will look for the given text in the serial output and exit with code 0 if found, or 1 if not found. You can find an example in [the MicroPython CI test](./.github/workflows/ci-micropython.yml).
-
-#### Filesystem support
-
-With MicroPython, you can use the filesystem on the Pico. This becomes useful as more than one script file is used in your code. Just put a [LittleFS](https://github.com/littlefs-project/littlefs) formatted filesystem image called `littlefs.img` into the rp2040js root directory, and your `main.py` will be automatically started from there.
-
-A simple way to create a suitable LittleFS image containing your script files is outlined in [create_littlefs_image.py](https://github.com/tomods/GrinderController/blob/358ad3e0f795d8cc0bdf4f21bb35f806871d433f/tools/create_littlefs_image.py).
-So, using [littlefs-python](https://pypi.org/project/littlefs-python/), you can do the following:
-
-```python
-from littlefs import LittleFS
-files = ['your.py', 'files.py', 'here.py', 'main.py']
-output_image = 'output/littlefs.img'  # symlinked/copied to rp2040js root directory
-lfs = LittleFS(block_size=4096, block_count=352, prog_size=256)
-for filename in files:
-    with open(filename, 'rb') as src_file, lfs.open(filename, 'w') as lfs_file:
-        lfs_file.write(src_file.read())
-with open(output_image, 'wb') as fh:
-    fh.write(lfs.context.buffer)
-```
-
-Other ways of creating LittleFS images can be found [here](https://github.com/wokwi/littlefs-wasm) or [here](https://github.com/littlefs-project/littlefs#related-projects).
-
-Currently, the filesystem is not writeable, as the SSI peripheral required for flash writing is not implemented yet. If you're interested in hacking, see the discussion in https://github.com/wokwi/rp2040js/issues/88 for a workaround.
-
-### CircuitPython code
-
-To run the CircuitPython demo, you can follow the directions above for MicroPython, except download [adafruit-circuitpython-raspberry_pi_pico-en_US-8.0.2.uf2](https://adafruit-circuit-python.s3.amazonaws.com/bin/raspberry_pi_pico/en_US/adafruit-circuitpython-raspberry_pi_pico-en_US-8.0.2.uf2) instead of the MicroPython UF2 file. Place it in the rp2040js root directory, then run:
-
-```
-npm install
-npm run start:circuitpython
-```
-
-and start the CircuitPython REPL! The rest of the experience is the same as the MicroPython demo (Ctrl+X to exit, using the `--image` and
-`--gdb` options, etc).
-
-#### Filesystem support
-
-For CircuitPython, you can create a FAT12 filesystem in Linux using the `truncate` and `mkfs.vfat` utilities:
-
-```shell
-truncate fat12.img -s 1M  # make the image file
-mkfs.vfat -F12 -S512 fat12.img  # create the FAT12 filesystem
-```
-
-You can then mount the filesystem image and add files to it:
-
-```shell
-mkdir fat12  # create the mounting folder if needed
-sudo mount -o loop fat12.img fat12/  # mount the filesystem to the folder
-sudo cp code.py fat12/  # copy code.py to the filesystem
-sudo umount fat12/  # unmount the filesystem
-```
-
-While CircuitPython does not typically use a writeable filesystem, note that this functionality is unavailable (see MicroPython filesystem
-support section for more details).
-
-## Learn more
-
-- [Live-coding stream playlist](https://www.youtube.com/playlist?list=PLLomdjsHtJTxT-vdJHwa3z62dFXZnzYBm)
-- [Hackaday project page](https://hackaday.io/project/177082-raspberry-pi-pico-emulator)
-
-## License
-
-Released under the MIT licence. Copyright (c) 2021-2023, Uri Shaked.
+![](../../actions/workflows/ci-test.yml/badge.svg) ![](../../actions/workflows/ci-micropython.yml/badge.svg) ![](../../actions/workflows/ci-pico-sdk.yml/badge.svg)
+
+# rp2040js
+
+Raspberry Pi Pico Emulator for the [Wokwi Simulation Platform](https://wokwi.com). It blinks, runs Arduino code, and even the MicroPython REPL!
+
+## Online examples
+
+If you are just looking to play around with the Raspberry Pi Pico Simulator, check out the Wokwi Simulator:
+
+- [Raspberry Pi Pico Traffic Light](https://wokwi.com/arduino/projects/297322571959894536)
+- [LCD1602 Hello World](https://wokwi.com/arduino/projects/297323005822894602)
+- [MicroPython Blink](https://wokwi.com/arduino/projects/300504213470839309)
+- [MicroPython 7-Segment Counter](https://wokwi.com/arduino/projects/300210834979684872)
+
+For more information, take a look at the [wokwi-pi-pico docs](https://docs.wokwi.com/parts/wokwi-pi-pico) and the [Pi Pico MicroPython Guide](https://docs.wokwi.com/guides/micropython).
+
+If you want to develop your own application using the Raspberry Pi Pico simulator, the following examples may be helpful:
+
+- [Blink LEDs with RP2040js, from scratch](https://stackblitz.com/edit/rp2040js-blink?file=index.ts) - Press "Run" and patiently wait for the code to compile ;-)
+
+## Run the demo project
+
+### Native code
+
+You'd need to get `hello_uart.hex` by building it from the [pico-examples repo](https://github.com/raspberrypi/pico-examples/tree/master/uart/hello_uart), then copy it to the rp2040js root directory and run:
+
+```
+npm install
+npm start
+```
+
+You can also specify the path to the image on the command line and/or load an UF2 image:
+
+```sh
+npm run start -- --image ./my-pico-project.uf2
+```
+
+A GDB server will be available on port 3333, and the data written to UART0 will be printed
+to the console.
+
+### MicroPython code
+
+To run the MicroPython demo, first download [RPI_PICO-20230426-v1.20.0.uf2](https://micropython.org/resources/firmware/RPI_PICO-20230426-v1.20.0.uf2), place it in the rp2040js root directory, then run:
+
+```
+npm install
+npm run start:micropython
+```
+
+and enjoy the MicroPython REPL! Quit the REPL with Ctrl+X. A different MicroPython UF2 image can be loaded by supplying the `--image` option:
+
+```
+npm run start:micropython -- --image=my_image.uf2
+```
+
+A GDB server on port 3333 can be enabled by specifying the `--gdb` flag:
+
+```
+npm run start:micropython -- --gdb
+```
+
+For using the MicroPython demo code in tests, the `--expect-text` can come handy: it will look for the given text in the serial output and exit with code 0 if found, or 1 if not found. You can find an example in [the MicroPython CI test](./.github/workflows/ci-micropython.yml).
+
+#### Filesystem support
+
+With MicroPython, you can use the filesystem on the Pico. This becomes useful as more than one script file is used in your code. Just put a [LittleFS](https://github.com/littlefs-project/littlefs) formatted filesystem image called `littlefs.img` into the rp2040js root directory, and your `main.py` will be automatically started from there.
+
+A simple way to create a suitable LittleFS image containing your script files is outlined in [create_littlefs_image.py](https://github.com/tomods/GrinderController/blob/358ad3e0f795d8cc0bdf4f21bb35f806871d433f/tools/create_littlefs_image.py).
+So, using [littlefs-python](https://pypi.org/project/littlefs-python/), you can do the following:
+
+```python
+from littlefs import LittleFS
+files = ['your.py', 'files.py', 'here.py', 'main.py']
+output_image = 'output/littlefs.img'  # symlinked/copied to rp2040js root directory
+lfs = LittleFS(block_size=4096, block_count=352, prog_size=256)
+for filename in files:
+    with open(filename, 'rb') as src_file, lfs.open(filename, 'w') as lfs_file:
+        lfs_file.write(src_file.read())
+with open(output_image, 'wb') as fh:
+    fh.write(lfs.context.buffer)
+```
+
+Other ways of creating LittleFS images can be found [here](https://github.com/wokwi/littlefs-wasm) or [here](https://github.com/littlefs-project/littlefs#related-projects).
+
+Currently, the filesystem is not writeable, as the SSI peripheral required for flash writing is not implemented yet. If you're interested in hacking, see the discussion in https://github.com/wokwi/rp2040js/issues/88 for a workaround.
+
+### CircuitPython code
+
+To run the CircuitPython demo, you can follow the directions above for MicroPython, except download [adafruit-circuitpython-raspberry_pi_pico-en_US-8.0.2.uf2](https://adafruit-circuit-python.s3.amazonaws.com/bin/raspberry_pi_pico/en_US/adafruit-circuitpython-raspberry_pi_pico-en_US-8.0.2.uf2) instead of the MicroPython UF2 file. Place it in the rp2040js root directory, then run:
+
+```
+npm install
+npm run start:circuitpython
+```
+
+and start the CircuitPython REPL! The rest of the experience is the same as the MicroPython demo (Ctrl+X to exit, using the `--image` and
+`--gdb` options, etc).
+
+#### Filesystem support
+
+For CircuitPython, you can create a FAT12 filesystem in Linux using the `truncate` and `mkfs.vfat` utilities:
+
+```shell
+truncate fat12.img -s 1M  # make the image file
+mkfs.vfat -F12 -S512 fat12.img  # create the FAT12 filesystem
+```
+
+You can then mount the filesystem image and add files to it:
+
+```shell
+mkdir fat12  # create the mounting folder if needed
+sudo mount -o loop fat12.img fat12/  # mount the filesystem to the folder
+sudo cp code.py fat12/  # copy code.py to the filesystem
+sudo umount fat12/  # unmount the filesystem
+```
+
+While CircuitPython does not typically use a writeable filesystem, note that this functionality is unavailable (see MicroPython filesystem
+support section for more details).
+
+## Learn more
+
+- [Live-coding stream playlist](https://www.youtube.com/playlist?list=PLLomdjsHtJTxT-vdJHwa3z62dFXZnzYBm)
+- [Hackaday project page](https://hackaday.io/project/177082-raspberry-pi-pico-emulator)
+
+## License
+
+Released under the MIT licence. Copyright (c) 2021-2023, Uri Shaked.

package/dist/cjs/gdb/gdb-server.js

@@ -32,37 +32,37 @@ const registers = [
     `name:pc;bitsize:32;offset:60;encoding:int;format:hex;set:General Purpose Registers;generic:pc;alt-name:r15;gcc:15;dwarf:15;`,
     `name:cpsr;bitsize:32;offset:64;encoding:int;format:hex;set:General Purpose Registers;generic:flags;alt-name:psr;gcc:16;dwarf:16;`,
 ];
-const targetXML = `<?xml version="1.0"?>
-<!DOCTYPE target SYSTEM "gdb-target.dtd">
-<target version="1.0">
-<architecture>arm</architecture>
-<feature name="org.gnu.gdb.arm.m-profile">
-<reg name="r0" bitsize="32" regnum="0" save-restore="yes" type="int" group="general"/>
-<reg name="r1" bitsize="32" regnum="1" save-restore="yes" type="int" group="general"/>
-<reg name="r2" bitsize="32" regnum="2" save-restore="yes" type="int" group="general"/>
-<reg name="r3" bitsize="32" regnum="3" save-restore="yes" type="int" group="general"/>
-<reg name="r4" bitsize="32" regnum="4" save-restore="yes" type="int" group="general"/>
-<reg name="r5" bitsize="32" regnum="5" save-restore="yes" type="int" group="general"/>
-<reg name="r6" bitsize="32" regnum="6" save-restore="yes" type="int" group="general"/>
-<reg name="r7" bitsize="32" regnum="7" save-restore="yes" type="int" group="general"/>
-<reg name="r8" bitsize="32" regnum="8" save-restore="yes" type="int" group="general"/>
-<reg name="r9" bitsize="32" regnum="9" save-restore="yes" type="int" group="general"/>
-<reg name="r10" bitsize="32" regnum="10" save-restore="yes" type="int" group="general"/>
-<reg name="r11" bitsize="32" regnum="11" save-restore="yes" type="int" group="general"/>
-<reg name="r12" bitsize="32" regnum="12" save-restore="yes" type="int" group="general"/>
-<reg name="sp" bitsize="32" regnum="13" save-restore="yes" type="data_ptr" group="general"/>
-<reg name="lr" bitsize="32" regnum="14" save-restore="yes" type="int" group="general"/>
-<reg name="pc" bitsize="32" regnum="15" save-restore="yes" type="code_ptr" group="general"/>
-<reg name="xPSR" bitsize="32" regnum="16" save-restore="yes" type="int" group="general"/>
-</feature>
-<feature name="org.gnu.gdb.arm.m-system">
-<reg name="msp" bitsize="32" regnum="17" save-restore="yes" type="data_ptr" group="system"/>
-<reg name="psp" bitsize="32" regnum="18" save-restore="yes" type="data_ptr" group="system"/>
-<reg name="primask" bitsize="1" regnum="19" save-restore="yes" type="int8" group="system"/>
-<reg name="basepri" bitsize="8" regnum="20" save-restore="yes" type="int8" group="system"/>
-<reg name="faultmask" bitsize="1" regnum="21" save-restore="yes" type="int8" group="system"/>
-<reg name="control" bitsize="2" regnum="22" save-restore="yes" type="int8" group="system"/>
-</feature>
+const targetXML = `<?xml version="1.0"?>
+<!DOCTYPE target SYSTEM "gdb-target.dtd">
+<target version="1.0">
+<architecture>arm</architecture>
+<feature name="org.gnu.gdb.arm.m-profile">
+<reg name="r0" bitsize="32" regnum="0" save-restore="yes" type="int" group="general"/>
+<reg name="r1" bitsize="32" regnum="1" save-restore="yes" type="int" group="general"/>
+<reg name="r2" bitsize="32" regnum="2" save-restore="yes" type="int" group="general"/>
+<reg name="r3" bitsize="32" regnum="3" save-restore="yes" type="int" group="general"/>
+<reg name="r4" bitsize="32" regnum="4" save-restore="yes" type="int" group="general"/>
+<reg name="r5" bitsize="32" regnum="5" save-restore="yes" type="int" group="general"/>
+<reg name="r6" bitsize="32" regnum="6" save-restore="yes" type="int" group="general"/>
+<reg name="r7" bitsize="32" regnum="7" save-restore="yes" type="int" group="general"/>
+<reg name="r8" bitsize="32" regnum="8" save-restore="yes" type="int" group="general"/>
+<reg name="r9" bitsize="32" regnum="9" save-restore="yes" type="int" group="general"/>
+<reg name="r10" bitsize="32" regnum="10" save-restore="yes" type="int" group="general"/>
+<reg name="r11" bitsize="32" regnum="11" save-restore="yes" type="int" group="general"/>
+<reg name="r12" bitsize="32" regnum="12" save-restore="yes" type="int" group="general"/>
+<reg name="sp" bitsize="32" regnum="13" save-restore="yes" type="data_ptr" group="general"/>
+<reg name="lr" bitsize="32" regnum="14" save-restore="yes" type="int" group="general"/>
+<reg name="pc" bitsize="32" regnum="15" save-restore="yes" type="code_ptr" group="general"/>
+<reg name="xPSR" bitsize="32" regnum="16" save-restore="yes" type="int" group="general"/>
+</feature>
+<feature name="org.gnu.gdb.arm.m-system">
+<reg name="msp" bitsize="32" regnum="17" save-restore="yes" type="data_ptr" group="system"/>
+<reg name="psp" bitsize="32" regnum="18" save-restore="yes" type="data_ptr" group="system"/>
+<reg name="primask" bitsize="1" regnum="19" save-restore="yes" type="int8" group="system"/>
+<reg name="basepri" bitsize="8" regnum="20" save-restore="yes" type="int8" group="system"/>
+<reg name="faultmask" bitsize="1" regnum="21" save-restore="yes" type="int8" group="system"/>
+<reg name="control" bitsize="2" regnum="22" save-restore="yes" type="int8" group="system"/>
+</feature>
 </target>`;
 const LOG_NAME = 'GDBServer';
 class GDBServer {

package/dist/cjs/index.d.ts

@@ -5,7 +5,7 @@ export { I2CMode, I2CSpeed, RPI2C } from './peripherals/i2c.js';
 export { BasePeripheral, type Peripheral } from './peripherals/peripheral.js';
 export { RPPIO, StateMachine } from './peripherals/pio.js';
 export { RPUSBController } from './peripherals/usb.js';
-export { RP2040 } from './rp2040.js';
+export { RP2040, type ClockListener } from './rp2040.js';
 export { Simulator } from './simulator.js';
 export { USBCDC } from './usb/cdc.js';
 export { DataDirection, DescriptorType, SetupRecipient, SetupRequest, SetupType, type ISetupPacketParams, } from './usb/interfaces.js';

package/dist/cjs/peripherals/clocks.d.ts

@@ -22,6 +22,17 @@ export declare class RPClocks extends BasePeripheral implements Peripheral {
     rtcCtrl: number;
     rtcDiv: number;
     constructor(rp2040: RP2040, name: string);
+    /** clk_ref frequency, in Hz. GPIN0/GPIN1 are not modelled and yield 0. */
+    get refFreq(): number;
+    /** clk_sys frequency, in Hz. GPIN0/GPIN1 are not modelled and yield 0. */
+    get sysFreq(): number;
+    /**
+     * clk_peri frequency, in Hz. Feeds the UART and SPI baud rate generators. Returns 0 while
+     * the clock generator is stopped, and for the GPIN0/GPIN1 sources we do not model.
+     */
+    get periFreq(): number;
+    private get refSourceFreq();
+    private get sysSourceFreq();
     readUint32(offset: number): number;
     writeUint32(offset: number, value: number): void;
 }

package/dist/cjs/peripherals/clocks.js

@@ -34,6 +34,44 @@ const CLK_RTC_DIV = 0x70;
 const CLK_RTC_SELECTED = 0x74;
 const CLK_SYS_RESUS_CTRL = 0x78;
 const CLK_SYS_RESUS_STATUS = 0x7c;
+// CLK_REF_CTRL
+const CLK_REF_CTRL_SRC_MASK = 0x3;
+const CLK_REF_CTRL_SRC_ROSC = 0x0;
+const CLK_REF_CTRL_SRC_AUX = 0x1;
+const CLK_REF_CTRL_SRC_XOSC = 0x2;
+const CLK_REF_CTRL_AUXSRC_SHIFT = 5;
+const CLK_REF_CTRL_AUXSRC_MASK = 0x3;
+const CLK_REF_CTRL_AUXSRC_PLL_USB = 0x0;
+// CLK_REF_DIV has no fractional part, only INT (bits 9:8)
+const CLK_REF_DIV_INT_BITS = 0x300;
+// CLK_SYS_CTRL
+const CLK_SYS_CTRL_SRC_MASK = 0x1;
+const CLK_SYS_CTRL_SRC_REF = 0x0;
+const CLK_SYS_CTRL_AUXSRC_SHIFT = 5;
+const CLK_SYS_CTRL_AUXSRC_MASK = 0x7;
+const CLK_SYS_CTRL_AUXSRC_PLL_SYS = 0x0;
+const CLK_SYS_CTRL_AUXSRC_PLL_USB = 0x1;
+const CLK_SYS_CTRL_AUXSRC_ROSC = 0x2;
+const CLK_SYS_CTRL_AUXSRC_XOSC = 0x3;
+// CLK_PERI_CTRL. clk_peri has no SRC mux and no divider: it is driven straight from AUXSRC,
+// which uses its own encoding (not the CLK_SYS one).
+const CLK_PERI_CTRL_ENABLE = 1 << 11;
+const CLK_PERI_CTRL_KILL = 1 << 10;
+const CLK_PERI_CTRL_AUXSRC_SHIFT = 5;
+const CLK_PERI_CTRL_AUXSRC_MASK = 0x7;
+const CLK_PERI_CTRL_AUXSRC_CLK_SYS = 0x0;
+const CLK_PERI_CTRL_AUXSRC_PLL_SYS = 0x1;
+const CLK_PERI_CTRL_AUXSRC_PLL_USB = 0x2;
+const CLK_PERI_CTRL_AUXSRC_ROSC = 0x3;
+const CLK_PERI_CTRL_AUXSRC_XOSC = 0x4;
+// CLK_x_DIV: 24.8 fixed point (INT bits 31:8, FRAC bits 7:0)
+const CLK_DIV_INT_SHIFT = 8;
+const CLK_DIV_FRAC_MASK = 0xff;
+/** Decodes a CLK_x_DIV register value. INT = 0 means divide by 2^16. */
+function clockDivisor(div) {
+    const int = div >>> CLK_DIV_INT_SHIFT;
+    return int ? int + (div & CLK_DIV_FRAC_MASK) / 256 : 0x10000;
+}
 class RPClocks extends peripheral_js_1.BasePeripheral {
     constructor(rp2040, name) {
         super(rp2040, name);
@@ -58,6 +96,71 @@ class RPClocks extends peripheral_js_1.BasePeripheral {
         this.rtcCtrl = 0;
         this.rtcDiv = 0x100;
     }
+    /** clk_ref frequency, in Hz. GPIN0/GPIN1 are not modelled and yield 0. */
+    get refFreq() {
+        return this.refSourceFreq / clockDivisor(this.refDiv & CLK_REF_DIV_INT_BITS);
+    }
+    /** clk_sys frequency, in Hz. GPIN0/GPIN1 are not modelled and yield 0. */
+    get sysFreq() {
+        return this.sysSourceFreq / clockDivisor(this.sysDiv);
+    }
+    /**
+     * clk_peri frequency, in Hz. Feeds the UART and SPI baud rate generators. Returns 0 while
+     * the clock generator is stopped, and for the GPIN0/GPIN1 sources we do not model.
+     */
+    get periFreq() {
+        const { rp2040 } = this;
+        if (!(this.periCtrl & CLK_PERI_CTRL_ENABLE) || this.periCtrl & CLK_PERI_CTRL_KILL) {
+            return 0;
+        }
+        switch ((this.periCtrl >>> CLK_PERI_CTRL_AUXSRC_SHIFT) & CLK_PERI_CTRL_AUXSRC_MASK) {
+            case CLK_PERI_CTRL_AUXSRC_CLK_SYS:
+                return this.sysFreq;
+            case CLK_PERI_CTRL_AUXSRC_PLL_SYS:
+                return rp2040.pllSys.frequency;
+            case CLK_PERI_CTRL_AUXSRC_PLL_USB:
+                return rp2040.pllUsb.frequency;
+            case CLK_PERI_CTRL_AUXSRC_ROSC:
+                return rp2040.roscFreq;
+            case CLK_PERI_CTRL_AUXSRC_XOSC:
+                return rp2040.xoscFreq;
+            default:
+                return 0;
+        }
+    }
+    get refSourceFreq() {
+        const { rp2040 } = this;
+        switch (this.refCtrl & CLK_REF_CTRL_SRC_MASK) {
+            case CLK_REF_CTRL_SRC_ROSC:
+                return rp2040.roscFreq;
+            case CLK_REF_CTRL_SRC_XOSC:
+                return rp2040.xoscFreq;
+            case CLK_REF_CTRL_SRC_AUX: {
+                const auxsrc = (this.refCtrl >>> CLK_REF_CTRL_AUXSRC_SHIFT) & CLK_REF_CTRL_AUXSRC_MASK;
+                return auxsrc === CLK_REF_CTRL_AUXSRC_PLL_USB ? rp2040.pllUsb.frequency : 0;
+            }
+            default:
+                return 0;
+        }
+    }
+    get sysSourceFreq() {
+        const { rp2040 } = this;
+        if ((this.sysCtrl & CLK_SYS_CTRL_SRC_MASK) === CLK_SYS_CTRL_SRC_REF) {
+            return this.refFreq;
+        }
+        switch ((this.sysCtrl >>> CLK_SYS_CTRL_AUXSRC_SHIFT) & CLK_SYS_CTRL_AUXSRC_MASK) {
+            case CLK_SYS_CTRL_AUXSRC_PLL_SYS:
+                return rp2040.pllSys.frequency;
+            case CLK_SYS_CTRL_AUXSRC_PLL_USB:
+                return rp2040.pllUsb.frequency;
+            case CLK_SYS_CTRL_AUXSRC_ROSC:
+                return rp2040.roscFreq;
+            case CLK_SYS_CTRL_AUXSRC_XOSC:
+                return rp2040.xoscFreq;
+            default:
+                return 0;
+        }
+    }
     readUint32(offset) {
         switch (offset) {
             case CLK_GPOUT0_CTRL:
@@ -155,18 +258,23 @@ class RPClocks extends peripheral_js_1.BasePeripheral {
                 break;
             case CLK_REF_CTRL:
                 this.refCtrl = value;
+                this.rp2040.updateClocks();
                 break;
             case CLK_REF_DIV:
                 this.refDiv = value;
+                this.rp2040.updateClocks();
                 break;
             case CLK_SYS_CTRL:
                 this.sysCtrl = value;
+                this.rp2040.updateClocks();
                 break;
             case CLK_SYS_DIV:
                 this.sysDiv = value;
+                this.rp2040.updateClocks();
                 break;
             case CLK_PERI_CTRL:
                 this.periCtrl = value;
+                this.rp2040.updateClocks();
                 break;
             case CLK_PERI_DIV:
                 this.periDiv = value;

package/dist/cjs/peripherals/pll.d.ts

@@ -0,0 +1,25 @@
+import { BasePeripheral, Peripheral } from './peripheral.js';
+/**
+ * RP2040 PLL peripheral.
+ *
+ * Always reports locked (we have no startup delay to model), and computes its output
+ * frequency from the divider registers:
+ *
+ *   f_out = (f_ref / REFDIV * FBDIV) / (POSTDIV1 * POSTDIV2)
+ *
+ * The frequency is what makes `RP2040.clkSys` follow `set_sys_clock_khz()` and friends.
+ */
+export declare class RPPLL extends BasePeripheral implements Peripheral {
+    private cs;
+    private pwr;
+    private fbdivInt;
+    private prim;
+    get refdiv(): number;
+    get fbdiv(): number;
+    get postdiv1(): number;
+    get postdiv2(): number;
+    /** PLL output frequency, in Hz, derived from the current register values. */
+    get frequency(): number;
+    readUint32(offset: number): number;
+    writeUint32(offset: number, value: number): void;
+}