rp2040js 0.17.7 → 0.17.8

package/README.md

@@ -6,20 +6,21 @@ Raspberry Pi Pico Emulator for the [Wokwi Simulation Platform](https://wokwi.com
 
 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)
+- [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 ;-)
+- [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:
 
 ```
@@ -28,6 +29,7 @@ npm start
 ```
 
 ### MicroPython code
+
 To run the MicroPython demo, first download [rp2-pico-20210902-v1.17.uf2](https://micropython.org/resources/firmware/rp2-pico-20210902-v1.17.uf2), place it in the rp2040js root directory, then run:
 
 ```
@@ -35,14 +37,27 @@ npm install
 npm run start:micropython
 ```
 
-and enjoy the MicroPython REPL! Quit the REPL with Ctrl+X.
+and enjoy the MicroPython REPL! Quit the REPL with Ctrl+X. A different UF2 image can be loaded by supplying the `--image` option:
+
+```
+npm run start:micropython -- --image=my_image.uf2
+```
 
-You can replace rp2-pico-20210902-v1.17.uf2 with any recent MicroPython or CircuitPython release built for the RP2040.
+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 – and probably also CircuitPython – 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']
@@ -66,4 +81,4 @@ Currently, the filesystem is not writeable, as the SSI peripheral required for f
 
 ## License
 
-Released under the MIT licence. Copyright (c) 2021, Uri Shaked.
+Released under the MIT licence. Copyright (c) 2021-2023, Uri Shaked.

package/dist/cjs/cortex-m0-core.d.ts

@@ -79,7 +79,7 @@ export declare class CortexM0Core {
     BXWritePC(address: number): void;
     private substractUpdateFlags;
     private addUpdateFlags;
-    slowIO(addr: number): boolean;
+    cyclesIO(addr: number, write?: boolean): 3 | 0 | 1 | 4;
     executeInstruction(): void;
 }
 export {};

package/dist/cjs/cortex-m0-core.js

@@ -502,9 +502,15 @@ class CortexM0Core {
         this.V = (result | 0) === signedSum ? false : true;
         return result & 0xffffffff;
     }
-    slowIO(addr) {
+    cyclesIO(addr, write = false) {
         addr = addr >>> 0;
-        return addr < rp2040_1.SIO_START_ADDRESS || addr > rp2040_1.SIO_START_ADDRESS + 0x10000000;
+        if (addr >= rp2040_1.SIO_START_ADDRESS && addr < rp2040_1.SIO_START_ADDRESS + 0x10000000) {
+            return 0;
+        }
+        if (addr >= rp2040_1.APB_START_ADDRESS && addr < rp2040_1.APB_START_ADDRESS + 0x10000000) {
+            return write ? 4 : 3;
+        }
+        return 1;
     }
     executeInstruction() {
         if (this.interruptsUpdated) {
@@ -759,6 +765,7 @@ class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const addr = this.registers[Rn] + imm5;
+            this.cycles += this.cyclesIO(addr);
             this.registers[Rt] = this.readUint32(addr);
         }
         // LDR (sp + immediate)
@@ -766,6 +773,7 @@ class CortexM0Core {
             const Rt = (opcode >> 8) & 0x7;
             const imm8 = opcode & 0xff;
             const addr = this.SP + (imm8 << 2);
+            this.cycles += this.cyclesIO(addr);
             this.registers[Rt] = this.readUint32(addr);
         }
         // LDR (literal)
@@ -774,6 +782,7 @@ class CortexM0Core {
             const Rt = (opcode >> 8) & 7;
             const nextPC = this.PC + 2;
             const addr = (nextPC & 0xfffffffc) + imm8;
+            this.cycles += this.cyclesIO(addr);
             this.registers[Rt] = this.readUint32(addr);
         }
         // LDR (register)
@@ -782,9 +791,7 @@ class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const addr = this.registers[Rm] + this.registers[Rn];
-            if (this.slowIO(addr)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(addr);
             this.registers[Rt] = this.readUint32(addr);
         }
         // LDRB (immediate)
@@ -793,9 +800,7 @@ class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const addr = this.registers[Rn] + imm5;
-            if (this.slowIO(addr)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(addr);
             this.registers[Rt] = this.readUint8(addr);
         }
         // LDRB (register)
@@ -804,9 +809,7 @@ class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const addr = this.registers[Rm] + this.registers[Rn];
-            if (this.slowIO(addr)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(addr);
             this.registers[Rt] = this.readUint8(addr);
         }
         // LDRH (immediate)
@@ -815,9 +818,7 @@ class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const addr = this.registers[Rn] + (imm5 << 1);
-            if (this.slowIO(addr)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(addr);
             this.registers[Rt] = this.readUint16(addr);
         }
         // LDRH (register)
@@ -826,9 +827,7 @@ class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const addr = this.registers[Rm] + this.registers[Rn];
-            if (this.slowIO(addr)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(addr);
             this.registers[Rt] = this.readUint16(addr);
         }
         // LDRSB
@@ -837,9 +836,7 @@ class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const addr = this.registers[Rm] + this.registers[Rn];
-            if (this.slowIO(addr)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(addr);
             this.registers[Rt] = signExtend8(this.readUint8(addr));
         }
         // LDRSH
@@ -848,9 +845,7 @@ class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const addr = this.registers[Rm] + this.registers[Rn];
-            if (this.slowIO(addr)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(addr);
             this.registers[Rt] = signExtend16(this.readUint16(addr));
         }
         // LSLS (immediate)
@@ -1091,9 +1086,7 @@ class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const address = this.registers[Rn] + imm5;
-            if (this.slowIO(address)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(address, true);
             this.writeUint32(address, this.registers[Rt]);
         }
         // STR (sp + immediate)
@@ -1101,9 +1094,7 @@ class CortexM0Core {
             const Rt = (opcode >> 8) & 0x7;
             const imm8 = opcode & 0xff;
             const address = this.SP + (imm8 << 2);
-            if (this.slowIO(address)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(address, true);
             this.writeUint32(address, this.registers[Rt]);
         }
         // STR (register)
@@ -1112,9 +1103,7 @@ class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const address = this.registers[Rm] + this.registers[Rn];
-            if (this.slowIO(address)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(address, true);
             this.writeUint32(address, this.registers[Rt]);
         }
         // STRB (immediate)
@@ -1123,9 +1112,7 @@ class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const address = this.registers[Rn] + imm5;
-            if (this.slowIO(address)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(address, true);
             this.writeUint8(address, this.registers[Rt]);
         }
         // STRB (register)
@@ -1134,9 +1121,7 @@ class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const address = this.registers[Rm] + this.registers[Rn];
-            if (this.slowIO(address)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(address, true);
             this.writeUint8(address, this.registers[Rt]);
         }
         // STRH (immediate)
@@ -1145,9 +1130,7 @@ class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const address = this.registers[Rn] + imm5;
-            if (this.slowIO(address)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(address, true);
             this.writeUint16(address, this.registers[Rt]);
         }
         // STRH (register)
@@ -1156,9 +1139,7 @@ class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const address = this.registers[Rm] + this.registers[Rn];
-            if (this.slowIO(address)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(address, true);
             this.writeUint16(address, this.registers[Rt]);
         }
         // SUB (SP minus immediate)

package/dist/cjs/interpolator.js

@@ -89,8 +89,8 @@ class Interpolator {
         const overf0 = Boolean((input0 >>> ctrl0.shift) & ~msbmask0);
         const overf1 = Boolean((input1 >>> ctrl1.shift) & ~msbmask1);
         const overf = overf0 || overf1;
-        const sextmask0 = (uresult0 & (1 << ctrl0.maskMSB)) ? (-1 << ctrl0.maskMSB) : 0;
-        const sextmask1 = (uresult1 & (1 << ctrl1.maskMSB)) ? (-1 << ctrl1.maskMSB) : 0;
+        const sextmask0 = uresult0 & (1 << ctrl0.maskMSB) ? -1 << ctrl0.maskMSB : 0;
+        const sextmask1 = uresult1 & (1 << ctrl1.maskMSB) ? -1 << ctrl1.maskMSB : 0;
         const sresult0 = uresult0 | sextmask0;
         const sresult1 = uresult1 | sextmask1;
         const result0 = ctrl0.signed ? sresult0 : uresult0;
@@ -98,8 +98,16 @@ class Interpolator {
         const addresult0 = this.base0 + (ctrl0.addRaw ? input0 : result0);
         const addresult1 = this.base1 + (ctrl1.addRaw ? input1 : result1);
         const addresult2 = this.base2 + result0 + (do_blend ? 0 : result1);
-        const uclamp0 = bit_1.u32(result0) < bit_1.u32(this.base0) ? this.base0 : (bit_1.u32(result0) > bit_1.u32(this.base1) ? this.base1 : result0);
-        const sclamp0 = bit_1.s32(result0) < bit_1.s32(this.base0) ? this.base0 : (bit_1.s32(result0) > bit_1.s32(this.base1) ? this.base1 : result0);
+        const uclamp0 = bit_1.u32(result0) < bit_1.u32(this.base0)
+            ? this.base0
+            : bit_1.u32(result0) > bit_1.u32(this.base1)
+                ? this.base1
+                : result0;
+        const sclamp0 = bit_1.s32(result0) < bit_1.s32(this.base0)
+            ? this.base0
+            : bit_1.s32(result0) > bit_1.s32(this.base1)
+                ? this.base1
+                : result0;
         const clamp0 = ctrl0.signed ? sclamp0 : uclamp0;
         const alpha1 = result1 & 0xff;
         const ublend1 = bit_1.u32(this.base0) + (Math.floor((alpha1 * (bit_1.u32(this.base1) - bit_1.u32(this.base0))) / 256) | 0);

package/dist/cjs/peripherals/usb.js

@@ -205,7 +205,7 @@ class RPUSBController extends peripheral_1.BasePeripheral {
                     (_b = this.onEndpointWrite) === null || _b === void 0 ? void 0 : _b.call(this, endpoint, buffer);
                 }
             }
-            if (doubleBuffer && ((value >> USB_BUF1_SHIFT) & USB_BUF_CTRL_AVAILABLE)) {
+            if (doubleBuffer && (value >> USB_BUF1_SHIFT) & USB_BUF_CTRL_AVAILABLE) {
                 const bufferLength = (value >> USB_BUF1_SHIFT) & USB_BUF_CTRL_LEN_MASK;
                 const bufferOffset = this.getEndpointBufferOffset(endpoint, bufferOut) + USB_BUF1_OFFSET;
                 this.debug(`Start USB transfer, endPoint=${endpoint}, direction=${bufferOut ? 'out' : 'in'} buffer=${bufferOffset.toString(16)} length=${bufferLength}`);

package/dist/cjs/rp2040.d.ts

@@ -15,6 +15,7 @@ import { RPSIO } from './sio';
 import { Logger } from './utils/logging';
 export declare const FLASH_START_ADDRESS = 268435456;
 export declare const RAM_START_ADDRESS = 536870912;
+export declare const APB_START_ADDRESS = 1073741824;
 export declare const DPRAM_START_ADDRESS = 1343225856;
 export declare const SIO_START_ADDRESS = 3489660928;
 export declare class RP2040 {

package/dist/cjs/rp2040.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RP2040 = exports.SIO_START_ADDRESS = exports.DPRAM_START_ADDRESS = exports.RAM_START_ADDRESS = exports.FLASH_START_ADDRESS = void 0;
+exports.RP2040 = exports.SIO_START_ADDRESS = exports.DPRAM_START_ADDRESS = exports.APB_START_ADDRESS = exports.RAM_START_ADDRESS = exports.FLASH_START_ADDRESS = void 0;
 const realtime_clock_1 = require("./clock/realtime-clock");
 const cortex_m0_core_1 = require("./cortex-m0-core");
 const gpio_pin_1 = require("./gpio-pin");
@@ -29,6 +29,7 @@ const logging_1 = require("./utils/logging");
 const tbman_1 = require("./peripherals/tbman");
 exports.FLASH_START_ADDRESS = 0x10000000;
 exports.RAM_START_ADDRESS = 0x20000000;
+exports.APB_START_ADDRESS = 0x40000000;
 exports.DPRAM_START_ADDRESS = 0x50100000;
 exports.SIO_START_ADDRESS = 0xd0000000;
 const LOG_NAME = 'RP2040';

package/dist/esm/cortex-m0-core.d.ts

@@ -79,7 +79,7 @@ export declare class CortexM0Core {
     BXWritePC(address: number): void;
     private substractUpdateFlags;
     private addUpdateFlags;
-    slowIO(addr: number): boolean;
+    cyclesIO(addr: number, write?: boolean): 3 | 0 | 1 | 4;
     executeInstruction(): void;
 }
 export {};

package/dist/esm/cortex-m0-core.js

@@ -1,5 +1,5 @@
 import { MAX_HARDWARE_IRQ } from './irq';
-import { SIO_START_ADDRESS } from './rp2040';
+import { APB_START_ADDRESS, SIO_START_ADDRESS } from './rp2040';
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const EXC_RESET = 1;
 const EXC_NMI = 2;
@@ -499,9 +499,15 @@ export class CortexM0Core {
         this.V = (result | 0) === signedSum ? false : true;
         return result & 0xffffffff;
     }
-    slowIO(addr) {
+    cyclesIO(addr, write = false) {
         addr = addr >>> 0;
-        return addr < SIO_START_ADDRESS || addr > SIO_START_ADDRESS + 0x10000000;
+        if (addr >= SIO_START_ADDRESS && addr < SIO_START_ADDRESS + 0x10000000) {
+            return 0;
+        }
+        if (addr >= APB_START_ADDRESS && addr < APB_START_ADDRESS + 0x10000000) {
+            return write ? 4 : 3;
+        }
+        return 1;
     }
     executeInstruction() {
         if (this.interruptsUpdated) {
@@ -756,6 +762,7 @@ export class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const addr = this.registers[Rn] + imm5;
+            this.cycles += this.cyclesIO(addr);
             this.registers[Rt] = this.readUint32(addr);
         }
         // LDR (sp + immediate)
@@ -763,6 +770,7 @@ export class CortexM0Core {
             const Rt = (opcode >> 8) & 0x7;
             const imm8 = opcode & 0xff;
             const addr = this.SP + (imm8 << 2);
+            this.cycles += this.cyclesIO(addr);
             this.registers[Rt] = this.readUint32(addr);
         }
         // LDR (literal)
@@ -771,6 +779,7 @@ export class CortexM0Core {
             const Rt = (opcode >> 8) & 7;
             const nextPC = this.PC + 2;
             const addr = (nextPC & 0xfffffffc) + imm8;
+            this.cycles += this.cyclesIO(addr);
             this.registers[Rt] = this.readUint32(addr);
         }
         // LDR (register)
@@ -779,9 +788,7 @@ export class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const addr = this.registers[Rm] + this.registers[Rn];
-            if (this.slowIO(addr)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(addr);
             this.registers[Rt] = this.readUint32(addr);
         }
         // LDRB (immediate)
@@ -790,9 +797,7 @@ export class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const addr = this.registers[Rn] + imm5;
-            if (this.slowIO(addr)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(addr);
             this.registers[Rt] = this.readUint8(addr);
         }
         // LDRB (register)
@@ -801,9 +806,7 @@ export class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const addr = this.registers[Rm] + this.registers[Rn];
-            if (this.slowIO(addr)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(addr);
             this.registers[Rt] = this.readUint8(addr);
         }
         // LDRH (immediate)
@@ -812,9 +815,7 @@ export class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const addr = this.registers[Rn] + (imm5 << 1);
-            if (this.slowIO(addr)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(addr);
             this.registers[Rt] = this.readUint16(addr);
         }
         // LDRH (register)
@@ -823,9 +824,7 @@ export class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const addr = this.registers[Rm] + this.registers[Rn];
-            if (this.slowIO(addr)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(addr);
             this.registers[Rt] = this.readUint16(addr);
         }
         // LDRSB
@@ -834,9 +833,7 @@ export class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const addr = this.registers[Rm] + this.registers[Rn];
-            if (this.slowIO(addr)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(addr);
             this.registers[Rt] = signExtend8(this.readUint8(addr));
         }
         // LDRSH
@@ -845,9 +842,7 @@ export class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const addr = this.registers[Rm] + this.registers[Rn];
-            if (this.slowIO(addr)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(addr);
             this.registers[Rt] = signExtend16(this.readUint16(addr));
         }
         // LSLS (immediate)
@@ -1088,9 +1083,7 @@ export class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const address = this.registers[Rn] + imm5;
-            if (this.slowIO(address)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(address, true);
             this.writeUint32(address, this.registers[Rt]);
         }
         // STR (sp + immediate)
@@ -1098,9 +1091,7 @@ export class CortexM0Core {
             const Rt = (opcode >> 8) & 0x7;
             const imm8 = opcode & 0xff;
             const address = this.SP + (imm8 << 2);
-            if (this.slowIO(address)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(address, true);
             this.writeUint32(address, this.registers[Rt]);
         }
         // STR (register)
@@ -1109,9 +1100,7 @@ export class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const address = this.registers[Rm] + this.registers[Rn];
-            if (this.slowIO(address)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(address, true);
             this.writeUint32(address, this.registers[Rt]);
         }
         // STRB (immediate)
@@ -1120,9 +1109,7 @@ export class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const address = this.registers[Rn] + imm5;
-            if (this.slowIO(address)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(address, true);
             this.writeUint8(address, this.registers[Rt]);
         }
         // STRB (register)
@@ -1131,9 +1118,7 @@ export class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const address = this.registers[Rm] + this.registers[Rn];
-            if (this.slowIO(address)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(address, true);
             this.writeUint8(address, this.registers[Rt]);
         }
         // STRH (immediate)
@@ -1142,9 +1127,7 @@ export class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const address = this.registers[Rn] + imm5;
-            if (this.slowIO(address)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(address, true);
             this.writeUint16(address, this.registers[Rt]);
         }
         // STRH (register)
@@ -1153,9 +1136,7 @@ export class CortexM0Core {
             const Rn = (opcode >> 3) & 0x7;
             const Rt = opcode & 0x7;
             const address = this.registers[Rm] + this.registers[Rn];
-            if (this.slowIO(address)) {
-                this.cycles++;
-            }
+            this.cycles += this.cyclesIO(address, true);
             this.writeUint16(address, this.registers[Rt]);
         }
         // SUB (SP minus immediate)

package/dist/esm/interpolator.js

@@ -85,8 +85,8 @@ export class Interpolator {
         const overf0 = Boolean((input0 >>> ctrl0.shift) & ~msbmask0);
         const overf1 = Boolean((input1 >>> ctrl1.shift) & ~msbmask1);
         const overf = overf0 || overf1;
-        const sextmask0 = (uresult0 & (1 << ctrl0.maskMSB)) ? (-1 << ctrl0.maskMSB) : 0;
-        const sextmask1 = (uresult1 & (1 << ctrl1.maskMSB)) ? (-1 << ctrl1.maskMSB) : 0;
+        const sextmask0 = uresult0 & (1 << ctrl0.maskMSB) ? -1 << ctrl0.maskMSB : 0;
+        const sextmask1 = uresult1 & (1 << ctrl1.maskMSB) ? -1 << ctrl1.maskMSB : 0;
         const sresult0 = uresult0 | sextmask0;
         const sresult1 = uresult1 | sextmask1;
         const result0 = ctrl0.signed ? sresult0 : uresult0;
@@ -94,8 +94,16 @@ export class Interpolator {
         const addresult0 = this.base0 + (ctrl0.addRaw ? input0 : result0);
         const addresult1 = this.base1 + (ctrl1.addRaw ? input1 : result1);
         const addresult2 = this.base2 + result0 + (do_blend ? 0 : result1);
-        const uclamp0 = u32(result0) < u32(this.base0) ? this.base0 : (u32(result0) > u32(this.base1) ? this.base1 : result0);
-        const sclamp0 = s32(result0) < s32(this.base0) ? this.base0 : (s32(result0) > s32(this.base1) ? this.base1 : result0);
+        const uclamp0 = u32(result0) < u32(this.base0)
+            ? this.base0
+            : u32(result0) > u32(this.base1)
+                ? this.base1
+                : result0;
+        const sclamp0 = s32(result0) < s32(this.base0)
+            ? this.base0
+            : s32(result0) > s32(this.base1)
+                ? this.base1
+                : result0;
         const clamp0 = ctrl0.signed ? sclamp0 : uclamp0;
         const alpha1 = result1 & 0xff;
         const ublend1 = u32(this.base0) + (Math.floor((alpha1 * (u32(this.base1) - u32(this.base0))) / 256) | 0);

package/dist/esm/peripherals/usb.js

@@ -202,7 +202,7 @@ export class RPUSBController extends BasePeripheral {
                     (_b = this.onEndpointWrite) === null || _b === void 0 ? void 0 : _b.call(this, endpoint, buffer);
                 }
             }
-            if (doubleBuffer && ((value >> USB_BUF1_SHIFT) & USB_BUF_CTRL_AVAILABLE)) {
+            if (doubleBuffer && (value >> USB_BUF1_SHIFT) & USB_BUF_CTRL_AVAILABLE) {
                 const bufferLength = (value >> USB_BUF1_SHIFT) & USB_BUF_CTRL_LEN_MASK;
                 const bufferOffset = this.getEndpointBufferOffset(endpoint, bufferOut) + USB_BUF1_OFFSET;
                 this.debug(`Start USB transfer, endPoint=${endpoint}, direction=${bufferOut ? 'out' : 'in'} buffer=${bufferOffset.toString(16)} length=${bufferLength}`);

package/dist/esm/rp2040.d.ts

@@ -15,6 +15,7 @@ import { RPSIO } from './sio';
 import { Logger } from './utils/logging';
 export declare const FLASH_START_ADDRESS = 268435456;
 export declare const RAM_START_ADDRESS = 536870912;
+export declare const APB_START_ADDRESS = 1073741824;
 export declare const DPRAM_START_ADDRESS = 1343225856;
 export declare const SIO_START_ADDRESS = 3489660928;
 export declare class RP2040 {

package/dist/esm/rp2040.js

@@ -26,6 +26,7 @@ import { ConsoleLogger, LogLevel } from './utils/logging';
 import { RPTBMAN } from './peripherals/tbman';
 export const FLASH_START_ADDRESS = 0x10000000;
 export const RAM_START_ADDRESS = 0x20000000;
+export const APB_START_ADDRESS = 0x40000000;
 export const DPRAM_START_ADDRESS = 0x50100000;
 export const SIO_START_ADDRESS = 0xd0000000;
 const LOG_NAME = 'RP2040';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rp2040js",
-  "version": "0.17.7",
+  "version": "0.17.8",
   "description": "Raspberry Pi Pico (RP2040) Emulator",
   "repository": "https://github.com/wokwi/rp2040js",
   "keywords": [
@@ -30,6 +30,7 @@
     "build": "rimraf dist && tsc && tsc -p tsconfig.esm.json && node build-scripts/dist-package-json",
     "prepublish": "npm run build",
     "prepare": "husky install",
+    "format:check": "prettier --check **/*.{ts,js} !**/dist/** !**/node_modules/**",
     "lint": "eslint . --ext .ts",
     "start": "ts-node demo/emulator-run.ts",
     "start:micropython": "ts-node demo/micropython-run.ts",
@@ -38,13 +39,15 @@
   },
   "devDependencies": {
     "@types/jest": "^27.4.1",
+    "@types/minimist": "^1.2.2",
     "@types/node": "^14.14.22",
     "@typescript-eslint/eslint-plugin": "^4.22.1",
     "@typescript-eslint/parser": "^4.22.1",
     "eslint": "^7.26.0",
-    "husky": "^6.0.0",
+    "husky": "^8.0.0",
     "jest": "^27.5.1",
     "lint-staged": "^11.0.0",
+    "minimist": "^1.2.7",
     "prettier": "^2.2.1",
     "rimraf": "^3.0.2",
     "ts-jest": "^27.1.3",