sim: APU updates from upstream (#25)

ZigEmbeddedGroup · Apr 19, 2024 · cb6e1e2 · cb6e1e2
1 parent f0669ce
commit cb6e1e2
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 7 deletions.
diff --git a/simulator/src/apu-worklet.ts b/simulator/src/apu-worklet.ts
@@ -27,6 +27,9 @@ class Channel {
     /** Time the tone should end. */
     releaseTime = 0;
 
+    /** The tick the tone should end. */
+    endTick = 0;
+
     /** Sustain volume level. */
     sustainVolume = 0;
 
@@ -65,27 +68,38 @@ function polyblep (phase: number, phaseInc: number) {
     }
 }
 
+function midiFreq (note: number, bend: number) {
+    return Math.pow(2, (note - 69 + bend / 256) / 12) * 440;
+}
+
 class APUProcessor extends AudioWorkletProcessor {
     time: number;
+    ticks: number;
     channels: Channel[];
 
     constructor () {
         super();
 
         this.time = 0;
+        this.ticks = 0;
         this.channels = new Array(4);
         for (let ii = 0; ii < 4; ++ii) {
             this.channels[ii] = new Channel();
         }
 
         if (this.port != null) {
-            this.port.onmessage = (event: MessageEvent<[number, number, number, number]>) => {
-                this.tone(...event.data);
+            this.port.onmessage = (event: MessageEvent<"tick" | [number, number, number, number]>) => {
+                if (event.data == "tick") {
+                    this.tick();
+                } else {
+                    this.tone(...event.data);
+                }
             };
         }
     }
 
     ramp (value1: number, value2: number, time1: number, time2: number) {
+        if (this.time >= time2) return value2;
         const t = (this.time - time1) / (time2 - time1);
         return lerp(value1, value2, t);
     }
@@ -100,7 +114,7 @@ class APUProcessor extends AudioWorkletProcessor {
 
     getCurrentVolume (channel: Channel) {
         const time = this.time;
-        if (time >= channel.sustainTime) {
+        if (time >= channel.sustainTime && channel.releaseTime != channel.sustainTime) {
             // Release
             return this.ramp(channel.sustainVolume, 0, channel.sustainTime, channel.releaseTime);
         } else if (time >= channel.decayTime) {
@@ -115,6 +129,10 @@ class APUProcessor extends AudioWorkletProcessor {
         }
     }
 
+    tick () {
+        this.ticks++;
+    }
+
     tone (frequency: number, duration: number, volume: number, flags: number) {
         const freq1 = frequency & 0xffff;
         const freq2 = (frequency >> 16) & 0xffff;
@@ -130,21 +148,28 @@ class APUProcessor extends AudioWorkletProcessor {
         const channelIdx = flags & 0x3;
         const mode = (flags >> 2) & 0x3;
         const pan = (flags >> 4) & 0x3;
+        const noteMode = flags & 0x40;
 
         const channel = this.channels[channelIdx];
 
         // Restart the phase if this channel wasn't already playing
-        if (this.time > channel.releaseTime) {
+        if (this.time > channel.releaseTime && this.ticks != channel.endTick) {
             channel.phase = (channelIdx == 2) ? 0.25 : 0;
         }
 
-        channel.freq1 = freq1;
-        channel.freq2 = freq2;
+        if (noteMode) {
+            channel.freq1 = midiFreq(freq1 & 0xff, freq1 >> 8);
+            channel.freq2 = (freq2 == 0) ? 0 : midiFreq(freq2 & 0xff, freq2 >> 8);
+        } else {
+            channel.freq1 = freq1;
+            channel.freq2 = freq2;
+        }
         channel.startTime = this.time;
         channel.attackTime = channel.startTime + ((SAMPLE_RATE*attack/60) >>> 0);
         channel.decayTime = channel.attackTime + ((SAMPLE_RATE*decay/60) >>> 0);
         channel.sustainTime = channel.decayTime + ((SAMPLE_RATE*sustain/60) >>> 0);
         channel.releaseTime = channel.sustainTime + ((SAMPLE_RATE*release/60) >>> 0);
+        channel.endTick = this.ticks + attack + decay + sustain + release;
         channel.pan = pan;
 
         const maxVolume = (channelIdx == 2) ? MAX_VOLUME_TRIANGLE : MAX_VOLUME;
@@ -179,7 +204,7 @@ class APUProcessor extends AudioWorkletProcessor {
             for (let channelIdx = 0; channelIdx < 4; ++channelIdx) {
                 const channel = this.channels[channelIdx];
 
-                if (this.time < channel.releaseTime) {
+                if (this.time < channel.releaseTime || this.ticks == channel.endTick) {
                     const freq = this.getCurrentFrequency(channel);
                     const volume = this.getCurrentVolume(channel);
                     let sample;

diff --git a/simulator/src/apu.ts b/simulator/src/apu.ts
@@ -23,6 +23,10 @@ export class APU {
         workletNode.connect(audioCtx.destination);
     }
 
+    tick() {
+        this.processorPort!.postMessage("tick");
+    }
+
     tone(frequency: number, duration: number, volume: number, flags: number) {
         this.processorPort!.postMessage([frequency, duration, volume, flags]);
     }

diff --git a/simulator/src/runtime.ts b/simulator/src/runtime.ts
@@ -236,6 +236,7 @@ export class Runtime {
         let update_function = this.wasm!.exports["update"];
         if (typeof update_function === "function") {
             this.bluescreenOnError(update_function);
+            this.apu.tick();
         }
     }