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/peripherals/usart.ts | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'src/peripherals/usart.ts')

diff --git a/src/peripherals/usart.ts b/src/peripherals/usart.ts
index c1441ad..c7dcbd4 100644
--- a/src/peripherals/usart.ts
+++ b/src/peripherals/usart.ts
@@ -87,8 +87,6 @@ export class AVRUSART {
     enableMask: UCSRB_TXCIE,
   };
 
-  private txCompleteCycles = 0;
-
   constructor(private cpu: CPU, private config: USARTConfig, private freqMHz: number) {
     this.reset();
     this.cpu.writeHooks[config.UCSRA] = (value) => {
@@ -119,7 +117,11 @@ export class AVRUSART {
         }
       }
       const symbolsPerChar = 1 + this.bitsPerChar + this.stopBits + (this.parityEnabled ? 1 : 0);
-      this.txCompleteCycles = this.cpu.cycles + (this.UBRR * this.multiplier + 1) * symbolsPerChar;
+      const cyclesToComplete = (this.UBRR * this.multiplier + 1) * symbolsPerChar;
+      this.cpu.addClockEvent(() => {
+        cpu.setInterruptFlag(this.UDRE);
+        cpu.setInterruptFlag(this.TXC);
+      }, cyclesToComplete);
       this.cpu.clearInterrupt(this.TXC);
       this.cpu.clearInterrupt(this.UDRE);
     };
@@ -131,15 +133,6 @@ export class AVRUSART {
     this.cpu.data[this.config.UCSRC] = UCSRC_UCSZ1 | UCSRC_UCSZ0; // default: 8 bits per byte
   }
 
-  tick() {
-    const { txCompleteCycles, cpu } = this;
-    if (txCompleteCycles && cpu.cycles >= txCompleteCycles) {
-      cpu.setInterruptFlag(this.UDRE);
-      cpu.setInterruptFlag(this.TXC);
-      this.txCompleteCycles = 0;
-    }
-  }
-
   private get UBRR() {
     return (this.cpu.data[this.config.UBRRH] << 8) | this.cpu.data[this.config.UBRRL];
   }
-- 
cgit v1.2.3