Update version number to 0.2.0-rc1

It needs some more thought before committing to it.

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
 
     steps:
     - name: Install dependencies
-      run: sudo apt-get install -y libxkbcommon-dev
+      run: sudo apt-get install -y libxkbcommon-dev libasound2-dev
       if: matrix.os == 'ubuntu-latest'
     - name: Checkout
       uses: actions/checkout@v2

Cargo.toml

@@ -1,26 +1,29 @@
 [package]
 name = "uw8"
-version = "0.1.2"
+version = "0.2.0-rc1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
 default = ["native", "browser"]
-native = ["wasmtime"]
+native = ["wasmtime", "minifb", "cpal", "rubato"]
 browser = ["warp", "tokio", "tokio-stream", "webbrowser"]
 
 [dependencies]
-wasmtime = { version = "0.30", optional = true }
+wasmtime = { version = "0.35.3", optional = true }
 anyhow = "1"
-minifb = { version = "0.20", default-features = false, features = ["x11"] }
+minifb = { version = "0.22", default-features = false, features = ["x11"], optional = true }
 notify = "4"
 pico-args = "0.4"
-curlywas = { git = "https://github.com/exoticorn/curlywas.git", rev = "89638565" }
+curlywas = { git = "https://github.com/exoticorn/curlywas.git", rev = "aac7bbd" }
 wat = "1"
 uw8-tool = { path = "uw8-tool" }
 same-file = "1"
 warp = { version = "0.3.2", optional = true }
 tokio = { version = "1.17.0", features = ["sync", "rt"], optional = true }
 tokio-stream = { version = "0.1.8", features = ["sync"], optional = true }
-webbrowser = { version = "0.6.0", optional = true }
+webbrowser = { version = "0.6.0", optional = true }
+ansi_term = "0.12.1"
+cpal = { version = "0.13.5", optional = true }
+rubato = { version = "0.11.0", optional = true }

examples/curlywas/simple_music.cwa

@@ -0,0 +1,38 @@
+include "../include/microw8-api.cwa"
+
+global mut frame = 0;
+
+export fn upd() {
+    if frame % 16 == 0 {
+        let ch: i32;
+        loop channels {
+            playNote(ch, (ch * 32 + (frame / 16) % 32)?0x20000);
+            branch_if ch := (ch + 1) % 4: channels;
+        }
+    }
+    frame = frame + 1;
+}
+
+data 0x20000 {
+    i8(
+        0x4e, 0x0, 0x0, 0x4c, 0x49, 0x0, 0x45, 0x47,
+        0x49, 0x47, 0x45, 0x44, 0x42, 0x0, 0x3d, 0x41,
+        0x44, 0x0, 0x0, 0x47, 0x49, 0x47, 0x45, 0x41,
+        0x44, 0x0, 0x0, 0x0, 0x42, 0x0, 0x0, 0x0,
+
+        0x25, 0, 0x49, 0x25, 0x25, 0, 0x49, 0x38,
+        0x25, 0, 0x49, 0x25, 0x25, 0, 0x49, 0x38,
+        0x25, 0, 0x49, 0x25, 0x25, 0, 0x49, 0x38,
+        0x25, 0, 0x49, 0x25, 0x25, 0, 0x49, 0x38,
+
+        0x2a, 0x0, 0x0, 0x0, 0x2d, 0x0, 0x0, 0x0,
+        0x2c, 0x0, 0x28, 0x0, 0x2a, 0x0, 0x0, 0x0,
+        0x25, 0x0, 0x0, 0x0, 0x29, 0x0, 0x0, 0x0,
+        0x2c, 0x0, 0x2d, 0x0, 0x2a, 0x0, 0x25, 0x0,
+
+        0x0, 0x0, 0x31, 0x0, 0x34, 0x0, 0x0, 0x36,
+        0x38, 0x39, 0x38, 0x34, 0x36, 0x0, 0x0, 0x0,
+        0x0, 0x3d, 0x3b, 0x39, 0x38, 0x0, 0x0, 0x0,
+        0x0, 0x39, 0x38, 0x39, 0x38, 0x0, 0x36, 0x0
+    )
+}

examples/curlywas/steadyon.cwa

@@ -0,0 +1,38 @@
+// Steady On Tim, It's Only A Budget Game
+// by Gasman / Hooy-Program
+// ported to MicroW8 by exoticorn/icebird
+
+include "../include/microw8-api.cwa"
+
+fn melody(t: i32, T: i32) -> i32 {
+    let inline riff_pos = abs(((T&31) - 16) as f32) as i32;
+    let lazy shift = ((1-((T>>5)&3))%2-1) as f32 / 6 as f32;
+
+    let inline note_count = 5 - (T >= 512);
+    let inline octave = (riff_pos/5) as f32;
+    let inline riff_note = 5514 >> (riff_pos % note_count * 4) & 15;
+    let inline melody_freq = pow(2 as f32, shift + octave - (riff_note as f32 / 12 as f32));
+    let inline melody = (t as f32 * melody_freq) as i32 & 128;
+    
+    let inline arp_note = ((0x85>>((t>>12)%3*4)) & 15) - 1;
+    let inline arp_freq = pow(2 as f32, shift + (arp_note as f32 / 12 as f32));
+    let inline arp_vol = (T >= 256) * (12-T%12);
+    let inline arpeggio = ((t as f32 * arp_freq) as i32 & 128) * arp_vol / 12;
+    
+    melody + arpeggio
+}
+
+export fn snd(t: i32) -> f32 {
+    let lazy T = t/10000;
+    
+    let inline mel_arp = melody(t, T)/3 + melody(t, T-3)/5;
+
+    let inline bass_vol = (T >= 128) & (197 >> (T % 8));
+    let inline bass_freq = pow(2 as f32, (((T & 4) * ((T & 7) - 1)) as f32 / 24 as f32 - 5 as f32));
+    let inline bass = ((t as f32 * bass_freq) as i32 & 63) * bass_vol;
+
+    let inline snare_ish = (random() & 31) * (8 - (T + 4) % 8) / 8;
+
+    let inline sample = mel_arp + bass + snare_ish;
+    sample as f32 / 255 as f32
+}

examples/curlywas/tim_ges.cwa

@@ -0,0 +1,64 @@
+// Steady On Tim, It's Only A Budget Game
+// original bytebeat by Gasman / Hooy-Program
+// ported to MicroW8/GES by exoticorn/icebird
+
+import "env.memory" memory(4);
+
+fn melody(ch: i32, t: i32, T: i32) {
+    let lazy riff_pos = abs(((T&31) - 16) as f32) as i32;
+    let lazy shift = ((1-((T>>5)&3))%2-1) * 2;
+
+    let inline note_count = 5 - (T >= 512);
+    let inline octave = (riff_pos/5) * 12;
+    let inline riff_note = 5514 >> (riff_pos % note_count * 4) & 15;
+    let inline melody_note = shift + octave - riff_note;
+
+    ch?1 = 230 - riff_pos * 14;
+    ch?3 = melody_note + 64;
+
+    let inline arp_note = shift + ((0x85>>((t/2)%3*4)) & 15) - 1;
+    80?3 = arp_note + 64;
+}
+
+export fn upd() {
+    let lazy t = 32!32 / (1000/60);
+    let lazy T = t / 7;
+    melody(98, t, T - 3);
+    melody(92, t, T);
+
+    80?0 = ((T >= 256) & (T/12+(T-3)/12)) * 2 | 0x48; // arp trigger
+
+    if T >= 128 {
+        let inline bass_step = T % 8;
+        86?3 = if bass_step / 2 == 2 {
+            86?0 = 0xd6;
+            81
+        } else {
+            86?0 = ((197 >> bass_step) & 1) | 0x48;
+            ((T & 4) * ((T & 7) - 1)) / 2 + 28
+        };
+    }
+}
+
+data 80 {
+    i8(
+        0, 0x90, 0, 0, 0, 0x90,
+        0, 0x4c, 0, 0, 0, 0x4c,
+        0x19, 0, 0, 0, 0, 0x4c,
+        0x19, 0, 0, 0, 0, 0x4c,
+        0xfa, 0x84,
+        0xc1, 0xc1, 0, 107, 0, 0x4c
+    )
+}
+
+/*
+include "../../platform/src/ges.cwa"
+
+import "env.pow" fn pow(f32, f32) -> f32;
+import "env.exp" fn exp(f32) -> f32;
+import "env.sin" fn sin(f32) -> f32;
+
+export fn snd(t: i32) -> f32 {
+    gesSnd(t)
+}
+*/

examples/include/microw8-api.cwa

@@ -33,6 +33,7 @@ import "env.setCursorPosition" fn setCursorPosition(i32, i32);
 import "env.rectangle_outline" fn rectangle_outline(f32, f32, f32, f32, i32);
 import "env.circle_outline" fn circle_outline(f32, f32, f32, i32);
 import "env.exp" fn exp(f32) -> f32;
+import "env.playNote" fn playNote(i32, i32);
 
 const TIME_MS = 0x40;
 const GAMEPAD = 0x44;

examples/include/microw8-api.wat

@@ -33,6 +33,7 @@
 (import "env" "rectangle_outline" (func $rectangle_outline (param f32) (param f32) (param f32) (param f32) (param i32)))
 (import "env" "circle_outline" (func $circle_outline (param f32) (param f32) (param f32) (param i32)))
 (import "env" "exp" (func $exp (param f32) (result f32)))
+(import "env" "playNote" (func $playNote (param i32) (param i32)))
 
 ;; to use defines, include this file with a preprocessor
 ;; like gpp (https://logological.org/gpp).

platform/Cargo.lock

@@ -146,7 +146,7 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 [[package]]
 name = "curlywas"
 version = "0.1.0"
-source = "git+https://github.com/exoticorn/curlywas.git?rev=89638565#896385654ab2c089200920b6dea4abec641c88d6"
+source = "git+https://github.com/exoticorn/curlywas.git?rev=aac7bbd#aac7bbd8786a26da0dcbe8320b1afefaf6086464"
 dependencies = [
  "anyhow",
  "ariadne",

platform/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-curlywas = { git="https://github.com/exoticorn/curlywas.git", rev="89638565" }
+curlywas = { git="https://github.com/exoticorn/curlywas.git", rev="aac7bbd" }
 uw8-tool = { path="../uw8-tool" }
 anyhow = "1"
 lodepng = "3.4"

platform/src/ges.cwa

@@ -0,0 +1,222 @@
+const GesChannelState.Trigger = 0;
+const GesChannelState.EnvState = 1;
+const GesChannelState.EnvVol = 2;
+const GesChannelState.Phase = 4;
+const GesChannelState.Size = 8;
+
+const GesState.Filter = GesChannelState.Size * 4;
+const GesState.Size = GesState.Filter + 8*4;
+
+const GesStateOffset = 32;
+const GesBufferOffset = 32 + GesState.Size;
+
+export fn gesSnd(t: i32) -> f32 {
+    let baseAddr = 0!0x12c78;
+    if !(t & 127) {
+        let i: i32;
+        loop clearLoop {
+            (baseAddr + i)!GesBufferOffset = 0;
+            branch_if (i := i + 4) < 128*4: clearLoop;
+        }
+
+        let ch: i32;
+        loop channelLoop {
+            let lazy channelState = baseAddr + GesStateOffset + ch * GesChannelState.Size;
+            let lazy channelReg = baseAddr + ch * 6;
+            let envState = channelState?GesChannelState.EnvState;
+            let envVol = i32.load16_u(channelState, GesChannelState.EnvVol);
+
+            let lazy oldTrigger = channelState?GesChannelState.Trigger;
+            let lazy ctrl = channelReg?0;
+            if (oldTrigger ^ ctrl) & (ctrl | 2) & 3 {
+                envState = 1;
+                envVol = 0;
+            }
+            channelState?GesChannelState.Trigger = ctrl;
+
+            if envState {
+                let lazy attack = channelReg?4 & 15;
+                envVol = envVol + 12 * pow(1.675, (15 - attack) as f32) as i32;
+                if envVol >= 65535 {
+                    envVol = 65535;
+                    envState = 0;
+                }
+            } else {
+                let inline decay = (channelReg - (ctrl & 1))?5 >> 4;
+                let inline dec = 8 * pow(1.5625, (15 - decay) as f32) as i32;
+                envVol = envVol - ((dec * (envVol + 8192)) >> 16);
+                let inline sustain = (channelReg?5 & 15) << 12;
+                let lazy targetVol = (ctrl & 1) * sustain;
+                if envVol < targetVol {
+                    envVol = targetVol;
+                }
+            }
+            channelState?GesChannelState.EnvState = envState;
+
+            i32.store16(envVol, channelState, GesChannelState.EnvVol);
+
+            let inline note = i32.load16_u(channelReg, 2);
+            let lazy freq = 440 as f32 * pow(2.0, (note - 69*256) as f32 / (12*256) as f32);
+            let phaseInc = (freq * (65536.0 / 44100.0)) as i32;
+
+            let phase = channelState!GesChannelState.Phase;
+
+            let inline pulseWidth = channelReg?1;
+            let phaseShift = (pulseWidth - 128) * 255;
+            let invPhaseInc = 1 as f32 / phaseInc as f32;
+
+            i = 0;
+            let wave = ctrl >> 6;
+            if wave < 2 {
+                if wave {
+                    let pulsePhase1 = pulseWidth << 23;
+                    let pulsePhase2 = (511 - pulseWidth) << 23;
+                    loop sawLoop {
+                        let p = (phase ^ 32768) << 16;
+                        let saw = (p >> 16) - polyBlep(phase, invPhaseInc, -32767);
+                        let saw2 = select(p #>= pulsePhase1 & p #< pulsePhase2, -saw, saw);
+                        let saw2 = saw2 -
+                            polyBlep((p - pulsePhase1) >> 16, invPhaseInc, -saw) -
+                            polyBlep((p - pulsePhase2) >> 16, invPhaseInc, saw);
+                        (baseAddr + i)!(GesBufferOffset + 128*4) = saw2;
+                        phase = phase + phaseInc;
+                        branch_if (i := i + 4) < 64*4: sawLoop;
+                    }
+                }
+                else
+                {
+                    let pulsePhase = 32768 + pulseWidth * 128;
+                    loop rectLoop {
+                        (baseAddr + i)!(GesBufferOffset + 128*4) = select((phase & 65535) < pulsePhase, -32768, 32767) -
+                            polyBlep(phase, invPhaseInc, -32767) -
+                            polyBlep(phase - pulsePhase, invPhaseInc, 32767);
+                        phase = phase + phaseInc;
+                        branch_if (i := i + 4) < 64*4: rectLoop;
+                    }
+                }
+            } else {
+                if wave == 2 {
+                    let scale = pulseWidth + 256;
+                    loop triLoop {
+                        let s = phase << 16;
+                        s = (s ^ (s >> 31));
+                        s = (s >> 8) * scale;
+                        s = (s ^ (s >> 31));
+                        (baseAddr + i)!(GesBufferOffset + 128*4) = (s >> 15) - 32768;
+                        phase = phase + phaseInc;
+                        branch_if (i := i + 4) < 64*4: triLoop;
+                    }
+                } else {
+                    loop noiseLoop {
+                        let s = phase >> 12;
+                        let inline pulse = ((phase >> 8) & 255) >= pulseWidth;
+                        s = s * 0x6746ba73;
+                        s = s ^ (s >> 15) * pulse;
+                        (baseAddr + i)!(GesBufferOffset + 128*4) = (s * 0x835776c7) >> 16;
+                        phase = phase + phaseInc;
+                        branch_if (i := i + 4) < 64*4: noiseLoop;
+                    }
+                }
+            }
+
+            channelState!GesChannelState.Phase = phase;
+
+            if ctrl & 32 {
+                let lazy modSrc = (ch - 1) & 3;
+                let inline channelState = baseAddr + GesStateOffset + modSrc * GesChannelState.Size;
+                let inline channelReg = baseAddr + modSrc * 6;
+
+                let inline note = i32.load16_u(channelReg, 2);
+                let inline freq = 440 as f32 * pow(2.0, (note - 69*256) as f32 / (12*256) as f32);
+                let phaseInc = (freq * (65536.0 / 44100.0)) as i32;
+
+                let phase = channelState!GesChannelState.Phase;
+                if modSrc > ch {
+                    phase = phase - (phaseInc << 6);
+                }
+
+                i = 0;
+                loop ringLoop {
+                    let s = phase << 16;
+                    s = (s ^ (s >> 31));
+                    (baseAddr + i)!(GesBufferOffset + 128*4) = ((baseAddr + i)!(GesBufferOffset + 128*4) * ((s >> 15) - 32768)) >> 15;
+                    phase = phase + phaseInc;
+                    branch_if (i := i + 4) < 64*4: ringLoop;
+                }
+            }
+
+            let channelVol = ((baseAddr + (ch >> 1))?24 >> ((ch & 1) * 4)) & 15;
+            envVol = envVol * channelVol / 15;
+
+            let leftVol = (select(ctrl & 16, 0x3d5b, 0x6a79) >> (ch * 4)) & 15;
+            let rightVol = 16 - leftVol;
+
+            let lazy filter = (ctrl >> 2) & 3;
+
+            i = 0;
+            if filter < 2 {
+                if filter {
+                    let f = (4096 as f32 - min(4096 as f32, 4096 as f32 * exp(freq * (-8.0 * 3.141 / 44100.0)))) as i32;
+                    let low = (baseAddr + ch * 8)!(GesStateOffset + GesState.Filter);
+                    loop filterLoop {
+                        let in = ((baseAddr + i)!(GesBufferOffset + 128*4) * envVol) >> 18;
+                        low = low + (((in - low) * f) >> 12);
+                        (baseAddr + i * 2)!GesBufferOffset = (baseAddr + i * 2)!GesBufferOffset + ((low * leftVol) >> 4);
+                        (baseAddr + i * 2)!(GesBufferOffset + 4) = (baseAddr + i * 2)!(GesBufferOffset + 4) + ((low * rightVol) >> 4);
+                        branch_if (i := i + 4) < 64*4: filterLoop;
+                        (baseAddr + ch * 8)!(GesStateOffset + GesState.Filter) = low;
+                        (baseAddr + ch * 8)!(GesStateOffset + GesState.Filter + 4) = 0;
+                    }
+                } else {
+                    loop mixLoop {
+                        let sample = ((baseAddr + i)!(GesBufferOffset + 128*4) * envVol) >> 18;
+                        (baseAddr + i * 2)!GesBufferOffset = (baseAddr + i * 2)!GesBufferOffset + ((sample * leftVol) >> 4);
+                        (baseAddr + i * 2)!(GesBufferOffset + 4) = (baseAddr + i * 2)!(GesBufferOffset + 4) + ((sample * rightVol) >> 4);
+                        branch_if (i := i + 4) < 64*4: mixLoop;
+                        (baseAddr + ch * 8)!(GesStateOffset + GesState.Filter) = sample;
+                        (baseAddr + ch * 8)!(GesStateOffset + GesState.Filter + 4) = 0;
+                    }
+                }
+            } else {
+                filter = filter - 2;
+                let ctrl = (baseAddr + filter)?26;
+                let note = i32.load16_u(baseAddr + filter * 2, 28);
+                let inline freq = 440 as f32 * pow(2.0, (note - 69*256) as f32 / (12*256) as f32);
+                let F = (8192 as f32 * sin(min(0.25, freq / 44100 as f32) * 3.1415)) as i32;
+                let Q = 8192 - (ctrl >> 4) * (7000/15);
+                let Qlimit = (8192*4096/F - F/2) * 3 / 4;
+                if Q > Qlimit {
+                    Q = Qlimit;
+                }
+                let low_out = ctrl & 1;
+                let high_out = (ctrl >> 1) & 1;
+                let band_out = (ctrl >> 2) & 1;
+                let low = (baseAddr + ch * 8)!(GesStateOffset + GesState.Filter);
+                let band = (baseAddr + ch * 8)!(GesStateOffset + GesState.Filter + 4);
+                loop filterLoop {
+                    let in = ((baseAddr + i)!(GesBufferOffset + 128*4) * envVol) >> 18;
+
+                    let high = in - low - ((band * Q) >> 12);
+                    band = band + ((F * high) >> 12);
+                    low = low + ((F * band) >> 12);
+
+                    let sample = low * low_out + high * high_out + band * band_out;
+                    (baseAddr + i * 2)!GesBufferOffset = (baseAddr + i * 2)!GesBufferOffset + ((sample * leftVol) >> 4);
+                    (baseAddr + i * 2)!(GesBufferOffset + 4) = (baseAddr + i * 2)!(GesBufferOffset + 4) + ((sample * rightVol) >> 4);
+                    branch_if (i := i + 4) < 64*4: filterLoop;
+                    (baseAddr + ch * 8)!(GesStateOffset + GesState.Filter) = low;
+                    (baseAddr + ch * 8)!(GesStateOffset + GesState.Filter + 4) = band;
+                }
+            }
+
+            branch_if (ch := ch + 1) < 4: channelLoop;
+        }
+    }
+    ((baseAddr + (t & 127) * 4)!GesBufferOffset) as f32 / 32768 as f32
+}
+
+fn polyBlep(transientPhase: i32, invPhaseInc: f32, magnitude: i32) -> i32 {
+    let lazy t = ((transientPhase << 16) >> 16) as f32 * invPhaseInc;
+    let lazy x = max(0 as f32, 1 as f32 - abs(t));
+    (f32.copysign(x * x, t) * magnitude as f32) as i32
+}

platform/src/ges_only.cwa

@@ -0,0 +1,6 @@
+import "env.memory" memory(1);
+import "env.sin" fn sin(f32) -> f32;
+import "env.pow" fn pow(f32, f32) -> f32;
+import "env.exp" fn exp(f32) -> f32;
+
+include "ges.cwa"

platform/src/main.rs

@@ -11,16 +11,16 @@ fn main() -> Result<()> {
     convert_font()?;
 
     println!("Compiling loader module");
-    let loader = curlywas::compile_file("src/loader.cwa", curlywas::Options::default())?;
+    let loader = curlywas::compile_file("src/loader.cwa", curlywas::Options::default()).0?;
-    File::create("bin/loader.wasm")?.write_all(&loader.wasm)?;
+    File::create("bin/loader.wasm")?.write_all(&loader)?;
 
-    println!("Loader (including base module): {} bytes", loader.wasm.len());
+    println!("Loader (including base module): {} bytes", loader.len());
 
     println!("Compiling platform module");
-    let platform = curlywas::compile_file("src/platform.cwa", curlywas::Options::default())?;
+    let platform = curlywas::compile_file("src/platform.cwa", curlywas::Options::default()).0?;
     println!("Compressing platform module");
     let platform = uw8_tool::pack(
-        &platform.wasm,
+        &platform,
         &uw8_tool::PackConfig::default().with_compression_level(4),
     )?;
     File::create("bin/platform.uw8")?.write_all(&platform)?;

platform/src/platform.cwa

@@ -1,6 +1,9 @@
 import "env.memory" memory(4);
 
+import "env.sin" fn sin(f32) -> f32;
 import "env.cos" fn cos(f32) -> f32;
+import "env.pow" fn pow(f32, f32) -> f32;
+import "env.exp" fn exp(f32) -> f32;
 
 export fn time() -> f32 {
     (0!64) as f32 / 1000 as f32
@@ -336,6 +339,11 @@ fn printSingleChar(char: i32) {
         return;
     }
 
+    if char == 7 {
+        80?0 = 80?0 ^ 2;
+        return;
+    }
+
     if char == 8 {
         textCursorX = textCursorX - 8;
         if !graphicsText & textCursorX < 0 {
@@ -500,6 +508,32 @@ export fn setCursorPosition(x: i32, y: i32) {
     textCursorY = y * scale;
 }
 
+///////////
+// SOUND //
+///////////
+
+include "ges.cwa"
+
+export fn playNote(channel: i32, note: i32) {
+    (channel * 6)?80 = (channel * 6)?80 & 0xfe ^ if note {
+        (channel * 6)?83 = note & 127;
+        2 | !(note >> 7)
+    } else {
+        0
+    };
+}
+
+data 80 {
+    i8(
+        0x80, 0xc0, 0, 81, 0xa0, 0x50,
+        0xc4, 0, 0, 69, 0x60, 0x40,
+        0x44, 0xb0, 0, 69, 0x90, 0x43,
+        0x4, 0xf0, 0, 69, 0xa4, 0x44,
+        0xff, 0xff,
+        1, 1, 0, 100, 0, 100
+    )
+}
+
 ///////////
 // SETUP //
 ///////////
@@ -508,6 +542,13 @@ export fn endFrame() {
     68!4 = 68!0;
 }
 
+fn memclr(base: i32, size: i32) {
+    loop bytes {
+        (base + (size := size - 1))?0 = 0;
+        branch_if size: bytes;
+    }
+}
+
 start fn setup() {
     let i: i32 = 12*16*3-1;
     let avg: f32;
@@ -540,10 +581,19 @@ start fn setup() {
         branch_if (i := i - 1) >= 0: expand_sweetie;
     }
 
+    memclr(0, 64);
+    memclr(112, 8);
+    memclr(0x14000, 0x2c000);
+
+
     cls(0);
     randomSeed(random());
 }
 
+data 0x12c78 {
+    i32(80)
+}
+
 data 0x13000+192*4 {
     i32(
         0x2c1c1a,

site/content/_index.md

@@ -29,6 +29,19 @@ Examplers for older versions:
 
 ## Versions
 
+### v0.2.0-rc1
+
+* [Web runtime](v0.2.0-rc1)
+
+Changes:
+
+* [add sound support](docs#sound)
+* "integer constant cast to float" literal syntax in CurlyWas (ex. `1_f` is equivalent to `1 as f32`)
+
+Known issues:
+
+* timing accuracy/update frequency of sound support currently depends on sound buffer size
+
 ### v0.1.2
 
 * [Web runtime](v0.1.2)
@@ -43,27 +56,6 @@ Changes:
 * CurlyWas: implement support for constants
 * fix crash when trying to draw zero sized line
 
-### v0.1.1
+### Older versions
 
-* [Web runtime](v0.1.1)
+[Find older versions here.](versions)
-* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.1.1/microw8-0.1.1-linux.tgz)
-* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.1.1/microw8-0.1.1-macos.tgz)
-* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.1.1/microw8-0.1.1-windows.zip)
-
-Changes:
-
-* implement more robust file watcher
-* add basic video recording on F10 in web runtime
-* add screenshot on F9
-* add watchdog to interrupt hanging update in native runtime
-* add devkit mode to web runtime
-* add unpack and compile commands to uw8
-* add support for table/element section in pack command
-* disable wayland support (caused missing window decorations in gnome)
-
-### v0.1.0
-
-* [Web runtime](v0.1.0)
-* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.1.0/microw8-0.1.0-linux.tgz)
-* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.1.0/microw8-0.1.0-macos.tgz)
-* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.1.0/microw8-0.1.0-windows.zip)

site/content/docs.md

@@ -18,9 +18,12 @@ The memory has to be imported as `env` `memory` and has a maximum size of 256kb
 00000-00040: user memory
 00040-00044: time since module start in ms
 00044-0004c: gamepad state
-0004c-00078: reserved
+0004c-00050: reserved
+00050-00070: sound data (synced to sound thread)
+00070-00078: reserved
 00078-12c78: frame buffer
-12c78-13000: reserved
+12c78-12c7c: sound registers/work area base address (for sndGes function)
+12c7c-13000: reserved
 13000-13400: palette
 13400-13c00: font
 13c00-14000: reserved
@@ -229,7 +232,8 @@ Avoid the reserved control chars, they are currently NOPs but their behavior can
 | 2-3   | -          | Reserved                             |
 | 4     | -          | Switch to normal mode                |
 | 5     | -          | Switch to graphics mode              |
-| 6-7   | -          | Reserved                             |
+| 6     | -          | Reserved                             |
+| 7     | -          | Bell / trigger sound channel 0       |
 | 8     | -          | Move cursor left                     |
 | 9     | -          | Move cursor right                    |
 | 10    | -          | Move cursor down                     |
@@ -269,6 +273,130 @@ Sets the background color.
 
 Sets the cursor position. In normal mode `x` and `y` are multiplied by 8 to get the pixel position, in graphics mode they are used as is.
 
+## Sound
+
+### Low level operation
+
+MicroW8 actually runs two instances of your module. On the first instance, it calls `upd` and displays the framebuffer found in its memory. On the
+second instance, it calls `snd` instead with an incrementing sample index and expects that function to return sound samples for the left and right
+channel at 44100 Hz. If your module does not export a `snd` function, it calls the api function `sndGes` instead.
+
+As the only means of communication, 32 bytes starting at address 0x00050 are copied from main to sound memory after `upd` returns.
+
+By default, the `sndGes` function generates sound based on the 32 bytes at 0x00050. This means that in the default configuration those 32 bytes act
+as sound registers. See the `sndGes` function for the meaning of those registers.
+
+### export fn snd(sampleIndex: i32) -> f32
+
+If the module exports a `snd` function, it is called 88200 times per second to provide PCM sample data for playback (44.1kHz stereo).
+The `sampleIndex` will start at 0 and increments by 1 for each call. On even indices the function is expected to return a sample value for
+the left channel, on odd indices for the right channel.
+
+### fn playNote(channel: i32, note: i32)
+
+Triggers a note (1-127) on the given channel (0-3). Notes are semitones with 69 being A4 (same as MIDI). A note value of 0 stops the
+sound playing on that channel. A note value 128-255 will trigger note-128 and immediately stop it (playing attack+release parts of envelope).
+
+This function assumes the default setup, with the `sndGes` registers located at 0x00050.
+
+### fn sndGes(sampleIndex: i32) -> f32
+
+This implements a sound chip, generating sound based on 32 bytes of sound registers.
+
+The spec of this sound chip are:
+
+- 4 channels with individual volume control (0-15)
+- rect, saw, tri, noise wave forms selectable per channel
+- each wave form supports some kind of pulse width modulation
+- each channel has an optional automatic low pass filter, or can be sent to one of two manually controllable filters
+- each channel can select between a narrow and a wide stereo positioning. The two stereo positions of each channel are fixed.
+- optional ring modulation
+
+This function requires 1024 bytes of working memory, the first 32 bytes of which are interpreted as the sound registers.
+The base address of its working memory can be configured by writing the address to 0x12c78. It defaults to 0x00050.
+
+Here is a short description of the 32 sound registers.
+
+```
+00 - CTRL0
+06 - CTRL1
+0c - CTRL2
+12 - CTRL3
+  | 7  6 |   5  |   4  |  3  2  |    1    |    0    |
+  | wave | ring | wide | filter | trigger | note on |
+
+  note on: stay in decay/sustain part of envelope
+  trigger: the attack part of the envlope is triggered when either this changes
+           or note on is changed from 0 to 1.
+  filter : 0 - no filter
+           1 - fixed 6db 1-pole filter with cutoff two octaves above note
+           2 - programmable filter 0
+           3 - programmable filter 1
+  wide   : use wide stereo panning
+  ring   : ring modulate with triangle wave at frequency of previous channel
+  wave   : 0 - rectangle
+           1 - saw
+           2 - triangle
+           3 - noise
+
+01 - PULS0
+07 - PULS1
+0d - PULS2
+13 - PULS3
+  Pulse width 0-255, with 0 being the plain version of each wave form.
+  rectangle - 50%-100% pulse width
+  saw       - inverts 0%-100% of the saw wave form around the center
+  triangle  - morphs into an octave up triangle wave
+  noise     - blends into a decimated saw wave (just try it out)
+
+02 - FINE0
+08 - FINE1
+0e - FINE2
+14 - FINE3
+  Fractional note
+
+03 - NOTE0
+09 - NOTE1
+0f - NOTE2
+15 - NOTE3
+  Note, 69 = A4
+
+04 - ENVA0
+0a - ENVA1
+10 - ENVA2
+16 - ENVA3
+  | 7 6 5 4 | 3 2 1 0 |
+  | decay   | attack  |
+
+05 - ENVB0
+0b - ENVB1
+11 - ENVB2
+17 - ENVB3
+  | 7 6 5 4 | 3 2 1 0 |
+  | release | sustain |
+
+18 - VO01
+  | 7 6 5 4  | 3 2 1 0  |
+  | volume 1 | volume 0 |
+
+19 - VO23
+  | 7 6 5 4  | 3 2 1 0  |
+  | volume 3 | volume 2 |
+
+1a - FCTR0
+1b - FCTR1
+  | 7 6 5 4   | 3 | 2    | 1    | 0   |
+  | resonance | 0 | band | high | low |
+
+1c - FFIN0
+1e - FFIN1
+  cutoff frequency - fractional note
+
+1d - FNOT0
+1f - FNOT1
+  cutoff frequency - note
+```
+
 # The `uw8` tool
 
 The `uw8` tool included in the MicroW8 download includes a number of useful tools for developing MicroW8 carts. For small productions written in

site/content/versions.md

@@ -0,0 +1,42 @@
++++
+description = "Versions"
++++
+
+### v0.1.2
+
+* [Web runtime](v0.1.2)
+* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.1.2/microw8-0.1.2-linux.tgz)
+* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.1.2/microw8-0.1.2-macos.tgz)
+* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.1.2/microw8-0.1.2-windows.zip)
+
+Changes:
+
+* add option to `uw8 run` to run the cart in the browser using the web runtime
+* CurlyWas: implement `include` support
+* CurlyWas: implement support for constants
+* fix crash when trying to draw zero sized line
+
+### v0.1.1
+
+* [Web runtime](v0.1.1)
+* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.1.1/microw8-0.1.1-linux.tgz)
+* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.1.1/microw8-0.1.1-macos.tgz)
+* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.1.1/microw8-0.1.1-windows.zip)
+
+Changes:
+
+* implement more robust file watcher
+* add basic video recording on F10 in web runtime
+* add screenshot on F9
+* add watchdog to interrupt hanging update in native runtime
+* add devkit mode to web runtime
+* add unpack and compile commands to uw8
+* add support for table/element section in pack command
+* disable wayland support (caused missing window decorations in gnome)
+
+### v0.1.0
+
+* [Web runtime](v0.1.0)
+* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.1.0/microw8-0.1.0-linux.tgz)
+* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.1.0/microw8-0.1.0-macos.tgz)
+* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.1.0/microw8-0.1.0-windows.zip)

site/templates/index.html

@@ -4,7 +4,7 @@
         <section>
             <h1 class="text-center heading-text">A WebAssembly based fantasy console</h1>
         </section>
-        <a href="v0.1.1">
+        <a href="v0.1.2">
             <img class="demonstration-gif" style="width:640px;height:480px;image-rendering:pixelated" src="img/technotunnel.png"></img>
         </a>
     </div>

src/main.rs

@@ -15,6 +15,10 @@ use uw8::Runtime;
 fn main() -> Result<()> {
     let mut args = Arguments::from_env();
 
+    // try to enable ansi support in win10 cmd shell
+    #[cfg(target_os = "windows")]
+    let _ = ansi_term::enable_ansi_support();
+
     match args.subcommand()?.as_deref() {
         Some("version") => {
             println!("{}", env!("CARGO_PKG_VERSION"));
@@ -75,6 +79,8 @@ fn run(mut args: Arguments) -> Result<()> {
     #[cfg(not(feature = "native"))]
     let run_browser = args.contains(["-b", "--browser"]) || true;
 
+    let disable_audio = args.contains(["-m", "--disable-audio"]);
+
     let filename = args.free_from_os_str::<PathBuf, bool>(|s| Ok(s.into()))?;
 
     let mut watcher = uw8::FileWatcher::new()?;
@@ -85,7 +91,13 @@ fn run(mut args: Arguments) -> Result<()> {
         #[cfg(not(feature = "native"))]
         unimplemented!();
         #[cfg(feature = "native")]
-        Box::new(MicroW8::new()?)
+        {
+            let mut microw8 = MicroW8::new()?;
+            if disable_audio {
+                microw8.disable_audio();
+            }
+            Box::new(microw8)
+        }
     } else {
         #[cfg(not(feature = "browser"))]
         unimplemented!();
@@ -101,19 +113,16 @@ fn run(mut args: Arguments) -> Result<()> {
 
     while runtime.is_open() {
         if first_run || watcher.poll_changed_file()?.is_some() {
-            match start_cart(&filename, &mut *runtime, &config) {
+            let (result, dependencies) = start_cart(&filename, &mut *runtime, &config);
-                Ok(dependencies) => {
+            if watch_mode {
-                    if watch_mode {
+                for dep in dependencies {
-                        for dep in dependencies {
+                    watcher.add_file(dep)?;
-                            watcher.add_file(dep)?;
-                        }
-                    }
                 }
-                Err(err) => {
+            }
-                    eprintln!("Load error: {}", err);
+            if let Err(err) = result {
-                    if !watch_mode {
+                eprintln!("Load error: {}", err);
-                        exit(1);
+                if !watch_mode {
-                    }
+                    exit(1);
                 }
             }
             first_run = false;
@@ -136,37 +145,45 @@ struct Config {
     output_path: Option<PathBuf>,
 }
 
-fn load_cart(filename: &Path, config: &Config) -> Result<(Vec<u8>, Vec<PathBuf>)> {
+fn load_cart(filename: &Path, config: &Config) -> (Result<Vec<u8>>, Vec<PathBuf>) {
     let mut dependencies = Vec::new();
-    let mut cart = match SourceType::of_file(filename)? {
+    fn inner(filename: &Path, config: &Config, dependencies: &mut Vec<PathBuf>) -> Result<Vec<u8>> {
-        SourceType::Binary => {
+        let mut cart = match SourceType::of_file(filename)? {
-            let mut cart = vec![];
+            SourceType::Binary => {
-            File::open(filename)?.read_to_end(&mut cart)?;
+                let mut cart = vec![];
-            dependencies.push(filename.to_path_buf());
+                File::open(filename)?.read_to_end(&mut cart)?;
-            cart
+                cart
-        }
+            }
-        SourceType::Wat => {
+            SourceType::Wat => {
-            let cart = wat::parse_file(filename)?;
+                let cart = wat::parse_file(filename)?;
-            dependencies.push(filename.to_path_buf());
+                cart
-            cart
+            }
-        }
+            SourceType::CurlyWas => {
-        SourceType::CurlyWas => {
+                let (module, deps) = curlywas::compile_file(filename, curlywas::Options::default());
-            let module = curlywas::compile_file(filename, curlywas::Options::default())?;
+                *dependencies = deps;
-            dependencies = module.dependencies;
+                module?
-            module.wasm
+            }
-        }
+        };
-    };
 
-    if let Some(ref pack_config) = config.pack {
+        if let Some(ref pack_config) = config.pack {
-        cart = uw8_tool::pack(&cart, pack_config)?;
+            cart = uw8_tool::pack(&cart, pack_config)?;
-        println!("packed size: {} bytes", cart.len());
+            println!("packed size: {} bytes", cart.len());
+        }
+
+        if let Some(ref path) = config.output_path {
+            File::create(path)?.write_all(&cart)?;
+        }
+
+        Ok(cart)
     }
 
-    if let Some(ref path) = config.output_path {
+    let result = inner(filename, config, &mut dependencies);
-        File::create(path)?.write_all(&cart)?;
+
+    if dependencies.is_empty() {
+        dependencies.push(filename.to_path_buf());
     }
 
-    Ok((cart, dependencies))
+    (result, dependencies)
 }
 
 enum SourceType {
@@ -205,14 +222,22 @@ impl SourceType {
 }
 
 #[cfg(any(feature = "native", feature = "browser"))]
-fn start_cart(filename: &Path, runtime: &mut dyn Runtime, config: &Config) -> Result<Vec<PathBuf>> {
+fn start_cart(
-    let cart = load_cart(filename, config)?;
+    filename: &Path,
+    runtime: &mut dyn Runtime,
+    config: &Config,
+) -> (Result<()>, Vec<PathBuf>) {
+    let (cart, dependencies) = load_cart(filename, config);
+    let cart = match cart {
+        Ok(cart) => cart,
+        Err(err) => return (Err(err), dependencies),
+    };
 
-    if let Err(err) = runtime.load(&cart.0) {
+    if let Err(err) = runtime.load(&cart) {
         eprintln!("Load error: {}", err);
-        Err(err)
+        (Err(err), dependencies)
     } else {
-        Ok(cart.1)
+        (Ok(()), dependencies)
     }
 }
 
@@ -231,13 +256,14 @@ fn pack(mut args: Arguments) -> Result<()> {
 
     let out_file = args.free_from_os_str::<PathBuf, bool>(|s| Ok(s.into()))?;
 
-    let (cart, _) = load_cart(
+    let cart = load_cart(
         &in_file,
         &Config {
             pack: Some(pack_config),
             output_path: None,
         },
-    )?;
+    )
+    .0?;
 
     File::create(out_file)?.write_all(&cart)?;
 
@@ -260,8 +286,8 @@ fn compile(mut args: Arguments) -> Result<()> {
     let in_file = args.free_from_os_str::<PathBuf, bool>(|s| Ok(s.into()))?;
     let out_file = args.free_from_os_str::<PathBuf, bool>(|s| Ok(s.into()))?;
 
-    let module = curlywas::compile_file(in_file, options)?;
+    let module = curlywas::compile_file(in_file, options).0?;
-    File::create(out_file)?.write_all(&module.wasm)?;
+    File::create(out_file)?.write_all(&module)?;
 
     Ok(())
 }

src/run_native.rs

@@ -1,9 +1,11 @@
-use std::sync::{Arc, Mutex};
+use std::sync::{mpsc, Arc, Mutex};
 use std::time::Duration;
 use std::{thread, time::Instant};
 
-use anyhow::Result;
+use anyhow::{anyhow, Result};
+use cpal::traits::*;
 use minifb::{Key, Window, WindowOptions};
+use rubato::Resampler;
 use wasmtime::{
     Engine, GlobalType, Memory, MemoryType, Module, Mutability, Store, TypedFunc, ValType,
 };
@@ -26,16 +28,18 @@ pub struct MicroW8 {
     window_buffer: Vec<u32>,
     instance: Option<UW8Instance>,
     timeout: u32,
+    disable_audio: bool,
 }
 
 struct UW8Instance {
     store: Store<()>,
     memory: Memory,
     end_frame: TypedFunc<(), ()>,
-    update: TypedFunc<(), ()>,
+    update: Option<TypedFunc<(), ()>>,
     start_time: Instant,
     module: Vec<u8>,
     watchdog: Arc<Mutex<UW8WatchDog>>,
+    sound: Option<Uw8Sound>,
 }
 
 impl Drop for UW8Instance {
@@ -75,6 +79,7 @@ impl MicroW8 {
             window_buffer: vec![0u32; 320 * 240],
             instance: None,
             timeout: 30,
+            disable_audio: false,
         })
     }
 
@@ -84,6 +89,10 @@ impl MicroW8 {
             *v = 0;
         }
     }
+
+    pub fn disable_audio(&mut self) {
+        self.disable_audio = true;
+    }
 }
 
 impl super::Runtime for MicroW8 {
@@ -119,42 +128,9 @@ impl super::Runtime for MicroW8 {
         let module_length = load_uw8.call(&mut store, module_data.len() as i32)? as u32 as usize;
         let module = wasmtime::Module::new(&self.engine, &memory.data(&store)[..module_length])?;
 
-        linker.func_wrap("env", "acos", |v: f32| v.acos())?;
+        add_native_functions(&mut linker, &mut store)?;
-        linker.func_wrap("env", "asin", |v: f32| v.asin())?;
-        linker.func_wrap("env", "atan", |v: f32| v.atan())?;
-        linker.func_wrap("env", "atan2", |x: f32, y: f32| x.atan2(y))?;
-        linker.func_wrap("env", "cos", |v: f32| v.cos())?;
-        linker.func_wrap("env", "exp", |v: f32| v.exp())?;
-        linker.func_wrap("env", "log", |v: f32| v.ln())?;
-        linker.func_wrap("env", "sin", |v: f32| v.sin())?;
-        linker.func_wrap("env", "tan", |v: f32| v.tan())?;
-        linker.func_wrap("env", "pow", |a: f32, b: f32| a.powf(b))?;
-        for i in 9..64 {
-            linker.func_wrap("env", &format!("reserved{}", i), || {})?;
-        }
-        for i in 0..16 {
-            linker.define(
-                "env",
-                &format!("g_reserved{}", i),
-                wasmtime::Global::new(
-                    &mut store,
-                    GlobalType::new(ValType::I32, Mutability::Const),
-                    0.into(),
-                )?,
-            )?;
-        }
 
-        let platform_instance = linker.instantiate(&mut store, &platform_module)?;
+        let platform_instance = instantiate_platform(&mut linker, &mut store, &platform_module)?;
-
-        for export in platform_instance.exports(&mut store) {
-            linker.define(
-                "env",
-                export.name(),
-                export
-                    .into_func()
-                    .expect("platform surely only exports functions"),
-            )?;
-        }
 
         let watchdog = Arc::new(Mutex::new(UW8WatchDog {
             interupt: store.interrupt_handle()?,
@@ -187,7 +163,22 @@ impl super::Runtime for MicroW8 {
             watchdog.timeout = 0;
         }
         let end_frame = platform_instance.get_typed_func::<(), (), _>(&mut store, "endFrame")?;
-        let update = instance.get_typed_func::<(), (), _>(&mut store, "upd")?;
+        let update = instance.get_typed_func::<(), (), _>(&mut store, "upd").ok();
+
+        let sound = if self.disable_audio {
+            None
+        } else {
+            match init_sound(&self.engine, &platform_module, &module) {
+                Ok(sound) => {
+                    sound.stream.play()?;
+                    Some(sound)
+                }
+                Err(err) => {
+                    eprintln!("Failed to init sound: {}", err);
+                    None
+                }
+            }
+        };
 
         self.instance = Some(UW8Instance {
             store,
@@ -197,6 +188,7 @@ impl super::Runtime for MicroW8 {
             start_time: Instant::now(),
             module: module_data.into(),
             watchdog,
+            sound,
         });
 
         Ok(())
@@ -227,13 +219,22 @@ impl super::Runtime for MicroW8 {
             if let Ok(mut watchdog) = instance.watchdog.lock() {
                 watchdog.timeout = self.timeout;
             }
-            result = instance.update.call(&mut instance.store, ());
+            if let Some(ref update) = instance.update {
+                result = update.call(&mut instance.store, ());
+            }
             if let Ok(mut watchdog) = instance.watchdog.lock() {
                 watchdog.timeout = 0;
             }
             instance.end_frame.call(&mut instance.store, ())?;
 
             let memory = instance.memory.data(&instance.store);
+
+            let mut sound_regs = [0u8; 32];
+            sound_regs.copy_from_slice(&memory[80..112]);
+            if let Some(ref sound) = instance.sound {
+                sound.tx.send(sound_regs)?;
+            }
+
             let framebuffer = &memory[120..(120 + 320 * 240)];
             let palette = &memory[0x13000..];
             for (i, &color_index) in framebuffer.iter().enumerate() {
@@ -258,3 +259,210 @@ impl super::Runtime for MicroW8 {
         Ok(())
     }
 }
+
+fn add_native_functions(
+    linker: &mut wasmtime::Linker<()>,
+    store: &mut wasmtime::Store<()>,
+) -> Result<()> {
+    linker.func_wrap("env", "acos", |v: f32| v.acos())?;
+    linker.func_wrap("env", "asin", |v: f32| v.asin())?;
+    linker.func_wrap("env", "atan", |v: f32| v.atan())?;
+    linker.func_wrap("env", "atan2", |x: f32, y: f32| x.atan2(y))?;
+    linker.func_wrap("env", "cos", |v: f32| v.cos())?;
+    linker.func_wrap("env", "exp", |v: f32| v.exp())?;
+    linker.func_wrap("env", "log", |v: f32| v.ln())?;
+    linker.func_wrap("env", "sin", |v: f32| v.sin())?;
+    linker.func_wrap("env", "tan", |v: f32| v.tan())?;
+    linker.func_wrap("env", "pow", |a: f32, b: f32| a.powf(b))?;
+    for i in 10..64 {
+        linker.func_wrap("env", &format!("reserved{}", i), || {})?;
+    }
+    for i in 0..16 {
+        linker.define(
+            "env",
+            &format!("g_reserved{}", i),
+            wasmtime::Global::new(
+                &mut *store,
+                GlobalType::new(ValType::I32, Mutability::Const),
+                0.into(),
+            )?,
+        )?;
+    }
+
+    Ok(())
+}
+
+fn instantiate_platform(
+    linker: &mut wasmtime::Linker<()>,
+    store: &mut wasmtime::Store<()>,
+    platform_module: &wasmtime::Module,
+) -> Result<wasmtime::Instance> {
+    let platform_instance = linker.instantiate(&mut *store, &platform_module)?;
+
+    for export in platform_instance.exports(&mut *store) {
+        linker.define(
+            "env",
+            export.name(),
+            export
+                .into_func()
+                .expect("platform surely only exports functions"),
+        )?;
+    }
+
+    Ok(platform_instance)
+}
+
+struct Uw8Sound {
+    stream: cpal::Stream,
+    tx: mpsc::SyncSender<[u8; 32]>,
+}
+
+fn init_sound(
+    engine: &wasmtime::Engine,
+    platform_module: &wasmtime::Module,
+    module: &wasmtime::Module,
+) -> Result<Uw8Sound> {
+    let mut store = wasmtime::Store::new(engine, ());
+
+    let memory = wasmtime::Memory::new(&mut store, MemoryType::new(4, Some(4)))?;
+
+    let mut linker = wasmtime::Linker::new(engine);
+    linker.define("env", "memory", memory)?;
+    add_native_functions(&mut linker, &mut store)?;
+
+    let platform_instance = instantiate_platform(&mut linker, &mut store, platform_module)?;
+    let instance = linker.instantiate(&mut store, module)?;
+
+    let snd = instance
+        .get_typed_func::<(i32,), f32, _>(&mut store, "snd")
+        .or_else(|_| platform_instance.get_typed_func::<(i32,), f32, _>(&mut store, "gesSnd"))?;
+
+    let host = cpal::default_host();
+    let device = host
+        .default_output_device()
+        .ok_or_else(|| anyhow!("No audio output device available"))?;
+    let mut configs: Vec<_> = device
+        .supported_output_configs()?
+        .filter(|config| {
+            config.channels() == 2 && config.sample_format() == cpal::SampleFormat::F32
+        })
+        .collect();
+    configs.sort_by_key(|config| {
+        let rate = 44100
+            .max(config.min_sample_rate().0)
+            .min(config.max_sample_rate().0);
+        if rate >= 44100 {
+            rate - 44100
+        } else {
+            (44100 - rate) * 1000
+        }
+    });
+    let config = configs
+        .into_iter()
+        .next()
+        .ok_or_else(|| anyhow!("Could not find float output config"))?;
+    let sample_rate = cpal::SampleRate(44100)
+        .max(config.min_sample_rate())
+        .max(config.max_sample_rate());
+    let config = config.with_sample_rate(sample_rate);
+    let buffer_size = match *config.buffer_size() {
+        cpal::SupportedBufferSize::Unknown => cpal::BufferSize::Default,
+        cpal::SupportedBufferSize::Range { min, max } => {
+            cpal::BufferSize::Fixed(256.max(min).min(max))
+        }
+    };
+    let config = cpal::StreamConfig {
+        buffer_size,
+        ..config.config()
+    };
+
+    let sample_rate = config.sample_rate.0 as usize;
+
+    let (tx, rx) = mpsc::sync_channel::<[u8; 32]>(1);
+
+    let start_time = Instant::now();
+
+    struct Resampler {
+        resampler: rubato::FftFixedIn<f32>,
+        input_buffers: Vec<Vec<f32>>,
+        output_buffers: Vec<Vec<f32>>,
+        output_index: usize,
+    }
+    let mut resampler: Option<Resampler> = if sample_rate == 44100 {
+        None
+    } else {
+        let rs = rubato::FftFixedIn::new(44100, sample_rate, 128, 1, 2)?;
+        let input_buffers = rs.input_buffer_allocate();
+        let output_buffers = rs.output_buffer_allocate();
+        Some(Resampler {
+            resampler: rs,
+            input_buffers,
+            output_buffers,
+            output_index: usize::MAX,
+        })
+    };
+
+    let mut sample_index = 0;
+    let stream = device.build_output_stream(
+        &config,
+        move |mut buffer: &mut [f32], _| {
+            if let Ok(regs) = rx.try_recv() {
+                memory.write(&mut store, 80, &regs).unwrap();
+            }
+
+            {
+                let time = start_time.elapsed().as_millis() as i32;
+                let mem = memory.data_mut(&mut store);
+                mem[64..68].copy_from_slice(&time.to_le_bytes());
+            }
+
+            if let Some(ref mut resampler) = resampler {
+                while !buffer.is_empty() {
+                    let copy_size = resampler.output_buffers[0]
+                        .len()
+                        .saturating_sub(resampler.output_index)
+                        .min(buffer.len() / 2);
+                    if copy_size == 0 {
+                        resampler.input_buffers[0].clear();
+                        resampler.input_buffers[1].clear();
+                        for _ in 0..resampler.resampler.input_frames_next() {
+                            resampler.input_buffers[0]
+                                .push(snd.call(&mut store, (sample_index,)).unwrap_or(0.0));
+                            resampler.input_buffers[1]
+                                .push(snd.call(&mut store, (sample_index + 1,)).unwrap_or(0.0));
+                            sample_index = sample_index.wrapping_add(2);
+                        }
+
+                        resampler
+                            .resampler
+                            .process_into_buffer(
+                                &resampler.input_buffers,
+                                &mut resampler.output_buffers,
+                                None,
+                            )
+                            .unwrap();
+                        resampler.output_index = 0;
+                    } else {
+                        for i in 0..copy_size {
+                            buffer[i * 2] = resampler.output_buffers[0][resampler.output_index + i];
+                            buffer[i * 2 + 1] =
+                                resampler.output_buffers[1][resampler.output_index + i];
+                        }
+                        resampler.output_index += copy_size;
+                        buffer = &mut buffer[copy_size * 2..];
+                    }
+                }
+            } else {
+                for v in buffer {
+                    *v = snd.call(&mut store, (sample_index,)).unwrap_or(0.0);
+                    sample_index = sample_index.wrapping_add(1);
+                }
+            }
+        },
+        move |err| {
+            dbg!(err);
+        },
+    )?;
+
+    Ok(Uw8Sound { stream, tx })
+}

test/ges_test.cwa

@@ -0,0 +1,30 @@
+import "env.memory" memory(4);
+import "env.pow" fn pow(f32, f32) -> f32;
+import "env.sin" fn sin(f32) -> f32;
+import "env.cls" fn cls(i32);
+import "env.rectangle" fn rectangle(f32, f32, f32, f32, i32);
+
+include "../platform/src/ges.cwa"
+
+export fn snd(t: i32) -> f32 {
+    gesSnd(t)
+}
+
+export fn upd() {
+    80?0 = 32!32 / 200 & 2 | 0x41;
+    80?3 = (32!32 / 400)%7*12/7 + 40;
+    let pulse = (32!32 * 256 / 2000) & 511;
+    if pulse >= 256 {
+        pulse = 511 - pulse;
+    }
+    80?1 = pulse;
+
+    cls(0);
+    rectangle(0.0, 100.0, (pulse * 320 / 256) as f32, 16.0, 15);
+}
+
+data 80 {
+    i8(
+        0x41, 0, 0, 80, 0x70, 0
+    )
+}

tests/plot_ges.cwa

@@ -0,0 +1,59 @@
+include "../examples/include/microw8-api.cwa"
+
+export fn upd() {
+    80?0 = (32!32 >> 11 << 6) | 5;
+    80?1 = (sin(time() * 6 as f32) * 95 as f32) as i32 + 128;
+    plotGes();
+}
+
+data 80 { i8 (
+    1, 128, 0, 69, 0, 15,
+    0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0,
+    0xff, 0xff,
+    0xc1, 0, 0, 110, 0, 0
+) }
+
+//import "env.gesSnd" fn gesSnd(i32) -> f32;
+
+include "../platform/src/ges.cwa"
+
+export fn snd(t: i32) -> f32 {
+    gesSnd(t)
+}
+
+global mut samplePos: i32 = 0;
+
+const SoundBuffer = 0x30000;
+
+fn plotGes() {
+    rectangle(0 as f32, 10 as f32, 320 as f32, 320 as f32, 0);
+    let count = (time() * 44100 as f32) as i32 * 2 - samplePos;
+    let i: i32;
+    loop genLoop {
+        (i*4)$SoundBuffer = gesSnd(samplePos + i);
+        branch_if (i := i + 1) < count: genLoop;
+    }
+    samplePos = samplePos + count;
+
+    let ch: i32;
+    loop channelLoop {
+        let offset = 159;
+        i = 0;
+
+        loop searchLoop {
+            offset = offset + 1;
+            branch_if (offset * 8 + ch - 8)$SoundBuffer < 0 as f32 | (offset * 8 + ch)$SoundBuffer >= 0 as f32 & offset + 160 < count: searchLoop;
+        }
+
+        offset = ch + (offset - 160) * 8;
+        i = 0;
+        loop plotLoop {
+            setPixel(i, floor((i * 8 + offset)$SoundBuffer * 127 as f32) as i32 + 60 + ch * (120/8), 15);
+            branch_if (i := i + 1) < 320: plotLoop;
+        }
+
+        branch_if (ch := ch + 8) < 16: channelLoop;
+    }
+}

uw8-tool/src/base_module.rs

@@ -166,6 +166,8 @@ impl BaseModule {
 
         add_function(&mut functions, &type_map, "exp", &[F32], Some(F32));
 
+        add_function(&mut functions, &type_map, "playNote", &[I32, I32], None);
+
         for i in functions.len()..64 {
             add_function(
                 &mut functions,
@@ -291,7 +293,10 @@ impl BaseModule {
 
     pub fn write_as_cwa<P: AsRef<Path>>(&self, path: P) -> Result<()> {
         fn inner(mut file: File, base: &BaseModule) -> Result<()> {
-            writeln!(file, "// MicroW8 APIs, to be `include`d in CurlyWas sources")?;
+            writeln!(
+                file,
+                "// MicroW8 APIs, to be `include`d in CurlyWas sources"
+            )?;
             writeln!(file, "import \"env.memory\" memory({});", base.memory)?;
             writeln!(file)?;
             for &(module, ref name, type_id) in &base.function_imports {
@@ -402,5 +407,5 @@ const CONSTANTS: &[(&str, u32)] = &[
     ("BUTTON_A", 4),
     ("BUTTON_B", 5),
     ("BUTTON_X", 6),
-    ("BUTTON_Y", 7)
+    ("BUTTON_Y", 7),
 ];

web/run

@@ -0,0 +1,2 @@
+#!/bin/bash
+rm -rf .parcel-cache && yarn parcel src/index.html

web/src/audiolet.js

@@ -0,0 +1,75 @@
+let U8 = (...a) => new Uint8Array(...a);
+class APU extends AudioWorkletProcessor {
+    constructor() {
+        super();
+        this.sampleIndex = 0;
+        this.port.onmessage = (ev) => {
+            if(this.memory) {
+                if(isNaN(ev.data)) {
+                    U8(this.memory.buffer, 80, 32).set(U8(ev.data));
+                } else {
+                    this.startTime = ev.data;
+                }
+            } else {
+                this.load(ev.data[0], ev.data[1]);
+            }
+        };
+    }
+
+    async load(platform_data, data) {
+        let memory = new WebAssembly.Memory({ initial: 4, maximum: 4 });
+
+        let importObject = {
+            env: {
+                memory
+            },
+        };
+
+        for (let n of ['acos', 'asin', 'atan', 'atan2', 'cos', 'exp', 'log', 'sin', 'tan', 'pow']) {
+            importObject.env[n] = Math[n];
+        }
+
+        for (let i = 9; i < 64; ++i) {
+            importObject.env['reserved' + i] = () => { };
+        }
+
+        for (let i = 0; i < 16; ++i) {
+            importObject.env['g_reserved' + i] = 0;
+        }
+
+        let instantiate = async (data) => (await WebAssembly.instantiate(data, importObject)).instance;
+
+        let platform_instance = await instantiate(platform_data);
+
+        for (let name in platform_instance.exports) {
+            importObject.env[name] = platform_instance.exports[name]
+        }
+
+        let instance = await instantiate(data);
+
+        this.memory = memory;
+
+        this.snd = instance.exports.snd || platform_instance.exports.gesSnd;
+
+        this.port.postMessage(2);
+    }
+
+    process(inputs, outputs, parameters) {
+        if(this.snd && this.startTime) {
+            let u32Mem = new Uint32Array(this.memory.buffer);
+            u32Mem[16] = Date.now() - this.startTime;
+            let channels = outputs[0];
+            let index = this.sampleIndex;
+            let numSamples = channels[0].length;
+            for(let i = 0; i < numSamples; ++i) {
+                channels[0][i] = this.snd(index++);
+                channels[1][i] = this.snd(index++);
+            }
+            this.sampleIndex = index & 0xffffffff;
+        }
+
+        return true;
+    }
+}
+
+registerProcessor('apu', APU);

web/src/index.html

@@ -10,13 +10,14 @@
     </head>
     <body>
         <div id="uw8">
-            <a href="https://exoticorn.github.io/microw8">MicroW8</a> 0.1.2
+            <a href="https://exoticorn.github.io/microw8">MicroW8</a> 0.2.0-rc1
         </div>
         <div id="centered">
-            <canvas id="screen" width="320" height="240">
+            <canvas class="screen" id="screen" width="320" height="240">
             </canvas>
-        <div id="timer" hidden="true"></div>        
+            <button class="screen" id="start" style="display:none">Click to start</button>
-        <div id="message"></div>
+            <div id="timer" hidden="true"></div>        
+            <div id="message"></div>
             <button id="cartButton" style="visibility:hidden">Load cart...</button>
         </div>
         <div id="footer">

web/src/main.js

@@ -12,6 +12,7 @@ let uw8 = MicroW8(document.getElementById('screen'), {
     setMessage,
     keyboardElement: window,
     timerElement: document.getElementById("timer"),
+    startButton: document.getElementById("start")
 });
 
 function runModuleFromHash() {
@@ -79,7 +80,9 @@ if(location.hash.length != 0) {
             url += 'cart.uw8';
         }
         try {
-            await uw8.runModuleFromURL(url, true);
+            if(!await uw8.runModuleFromURL(url, true)) {
+                setupLoad();
+            }
         } catch(e) {
             setupLoad();
         }

web/src/microw8.js

@@ -1,5 +1,15 @@
 import loaderUrl from "data-url:../../platform/bin/loader.wasm";
 import platformUrl from "data-url:../../platform/bin/platform.uw8";
+import audioWorkletUrl from "data-url:./audiolet.js";
+
+class AudioNode extends AudioWorkletNode {
+    constructor(context) {
+        super(context, 'apu', {outputChannelCount: [2]});
+    }
+}
+
+let U8 = (...a) => new Uint8Array(...a);
+let U32 = (...a) => new Uint32Array(...a);
 
 export default function MicroW8(screen, config = {}) {
     if(!config.setMessage) {
@@ -18,9 +28,6 @@ export default function MicroW8(screen, config = {}) {
     
     let currentData;
     
-    let U8 = (d) => new Uint8Array(d);
-    let U32 = (d) => new Uint32Array(d);
-    
     let pad = 0;
     let keyboardElement = config.keyboardElement == undefined ? screen : config.keyboardElement;
     if(keyboardElement) {
@@ -83,6 +90,9 @@ export default function MicroW8(screen, config = {}) {
         keyboardElement.onkeydown = keyHandler;
         keyboardElement.onkeyup = keyHandler;
     }
+
+    let audioContext;
+    let audioNode;
     
     async function runModule(data, keepUrl) {
         if (cancelFunction) {
@@ -90,6 +100,15 @@ export default function MicroW8(screen, config = {}) {
             cancelFunction = null;
         }
     
+        audioContext = new AudioContext({sampleRate: 44100});
+        let keepRunning = true;
+        let abortController = new AbortController();
+        cancelFunction = () => {
+            audioContext.close();
+            keepRunning = false;
+            abortController.abort();
+        }
+
         let cartridgeSize = data.byteLength;
     
         config.setMessage(cartridgeSize);
@@ -97,6 +116,39 @@ export default function MicroW8(screen, config = {}) {
             return;
         }
     
+        await audioContext.audioWorklet.addModule(audioWorkletUrl);
+        audioNode = new AudioNode(audioContext);
+
+        let audioReadyFlags = 0;
+        let audioReadyResolve;
+        let audioReadyPromise = new Promise(resolve => audioReadyResolve = resolve);
+        let updateAudioReady = (f) => {
+            audioReadyFlags |= f;
+            if(audioReadyFlags == 3 && audioReadyResolve) {
+                audioReadyResolve(true);
+                audioReadyResolve = null;
+            }
+        };
+        let audioStateChange = () => {
+            if(audioContext.state == 'suspended') {
+                if(config.startButton) {
+                    config.startButton.style = '';
+                    screen.style = 'display:none';
+                }
+                (config.startButton || screen).onclick = () => {
+                    audioContext.resume();
+                };
+            } else {
+                if(config.startButton) {
+                    config.startButton.style = 'display:none';
+                    screen.style = '';
+                }
+                updateAudioReady(1);
+            }
+        };
+        audioContext.onstatechange = audioStateChange;
+        audioStateChange();
+
         currentData = data;
     
         let newURL = window.location.pathname;
@@ -119,7 +171,7 @@ export default function MicroW8(screen, config = {}) {
             if(!devkitMode) {
                 memSize.maximum = 4;
             }
-            let memory = new WebAssembly.Memory({ initial: 4, maximum: devkitMode ? 16 : 4 });
+            let memory = new WebAssembly.Memory(memSize);
             let memU8 = U8(memory.buffer);
     
             let importObject = {
@@ -142,9 +194,9 @@ export default function MicroW8(screen, config = {}) {
     
             let instantiate = async (data) => (await WebAssembly.instantiate(data, importObject)).instance;
     
-            let loadModuleURL = async (url) => instantiate(loadModuleData(await (await fetch(url)).arrayBuffer()));
+            let loadModuleURL = async (url) => loadModuleData(await (await fetch(url)).arrayBuffer());
     
-            loader = await loadModuleURL(loaderUrl);
+            loader = await instantiate(await loadModuleURL(loaderUrl));
     
             for (let n of ['acos', 'asin', 'atan', 'atan2', 'cos', 'exp', 'log', 'sin', 'tan', 'pow']) {
                 importObject.env[n] = Math[n];
@@ -160,7 +212,12 @@ export default function MicroW8(screen, config = {}) {
     
             data = loadModuleData(data);
     
-            let platform_instance = await loadModuleURL(platformUrl);
+            let platform_data = await loadModuleURL(platformUrl);
+
+            audioNode.port.onmessage = (e) => updateAudioReady(e.data);
+            audioNode.port.postMessage([platform_data, data]);
+
+            let platform_instance = await instantiate(platform_data);
     
             for (let name in platform_instance.exports) {
                 importObject.env[name] = platform_instance.exports[name]
@@ -169,14 +226,35 @@ export default function MicroW8(screen, config = {}) {
             let instance = await instantiate(data);
     
             let buffer = U32(imageData.data.buffer);
+
+            await audioReadyPromise;
     
             let startTime = Date.now();
     
-            let keepRunning = true;
-            cancelFunction = () => keepRunning = false;
-    
             const timePerFrame = 1000 / 60;
             let nextFrame = startTime;
+
+            audioNode.connect(audioContext.destination);
+
+            let isPaused = false;
+            let pauseTime = startTime;
+            let updateVisibility = isVisible => {
+                let now = Date.now();
+                if(isVisible) {
+                    isPaused = false;
+                    audioContext.resume();
+                    startTime += now - pauseTime;
+                    audioNode.port.postMessage(startTime);
+                } else {
+                    isPaused = true;
+                    audioContext.suspend();
+                    pauseTime = now;
+                    audioNode.port.postMessage(0);
+                }
+            };
+            window.addEventListener('focus', () => updateVisibility(true), { signal: abortController.signal });
+            window.addEventListener('blur', () => updateVisibility(false), { signal: abortController.signal });
+            updateVisibility(document.hasFocus());
     
             function mainloop() {
                 if (!keepRunning) {
@@ -184,9 +262,8 @@ export default function MicroW8(screen, config = {}) {
                 }
     
                 try {
-                    let now = Date.now();
                     let restart = false;
-                    if (now >= nextFrame) {
+                    if (!isPaused) {
                         let gamepads = navigator.getGamepads();
                         let gamepad = 0;
                         for (let i = 0; i < 4; ++i) {
@@ -214,23 +291,30 @@ export default function MicroW8(screen, config = {}) {
                         }
     
                         let u32Mem = U32(memory.buffer);
-                        u32Mem[16] = now - startTime;
+                        u32Mem[16] = Date.now() - startTime;
                         u32Mem[17] = pad | gamepad;
-                        instance.exports.upd();
+                        if(instance.exports.upd) {
+                            instance.exports.upd();
+                        }
                         platform_instance.exports.endFrame();
+
+                        let soundRegisters = new ArrayBuffer(32);
+                        U8(soundRegisters).set(U8(memory.buffer, 80, 32));
+                        audioNode.port.postMessage(soundRegisters, [soundRegisters]);
     
-                        let palette = U32(memory.buffer.slice(0x13000, 0x13000 + 1024));
+                        let palette = U32(memory.buffer, 0x13000, 1024);
                         for (let i = 0; i < 320 * 240; ++i) {
                             buffer[i] = palette[memU8[i + 120]] | 0xff000000;
                         }
                         canvasCtx.putImageData(imageData, 0, 0);
-                        nextFrame = Math.max(nextFrame + timePerFrame, now);
                     }
+                    let now = Date.now();
+                    nextFrame = Math.max(nextFrame + timePerFrame, now);
     
                     if (restart) {
                         runModule(currentData);
                     } else {
-                        window.requestAnimationFrame(mainloop);
+                        window.setTimeout(mainloop, Math.round(nextFrame - now))
                     }
                 } catch (err) {
                     config.setMessage(cartridgeSize, err.toString());
@@ -253,14 +337,25 @@ export default function MicroW8(screen, config = {}) {
     
     let videoRecorder;
     let videoStartTime;
+    let videoAudioSourceNode;
+    let videoAudioStreamNode;
     function recordVideo() {
         if(videoRecorder) {
             videoRecorder.stop();
             videoRecorder = null;
+            videoAudioSourceNode.disconnect(videoAudioStreamNode);
+            videoAudioSourceNode = null;
+            videoAudioStreamNode = null;
             return;
         }
+
+        let stream = screen.captureStream();
+        videoAudioStreamNode = audioContext.createMediaStreamDestination();
+        videoAudioSourceNode = audioNode;
+        audioNode.connect(videoAudioStreamNode);
+        stream.addTrack(videoAudioStreamNode.stream.getAudioTracks()[0]);
     
-        videoRecorder = new MediaRecorder(screen.captureStream(), {
+        videoRecorder = new MediaRecorder(stream, {
             mimeType: 'video/webm',
             videoBitsPerSecond: 25000000
         });
@@ -305,10 +400,11 @@ export default function MicroW8(screen, config = {}) {
     async function runModuleFromURL(url, keepUrl) {
         let response = await fetch(url);
         let type = response.headers.get('Content-Type');
-        if(type && type.includes('html')) {
+        if((type && type.includes('html')) || response.status != 200) {
-            throw false;
+            return false;
         }
         runModule(await response.arrayBuffer(), keepUrl || devkitMode);
+        return true;
     }
 
     return {

web/src/style.css

@@ -37,7 +37,7 @@ a:hover {
     color: #405040;
 }
 
-#screen {
+.screen {
     width: 320px;
     height: 240px;
     image-rendering: pixelated;
@@ -45,9 +45,16 @@ a:hover {
     margin-bottom: 8px;
     border: 4px solid #303040;
     box-shadow: 5px 5px 20px black;
+}
+
+#screen {
     cursor: none;
 }
 
+#start {
+    font-size: 150%;
+}
+
 #timer::before {
     content: '';
     display: inline-block;
@@ -84,21 +91,21 @@ button:active {
 }
 
 @media (min-width: 680px) and (min-height: 620px) {
-    #screen {
+    .screen {
         width: 640px;
         height: 480px;
     }
 }
 
 @media (min-width: 1000px) and (min-height: 800px) {
-    #screen {
+    .screen {
         width: 960px;
         height: 720px;
     }
 }
 
 @media (width:640px) and (height:480px) {
-    #screen {
+    .screen {
         width: 640px;
         height: 480px;
         border: 0;