rp2040js 0.17.10 → 0.17.12

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

@@ -0,0 +1,10 @@
+import { RP2040 } from '../rp2040';
+import { BasePeripheral, Peripheral } from './peripheral';
+export declare class RPBUSCTRL extends BasePeripheral implements Peripheral {
+    voltageSelect: number;
+    readonly perfCtr: number[];
+    readonly perfSel: number[];
+    constructor(rp2040: RP2040, name: string);
+    readUint32(offset: number): number;
+    writeUint32(offset: number, value: number): void;
+}

package/dist/cjs/peripherals/busctrl.js

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RPBUSCTRL = void 0;
+const peripheral_1 = require("./peripheral");
+/** Bus priority acknowledge */
+const BUS_PRIORITY_ACK = 0x004;
+/** Bus fabric performance counter 0 */
+const PERFCTR0 = 0x008;
+/** Bus fabric performance event select for PERFCTR0 */
+const PERFSEL0 = 0x00c;
+/** Bus fabric performance counter 1 */
+const PERFCTR1 = 0x010;
+/** Bus fabric performance event select for PERFCTR1 */
+const PERFSEL1 = 0x014;
+/** Bus fabric performance counter 2 */
+const PERFCTR2 = 0x018;
+/** Bus fabric performance event select for PERFCTR2 */
+const PERFSEL2 = 0x01c;
+/** Bus fabric performance counter 3 */
+const PERFCTR3 = 0x020;
+/** Bus fabric performance event select for PERFCTR3 */
+const PERFSEL3 = 0x024;
+class RPBUSCTRL extends peripheral_1.BasePeripheral {
+    constructor(rp2040, name) {
+        super(rp2040, name);
+        this.voltageSelect = 0;
+        this.perfCtr = [0, 0, 0, 0];
+        this.perfSel = [0x1f, 0x1f, 0x1f, 0x1f];
+    }
+    readUint32(offset) {
+        switch (offset) {
+            case BUS_PRIORITY_ACK:
+                return 1;
+            case PERFCTR0:
+                return this.perfCtr[0];
+            case PERFSEL0:
+                return this.perfSel[0];
+            case PERFCTR1:
+                return this.perfCtr[1];
+            case PERFSEL1:
+                return this.perfSel[1];
+            case PERFCTR2:
+                return this.perfCtr[2];
+            case PERFSEL2:
+                return this.perfSel[2];
+            case PERFCTR3:
+                return this.perfCtr[3];
+            case PERFSEL3:
+                return this.perfSel[3];
+        }
+        return super.readUint32(offset);
+    }
+    writeUint32(offset, value) {
+        switch (offset) {
+            case PERFCTR0:
+                this.perfCtr[0] = 0;
+                break;
+            case PERFSEL0:
+                this.perfSel[0] = value & 0x1f;
+                break;
+            case PERFCTR1:
+                this.perfCtr[1] = 0;
+                break;
+            case PERFSEL1:
+                this.perfSel[1] = value & 0x1f;
+                break;
+            case PERFCTR2:
+                this.perfCtr[2] = 0;
+                break;
+            case PERFSEL2:
+                this.perfSel[2] = value & 0x1f;
+                break;
+            case PERFCTR3:
+                this.perfCtr[3] = 0;
+                break;
+            case PERFSEL3:
+                this.perfSel[3] = value & 0x1f;
+                break;
+            default:
+                super.writeUint32(offset, value);
+        }
+    }
+}
+exports.RPBUSCTRL = RPBUSCTRL;

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

@@ -1,4 +1,5 @@
-import { IClockTimer } from '../clock/clock';
+import { RP2040 } from '../rp2040';
+import { Timer32, Timer32PeriodicAlarm } from '../utils/timer32';
 import { BasePeripheral, Peripheral } from './peripheral';
 export declare const CPUID = 3328;
 export declare const ICSR = 3332;
@@ -12,10 +13,13 @@ export declare const SHPR3 = 3360;
  */
 export declare class RPPPB extends BasePeripheral implements Peripheral {
     systickCountFlag: boolean;
-    systickControl: number;
-    systickLastZero: number;
+    systickClkSource: boolean;
+    systickIntEnable: boolean;
     systickReload: number;
-    systickTimer: IClockTimer | null;
+    readonly systickTimer: Timer32;
+    readonly systickAlarm: Timer32PeriodicAlarm;
+    constructor(rp2040: RP2040, name: string);
+    reset(): void;
     readUint32(offset: number): number;
     writeUint32(offset: number, value: number): void;
 }

package/dist/cjs/peripherals/ppb.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RPPPB = exports.SHPR3 = exports.SHPR2 = exports.VTOR = exports.ICSR = exports.CPUID = void 0;
 const irq_1 = require("../irq");
+const timer32_1 = require("../utils/timer32");
 const peripheral_1 = require("./peripheral");
 exports.CPUID = 0xd00;
 exports.ICSR = 0xd04;
@@ -43,14 +44,32 @@ const VECTACTIVE_SHIFT = 0;
  * Included peripheral: NVIC, SysTick timer
  */
 class RPPPB extends peripheral_1.BasePeripheral {
-    constructor() {
-        super(...arguments);
+    constructor(rp2040, name) {
+        super(rp2040, name);
         // Systick
         this.systickCountFlag = false;
-        this.systickControl = 0;
-        this.systickLastZero = 0;
+        this.systickClkSource = false;
+        this.systickIntEnable = false;
         this.systickReload = 0;
-        this.systickTimer = null;
+        this.systickTimer = new timer32_1.Timer32(this.rp2040.clock, this.rp2040.clkSys);
+        this.systickAlarm = new timer32_1.Timer32PeriodicAlarm(this.systickTimer, () => {
+            this.systickCountFlag = true;
+            if (this.systickIntEnable) {
+                this.rp2040.core.pendingSystick = true;
+                this.rp2040.core.interruptsUpdated = true;
+            }
+            this.systickTimer.set(this.systickReload);
+        });
+        this.systickTimer.top = 0xffffff;
+        this.systickTimer.mode = timer32_1.TimerMode.Decrement;
+        this.systickAlarm.target = 0;
+        this.systickAlarm.enable = true;
+        this.reset();
+    }
+    reset() {
+        this.writeUint32(SYST_CSR, 0);
+        this.writeUint32(SYST_RVR, 0xffffff);
+        this.systickTimer.set(0xffffff);
     }
     readUint32(offset) {
         const { rp2040 } = this;
@@ -106,16 +125,14 @@ class RPPPB extends peripheral_1.BasePeripheral {
             /* SysTick */
             case SYST_CSR: {
                 const countFlagValue = this.systickCountFlag ? 1 << 16 : 0;
+                const clkSourceValue = this.systickClkSource ? 1 << 2 : 0;
+                const tickIntValue = this.systickIntEnable ? 1 << 1 : 0;
+                const enableFlagValue = this.systickTimer.enable ? 1 << 0 : 0;
                 this.systickCountFlag = false;
-                return countFlagValue | (this.systickControl & 0x7);
-            }
-            case SYST_CVR: {
-                const delta = (rp2040.core.cycles - this.systickLastZero) % (this.systickReload + 1);
-                if (!delta) {
-                    return 0;
-                }
-                return this.systickReload - (delta - 1);
+                return countFlagValue | clkSourceValue | tickIntValue | enableFlagValue;
             }
+            case SYST_CVR:
+                return this.systickTimer.counter;
             case SYST_RVR:
                 return this.systickReload;
             case SYST_CALIB:
@@ -194,32 +211,12 @@ class RPPPB extends peripheral_1.BasePeripheral {
                 return;
             // SysTick
             case SYST_CSR:
-                {
-                    const prevInterrupt = this.systickControl === 0x7;
-                    const interrupt = value === 0x7;
-                    if (interrupt && !prevInterrupt) {
-                        // TODO: adjust the timer based on the current systick value
-                        const systickCallback = () => {
-                            core.pendingSystick = true;
-                            core.interruptsUpdated = true;
-                            if (core.waiting && core.checkForInterrupts()) {
-                                core.waiting = false;
-                            }
-                            this.systickTimer = rp2040.clock.createTimer(this.systickReload + 1, systickCallback);
-                        };
-                        this.systickTimer = rp2040.clock.createTimer(this.systickReload + 1, systickCallback);
-                    }
-                    if (prevInterrupt && interrupt) {
-                        if (this.systickTimer) {
-                            rp2040.clock.deleteTimer(this.systickTimer);
-                        }
-                        this.systickTimer = null;
-                    }
-                    this.systickControl = value & 0x7;
-                }
+                this.systickClkSource = value & (1 << 2) ? true : false;
+                this.systickIntEnable = value & (1 << 1) ? true : false;
+                this.systickTimer.enable = value & (1 << 0) ? true : false;
                 return;
             case SYST_CVR:
-                this.warn(`SYSTICK CVR: not implemented yet, value=${value}`);
+                this.systickTimer.set(0);
                 return;
             case SYST_RVR:
                 this.systickReload = value;

package/dist/cjs/rp2040.js

@@ -6,6 +6,7 @@ const cortex_m0_core_1 = require("./cortex-m0-core");
 const gpio_pin_1 = require("./gpio-pin");
 const irq_1 = require("./irq");
 const adc_1 = require("./peripherals/adc");
+const busctrl_1 = require("./peripherals/busctrl");
 const clocks_1 = require("./peripherals/clocks");
 const dma_1 = require("./peripherals/dma");
 const i2c_1 = require("./peripherals/i2c");
@@ -21,12 +22,12 @@ const spi_1 = require("./peripherals/spi");
 const ssi_1 = require("./peripherals/ssi");
 const syscfg_1 = require("./peripherals/syscfg");
 const sysinfo_1 = require("./peripherals/sysinfo");
+const tbman_1 = require("./peripherals/tbman");
 const timer_1 = require("./peripherals/timer");
 const uart_1 = require("./peripherals/uart");
 const usb_1 = require("./peripherals/usb");
 const sio_1 = require("./sio");
 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;
@@ -121,7 +122,7 @@ class RP2040 {
             0x40024: new peripheral_1.UnimplementedPeripheral(this, 'XOSC_BASE'),
             0x40028: new peripheral_1.UnimplementedPeripheral(this, 'PLL_SYS_BASE'),
             0x4002c: new peripheral_1.UnimplementedPeripheral(this, 'PLL_USB_BASE'),
-            0x40030: new peripheral_1.UnimplementedPeripheral(this, 'BUSCTRL_BASE'),
+            0x40030: new busctrl_1.RPBUSCTRL(this, 'BUSCTRL_BASE'),
             0x40034: this.uart[0],
             0x40038: this.uart[1],
             0x4003c: this.spi[0],

package/dist/cjs/utils/timer32.js

@@ -192,7 +192,7 @@ class Timer32PeriodicAlarm {
             }
         }
         if (mode === TimerMode.Decrement) {
-            cycleDelta = top - cycleDelta;
+            cycleDelta = top + 1 - cycleDelta;
         }
         const cyclesToAlarm = cycleDelta >>> 0;
         const microsToAlarm = timer.toMicros(cyclesToAlarm);

package/dist/esm/peripherals/busctrl.d.ts

@@ -0,0 +1,10 @@
+import { RP2040 } from '../rp2040';
+import { BasePeripheral, Peripheral } from './peripheral';
+export declare class RPBUSCTRL extends BasePeripheral implements Peripheral {
+    voltageSelect: number;
+    readonly perfCtr: number[];
+    readonly perfSel: number[];
+    constructor(rp2040: RP2040, name: string);
+    readUint32(offset: number): number;
+    writeUint32(offset: number, value: number): void;
+}

package/dist/esm/peripherals/busctrl.js

@@ -0,0 +1,80 @@
+import { BasePeripheral } from './peripheral';
+/** Bus priority acknowledge */
+const BUS_PRIORITY_ACK = 0x004;
+/** Bus fabric performance counter 0 */
+const PERFCTR0 = 0x008;
+/** Bus fabric performance event select for PERFCTR0 */
+const PERFSEL0 = 0x00c;
+/** Bus fabric performance counter 1 */
+const PERFCTR1 = 0x010;
+/** Bus fabric performance event select for PERFCTR1 */
+const PERFSEL1 = 0x014;
+/** Bus fabric performance counter 2 */
+const PERFCTR2 = 0x018;
+/** Bus fabric performance event select for PERFCTR2 */
+const PERFSEL2 = 0x01c;
+/** Bus fabric performance counter 3 */
+const PERFCTR3 = 0x020;
+/** Bus fabric performance event select for PERFCTR3 */
+const PERFSEL3 = 0x024;
+export class RPBUSCTRL extends BasePeripheral {
+    constructor(rp2040, name) {
+        super(rp2040, name);
+        this.voltageSelect = 0;
+        this.perfCtr = [0, 0, 0, 0];
+        this.perfSel = [0x1f, 0x1f, 0x1f, 0x1f];
+    }
+    readUint32(offset) {
+        switch (offset) {
+            case BUS_PRIORITY_ACK:
+                return 1;
+            case PERFCTR0:
+                return this.perfCtr[0];
+            case PERFSEL0:
+                return this.perfSel[0];
+            case PERFCTR1:
+                return this.perfCtr[1];
+            case PERFSEL1:
+                return this.perfSel[1];
+            case PERFCTR2:
+                return this.perfCtr[2];
+            case PERFSEL2:
+                return this.perfSel[2];
+            case PERFCTR3:
+                return this.perfCtr[3];
+            case PERFSEL3:
+                return this.perfSel[3];
+        }
+        return super.readUint32(offset);
+    }
+    writeUint32(offset, value) {
+        switch (offset) {
+            case PERFCTR0:
+                this.perfCtr[0] = 0;
+                break;
+            case PERFSEL0:
+                this.perfSel[0] = value & 0x1f;
+                break;
+            case PERFCTR1:
+                this.perfCtr[1] = 0;
+                break;
+            case PERFSEL1:
+                this.perfSel[1] = value & 0x1f;
+                break;
+            case PERFCTR2:
+                this.perfCtr[2] = 0;
+                break;
+            case PERFSEL2:
+                this.perfSel[2] = value & 0x1f;
+                break;
+            case PERFCTR3:
+                this.perfCtr[3] = 0;
+                break;
+            case PERFSEL3:
+                this.perfSel[3] = value & 0x1f;
+                break;
+            default:
+                super.writeUint32(offset, value);
+        }
+    }
+}

package/dist/esm/peripherals/ppb.d.ts

@@ -1,4 +1,5 @@
-import { IClockTimer } from '../clock/clock';
+import { RP2040 } from '../rp2040';
+import { Timer32, Timer32PeriodicAlarm } from '../utils/timer32';
 import { BasePeripheral, Peripheral } from './peripheral';
 export declare const CPUID = 3328;
 export declare const ICSR = 3332;
@@ -12,10 +13,13 @@ export declare const SHPR3 = 3360;
  */
 export declare class RPPPB extends BasePeripheral implements Peripheral {
     systickCountFlag: boolean;
-    systickControl: number;
-    systickLastZero: number;
+    systickClkSource: boolean;
+    systickIntEnable: boolean;
     systickReload: number;
-    systickTimer: IClockTimer | null;
+    readonly systickTimer: Timer32;
+    readonly systickAlarm: Timer32PeriodicAlarm;
+    constructor(rp2040: RP2040, name: string);
+    reset(): void;
     readUint32(offset: number): number;
     writeUint32(offset: number, value: number): void;
 }

package/dist/esm/peripherals/ppb.js

@@ -1,4 +1,5 @@
 import { MAX_HARDWARE_IRQ } from '../irq';
+import { Timer32, Timer32PeriodicAlarm, TimerMode } from '../utils/timer32';
 import { BasePeripheral } from './peripheral';
 export const CPUID = 0xd00;
 export const ICSR = 0xd04;
@@ -40,14 +41,32 @@ const VECTACTIVE_SHIFT = 0;
  * Included peripheral: NVIC, SysTick timer
  */
 export class RPPPB extends BasePeripheral {
-    constructor() {
-        super(...arguments);
+    constructor(rp2040, name) {
+        super(rp2040, name);
         // Systick
         this.systickCountFlag = false;
-        this.systickControl = 0;
-        this.systickLastZero = 0;
+        this.systickClkSource = false;
+        this.systickIntEnable = false;
         this.systickReload = 0;
-        this.systickTimer = null;
+        this.systickTimer = new Timer32(this.rp2040.clock, this.rp2040.clkSys);
+        this.systickAlarm = new Timer32PeriodicAlarm(this.systickTimer, () => {
+            this.systickCountFlag = true;
+            if (this.systickIntEnable) {
+                this.rp2040.core.pendingSystick = true;
+                this.rp2040.core.interruptsUpdated = true;
+            }
+            this.systickTimer.set(this.systickReload);
+        });
+        this.systickTimer.top = 0xffffff;
+        this.systickTimer.mode = TimerMode.Decrement;
+        this.systickAlarm.target = 0;
+        this.systickAlarm.enable = true;
+        this.reset();
+    }
+    reset() {
+        this.writeUint32(SYST_CSR, 0);
+        this.writeUint32(SYST_RVR, 0xffffff);
+        this.systickTimer.set(0xffffff);
     }
     readUint32(offset) {
         const { rp2040 } = this;
@@ -103,16 +122,14 @@ export class RPPPB extends BasePeripheral {
             /* SysTick */
             case SYST_CSR: {
                 const countFlagValue = this.systickCountFlag ? 1 << 16 : 0;
+                const clkSourceValue = this.systickClkSource ? 1 << 2 : 0;
+                const tickIntValue = this.systickIntEnable ? 1 << 1 : 0;
+                const enableFlagValue = this.systickTimer.enable ? 1 << 0 : 0;
                 this.systickCountFlag = false;
-                return countFlagValue | (this.systickControl & 0x7);
-            }
-            case SYST_CVR: {
-                const delta = (rp2040.core.cycles - this.systickLastZero) % (this.systickReload + 1);
-                if (!delta) {
-                    return 0;
-                }
-                return this.systickReload - (delta - 1);
+                return countFlagValue | clkSourceValue | tickIntValue | enableFlagValue;
             }
+            case SYST_CVR:
+                return this.systickTimer.counter;
             case SYST_RVR:
                 return this.systickReload;
             case SYST_CALIB:
@@ -191,32 +208,12 @@ export class RPPPB extends BasePeripheral {
                 return;
             // SysTick
             case SYST_CSR:
-                {
-                    const prevInterrupt = this.systickControl === 0x7;
-                    const interrupt = value === 0x7;
-                    if (interrupt && !prevInterrupt) {
-                        // TODO: adjust the timer based on the current systick value
-                        const systickCallback = () => {
-                            core.pendingSystick = true;
-                            core.interruptsUpdated = true;
-                            if (core.waiting && core.checkForInterrupts()) {
-                                core.waiting = false;
-                            }
-                            this.systickTimer = rp2040.clock.createTimer(this.systickReload + 1, systickCallback);
-                        };
-                        this.systickTimer = rp2040.clock.createTimer(this.systickReload + 1, systickCallback);
-                    }
-                    if (prevInterrupt && interrupt) {
-                        if (this.systickTimer) {
-                            rp2040.clock.deleteTimer(this.systickTimer);
-                        }
-                        this.systickTimer = null;
-                    }
-                    this.systickControl = value & 0x7;
-                }
+                this.systickClkSource = value & (1 << 2) ? true : false;
+                this.systickIntEnable = value & (1 << 1) ? true : false;
+                this.systickTimer.enable = value & (1 << 0) ? true : false;
                 return;
             case SYST_CVR:
-                this.warn(`SYSTICK CVR: not implemented yet, value=${value}`);
+                this.systickTimer.set(0);
                 return;
             case SYST_RVR:
                 this.systickReload = value;

package/dist/esm/rp2040.js

@@ -3,6 +3,7 @@ import { CortexM0Core } from './cortex-m0-core';
 import { GPIOPin } from './gpio-pin';
 import { IRQ } from './irq';
 import { RPADC } from './peripherals/adc';
+import { RPBUSCTRL } from './peripherals/busctrl';
 import { RPClocks } from './peripherals/clocks';
 import { RPDMA } from './peripherals/dma';
 import { RPI2C } from './peripherals/i2c';
@@ -18,12 +19,12 @@ import { RPSPI } from './peripherals/spi';
 import { RPSSI } from './peripherals/ssi';
 import { RP2040SysCfg } from './peripherals/syscfg';
 import { RP2040SysInfo } from './peripherals/sysinfo';
+import { RPTBMAN } from './peripherals/tbman';
 import { RPTimer } from './peripherals/timer';
 import { RPUART } from './peripherals/uart';
 import { RPUSBController } from './peripherals/usb';
 import { RPSIO } from './sio';
 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;
@@ -118,7 +119,7 @@ export class RP2040 {
             0x40024: new UnimplementedPeripheral(this, 'XOSC_BASE'),
             0x40028: new UnimplementedPeripheral(this, 'PLL_SYS_BASE'),
             0x4002c: new UnimplementedPeripheral(this, 'PLL_USB_BASE'),
-            0x40030: new UnimplementedPeripheral(this, 'BUSCTRL_BASE'),
+            0x40030: new RPBUSCTRL(this, 'BUSCTRL_BASE'),
             0x40034: this.uart[0],
             0x40038: this.uart[1],
             0x4003c: this.spi[0],

package/dist/esm/utils/timer32.js

@@ -188,7 +188,7 @@ export class Timer32PeriodicAlarm {
             }
         }
         if (mode === TimerMode.Decrement) {
-            cycleDelta = top - cycleDelta;
+            cycleDelta = top + 1 - cycleDelta;
         }
         const cyclesToAlarm = cycleDelta >>> 0;
         const microsToAlarm = timer.toMicros(cyclesToAlarm);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rp2040js",
-  "version": "0.17.10",
+  "version": "0.17.12",
   "description": "Raspberry Pi Pico (RP2040) Emulator",
   "repository": "https://github.com/wokwi/rp2040js",
   "keywords": [