From 9c1288f18889ae3bd10869a9f6ebc53defa3024b Mon Sep 17 00:00:00 2001
From: Uri Shaked
Date: Wed, 9 Dec 2020 15:46:53 +0200
Subject: perf!: centeral timekeeping

This should improve performance, especially when running simulations with
multiple peripherals. For instance, the demo project now runs at ~322%,
up from ~185% in AVR8js 0.13.1.

BREAKING CHANGE: `tick()` methods were removed from individual peripherals.
You now need to call `cpu.tick()` instead.
---
 src/cpu/cpu.ts | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

(limited to 'src/cpu')

diff --git a/src/cpu/cpu.ts b/src/cpu/cpu.ts
index 4b70efb..fb98786 100644
--- a/src/cpu/cpu.ts
+++ b/src/cpu/cpu.ts
@@ -55,6 +55,13 @@ export interface AVRInterruptConfig {
   constant?: boolean;
 }
 
+export type AVRClockEventCallback = () => void;
+
+interface AVRClockEventEntry {
+  cycles: number;
+  callback: AVRClockEventCallback;
+}
+
 export class CPU implements ICPU {
   readonly data: Uint8Array = new Uint8Array(this.sramBytes + registerSpace);
   readonly data16 = new Uint16Array(this.data.buffer);
@@ -63,6 +70,7 @@ export class CPU implements ICPU {
   readonly readHooks: CPUMemoryReadHooks = [];
   readonly writeHooks: CPUMemoryHooks = [];
   private readonly pendingInterrupts: AVRInterruptConfig[] = [];
+  private readonly clockEvents: AVRClockEventEntry[] = [];
   readonly pc22Bits = this.progBytes.length > 0x20000;
 
   // This lets the Timer Compare output override GPIO pins:
@@ -71,6 +79,7 @@ export class CPU implements ICPU {
   pc: u32 = 0;
   cycles: u32 = 0;
   nextInterrupt: i16 = -1;
+  private nextClockEvent: u32 = 0;
 
   constructor(public progMem: Uint16Array, private sramBytes = 8192) {
     this.reset();
@@ -164,10 +173,44 @@ export class CPU implements ICPU {
     }
   }
 
+  private updateClockEvents() {
+    this.clockEvents.sort((a, b) => a.cycles - b.cycles);
+    this.nextClockEvent = this.clockEvents[0]?.cycles ?? 0;
+  }
+
+  addClockEvent(callback: AVRClockEventCallback, cycles: number) {
+    const entry = { cycles: this.cycles + Math.max(1, cycles), callback };
+    this.clockEvents.push(entry);
+    this.updateClockEvents();
+    return callback;
+  }
+
+  updateClockEvent(callback: AVRClockEventCallback, cycles: number) {
+    const entry = this.clockEvents.find((item) => (item.callback = callback));
+    if (entry) {
+      entry.cycles = this.cycles + Math.max(1, cycles);
+      this.updateClockEvents();
+      return true;
+    }
+    return false;
+  }
+
+  clearClockEvent(callback: AVRClockEventCallback) {
+    const index = this.clockEvents.findIndex((item) => (item.callback = callback));
+    if (index >= 0) {
+      this.clockEvents.splice(index, 1);
+      this.updateClockEvents();
+    }
+  }
+
   tick() {
+    if (this.nextClockEvent && this.nextClockEvent <= this.cycles) {
+      const clockEvent = this.clockEvents.shift();
+      clockEvent?.callback();
+      this.nextClockEvent = this.clockEvents[0]?.cycles ?? 0;
+    }
     if (this.interruptsEnabled && this.nextInterrupt >= 0) {
       const interrupt = this.pendingInterrupts[this.nextInterrupt];
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       avrInterrupt(this, interrupt.address);
       if (!interrupt.constant) {
         this.clearInterrupt(interrupt);
-- 
cgit v1.2.3