backport sound fix

.github/workflows/ci.yml

@@ -30,9 +30,9 @@ jobs:
       run: sudo apt-get install -y libxkbcommon-dev libasound2-dev
       if: matrix.os == 'ubuntu-latest'
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
     - name: Cache build dirs
-      uses: actions/cache@v3
+      uses: actions/cache@v2
       with:
         path: |
           ~/.cargo/bin/
@@ -44,7 +44,7 @@ jobs:
     - name: Build
       run: cargo build --release --verbose
     - name: Upload artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
       with:
         name: uw8-${{ matrix.build }}
         path: target/release/${{ matrix.exe }}

.github/workflows/main.yml

@@ -8,12 +8,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       - name: build_and_deploy
-        uses: shalzz/zola-deploy-action@70a101a14bbdeed13e7a42a9ed06b35c9e9e826e
+        uses: shalzz/zola-deploy-action@v0.14.1
         env:
           # Target branch
           PAGES_BRANCH: gh-pages
           BUILD_DIR: site
           # Provide personal access token
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TOKEN: $GITHUB_ACTOR:${{ secrets.GITHUB_TOKEN }}

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "uw8"
-version = "0.4.1"
+version = "0.2.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -11,21 +11,21 @@ native = ["wasmtime", "uw8-window", "cpal", "rubato" ]
 browser = ["warp", "tokio", "tokio-stream", "webbrowser"]
 
 [dependencies]
-wasmtime = { git = "https://github.com/bytecodealliance/wasmtime.git", rev = "0f48f939b9870036562ca02ff21253547a9f1a5c", optional = true }
+wasmtime = { version = "0.37.0", optional = true }
 anyhow = "1"
-env_logger = "0.11.3"
+env_logger = "0.9"
 log = "0.4"
 uw8-window = { path = "uw8-window", optional = true }
-notify-debouncer-mini = { version = "0.4.1", default-features = false }
-pico-args = "0.5"
+notify = "4"
+pico-args = "0.4"
 curlywas = { git = "https://github.com/exoticorn/curlywas.git", rev = "0e7ea50" }
 wat = "1"
 uw8-tool = { path = "uw8-tool" }
 same-file = "1"
-warp = { version = "0.3.6", optional = true }
-tokio = { version = "1.37.0", features = ["sync", "rt"], optional = true }
-tokio-stream = { version = "0.1.15", features = ["sync"], optional = true }
-webbrowser = { version = "0.8.13", optional = true }
+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 }
 ansi_term = "0.12.1"
-cpal = { version = "0.15.3", optional = true }
-rubato = { version = "0.12.0", optional = true }
+cpal = { version = "0.14.1", optional = true }
+rubato = { version = "0.11.0", optional = true }

README.md

@@ -15,9 +15,9 @@ See [here](https://exoticorn.github.io/microw8/) for more information and docs.
 
 ## Downloads
 
-* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-linux.tgz)
-* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-macos.tgz)
-* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-windows.zip)
+* [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)
 
 The download includes
 

examples/curlywas/cube_wireframe.cwa

@@ -1,254 +0,0 @@
-/*
-    This program renders a rotating 3D wireframe cube on a 2D screen using the MicroW8 platform.
-
-    code     : zbyti
-    date     : 2025.04.15
-    platform : MicroW8 0.4.1
-
-    https://exoticorn.github.io/microw8/
-    https://exoticorn.github.io/microw8/docs/
-
-    https://github.com/exoticorn/microw8
-    https://github.com/exoticorn/curlywas
-
-    https://developer.mozilla.org/en-US/docs/WebAssembly
-
-    https://en.wikipedia.org/wiki/Rotation_matrix
-*/
-
-//-----------------------------------------------------------------------------
-// MicroW8 API
-//-----------------------------------------------------------------------------
-
-//include "../include/microw8-api.cwa"
-
-// Import memory allocation: 4 pages (64KB) of memory (256KB total)
-import "env.memory" memory(4);
-
-// Import MicroW8 API functions for graphics and math operations
-import "env.cls" fn cls(i32);                       // Clears the screen
-import "env.time" fn time() -> f32;                 // Returns the current time as a float for animation
-import "env.sin" fn sin(f32) -> f32;                // Computes the sine of an angle (in radians)
-import "env.cos" fn cos(f32) -> f32;                // Computes the cosine of an angle (in radians)
-import "env.line" fn line(f32, f32, f32, f32, i32); // Draws a line between two 2D points with a color
-
-// Define the starting address for user memory
-const USER_MEM = 0x14000;
-
-//-----------------------------------------------------------------------------
-// CONSTANTS
-//-----------------------------------------------------------------------------
-
-// Screen and rendering constants
-const CENTER_X      = 320.0 / 2.0;          // X-coordinate of the screen center (320px width)
-const CENTER_Y      = 240.0 / 2.0;          // Y-coordinate of the screen center (240px height)
-const ROTATE_SPEED  = 0.5;                  // Speed at which the cube rotates
-const PI            = 3.14159265;           // Mathematical constant Pi for angle conversions
-const RADIAN        = PI / 180.0;           // Conversion factor from degrees to radians
-const SCALE         = 65.0;                 // Scaling factor to adjust the size of the cube on screen
-const PERSPECTIVE   = SCALE * 0.5;          // Perspective factor
-const LINE_COLOR    = 0xBF;                 // Color value for drawing the cube's edges (hexadecimal)
-
-// Memory layout for vertex data
-const V_BASE        = USER_MEM;             // Base vertices stored as 8-bit integers (i8)
-const V_ROT         = V_BASE + (3 * 8);     // Rotated vertices stored as 32-bit floats (f32), offset after V_BASE
-
-// Offsets for accessing X, Y, Z coordinates in memory (in bytes)
-const X             = 0;                    // Offset for X coordinate
-const Y             = 4;                    // Offset for Y coordinate
-const Z             = 8;                    // Offset for Z coordinate
-
-// Memory offsets for each rotated vertex (8 vertices, 3 floats each, 12 bytes per vertex)
-const VA            = V_ROT + (0 * 3 * 4);  // Vertex A (front-top-left)
-const VB            = V_ROT + (1 * 3 * 4);  // Vertex B (front-top-right)
-const VC            = V_ROT + (2 * 3 * 4);  // Vertex C (front-bottom-right)
-const VD            = V_ROT + (3 * 3 * 4);  // Vertex D (front-bottom-left)
-const VE            = V_ROT + (4 * 3 * 4);  // Vertex E (back-top-left)
-const VF            = V_ROT + (5 * 3 * 4);  // Vertex F (back-top-right)
-const VG            = V_ROT + (6 * 3 * 4);  // Vertex G (back-bottom-right)
-const VH            = V_ROT + (7 * 3 * 4);  // Vertex H (back-bottom-left)
-
-//-----------------------------------------------------------------------------
-// Function to rotate the cube around X, Y, and Z axes based on time
-//-----------------------------------------------------------------------------
-
-fn rotate() {
-    // Calculate the rotation angle using the current time for continuous animation
-    let angle = time() * ROTATE_SPEED;
-
-    // Precompute sine and cosine values once for efficiency
-    let sn = sin(angle);
-    let cs = cos(angle);
-
-    let calc = 0;
-    loop calc { // Iterate over all 8 vertices
-        // Calculate memory offset for current vertex (12 bytes per vertex: 4 bytes each for X, Y, Z)
-        let v = calc * 12;
-        let inline vX = v + X;
-        let inline vY = v + Y;
-        let inline vZ = v + Z;
-
-        // Load original vertex coordinates from V_BASE (stored as i8, converted to f32)
-        let x = i32.load8_s(V_BASE+(calc * 3 + 0)) as f32; // X coordinate
-        let y = i32.load8_s(V_BASE+(calc * 3 + 1)) as f32; // Y coordinate
-        let z = i32.load8_s(V_BASE+(calc * 3 + 2)) as f32; // Z coordinate
-
-        // Rotate around Z-axis: updates X and Y, Z stays the same
-        (vX)$V_ROT = x * cs - y * sn;
-        (vY)$V_ROT = x * sn + y * cs;
-        (vZ)$V_ROT = z;
-
-        // Rotate around Y-axis: updates X and Z, Y stays the same
-        x = (vX)$V_ROT;
-        z = (vZ)$V_ROT;
-        (vX)$V_ROT = x * cs + z * sn;
-        (vZ)$V_ROT = z * cs - x * sn;
-
-        // Rotate around X-axis: updates Y and Z, X stays the same
-        y = (vY)$V_ROT;
-        z = (vZ)$V_ROT;
-        (vY)$V_ROT = y * cs - z * sn;
-        (vZ)$V_ROT = y * sn + z * cs;
-
-        // Move to the next vertex until all 8 are processed
-        branch_if (calc +:= 1) < 8: calc;
-    }
-}
-
-//-----------------------------------------------------------------------------
-// Function to project 3D vertices to 2D screen space and draw the cube's edges
-//-----------------------------------------------------------------------------
-
-fn drawLines() {
-    let scale = 0;
-    loop scale { // Scale and center each vertex for 2D projection
-        // Calculate memory offset for current vertex (12 bytes per vertex: 4 bytes each for X, Y, Z)
-        let v = scale * 12;
-        let inline vX = v + X;
-        let inline vY = v + Y;
-
-        // Load Z coordinate of current vertex (from rotated vertex data)
-        let inline z = (v + Z)$V_ROT;
-
-        // Calculate perspective factor:
-        // - When z=0 (midpoint), factor=1.0 (no scaling)
-        // - Positive z (farther away) → factor<1.0 (objects appear smaller)
-        // - Negative z (closer) → factor>1.0 (objects appear larger)
-        let lazy factor = PERSPECTIVE / (PERSPECTIVE + z) * SCALE;
-
-        // Apply perspective projection, scaling and shift to center for X and Y coordinats:
-        // 1. Multiply by perspective factor
-        // 2. Apply global scaling (SCALE constant)
-        // 3. Center on screen (CENTER_X, CENTER_Y)
-        (vX)$V_ROT = (vX)$V_ROT * factor + CENTER_X; // X
-        (vY)$V_ROT = (vY)$V_ROT * factor + CENTER_Y; // Y
-
-        // Continue until all 8 vertices are scaled
-        branch_if (scale +:= 1) < 8: scale;
-    }
-
-    // Draw the front face of the cube (vertices A-B-C-D)
-    line(VA$X, VA$Y, VB$X, VB$Y, LINE_COLOR);
-    line(VB$X, VB$Y, VC$X, VC$Y, LINE_COLOR);
-    line(VC$X, VC$Y, VD$X, VD$Y, LINE_COLOR);
-    line(VD$X, VD$Y, VA$X, VA$Y, LINE_COLOR);
-
-    // Draw the back face of the cube (vertices E-F-G-H)
-    line(VE$X, VE$Y, VF$X, VF$Y, LINE_COLOR);
-    line(VF$X, VF$Y, VG$X, VG$Y, LINE_COLOR);
-    line(VG$X, VG$Y, VH$X, VH$Y, LINE_COLOR);
-    line(VH$X, VH$Y, VE$X, VE$Y, LINE_COLOR);
-
-    // Draw edges connecting front and back faces
-    line(VA$X, VA$Y, VE$X, VE$Y, LINE_COLOR);
-    line(VB$X, VB$Y, VF$X, VF$Y, LINE_COLOR);
-    line(VC$X, VC$Y, VG$X, VG$Y, LINE_COLOR);
-    line(VD$X, VD$Y, VH$X, VH$Y, LINE_COLOR);
-}
-
-//-----------------------------------------------------------------------------
-// Entry point for INIT type function, starts first
-//-----------------------------------------------------------------------------
-
-/*
-export fn start() {
-    let init = 0;
-    loop init {
-        // Calculate memory offset for current vertex (12 bytes per vertex: 4 bytes each for X, Y, Z)
-        let v = init * 12;
-
-        (v + X)$V_ROT = i32.load8_s(V_BASE+(init * 3) + 0) as f32;
-        (v + Y)$V_ROT = i32.load8_s(V_BASE+(init * 3) + 1) as f32;
-        (v + Z)$V_ROT = i32.load8_s(V_BASE+(init * 3) + 2) as f32;
-        branch_if (init +:= 1) < 8: init;
-    }
-}
-*/
-
-//-----------------------------------------------------------------------------
-// Main update function called every frame to refresh the screen
-//-----------------------------------------------------------------------------
-
-export fn upd() {
-    cls(0);         // Clear the screen with color 0 (black)
-    rotate();       // Perform cube rotation calculations
-    drawLines();    // Draw the rotated cube on the screen
-}
-
-//-----------------------------------------------------------------------------
-// DATA
-//-----------------------------------------------------------------------------
-
-/*
-    Initial vertex data for the cube (8 vertices, each with X, Y, Z as 8-bit signed integers)
-    Each vertex represents a corner of a unit cube centered at the origin
-
-    F - front, B - back, L - left, R - right, U - up, D - down
-*/
-data V_BASE { // 3 * 8 -> 3 bytes per vertex * 8 vertices = 24 bytes
-    i8(
-    //   X   Y   Z
-        -1, -1,  1, // FLU Vertex A
-         1, -1,  1, // FRU Vertex B
-         1,  1,  1, // FRD Vertex C
-        -1,  1,  1, // FLD Vertex D
-        -1, -1, -1, // BLU Vertex E
-         1, -1, -1, // BRU Vertex F
-         1,  1, -1, // BRD Vertex G
-        -1,  1, -1  // BLD Vertex H
-    )
-}
-
-//-----------------------------------------------------------------------------
-
-/*
-    Storage for rotated vertex data (8 vertices, each with X, Y, Z as 32-bit signed floats)
-    Initialized to zero and updated during rotation
-*/
-data V_ROT { // 4 * 3 * 8 -> 12 bytes per vertex * 8 vertices = 96 bytes
-    f32(
-    //   X    Y    Z
-        0.0, 0.0, 0.0, // VA -> Vertex A
-        0.0, 0.0, 0.0, // VB -> Vertex B
-        0.0, 0.0, 0.0, // VC -> Vertex C
-        0.0, 0.0, 0.0, // VD -> Vertex D
-        0.0, 0.0, 0.0, // VE -> Vertex E
-        0.0, 0.0, 0.0, // VF -> Vertex F
-        0.0, 0.0, 0.0, // VG -> Vertex G
-        0.0, 0.0, 0.0  // VH -> Vertex H
-    )
-}
-
-//-----------------------------------------------------------------------------
-// SNIPPETS
-//-----------------------------------------------------------------------------
-
-/*
-    let tmp: f32;
-    tmp = -123.0;
-    f32.store(tmp, V_ROT);
-    tmp = f32.load(V_ROT);
-    printInt(tmp as i32);
-*/
-
-//-----------------------------------------------------------------------------

examples/curlywas/plasma.cwa

@@ -1,51 +0,0 @@
-/*
-    Plasma effect (sizecoding)
-
-    Combines sine waves to create a 2D pixel pattern with intensity-based colors.
-
-    code     : zbyti & Grok 3
-    date     : 2025.04.17
-    platform : MicroW8 0.4.1
-*/
-
-include "../include/microw8-api.cwa"
-
-// Constants for color, math, and screen dimensions
-const BASE_COLOR = 0xF0;            // Base color value for pixel coloring
-const PI         = 3.14159265;      // Mathematical constant π
-const RAD        = PI / 180.0;      // Conversion factor from degrees to radians
-const SCR_X      = 320;             // Screen width in pixels
-const SCR_Y      = 240;             // Screen height in pixels
-const SCR_SIZE   = SCR_X * SCR_Y;   // Screen size in bytes
-
-// Global variables to track animation phases
-global mut phaseX = 0;              // Phase offset for X-axis wave animation
-global mut phaseY = 0;              // Phase offset for Y-axis wave animation
-
-// Update function called each frame to render the plasma effect
-export fn upd() {
-    let i = 0;
-    loop i {
-        // Calculate pixel coordinates from linear index
-        let lazy x = i % SCR_X; // X-coordinate (column)
-        let lazy y = i / SCR_X; // Y-coordinate (row)
-
-        // Compute three sine waves with different frequencies and phases
-        let inline val1 = sin(RAD * 2.25 * (x + phaseX) as f32);     // Wave along X-axis
-        let inline val2 = sin(RAD * 3.25 * (y + phaseY) as f32);     // Wave along Y-axis
-        let inline val3 = sin(RAD * 1.25 * (x + y + phaseX) as f32); // Diagonal wave
-
-        // Combine waves, scale to color range, and convert to integer
-        let inline c = BASE_COLOR + ((val1 + val2 + val3) * 4.75) as i32;
-
-        // Set pixel color based on computed intensity
-        setPixel(x, y, c);
-
-        // Continue loop until all pixels are processed
-        branch_if (i +:= 1) < (SCR_SIZE): i;
-    }
-
-    // Update phase offsets for animation (different speeds for dynamic effect)
-    phaseX += 1; // Increment X-phase for horizontal wave movement
-    phaseY += 2; // Increment Y-phase for vertical wave movement
-}

examples/curlywas/plasma_chars.cwa

@@ -1,168 +0,0 @@
-/*
-    Plasma effect (chars)
-
-    Combines sine waves to create a 2D pattern, maps to custom characters,
-    and renders to the 40x30 character grid with intensity-based colors.
-
-    code     : zbyti (conversion & optimizations)
-    original : https://github.com/tebe6502/Mad-Pascal/blob/origin/samples/a8/demoeffects/plasma_2.pas
-    date     : 2025.04.16
-    platform : MicroW8 0.4.1
-*/
-
-include "../include/microw8-api.cwa"
-
-//-----------------------------------------------------------------------------
-// Constants defining memory layout, screen dimensions, and effect parameters
-//-----------------------------------------------------------------------------
-
-const MEM_END           = 0x40000;
-
-const CUSTOM_FONT       = FONT + 0x100;
-const CHARS             = 0x20;
-const BASE_COLOR        = 0xF0;
-
-const PI                = 3.14159265;
-const RAD               = PI / 180.0;
-
-const SCR_X             = 320;
-const SCR_Y             = 240;
-const SCR_W             = SCR_X / 8; // 40
-const SCR_H             = SCR_Y / 8; // 30
-const SCR_SIZE          = SCR_X * SCR_Y;
-
-const SIN_TABLE_SIZE    = 128;                      // Number of entries in the sine lookup table
-const SIN_TABLE_MASK    = SIN_TABLE_SIZE - 1;
-
-const SIN_TABLE         = MEM_END - SIN_TABLE_SIZE; // Memory address for sine table
-const ROW_BUFFER        = SIN_TABLE - SCR_W;        // Memory address for precomputed row buffer
-
-//-----------------------------------------------------------------------------
-// Global variables to track animation state
-//-----------------------------------------------------------------------------
-
-global mut phaseA = 1; // Phase offset for the first sine wave, controls animation
-global mut phaseB = 5; // Phase offset for the second sine wave, controls animation
-
-//-----------------------------------------------------------------------------
-
-/*
-    Logs a value to the console (STDOUT) with a prefix for debugging purposes
-
-    Args:
-      prefix : 4-character identifier (i32) to label the output
-      log    : Integer value to log (i32)
-
-    Prints to console and returns to screen output
-*/
-fn console(prefix: i32, log: i32) {
-    printChar('\6');    // Switch output to console
-    printChar(prefix);  // Print the prefix
-    printInt(log);      // Print the integer value
-    printChar('\n\4');  // Print newline and switch back to screen output
-}
-
-//-------------------------------------
-
-/*
-    Fills a sine table with precomputed values for fast lookups
-
-    Args:
-      adr  : Memory address where the sine table is stored
-      size : Number of entries in the table
-
-    Computes: sin(i * 180/size * radians) * 255 for i = 0 to size-1, scaled to 0-255
-*/
-fn fillSin(adr: i32, size: i32) {
-    let i = 0;
-    let inline f = 180.00 / size as f32 * RAD;
-    loop i {
-        (adr+i)?0 = (sin(f * i as f32) * 255.0) as i32;
-        branch_if (i +:= 1) < size: i;
-    }
-}
-
-//-----------------------------------------------------------------------------
-
-/*
-    Initialization function called when the program starts
-*/
-export fn start() {
-    // Populate the sine table with values for fast wave calculations
-    fillSin(SIN_TABLE, SIN_TABLE_SIZE);
-}
-
-//-------------------------------------
-
-/*
-    Update function called each frame to render the plasma effect
-*/
-export fn upd() {
-    let pA = phaseA; // Local copy of phaseA to avoid modifying global during frame
-    let pB = phaseB; // Local copy of phaseB for the same reason
-
-    let i = 0;
-    loop i {
-        // Wrap phase values to stay within sine table bounds using bitwise AND
-        pA &= SIN_TABLE_MASK;
-        pB &= SIN_TABLE_MASK;
-
-        // Combine two sine waves and store in row buffer
-        i?ROW_BUFFER = pA?SIN_TABLE + pB?SIN_TABLE;
-
-        pA += 3; // Shift phase for first sine wave (controls wave speed)
-        pB += 7; // Shift phase for second sine wave (different speed for variety)
-
-        branch_if (i +:= 1) < SCR_W: i;
-    }
-
-    i = 0;
-    loop i {
-        let j = 0;
-        loop j {
-            // Combine wave values from row buffer for current position
-            // Use bitwise AND to clamp to 0-255, then scale to 0-15 for character index
-            let c = ((j?ROW_BUFFER + i?ROW_BUFFER) & 255) >> 4;
-
-            // Set text color based on intensity (base color + scaled value)
-            setTextColor(BASE_COLOR + c);
-            // Draw custom character corresponding to intensity
-            printChar(CHARS + c);
-
-            branch_if (j +:= 1) < SCR_W: j;
-        }
-        branch_if (i +:= 1) < SCR_H: i;
-    }
-
-    // Update global phase offsets for the next frame to animate the pattern
-    phaseA += 0; // Increment phaseA to shift the pattern (+/- speed move)
-    phaseB += 1; // Increment phaseB to shift the pattern (+/- right/left move)
-}
-
-//-----------------------------------------------------------------------------
-
-/*
-    Custom font data defining 16 characters (8x8 pixels each)
-    Each character represents a different intensity level for the plasma effect
-    Pixels range from empty (0x00) to nearly full (0xFE or 0x7F) to simulate gradients
-*/
-data CUSTOM_FONT {
-    i8(
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x3c, 0x3c, 0x3c, 0x3c, 0x00, 0x00,
-        0x00, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x00, 0x00,
-        0x00, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x00,
-        0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00,
-        0x00, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
-        0x00, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x00,
-        0x00, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x00, 0x00,
-        0x00, 0x00, 0x3c, 0x3c, 0x3c, 0x3c, 0x00, 0x00,
-        0x00, 0x00, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-    )
-}

examples/curlywas/scaled_text.cwa

@@ -1,14 +0,0 @@
-include "../include/microw8-api.cwa"
-
-export fn upd() {
-	printString(USER_MEM);
-}
-
-data USER_MEM {
-	// clear screen, switch to graphics text mode, text scale 4
-	i8(12, 5, 30, 4)
-	// text color, position, print two lines
-	i8(15, 86, 31, 8, 80) "Hello," i8(8, 8, 8, 8, 8, 10) "MicroW8!"
-	// print same two lines with different color and slight offset 
-	i8(15, 47, 31, 10, 82) "Hello," i8(8, 8, 8, 8, 8, 10) "MicroW8!" i8(0)
-}

examples/curlywas/sprites.cwa

@@ -1,21 +0,0 @@
-include "../include/microw8-api.cwa"
-
-const SPRITE = 0x20000;
-
-export fn upd() {
-	cls(0);
-	let t = time() / 2_f;
-	let i: i32;
-	loop spriteLoop {
-		let inline x = sin(t * -1.3 + i as f32 * (3.141 / 30_f)) * 180_f + 160_f;
-		let inline y = sin(t * 1.7 + i as f32 * (3.141 / 40_f)) * 140_f + 120_f;
-		blitSprite(SPRITE, 16, x as i32, y as i32, (i & 3) * 0x200 + 0x100);
-		branch_if (i +:= 1) < 100: spriteLoop;
-	}
-}
-
-start fn start() {
-	printChar('OO');
-	circle(8_f, 8_f, 6_f, 75);
-	grabSprite(SPRITE, 16, 0, 0, 0);
-}

examples/curlywas/tunnel.cwa

@@ -3,14 +3,12 @@ include "../include/microw8-api.cwa"
 export fn upd() {
     let i: i32;
     loop pixels {
-        let inline t = 16!56;
-        let inline x = (i % 320 - 160) as f32;
-        let inline y = (i #/ 320 - 120) as f32;
-        let inline d = 0xa000 as f32 / sqrt(x * x + y * y);
-        let inline a = atan2(x, y) * 163_f; // (512 / pi)
-        let inline u = i32.trunc_sat_f32_s(a) + t;
-        let inline v = i32.trunc_sat_f32_s(d) + t * 2;
-        let inline c = ((v ^ u) #/ 16) % 16;
+        let inline t = time() * 63 as f32;
+        let lazy x = (i % 320 - 160) as f32;
+        let lazy y = (i / 320 - 120) as f32;
+        let inline d = 40000 as f32 / sqrt(x * x + y * y);
+        let inline u = atan2(x, y) * (512.0 / 3.141);
+        let inline c = ((i32.trunc_sat_f32_s(d + t * 2 as f32) ^ i32.trunc_sat_f32_s(u + t)) & 255) >> 4;
         i?FRAMEBUFFER = c;
 
         branch_if (i := i + 1) < 320*240: pixels;

examples/include/microw8-api.cwa

@@ -30,13 +30,11 @@ import "env.printInt" fn printInt(i32);
 import "env.setTextColor" fn setTextColor(i32);
 import "env.setBackgroundColor" fn setBackgroundColor(i32);
 import "env.setCursorPosition" fn setCursorPosition(i32, i32);
-import "env.rectangleOutline" fn rectangleOutline(f32, f32, f32, f32, i32);
-import "env.circleOutline" fn circleOutline(f32, f32, f32, 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);
 import "env.sndGes" fn sndGes(i32) -> f32;
-import "env.blitSprite" fn blitSprite(i32, i32, i32, i32, i32);
-import "env.grabSprite" fn grabSprite(i32, i32, i32, i32, i32);
 
 const TIME_MS = 0x40;
 const GAMEPAD = 0x44;

examples/include/microw8-api.wat

@@ -30,13 +30,11 @@
 (import "env" "setTextColor" (func $setTextColor (param i32)))
 (import "env" "setBackgroundColor" (func $setBackgroundColor (param i32)))
 (import "env" "setCursorPosition" (func $setCursorPosition (param i32) (param i32)))
-(import "env" "rectangleOutline" (func $rectangleOutline (param f32) (param f32) (param f32) (param f32) (param i32)))
-(import "env" "circleOutline" (func $circleOutline (param f32) (param f32) (param f32) (param i32)))
+(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)))
 (import "env" "sndGes" (func $sndGes (param i32) (result f32)))
-(import "env" "blitSprite" (func $blitSprite (param i32) (param i32) (param i32) (param i32) (param i32)))
-(import "env" "grabSprite" (func $grabSprite (param i32) (param i32) (param i32) (param i32) (param i32)))
 
 ;; to use defines, include this file with a preprocessor
 ;; like gpp (https://logological.org/gpp).

platform/Cargo.lock

@@ -19,54 +19,47 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.11"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "cfg-if",
+ "getrandom",
  "once_cell",
  "version_check",
- "zerocopy",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.81"
+version = "1.0.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
+checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3"
 
 [[package]]
 name = "ariadne"
-version = "0.1.5"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1cb2a2046bea8ce5e875551f5772024882de0b540c7f93dfc5d6cf1ca8b030c"
+checksum = "7080ae01b2f0c312065d4914cd0f0de045eb8832e9415b355106a6cff3073cb4"
 dependencies = [
  "yansi",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
-
-[[package]]
-name = "bitflags"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "bytemuck"
-version = "1.15.0"
+version = "1.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
+checksum = "439989e6b8c38d1b6570a384ef1e49c8848128f5a97f3914baef02920842712f"
 
 [[package]]
 name = "cc"
-version = "1.0.92"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41"
+checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
 
 [[package]]
 name = "cdivsufsort"
@@ -95,47 +88,54 @@ dependencies = [
 
 [[package]]
 name = "const-random"
-version = "0.1.18"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
+checksum = "f590d95d011aa80b063ffe3253422ed5aa462af4e9867d43ce8337562bac77c4"
 dependencies = [
  "const-random-macro",
+ "proc-macro-hack",
 ]
 
 [[package]]
 name = "const-random-macro"
-version = "0.1.16"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
+checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40"
 dependencies = [
  "getrandom",
- "once_cell",
+ "lazy_static",
+ "proc-macro-hack",
  "tiny-keccak",
 ]
 
 [[package]]
 name = "crc32fast"
-version = "1.4.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.12"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
+checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
 dependencies = [
+ "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.19"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
+dependencies = [
+ "cfg-if",
+ "lazy_static",
+]
 
 [[package]]
 name = "crunchy"
@@ -151,47 +151,37 @@ dependencies = [
  "anyhow",
  "ariadne",
  "chumsky",
- "pico-args 0.4.2",
+ "pico-args",
  "wasm-encoder 0.10.0",
  "wasmparser 0.83.0",
 ]
 
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "fallible-iterator"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
-
 [[package]]
 name = "fallible_collections"
-version = "0.4.9"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a88c69768c0a15262df21899142bc6df9b9b823546d4b4b9a7bc2d6c448ec6fd"
+checksum = "52db5973b6a19247baf19b30f41c23a1bfffc2e9ce0a5db2f60e3cd5dc8895f7"
 dependencies = [
- "hashbrown 0.13.2",
+ "hashbrown",
 ]
 
 [[package]]
 name = "flate2"
-version = "1.0.28"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
 dependencies = [
+ "cfg-if",
  "crc32fast",
+ "libc",
  "miniz_oxide",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.2.14"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
+checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
 dependencies = [
  "cfg-if",
  "libc",
@@ -199,37 +189,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "gimli"
-version = "0.26.2"
+name = "hashbrown"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
 dependencies = [
- "fallible-iterator",
- "indexmap 1.9.3",
- "stable_deref_trait",
+ "ahash 0.7.6",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "hashbrown"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
-dependencies = [
- "ahash 0.8.11",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.14.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
-
 [[package]]
 name = "heck"
 version = "0.3.3"
@@ -246,24 +213,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005"
 
 [[package]]
-name = "indexmap"
-version = "1.9.3"
+name = "lazy_static"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
-dependencies = [
- "equivalent",
- "hashbrown 0.14.3",
-]
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "leb128"
@@ -271,25 +224,18 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
 
-[[package]]
-name = "lexopt"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478ee9e62aaeaf5b140bd4138753d1f109765488581444218d3ddda43234f3e8"
-
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.112"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
 
 [[package]]
 name = "lodepng"
-version = "3.10.1"
+version = "3.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a42d298694b14401847de29abd44adf278b42e989e516deac7b72018400002d8"
+checksum = "24844d5c0b922ddd52fb5bf0964a4c7f8e799a946ec01bb463771eb04fc1a323"
 dependencies = [
- "crc32fast",
  "fallible_collections",
  "flate2",
  "libc",
@@ -298,42 +244,47 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+dependencies = [
+ "cfg-if",
+]
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.2"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
 dependencies = [
  "adler",
+ "autocfg",
 ]
 
 [[package]]
 name = "num-traits"
-version = "0.2.18"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
 
 [[package]]
 name = "pbr"
-version = "1.1.1"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed5827dfa0d69b6c92493d6c38e633bbaa5937c153d0d7c28bf12313f8c6d514"
+checksum = "ff5751d87f7c00ae6403eb1fcbba229b9c76c9a30de8c1cf87182177b168cea2"
 dependencies = [
  "crossbeam-channel",
  "libc",
+ "time",
  "winapi",
 ]
 
@@ -343,12 +294,6 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468"
 
-[[package]]
-name = "pico-args"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
-
 [[package]]
 name = "platform"
 version = "0.1.0"
@@ -360,28 +305,34 @@ dependencies = [
 ]
 
 [[package]]
-name = "proc-macro2"
-version = "1.0.79"
+name = "proc-macro-hack"
+version = "0.5.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
 dependencies = [
- "unicode-ident",
+ "unicode-xid",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "rgb"
-version = "0.8.37"
+version = "0.8.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8"
+checksum = "9a374af9a0e5fdcdd98c1c7b64f05004f9ea2555b6c75f211daa81268a3c50f1"
 dependencies = [
  "bytemuck",
 ]
@@ -395,58 +346,25 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "semver"
-version = "1.0.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
 dependencies = [
  "proc-macro2",
  "quote",
- "unicode-ident",
+ "unicode-xid",
 ]
 
 [[package]]
-name = "syn"
-version = "2.0.58"
+name = "time"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
+checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
 dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.58",
+ "libc",
+ "winapi",
 ]
 
 [[package]]
@@ -459,26 +377,26 @@ dependencies = [
 ]
 
 [[package]]
-name = "unicode-ident"
-version = "1.0.12"
+name = "unicode-segmentation"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
 
 [[package]]
-name = "unicode-segmentation"
-version = "1.11.0"
+name = "unicode-xid"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
 
 [[package]]
 name = "upkr"
-version = "0.2.1"
-source = "git+https://github.com/exoticorn/upkr.git?rev=080db40d0088bbee2bdf3c5c75288ac7853d6b7a#080db40d0088bbee2bdf3c5c75288ac7853d6b7a"
+version = "0.1.0"
+source = "git+https://github.com/exoticorn/upkr.git?rev=d93aec186c9fb91d962c488682a2db125c61306c#d93aec186c9fb91d962c488682a2db125c61306c"
 dependencies = [
  "anyhow",
  "cdivsufsort",
- "lexopt",
- "thiserror",
+ "pbr",
+ "pico-args",
 ]
 
 [[package]]
@@ -487,33 +405,31 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "pbr",
- "pico-args 0.5.0",
+ "pico-args",
  "upkr",
  "walrus",
- "wasm-encoder 0.201.0",
- "wasmparser 0.201.0",
+ "wasm-encoder 0.8.0",
+ "wasmparser 0.81.0",
 ]
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
 
 [[package]]
 name = "walrus"
-version = "0.20.3"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c03529cd0c4400a2449f640d2f27cd1b48c3065226d15e26d98e4429ab0adb7"
+checksum = "4eb08e48cde54c05f363d984bb54ce374f49e242def9468d2e1b6c2372d291f8"
 dependencies = [
  "anyhow",
- "gimli",
  "id-arena",
  "leb128",
  "log",
  "walrus-macro",
- "wasm-encoder 0.29.0",
- "wasmparser 0.80.2",
+ "wasmparser 0.77.0",
 ]
 
 [[package]]
@@ -525,14 +441,23 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.10.2+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
+
+[[package]]
+name = "wasm-encoder"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db0c351632e46cc06a58a696a6c11e4cf90cad4b9f8f07a0b59128d616c29bb0"
+dependencies = [
+ "leb128",
+]
 
 [[package]]
 name = "wasm-encoder"
@@ -544,28 +469,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "wasm-encoder"
-version = "0.29.0"
+name = "wasmparser"
+version = "0.77.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881"
-dependencies = [
- "leb128",
-]
-
-[[package]]
-name = "wasm-encoder"
-version = "0.201.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9c7d2731df60006819b013f64ccc2019691deccf6e11a1804bc850cd6748f1a"
-dependencies = [
- "leb128",
-]
+checksum = "b35c86d22e720a07d954ebbed772d01180501afe7d03d464f413bb5f8914a8d6"
 
 [[package]]
 name = "wasmparser"
-version = "0.80.2"
+version = "0.81.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "449167e2832691a1bff24cde28d2804e90e09586a448c8e76984792c44334a6b"
+checksum = "98930446519f63d00a836efdc22f67766ceae8dbcc1571379f2bcabc6b2b9abc"
 
 [[package]]
 name = "wasmparser"
@@ -573,17 +486,6 @@ version = "0.83.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a"
 
-[[package]]
-name = "wasmparser"
-version = "0.201.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84e5df6dba6c0d7fafc63a450f1738451ed7a0b52295d83e868218fa286bf708"
-dependencies = [
- "bitflags",
- "indexmap 2.2.6",
- "semver",
-]
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -608,26 +510,6 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "yansi"
-version = "0.5.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
-
-[[package]]
-name = "zerocopy"
-version = "0.7.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.58",
-]
+checksum = "9fc79f4a1e39857fc00c3f662cbf2651c771f00e9c15fe2abc341806bd46bd71"

platform/Cargo.toml

@@ -9,4 +9,4 @@ edition = "2021"
 curlywas = { git="https://github.com/exoticorn/curlywas.git", rev="0e7ea50" }
 uw8-tool = { path="../uw8-tool" }
 anyhow = "1"
-lodepng = "3.7.2"
+lodepng = "3.4"

platform/src/platform.cwa

@@ -62,7 +62,6 @@ export fn cls(col: i32) {
     textCursorX = 0;
     textCursorY = 0;
     outputChannel = 0;
-    textScale = 1;
     memory.fill(120, col, 320*240);
 }
 
@@ -172,7 +171,7 @@ export fn rectangle(x: f32, y: f32, w: f32, h: f32, col: i32) {
     }
 }
 
-export fn rectangleOutline(x: f32, y: f32, w: f32, h: f32, col: i32) {
+export fn rectangle_outline(x: f32, y: f32, w: f32, h: f32, col: i32) {
     let xl = nearest(x) as i32;
     let xr = nearest(x + w) as i32;
     let yt = nearest(y) as i32;
@@ -213,7 +212,7 @@ export fn circle(cx: f32, cy: f32, radius: f32, col: i32) {
     }
 }
 
-export fn circleOutline(cx: f32, cy: f32, radius: f32, col: i32) {
+export fn circle_outline(cx: f32, cy: f32, radius: f32, col: i32) {
     let prev_w: f32;
     let y = clamp(nearest(cy - radius) as i32, -1, 241);
     let maxY = clamp(nearest(cy + radius) as i32, -1, 241);
@@ -353,92 +352,6 @@ export fn line(x1: f32, y1: f32, x2: f32, y2: f32, col: i32) {
     setPixel(i32.trunc_sat_f32_s(x1 + f * dx), i32.trunc_sat_f32_s(y1 + f * dy), col);
 }
 
-export fn blitSprite(sprite: i32, size: i32, x: i32, y: i32, control: i32) {
-    let lazy width = size & 65535;
-    let lazy height = select(size >> 16, size >> 16, width);
-
-    let lazy x0 = select(x < 0, -x, 0);
-    let lazy x1 = select(x + width > 320, 320 - x, width);
-    let lazy y0 = select(y < 0, -y, 0);
-    let lazy y1 = select(y + height > 240, 240 - y, height);
-
-    let lazy numRows = y1 - y0;
-    let lazy numCols = x1 - x0;
-    if numRows <= 0 | numCols <= 0 {
-        return;
-    }
-
-    let trans = (control & 511) - 256;
-    let lazy flip_x = 1 - ((control >> 8) & 2);
-    let lazy flip_y = 1 - ((control >> 9) & 2);
-    if flip_x < 0 {
-        sprite += width - 1;
-    }
-    if flip_y < 0 {
-        sprite += (height - 1) * width;
-    }
-
-    let spriteRow = sprite + x0 * flip_x + y0 * flip_y * width;
-    let screenRow = x + x0 + (y + y0) * 320;
-
-    loop yloop {
-        let lx = 0;
-        loop xloop {
-            let lazy col = (spriteRow + lx * flip_x)?0;
-            if col != trans {
-                (screenRow + lx)?120 = col;
-            }
-            branch_if (lx +:= 1) < numCols: xloop;
-        }
-        spriteRow += width * flip_y;
-        screenRow += 320;
-        branch_if numRows -:= 1: yloop;
-    }
-}
-
-export fn grabSprite(sprite: i32, size: i32, x: i32, y: i32, control: i32) {
-    let lazy width = size & 65535;
-    let lazy height = select(size >> 16, size >> 16, width);
-
-    let lazy x0 = select(x < 0, -x, 0);
-    let lazy x1 = select(x + width > 320, 320 - x, width);
-    let lazy y0 = select(y < 0, -y, 0);
-    let lazy y1 = select(y + height > 240, 240 - y, height);
-
-    let lazy numRows = y1 - y0;
-    let lazy numCols = x1 - x0;
-    if numRows <= 0 | numCols <= 0 {
-        return;
-    }
-
-    let trans = (control & 511) - 256;
-    let lazy flip_x = 1 - ((control >> 8) & 2);
-    let lazy flip_y = 1 - ((control >> 9) & 2);
-    if flip_x < 0 {
-        sprite += width - 1;
-    }
-    if flip_y < 0 {
-        sprite += (height - 1) * width;
-    }
-
-    let spriteRow = sprite + x0 * flip_x + y0 * flip_y * width;
-    let screenRow = x + x0 + (y + y0) * 320;
-
-    loop yloop {
-        let lx = 0;
-        loop xloop {
-            let lazy col = (screenRow + lx)?120;
-            if col != trans {
-                (spriteRow + lx * flip_x)?0 = col;
-            }
-            branch_if (lx +:= 1) < numCols: xloop;
-        }
-        spriteRow += width * flip_y;
-        screenRow += 320;
-        branch_if numRows -:= 1: yloop;
-    }
-}
-
 //////////
 // TEXT //
 //////////
@@ -448,7 +361,6 @@ global mut textCursorY = 0;
 global mut textColor = 15;
 global mut bgColor = 0;
 global mut outputChannel = 0;
-global mut textScale = 1;
 
 export fn printChar(char: i32) {
     loop chars {
@@ -460,9 +372,16 @@ export fn printChar(char: i32) {
 global mut controlCodeLength = 0;
 
 fn printSingleChar(char: i32) {
-    let charSize = 8 * textScale;
+    if char >= 4 & char <= 6 {
+        outputChannel = char - 4;
+        if !outputChannel {
+            textCursorX = 0;
+            textCursorY = 0;
+        }
+        return;
+    }
 
-    if outputChannel >= 2 & (char < 4 | char > 6) {
+    if outputChannel >= 2 {
         logChar(char);
         return;
     }
@@ -480,24 +399,15 @@ fn printSingleChar(char: i32) {
         return;
     }
 
-    if char >= 4 & char <= 6 {
-        outputChannel = char - 4;
-        if !outputChannel {
-            textCursorX = 0;
-            textCursorY = 0;
-        }
-        return;
-    }
-
     if char == 7 {
         80?0 = 80?0 ^ 2;
         return;
     }
 
     if char == 8 {
-        textCursorX = textCursorX - charSize;
+        textCursorX = textCursorX - 8;
         if !outputChannel & textCursorX < 0 {
-            textCursorX = 320-charSize;
+            textCursorX = 320-8;
             printSingleChar(11);
         }
         return;
@@ -507,34 +417,34 @@ fn printSingleChar(char: i32) {
         if !outputChannel & textCursorX >= 320 {
             printChar(0xd0a);
         }
-        textCursorX = textCursorX + charSize;
+        textCursorX = textCursorX + 8;
         return;
     }
 
     if char == 10 {
-        textCursorY = textCursorY + charSize;
+        textCursorY = textCursorY + 8;
         if !outputChannel & textCursorY >= 240 {
-            textCursorY = 240 - charSize;
+            textCursorY = 240 - 8;
             let i: i32;
             loop scroll_copy {
-                i!120 = (i + 320 * charSize)!120;
-                branch_if (i := i + 4) < 320 * (240 - charSize): scroll_copy;
+                i!120 = i!(120 + 320 * 8);
+                branch_if (i := i + 4) < 320 * (240 - 8): scroll_copy;
             }
-            rectangle(0 as f32, (240 - charSize) as f32, 320 as f32, charSize as f32, bgColor);
+            rectangle(0 as f32, (240 - 8) as f32, 320 as f32, 8 as f32, bgColor);
         }
         return;
     }
 
     if char == 11 {
-        textCursorY = textCursorY - charSize;
+        textCursorY = textCursorY - 8;
         if !outputChannel & textCursorY < 0 {
             textCursorY = 0;
-            let i = 320 * (240 - charSize);
+            let i = 320 * (240 - 8);
             loop scroll_copy {
-                (i + 320 * charSize)!116 = i!116;
+                i!(116 + 320 * 8) = i!116;
                 branch_if (i := i - 4): scroll_copy;
             }
-            rectangle(0 as f32, 0 as f32, 320 as f32, charSize as f32, bgColor);
+            rectangle(0 as f32, 0 as f32, 320 as f32, 8 as f32, bgColor);
         }
         return;
     }
@@ -566,12 +476,6 @@ fn printSingleChar(char: i32) {
         return;
     }
 
-    if char == 30 {
-        let scale = 0x12d20?1;
-        textScale = select(scale > 0 & scale <= 16, scale, 1);
-        return;
-    }
-
     if char == 31 {
         textCursorX = 0x12d20?1 * (8 - outputChannel * 6);
         textCursorY = 0x12d20?2 * (8 - outputChannel * 7);
@@ -594,7 +498,7 @@ data(0x12d00) {
     1, 1, 1, 1, // 16-19,
     1, 1, 1, 1, // 20-23,
     1, 1, 1, 1, // 24-27,
-    1, 1, 2, 3 // 28-31
+    1, 1, 1, 3 // 28-31
   )
 }
 
@@ -603,28 +507,26 @@ fn drawChar(char: i32) {
         printChar(0xd0a);
     }
 
-    let charSize = 8 * textScale;
-
     let y: i32;
     loop rows {
-        let bits = (char * 8 + y / textScale)?0x13400;
+        let bits = (char * 8 + y)?0x13400;
         let x = 0;
         if outputChannel {
             loop pixels {
-                if (bits << (x / textScale)) & 128 {
+                if (bits := bits << 1) & 256 {
                     setPixel(textCursorX + x, textCursorY + y, textColor);
                 }
-                branch_if (x := x + 1) < charSize: pixels;
+                branch_if (x := x + 1) < 8: pixels;
             }
         } else {
             loop pixels {
-                setPixel(textCursorX + x, textCursorY + y, select((bits << (x / textScale)) & 128, textColor, bgColor));
-                branch_if (x := x + 1) < charSize: pixels;
+                setPixel(textCursorX + x, textCursorY + y, select((bits := bits << 1) & 256, textColor, bgColor));
+                branch_if (x := x + 1) < 8: pixels;
             }
         }
-        branch_if (y := y + 1) < charSize: rows;
+        branch_if (y := y + 1) < 8: rows;
     }
-    textCursorX = textCursorX + charSize;
+    textCursorX = textCursorX + 8;
 }
 
 export fn printString(ptr: i32) {

site/content/_index.md

@@ -14,8 +14,6 @@ The initial motivation behind MicroW8 was to explore whether there was a way to
 * Memory: 256KB
 * Gamepad input (D-Pad + 4 Buttons)
 
-For detailed [documentation see here](docs).
-
 ## Examples
 * [Skip Ahead](v0.2.0#AgVfq24KI2Ok2o8qVtPYj27fSuGnfeSKgbOkIOsaEQMov8TDYQ6UjdjwkZrYcM1i9alo4/+Bhm1PRFEa0YHJlJAk/PGoc2K41rejv9ZSqJqIHNjr7cappqhOR2jT+jk+0b0+U6hO+geRCTP2aufWs7L+f/Z27NFY8LKlqPSv+C6Rd6+ohoKi6sYl5Kcrlf1cyTinV7jTTnmbcXWVDBA5rRKxAGMUTDS8rHxqSztRITOaQVP1pSdYgi/BDdOJOxSOIkeaId84S+Ycls5na7EgwSfVIpgqF+tcfkUecb8t2mQrXA7pyKrh/wzHn5N6Oe5aOgmzY2YpTIct) (249 bytes): A port of my [TIC-80 256byte game](http://tic80.com/play?cart=1735) from LoveByte'21, now with sound
 * [Fireworks](v0.2.0#AgwvgP+M59snqjl4CMKw5sqm1Zw9yJCbSviMjeLUdHus2a3yl/a99+uiBeqZgP/2jqSjrLjRk73COMM6OSLpsxK8ugT1kuk/q4hQUqqPpGozHoa0laulzGGcahzdfdJsYaK1sIdeIYS9M5PnJx/Wk9H+PvWEPy2Zvv7I6IW7Fg==) (127 bytes): Some fireworks to welcome 2022.
@@ -31,19 +29,36 @@ Examplers for older versions:
 
 ## Versions
 
-### v0.4.1
+### v0.2.1
 
-* [Web runtime](../v0.4.1)
-* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-linux.tgz)
-* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-macos.tgz)
-* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-windows.zip)
+* [Web runtime](v0.2.1)
+* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.2.1/microw8-0.2.1-linux.tgz)
+* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.2.1/microw8-0.2.1-macos.tgz)
+* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.2.1/microw8-0.2.1-windows.zip)
 
 Changes:
 
-* Windows: fix bad/inconsistent frame rate
-* fix choppy sound on devices with sample rates != 44100 kHz
-* add scale mode 'fill' option
+* new gpu accelerated renderer with (optional) crt filter
+* optimized `hline` function, a big speed-up when drawing large filled circles or rectangles
+* print fractional size of packed `uw8` cart
 
+### v0.2.0
+
+* [Web runtime](v0.2.0)
+* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.2.0/microw8-0.2.0-linux.tgz)
+* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.2.0/microw8-0.2.0-macos.tgz)
+* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.2.0/microw8-0.2.0-windows.zip)
+
+Changes:
+
+* [add sound support!](docs#sound)
+* add support to redirect text output to the console for debugging using control code 6
+* update curlywas:
+  * add support for `else if`
+  * add support for escape sequences in strings
+  * add support for char literals
+  * add support for binop-assignment, eg. `+=`, `^=`, `<<=` etc. (also support for the tee operator: `+:=`)
+  * "integer constant cast to float" literal syntax in CurlyWas (ex. `1_f` is equivalent to `1 as f32`)
 
 ### Older versions
 

site/content/docs.md

@@ -5,23 +5,20 @@ description = "Docs"
 
 # Overview
 
-MicroW8 loads WebAssembly modules with a maximum size of 256kb. Your module needs to export
+MicroW8 loads WebAssembly modules with a maximum size of 256kb. You module needs to export
 a function `fn upd()` which will be called once per frame.
 After calling `upd` MicroW8 will display the 320x240 8bpp framebuffer located
 at offset 120 in memory with the 32bpp palette located at 0x13000.
 
 The memory has to be imported as `env` `memory` and has a maximum size of 256kb (4 pages).
 
-If the module exports a function called `start`, it will be called once after the module is
-loaded.
-
 # Memory map
 
 ```
 00000-00040: user memory
 00040-00044: time since module start in ms
 00044-0004c: gamepad state
-0004c-00050: number of frames since module start
+0004c-00050: reserved
 00050-00070: sound data (synced to sound thread)
 00070-00078: reserved
 00078-12c78: frame buffer
@@ -146,13 +143,13 @@ Fills the circle at `cx, cy` and with `radius` with the given color index.
 
 (Sets all pixels where the pixel center lies inside the circle.)
 
-### fn rectangleOutline(x: f32, y: f32, w: f32, h: f32, color: i32)
+### fn rectangle_outline(x: f32, y: f32, w: f32, h: f32, color: i32)
 
 Draws a one pixel outline on the inside of the given rectangle.
 
 (Draws the outermost pixels that are still inside the rectangle area.)
 
-### fn circleOutline(cx: f32, cy: f32, radius: f32, color: i32)
+### fn circle_outline(cx: f32, cy: f32, radius: f32, color: i32)
 
 Draws a one pixel outline on the inside of the given circle.
 
@@ -162,21 +159,6 @@ Draws a one pixel outline on the inside of the given circle.
 
 Draws a line from `x1,y1` to `x2,y2` in the given color index.
 
-### fn blitSprite(spriteData: i32, size: i32, x: i32, y: i32, control: i32)
-
-Copies the pixel data at `spriteData` onto the screen at `x`, `y`. The size of the sprite is passed as `width | (height << 16)`.
-If the height is given as 0, the sprite is is treated as square (width x width).
-
-The control parameter controls masking and flipping of the sprite:
-* bits 0-7: color mask index
-* bit 8: switch on masked blit (pixel with color mask index are treated as transparent)
-* bit 9: flip sprite x
-* bit 10: flip sprite y
-
-### fn grabSprite(spriteData: i32, size: i32, x: i32, y: i32, control: i32)
-
-Copies the pixel data on the screen at `x`, `y` to `spriteData`. Parameters are exactly the same as `blitSprite`.
-
 ## Input
 
 MicroW8 provides input from a gamepad with one D-Pad and 4 buttons, or a keyboard emulation thereof.
@@ -238,13 +220,6 @@ When printing characters only the foreground pixels are set, the background is "
 
 Moving/printing past any border does not cause any special operation, the cursor just goes off-screen.
 
-### Text scale
-
-An integer text scale factor in the range 1x-16x can be set with control char 30. An attempt to
-set a scale outside that range will reset the scale to 1x.
-
-After startup and `cls` the scale is initialized to 1x.
-
 ### Control chars
 
 Characters 0-31 are control characters and don't print by default. They take the next 0-2 following characters as parameters.
@@ -269,8 +244,7 @@ Avoid the reserved control chars, they are currently NOPs but their behavior can
 | 15    | color      | Set the text color                         |
 | 16-23 | -          | Reserved                                   |
 | 24    | -          | Swap text/background colors                |
-| 25-29 | -          | Reserved                                   |
-| 30    | scale      | Set text scale (1-16)                      |
+| 25-30 | -          | Reserved                                   |
 | 31    | x, y       | Set cursor position (*)                    |
 
 (*) In graphics mode, the x coordinate is doubled when using control char 31 to be able to cover the whole screen with one byte.
@@ -279,7 +253,7 @@ Avoid the reserved control chars, they are currently NOPs but their behavior can
 
 Control code 6 switches all text output (except codes 4 and 5 to switch output back to the screen) to the console. Where exactly this ends
 up (if at all) is an implementation detail of the runtimes. The native dev-runtime writes the debug output to `stdout`, the web runtime to
-the debug console using `console.log`. Both implementations buffer the output until they encounter a newline character (10) in the output stream.
+the debug console using `console.log`. Both implementation buffer the output until they encounter a newline character (10) in the output stream.
 
 There may be future runtimes that ignore the debug output completely.
 
@@ -468,7 +442,6 @@ when using the native runtime:
 * `--no-gpu`:  Force old cpu-only window code
 * `--filter FILTER`:  Select an upscale filter at startup
 * `--fullscreen`:  Start in fullscreen mode
-* `--scale-fill`:  Scale to fill whole screen, potentially cropping parts of the frame buffer.
 
 Note that the cpu-only window does not support fullscreen nor upscale filters.
 
@@ -485,7 +458,7 @@ The upscale filter options are:
 5, auto_crt (default)   : ss_crt below 960x720, chromatic_crt otherwise
 ```
 
-You can switch the upscale filter at any time using the keys 1-5. You can toggle fullscreen with F. You can toggle between scale modes 'fit' and 'fill' with M.
+You can switch the upscale filter at any time using the keys 1-5. You can toggle fullscreen with F.
 
 ## `uw8 pack`
 
@@ -595,7 +568,7 @@ a base module provided by MicroW8.
 
 You can generate this base module yourself using
 `uw8-tool`. As a quick summary, it provides all function
-types with up to 7 parameters (i32 or f32) where the
+types with up to 5 parameters (i32 or f32) where the
 `f32` parameters always preceed the `i32` parameters.
 Then it includes all imports that MicroW8 provides,
 a function section with a single function of type

site/content/versions.md

@@ -2,77 +2,9 @@
 description = "Versions"
 +++
 
-### v0.4.1
-
-* [Web runtime](../v0.4.1)
-* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-linux.tgz)
-* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-macos.tgz)
-* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.4.1/microw8-0.4.1-windows.zip)
-
-Changes:
-
-* Windows: fix bad/inconsistent frame rate
-* fix choppy sound on devices with sample rates != 44100 kHz
-* add scale mode 'fill' option
-
-### v0.4.0
-
-* [Web runtime](../v0.4.0)
-* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.4.0/microw8-0.4.0-linux.tgz)
-* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.4.0/microw8-0.4.0-macos.tgz)
-* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.4.0/microw8-0.4.0-windows.zip)
-
-Changes:
-
-* add support for sound on mono- and surround-only devices
-* update wasmtime dependency to fix performance regression in 0.3.0
-* add frame counter since module start at location 72
-* add 6 and 7 parameter function types to base module
-
-### v0.3.0
-
-* [Web runtime](../v0.3.0)
-* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.3.0/microw8-0.3.0-linux.tgz)
-* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.3.0/microw8-0.3.0-macos.tgz)
-* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.3.0/microw8-0.3.0-windows.zip)
-
-Changes:
-
-* add blitSprite and grabSprite API calls
-* add support for integer scaling up to 16x for printing text
-* fix incompatibility with sound devices only offering 16bit audio formats
-* add support for br_table instruction in packed carts
-
-### v0.2.2
-
-* [Web runtime](../v0.2.2)
-* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.2.2/microw8-0.2.2-linux.tgz)
-* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.2.2/microw8-0.2.2-macos.tgz)
-* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.2.2/microw8-0.2.2-windows.zip)
-
-Changes:
-
-* call `start` function after loading cart if the cart exports one
-* fix `sndGes` having the wrong name and not being included in the auto imports
-* fix control codes 4-6 (change text output mode) being invoked when used as parameters in other control sequences
-* only open browser window once a cart was compiled sucessfully when running with `-b`
-
-### v0.2.1
-
-* [Web runtime](../v0.2.1)
-* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.2.1/microw8-0.2.1-linux.tgz)
-* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.2.1/microw8-0.2.1-macos.tgz)
-* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.2.1/microw8-0.2.1-windows.zip)
-
-Changes:
-
-* new gpu accelerated renderer with (optional) crt filter
-* optimized `hline` function, a big speed-up when drawing large filled circles or rectangles
-* print fractional size of packed `uw8` cart
-
 ### v0.2.0
 
-* [Web runtime](../v0.2.0)
+* [Web runtime](v0.2.0)
 * [Linux](https://github.com/exoticorn/microw8/releases/download/v0.2.0/microw8-0.2.0-linux.tgz)
 * [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.2.0/microw8-0.2.0-macos.tgz)
 * [Windows](https://github.com/exoticorn/microw8/releases/download/v0.2.0/microw8-0.2.0-windows.zip)
@@ -90,7 +22,7 @@ Changes:
 
 ### v0.2.0-rc3
 
-* [Web runtime](../v0.2.0-rc3)
+* [Web runtime](v0.2.0-rc3)
 * [Linux](https://github.com/exoticorn/microw8/releases/download/v0.2.0-rc3/microw8-0.2.0-rc3-linux.tgz)
 * [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.2.0-rc3/microw8-0.2.0-rc3-macos.tgz)
 * [Windows](https://github.com/exoticorn/microw8/releases/download/v0.2.0-rc3/microw8-0.2.0-rc3-windows.zip)
@@ -108,7 +40,7 @@ Changes:
 
 ### v0.2.0-rc2
 
-* [Web runtime](../v0.2.0-rc2)
+* [Web runtime](v0.2.0-rc2)
 * [Linux](https://github.com/exoticorn/microw8/releases/download/v0.2.0-rc2/microw8-0.2.0-rc2-linux.tgz)
 * [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.2.0-rc2/microw8-0.2.0-rc2-macos.tgz)
 * [Windows](https://github.com/exoticorn/microw8/releases/download/v0.2.0-rc2/microw8-0.2.0-rc2-windows.zip)
@@ -119,7 +51,7 @@ Changes:
 
 ### v0.2.0-rc1
 
-* [Web runtime](../v0.2.0-rc1)
+* [Web runtime](v0.2.0-rc1)
 * [Linux](https://github.com/exoticorn/microw8/releases/download/v0.2.0-rc1/microw8-0.2.0-rc1-linux.tgz)
 * [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.2.0-rc1/microw8-0.2.0-rc1-macos.tgz)
 * [Windows](https://github.com/exoticorn/microw8/releases/download/v0.2.0-rc1/microw8-0.2.0-rc1-windows.zip)
@@ -135,7 +67,7 @@ Known issues:
 
 ### v0.1.2
 
-* [Web runtime](../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)
@@ -143,13 +75,13 @@ Known issues:
 Changes:
 
 * add option to `uw8 run` to run the cart in the browser using the web runtime
-*../ CurlyWas: implement `include` support
+* 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)
+* [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)
@@ -158,16 +90,16 @@ Changes:
 
 * implement more robust file watcher
 * add basic video recording on F10 in web runtime
-*../ add screenshot on F9
+* 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 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)
+* [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/static/v0.2.2/index.html

@@ -1 +0,0 @@
-<!doctype html><html><head><meta charset="utf8"><title>MicroW8</title><link href="https://fonts.googleapis.com/css2?family=Josefin+Sans:wght@500&display=swap" rel="stylesheet"><style>html,body,canvas{margin:0;padding:0}html{color:#808070;height:100%;background-color:#202024;font-family:Josefin Sans,Verdana,Arial Black,sans-serif}body{height:100%;grid-template-rows:1fr 0fr;display:grid}#uw8{position:absolute}#uw8 a{font-size:130%}#centered{place-self:center}a{color:#303630}a:hover{color:#405040}.screen{width:320px;height:240px;image-rendering:pixelated;background-color:#202428;border:4px solid #303040;margin-bottom:8px;box-shadow:5px 5px 20px #000}#screen{cursor:none}#start{font-size:150%}#timer:before{content:"";width:12px;height:12px;background-color:red;border-radius:6px;margin-right:3px;display:inline-block}#message{margin-bottom:8px}.error{color:#e04030}button{color:#808070;background-color:#303440;border:1px solid #404040;border-radius:4px;padding:4px;font-family:inherit}button:hover{background-color:#202010}button:active{background-color:#504450}@media (min-width:680px) and (min-height:620px){.screen{width:640px;height:480px}}@media (min-width:1000px) and (min-height:800px){.screen{width:960px;height:720px}}@media (width:640px) and (height:480px){.screen{width:640px;height:480px;border:0;margin:0}body{overflow:hidden}}</style></head><body> <div id="uw8"> <a href="https://exoticorn.github.io/microw8">MicroW8</a> 0.2.2 </div> <div id="centered"> <canvas class="screen" id="screen" width="320" height="240"> </canvas> <button class="screen" id="start" style="display:none">Click to start</button> <div id="timer" hidden></div> <div id="message"></div> <button id="cartButton" style="visibility:hidden">Load cart...</button> </div> <div id="footer"> <a href="http://unlicense.org/" ref="license">Unlicense</a> </div> </body><script type="module">function e(e){return e&&e.__esModule?e.default:e}class t extends AudioWorkletNode{constructor(e){super(e,"apu",{outputChannelCount:[2]})}}let a=(...e)=>new Uint8Array(...e),n=(...e)=>new Uint32Array(...e);let s=function(s,r={}){r.setMessage||(r.setMessage=(e,t)=>{t&&console.log("error: "+t)});let A,B,o,i,l,d,F,u,c=s.getContext("2d"),D=c.createImageData(320,240),C=r.devkitMode,h=0,f=null==r.keyboardElement?s:r.keyboardElement;if(f){let e=e=>{let t,a="keydown"==e.type;switch(e.code){case"ArrowUp":t=1;break;case"ArrowDown":t=2;break;case"ArrowLeft":t=4;break;case"ArrowRight":t=8;break;case"KeyZ":t=16;break;case"KeyX":t=32;break;case"KeyA":t=64;break;case"KeyS":t=128;break;case"KeyR":a&&m(B,!0);break;case"F9":a&&s.toBlob((e=>{g(e,".png")})),e.preventDefault();break;case"F10":a&&function(){if(l)return l.stop(),l=null,F.disconnect(u),F=null,void(u=null);let e=s.captureStream();u=o.createMediaStreamDestination(),F=i,i.connect(u),e.addTrack(u.stream.getAudioTracks()[0]),l=new MediaRecorder(e,{mimeType:"video/webm",videoBitsPerSecond:25e6});let t=[];l.ondataavailable=e=>{t.push(e.data)};let a=r.timerElement;a&&(a.hidden=!1,a.innerText="00:00");function n(){if(d){if(a){let e=Math.floor((Date.now()-d)/1e3);a.innerText=Math.floor(e/60).toString().padStart(2,"0")+":"+(e%60).toString().padStart(2,"0")}setTimeout(n,1e3)}}l.onstop=()=>{a&&(a.hidden=!0),g(new Blob(t,{type:"video/webm"}),".webm")},l.start(),d=Date.now(),setTimeout(n,1e3)}(),e.preventDefault()}a?h|=t:h&=~t};f.onkeydown=e,f.onkeyup=e}async function m(l,d){A&&(A(),A=null),o=new AudioContext({sampleRate:44100});let F=!0,u=new AbortController;A=()=>{o.close(),F=!1,u.abort()};let f=l.byteLength;if(r.setMessage(f),0==f)return;await o.audioWorklet.addModule(e("data:application/javascript,let%20e%3D%28...e%29%3D%3Enew%20Uint8Array%28...e%29%3Bclass%20s%20extends%20AudioWorkletProcessor%7Bconstructor%28%29%7Bsuper%28%29%2Cthis.sampleIndex%3D0%2Cthis.currentTime%3D0%2Cthis.isFirstMessage%3D%210%2Cthis.pendingUpdates%3D%5B%5D%2Cthis.port.onmessage%3De%3D%3E%7Bthis.memory%3F%28this.isFirstMessage%26%26%28this.currentTime%2B%3D%28e.data.t-this.currentTime%29%2F8%2Cthis.isFirstMessage%3D%211%29%2Cthis.pendingUpdates.push%28e.data%29%29%3Athis.load%28e.data%5B0%5D%2Ce.data%5B1%5D%29%7D%7Dasync%20load%28e%2Cs%29%7Blet%20t%3Dnew%20WebAssembly.Memory%28%7Binitial%3A4%2Cmaximum%3A4%7D%29%2Ci%3D%7Benv%3A%7Bmemory%3At%7D%7D%3Bfor%28let%20e%20of%5B%22acos%22%2C%22asin%22%2C%22atan%22%2C%22atan2%22%2C%22cos%22%2C%22exp%22%2C%22log%22%2C%22sin%22%2C%22tan%22%2C%22pow%22%5D%29i.env%5Be%5D%3DMath%5Be%5D%3Bfor%28let%20e%3D9%3Be%3C64%3B%2B%2Be%29i.env%5B%22reserved%22%2Be%5D%3D%28%29%3D%3E%7B%7D%3Blet%20r%3D%22%22%3Bi.env.logChar%3De%3D%3E%7B10%3D%3De%3F%28console.log%28r%29%2Cr%3D%22%22%29%3Ar%2B%3DString.fromCharCode%28e%29%7D%3Bfor%28let%20e%3D0%3Be%3C16%3B%2B%2Be%29i.env%5B%22g_reserved%22%2Be%5D%3D0%3Blet%20n%3Dasync%20e%3D%3E%28await%20WebAssembly.instantiate%28e%2Ci%29%29.instance%2Ca%3Dawait%20n%28e%29%3Bfor%28let%20e%20in%20a.exports%29i.env%5Be%5D%3Da.exports%5Be%5D%3Blet%20o%3Dawait%20n%28s%29%3Bthis.memory%3Dt%2Cthis.snd%3Do.exports.snd%7Line truncated

site/static/v0.3.0/index.html

@@ -1 +0,0 @@
-<!doctype html><html><head><meta charset="utf8"><title>MicroW8</title><link href="https://fonts.googleapis.com/css2?family=Josefin+Sans:wght@500&display=swap" rel="stylesheet"><style>html,body,canvas{margin:0;padding:0}html{color:#808070;background-color:#202024;height:100%;font-family:Josefin Sans,Verdana,Arial Black,sans-serif}body{grid-template-rows:1fr 0fr;height:100%;display:grid}#uw8{position:absolute}#uw8 a{font-size:130%}#centered{place-self:center}a{color:#303630}a:hover{color:#405040}.screen{image-rendering:pixelated;background-color:#202428;border:4px solid #303040;width:320px;height:240px;margin-bottom:8px;box-shadow:5px 5px 20px #000}#screen{cursor:none}#start{font-size:150%}#timer:before{content:"";background-color:red;border-radius:6px;width:12px;height:12px;margin-right:3px;display:inline-block}#message{margin-bottom:8px}.error{color:#e04030}button{color:#808070;background-color:#303440;border:1px solid #404040;border-radius:4px;padding:4px;font-family:inherit}button:hover{background-color:#202010}button:active{background-color:#504450}@media (width>=680px) and (height>=620px){.screen{width:640px;height:480px}}@media (width>=1000px) and (height>=800px){.screen{width:960px;height:720px}}@media (width:640px) and (height:480px){.screen{border:0;width:640px;height:480px;margin:0}body{overflow:hidden}}</style></head><body> <div id="uw8"> <a href="https://exoticorn.github.io/microw8">MicroW8</a> 0.3.0 </div> <div id="centered"> <canvas class="screen" id="screen" width="320" height="240"> </canvas> <button class="screen" id="start" style="display:none">Click to start</button> <div id="timer" hidden></div> <div id="message"></div> <button id="cartButton" style="visibility:hidden">Load cart...</button> </div> <div id="footer"> <a href="http://unlicense.org/" ref="license">Unlicense</a> </div> </body><script type="module">function e(e){return e&&e.__esModule?e.default:e}var t={};t="data:application/wasm;base64,AGFzbQEAAAABFQRgAX8Bf2ACf38Bf2ADf39%2FAGAAAAIPAQNlbnYGbWVtb3J5AgAEAwkIAAABAgEAAAMGEAN%2FAUEAC38BQQALfwFBAAsHGQIIbG9hZF91dzgAAAp1bmNvbXByZXNzAAQIAQcKngUIxwEBB39BAC0AAEEBayIBQQBIBEAgAA8LQYDAByAAaiECIAFBAXEEQEEBQYHABxAEIQIFQYDAB0EAIAAQAwtBAEGAhA9BCBADQYiEDyEDQQghBEGBwAchBQNAIAUgAkggAyMATiAFLQAAIAMtAABMcnEEQCAEIAQgBRACIgZqIQQgAyMASCAFLQAAIAMtAABGcQRAIAMgAxABaiEDCyAFIAZqIQUMAQsgAyMASARAIAQgBCADEAIiB2ohBCADIAdqIQMMAQsLIAQLPAEEfyAAIQEDQCACIAFBAWoiAS0AACIEQf8AcSADdHIhAiADQQdqIQMgBEEHdQ0ACyABQQFqIABrIAJqCxIBAX8gACABIAEQASICEAMgAgskAANAIAJBAEoEQCAAIAJBAWsiAmogASACai0AADoAAAwBCwsLqQEBBn8gACQBQQAkAgNAIANBgAE6AICADyADQQFqIgNBgQNIDQALAkADQEEAEAYiBQRAIAQEf0EBBUGAAhAGCwRAQYECEAVBAWsiAkUNAwtBwQIQBSEGA0AgASABIAJrLQAAOgAAIAFBAWohASAGQQFrIgYNAAsFQQEhBwNAIAdBAXQgBxAGciIHQYACSA0ACyABIAc6AAAgAUEBaiEBCyAFIQQMAAsLIAELNAECfwNAIAAgAmoQBgRAIAEgACACakEgahAGIAJ0ciEBIAJBAWohAgwBCwsgAUEBIAJ0cgtxAQR%2FA0AjAkGAIEgEQCMCQQh0IwEtAAByJAIjAUEBaiQBDAELCyMCQf8BcSICIAAtAICADyIBIwJBCHUiA2xBgAIgAWsgA2wgAWsgAiABSCIEG2okAiAAIAFBByAEQYECbGogAWtBBHVqOgCAgA8gBAsMAEEAQYCEDxAEJAALC%2FMDAQBBAAvsA%2F%2Bfl7wzZsoSLKqmsehkfJ%2BoXizXJ8krjBr6Mx5dWkR96aZnQyWWGaXzQdWZfpcd9XFpdN9brE8ZBQo0n3Wr%2Fs%2BwcdFUW6079DEcDwjYmrxg5ptF4o7IlImwxEhJSWrBbtJepjaeC4PojV7Jghr1VPwDsc83RsuuCyL03791uwlwi0T8mJR%2BslH82ckKlC5TK6wnPyoB908kSeLY%2BEhunDhtWHA7EWwwdQvigYMhTQ6Cyi%2BXelkSq6CnCQnZrAqXrvEsSe7%2BYNt3Hg0MFycXedDIoFANBDyfPayn0VpyJB%2FigcLSUVngClYh6qibj%2FqMUJp3UMooPK9GHgeBn5L4EMDKto29nKMzuGul%2FU%2FcsrTpGvMsNhvP9oiRbGLT%2BtKN9Y08k3umAuKgZuPejhSaRu79ibrTYsFmp%2BjM%2Brr4qsTtbl3vja0Dt7VJRQGqxv7QJUhYkdtsCTqAzeflbQedZ%2FLk8GqBGmx%2F1xH7%2BmtrYLi8V%2FcpWd8a890NTAXJ80KPWJciuREplmTFtGa64gqCDRwwbOzsf8cmf6kXjcByItR9q057ZaXi0FuFXm35mohkeovFYeSXK%2FcVwzOmxlRyMiUTnsaQ299ys%2Bz4RHmnHPKsPhWT42j%2Fn1uicDm5gVxw4bSPORZK9Nzvk9y3%2Bg%3D%3D";var a={};a="data:;base64,AiHfzO34vaTkrd2eAWsXmnk6O0saNxyBOKpKJ4gIZgTFyYLQaErZlwVOzFHSIEwVOdwimalCVY189KvAjT1MA27zTIMgHP7UatKxjcsK5BFbXOHvjhm%2FLesv0gorLh3%2Bp4VSOVvsomIiXDlLL175jQw%2FbY3NPCAhv3e8gH24nzYFr4u3WeQHbVbcFOTxKFGLYMNOsU2QjF2XaPOdZFP32e58qAST0gBwmSKO6tuZq7JVC68uBldt4wWCJEbQqqENSUe5rtcAfyaSRf3gzZ3t3PgnwZHp6%2Fr0cjPo8rqIhvmzkLWI2m4jPwHc8k4s87Gjgpc4YQeipZW9q4PGqym6pnlfUAA8lRaqIo9U%2BnyqAMiI37LAL%2FqtHCi8JG1ByCyw6d9Pf7TLrazkjNNHPa5IJV%2BD8KUJQcCDLquYfrU2baSeirg4QH64Pxevmuo5j9pF97P%2FrfT18mBqcFoba%2Bc1jAeWPRoOSmD9M%2FPIsO1a%2F4bjFd0Uuru95ilanB4yFg4tk9FRqP2zJPk0T4LAzWMXzSX8%2F0VBgOogv%2BniB0XHFmaXv%2BG0PqGrx2sDO2N%2Fi98A3DdQyry%2Fs1%2Bb8mid6w7g5mptwhx561baq1syBSrGSJLqcDAutTh8uXZYvVXbFVzmxfLpAxsR898NHK51FkzqvkxeaNnYbCkC19jhJaslZ1E0vdpidtMzv1uwHCp986mNDT3qK4nWbwOpG52kVtkmac18T9g428D%2BeyJW82GG1hJmGV%2F39FlEB5hxbyFZINNLLAfNwG08itW25ATJ7QxZ%2FAX8zoz%2FT7oLugeHUeMBtvBF%2Bt40Wh2n%2FvjehShTKyMYUvlDZTTzBq34hcaBhCNCHTEHV8bRzoBK3%2Fx0qmeTW2l8vG7KCizhl8VoxALJiY84Isnu1OAS8vKw35FHVUWXDfXLUJw0WooJ%2BdxHnwkxlGBfeNGdWY0zJyRe3CgvsBiGlxC5nABF4pFYBMEOIGR6ev%2F3rrkXL34LdvKr2PkRuMr1gjvb8gGszxhBS40uxdOoWZLRyLA5OZ07W5nHTFbL5l6wKfJrIbrl8ZRamKdD5IXHETRJZq%2BlF3KOS0Jug3R8cjVTtBWYH4QDRXEym7uWNetxnlA5tTOl9kl811ZJeAM2A8TwUY%2FZdnIoPSqf5gUCE%2BcUvdRo55HwOX%2FONuPrPGxNEYIklsAJJlz0ElLine truncated

site/static/v0.4.0/index.html

@@ -1 +0,0 @@
-<!doctype html><html><head><meta charset="utf8"><title>MicroW8</title><link href="https://fonts.googleapis.com/css2?family=Josefin+Sans:wght@500&display=swap" rel="stylesheet"><style>html,body,canvas{margin:0;padding:0}html{color:#808070;background-color:#202024;height:100%;font-family:Josefin Sans,Verdana,Arial Black,sans-serif}body{grid-template-rows:1fr 0fr;height:100%;display:grid}#uw8{position:absolute}#uw8 a{font-size:130%}#centered{place-self:center}a{color:#303630}a:hover{color:#405040}.screen{image-rendering:pixelated;background-color:#202428;border:4px solid #303040;width:320px;height:240px;margin-bottom:8px;box-shadow:5px 5px 20px #000}#screen{cursor:none}#start{font-size:150%}#timer:before{content:"";background-color:red;border-radius:6px;width:12px;height:12px;margin-right:3px;display:inline-block}#message{margin-bottom:8px}.error{color:#e04030}button{color:#808070;background-color:#303440;border:1px solid #404040;border-radius:4px;padding:4px;font-family:inherit}button:hover{background-color:#202010}button:active{background-color:#504450}@media (width>=680px) and (height>=620px){.screen{width:640px;height:480px}}@media (width>=1000px) and (height>=800px){.screen{width:960px;height:720px}}@media (width:640px) and (height:480px){.screen{border:0;width:640px;height:480px;margin:0}body{overflow:hidden}}</style></head><body> <div id="uw8"> <a href="https://exoticorn.github.io/microw8">MicroW8</a> 0.4.0 </div> <div id="centered"> <canvas class="screen" id="screen" width="320" height="240"> </canvas> <button class="screen" id="start" style="display:none">Click to start</button> <div id="timer" hidden></div> <div id="message"></div> <button id="cartButton" style="visibility:hidden">Load cart...</button> </div> <div id="footer"> <a href="http://unlicense.org/" ref="license">Unlicense</a> </div> </body><script type="module">function e(e){return e&&e.__esModule?e.default:e}var t={};t="data:application/wasm;base64,AGFzbQEAAAABFQRgAX8Bf2ACf38Bf2ADf39%2FAGAAAAIPAQNlbnYGbWVtb3J5AgAEAwkIAAABAgEAAAMGEAN%2FAUEAC38BQQALfwFBAAsHGQIIbG9hZF91dzgAAAp1bmNvbXByZXNzAAQIAQcKngUIxwEBB39BAC0AAEEBayIBQQBIBEAgAA8LQYDAByAAaiECIAFBAXEEQEEBQYHABxAEIQIFQYDAB0EAIAAQAwtBAEGAhA9BCBADQYiEDyEDQQghBEGBwAchBQNAIAUgAkggAyMATiAFLQAAIAMtAABMcnEEQCAEIAQgBRACIgZqIQQgAyMASCAFLQAAIAMtAABGcQRAIAMgAxABaiEDCyAFIAZqIQUMAQsgAyMASARAIAQgBCADEAIiB2ohBCADIAdqIQMMAQsLIAQLPAEEfyAAIQEDQCACIAFBAWoiAS0AACIEQf8AcSADdHIhAiADQQdqIQMgBEEHdQ0ACyABQQFqIABrIAJqCxIBAX8gACABIAEQASICEAMgAgskAANAIAJBAEoEQCAAIAJBAWsiAmogASACai0AADoAAAwBCwsLqQEBBn8gACQBQQAkAgNAIANBgAE6AICADyADQQFqIgNBgQNIDQALAkADQEEAEAYiBQRAIAQEf0EBBUGAAhAGCwRAQYECEAVBAWsiAkUNAwtBwQIQBSEGA0AgASABIAJrLQAAOgAAIAFBAWohASAGQQFrIgYNAAsFQQEhBwNAIAdBAXQgBxAGciIHQYACSA0ACyABIAc6AAAgAUEBaiEBCyAFIQQMAAsLIAELNAECfwNAIAAgAmoQBgRAIAEgACACakEgahAGIAJ0ciEBIAJBAWohAgwBCwsgAUEBIAJ0cgtxAQR%2FA0AjAkGAIEgEQCMCQQh0IwEtAAByJAIjAUEBaiQBDAELCyMCQf8BcSICIAAtAICADyIBIwJBCHUiA2xBgAIgAWsgA2wgAWsgAiABSCIEG2okAiAAIAFBByAEQYECbGogAWtBBHVqOgCAgA8gBAsMAEEAQYCEDxAEJAALC60EAQBBAAumBBf%2FyMx3cvbPLfDyK1Bb4IburZYc9i%2BGTsS3j6O4M0o%2Bl2NUQ%2B88SSzybjKLNViVnmhuM%2FZ6LyqKG10doX6mhidmH1yW84EJfcqSXy6pUuF8h7prEGKBJPbIG0yhSUUWuzMrdRxzE4okeNRo4cs%2FsVhtCh4Vai9OQbuu9AZbIpuNDXWOFbj927WcryfPy4dsdT0B%2BA3x1gqXPq2rgI2fI0dNid3EJDTBr3SZWQObkiDldI5YJ17KFwjme3ofejUZT6xP3cNY2XdcosNxULga5hpnvQxV%2F1YKYfeYBVnZ6mAPyIx6Ayl4uxPFNpFdkNv28D%2Bv4X4QS%2BMYgr%2BrLsNAjif5Pz0lVPDBHkx%2BuqJN9SHrb6uRHqvwoVNuRbgn4alMggAWdV0rqmwCXlsmJyzwX%2BrWtH7BoosSlavxs%2BMUTI%2BFXunhVtt5mz3HYy3%2BxBJXF%2FhLWKUPw8vHxoEt%2BBpGDuMK8%2B1ew3pagPiQ7PV7YPWeoHyEKBM92UbyjbJx7HBp7Gh31ZwL9x%2B1sj0ogjs4HLke4hPdXR2o%2F%2BO67SYnX8CPp6YygTuddCxYwU6eHzYFFpwQuzKCVNPXyJKX4HVPJnysHBj5ygPItuS0NZqGlhpzEbgDf%2FJbIQgHzmNotsi6ErQdaigmn0dopO1ybwjbUWZ1kcZmOiBxcoNYSZVtW9mWKfn52kTNDn0QlwZz1slXrqIcx%2BMVVGeIZ9Y5hThIK3lyj%2BL9o%2Fo%3D";var a={};a="data:;base64,AiHfzO34vaTkrd2eAWsXmnk6O0saNxyBOKpKJ4gIZgTFyYLQaErZlwVOzFHSIEwVOdwimalCVY189KvAjT1MA27zTIMgHP7UatKxjcsK5BFbXOHvjhm%2FLesv0gorLh3%2Bp4VSOVvsomIiXDlLL175jQw%2FbY3NPCAhv3e8gH24nzYFr4u3WeQHbVbcFOTxKFGLYMNOsU2QjF2XaPOdZFP32e58qAST0gBwmSKO6tuZq7JVC68uBldt4wWCJEbQqqENSUe5rtcAfyaSRf3gzZ3t3PgnwZHp6%2Fr0cjPo8rqIhvmzkLWI2m4jPwHc8k4s87Gjgpc4YQeipZW9q4PGqym6pnlfUAA8lRaqIo9U%2BnyqAMiI37LAL%2FqtHCi8JG1ByCyw6d9Pf7TLrazkjNNHPa5IJV%2BD8KUJQcCDLquYfrU2baSeirg4QH64Pxevmuo5j9pF97P%2FrfT18mBqcFoba%2Bc1jAeWPRoOSmD9M%2FPIsO1a%2F4bjFd0Uuru95ilanB4yFg4tk9FRqP2zJPk0T4LAzWMXzSX8%2F0VBgOogv%2BniB0XHFmaXv%2BG0PqGrx2sDO2N%2Fi98A3DdQyry%2Fs1%2Bb8mid6w7g5mptwhx561baq1syBSrGSJLqcDAutTh8uXZYvVXbFVzmxfLpAxsR898NHK51FkzqvkxeaNnYbCkC19jhJaslZ1E0vdpidtMzv1uwHCp986mNDT3qK4nWbwOpG52kVtkmac18T9g428D%2BeyJW82GG1hJmGV%2F39FlEB5hxbyFZINNLLAfNwG08itW25ATJ7QxZ%2FAX8zoz%2FT7oLugeHUeMBtvBF%2Bt40Wh2n%2FvjehShTKyMYUvlDZTTzBq34hcaBhCNCHTEHV8bRzoBK3%2Fx0qmeTW2l8vG7KCizhl8VoxALJiY84Isnu1OAS8vKw35FHVUWXDfXLUJw0WooJ%2BdxHnwkxlGBfeNGdWY0zJyRe3CgvsBiGlxC5nABF4pFYBMEOIGR6ev%2F3rrkXL34LdvKr2PkRuMr1gjvb8gGszxhBS40uxdOoWZLRyLA5OZ07W5nHTFbL5l6wKfJrIbrl8ZRamKdD5IXHETRJZq%2BlF3KOS0Jug3R8cjVTtBWYH4QDRXEym7uWNetxnlA5tTOlLine truncated

site/static/v0.4.1/index.html

@@ -1 +0,0 @@
-<!doctype html><html><head><meta charset="utf8"><title>MicroW8</title><link href="https://fonts.googleapis.com/css2?family=Josefin+Sans:wght@500&display=swap" rel="stylesheet"><style>html,body,canvas{margin:0;padding:0}html{color:#808070;background-color:#202024;height:100%;font-family:Josefin Sans,Verdana,Arial Black,sans-serif}body{grid-template-rows:1fr 0fr;height:100%;display:grid}#uw8{position:absolute}#uw8 a{font-size:130%}#centered{place-self:center}a{color:#303630}a:hover{color:#405040}.screen{image-rendering:pixelated;background-color:#202428;border:4px solid #303040;width:320px;height:240px;margin-bottom:8px;box-shadow:5px 5px 20px #000}#screen{cursor:none}#start{font-size:150%}#timer:before{content:"";background-color:red;border-radius:6px;width:12px;height:12px;margin-right:3px;display:inline-block}#message{margin-bottom:8px}.error{color:#e04030}button{color:#808070;background-color:#303440;border:1px solid #404040;border-radius:4px;padding:4px;font-family:inherit}button:hover{background-color:#202010}button:active{background-color:#504450}@media (width>=680px) and (height>=620px){.screen{width:640px;height:480px}}@media (width>=1000px) and (height>=800px){.screen{width:960px;height:720px}}@media (width:640px) and (height:480px){.screen{border:0;width:640px;height:480px;margin:0}body{overflow:hidden}}</style></head><body> <div id="uw8"> <a href="https://exoticorn.github.io/microw8">MicroW8</a> 0.4.1 </div> <div id="centered"> <canvas class="screen" id="screen" width="320" height="240"> </canvas> <button class="screen" id="start" style="display:none">Click to start</button> <div id="timer" hidden></div> <div id="message"></div> <button id="cartButton" style="visibility:hidden">Load cart...</button> </div> <div id="footer"> <a href="http://unlicense.org/" ref="license">Unlicense</a> </div> </body><script type="module">function e(e){return e&&e.__esModule?e.default:e}var t={};t="data:application/wasm;base64,AGFzbQEAAAABFQRgAX8Bf2ACf38Bf2ADf39%2FAGAAAAIPAQNlbnYGbWVtb3J5AgAEAwkIAAABAgEAAAMGEAN%2FAUEAC38BQQALfwFBAAsHGQIIbG9hZF91dzgAAAp1bmNvbXByZXNzAAQIAQcKngUIxwEBB39BAC0AAEEBayIBQQBIBEAgAA8LQYDAByAAaiECIAFBAXEEQEEBQYHABxAEIQIFQYDAB0EAIAAQAwtBAEGAhA9BCBADQYiEDyEDQQghBEGBwAchBQNAIAUgAkggAyMATiAFLQAAIAMtAABMcnEEQCAEIAQgBRACIgZqIQQgAyMASCAFLQAAIAMtAABGcQRAIAMgAxABaiEDCyAFIAZqIQUMAQsgAyMASARAIAQgBCADEAIiB2ohBCADIAdqIQMMAQsLIAQLPAEEfyAAIQEDQCACIAFBAWoiAS0AACIEQf8AcSADdHIhAiADQQdqIQMgBEEHdQ0ACyABQQFqIABrIAJqCxIBAX8gACABIAEQASICEAMgAgskAANAIAJBAEoEQCAAIAJBAWsiAmogASACai0AADoAAAwBCwsLqQEBBn8gACQBQQAkAgNAIANBgAE6AICADyADQQFqIgNBgQNIDQALAkADQEEAEAYiBQRAIAQEf0EBBUGAAhAGCwRAQYECEAVBAWsiAkUNAwtBwQIQBSEGA0AgASABIAJrLQAAOgAAIAFBAWohASAGQQFrIgYNAAsFQQEhBwNAIAdBAXQgBxAGciIHQYACSA0ACyABIAc6AAAgAUEBaiEBCyAFIQQMAAsLIAELNAECfwNAIAAgAmoQBgRAIAEgACACakEgahAGIAJ0ciEBIAJBAWohAgwBCwsgAUEBIAJ0cgtxAQR%2FA0AjAkGAIEgEQCMCQQh0IwEtAAByJAIjAUEBaiQBDAELCyMCQf8BcSICIAAtAICADyIBIwJBCHUiA2xBgAIgAWsgA2wgAWsgAiABSCIEG2okAiAAIAFBByAEQYECbGogAWtBBHVqOgCAgA8gBAsMAEEAQYCEDxAEJAALC60EAQBBAAumBBf%2FyMx3cvbPLfDyK1Bb4IburZYc9i%2BGTsS3j6O4M0o%2Bl2NUQ%2B88SSzybjKLNViVnmhuM%2FZ6LyqKG10doX6mhidmH1yW84EJfcqSXy6pUuF8h7prEGKBJPbIG0yhSUUWuzMrdRxzE4okeNRo4cs%2FsVhtCh4Vai9OQbuu9AZbIpuNDXWOFbj927WcryfPy4dsdT0B%2BA3x1gqXPq2rgI2fI0dNid3EJDTBr3SZWQObkiDldI5YJ17KFwjme3ofejUZT6xP3cNY2XdcosNxULga5hpnvQxV%2F1YKYfeYBVnZ6mAPyIx6Ayl4uxPFNpFdkNv28D%2Bv4X4QS%2BMYgr%2BrLsNAjif5Pz0lVPDBHkx%2BuqJN9SHrb6uRHqvwoVNuRbgn4alMggAWdV0rqmwCXlsmJyzwX%2BrWtH7BoosSlavxs%2BMUTI%2BFXunhVtt5mz3HYy3%2BxBJXF%2FhLWKUPw8vHxoEt%2BBpGDuMK8%2B1ew3pagPiQ7PV7YPWeoHyEKBM92UbyjbJx7HBp7Gh31ZwL9x%2B1sj0ogjs4HLke4hPdXR2o%2F%2BO67SYnX8CPp6YygTuddCxYwU6eHzYFFpwQuzKCVNPXyJKX4HVPJnysHBj5ygPItuS0NZqGlhpzEbgDf%2FJbIQgHzmNotsi6ErQdaigmn0dopO1ybwjbUWZ1kcZmOiBxcoNYSZVtW9mWKfn52kTNDn0QlwZz1slXrqIcx%2BMVVGeIZ9Y5hThIK3lyj%2BL9o%2Fo%3D";var a={};a="data:;base64,AiHfzO34vaTkrd2eAWsXmnk6O0saNxyBOKpKJ4gIZgTFyYLQaErZlwVOzFHSIEwVOdwimalCVY189KvAjT1MA27zTIMgHP7UatKxjcsK5BFbXOHvjhm%2FLesv0gorLh3%2Bp4VSOVvsomIiXDlLL175jQw%2FbY3NPCAhv3e8gH24nzYFr4u3WeQHbVbcFOTxKFGLYMNOsU2QjF2XaPOdZFP32e58qAST0gBwmSKO6tuZq7JVC68uBldt4wWCJEbQqqENSUe5rtcAfyaSRf3gzZ3t3PgnwZHp6%2Fr0cjPo8rqIhvmzkLWI2m4jPwHc8k4s87Gjgpc4YQeipZW9q4PGqym6pnlfUAA8lRaqIo9U%2BnyqAMiI37LAL%2FqtHCi8JG1ByCyw6d9Pf7TLrazkjNNHPa5IJV%2BD8KUJQcCDLquYfrU2baSeirg4QH64Pxevmuo5j9pF97P%2FrfT18mBqcFoba%2Bc1jAeWPRoOSmD9M%2FPIsO1a%2F4bjFd0Uuru95ilanB4yFg4tk9FRqP2zJPk0T4LAzWMXzSX8%2F0VBgOogv%2BniB0XHFmaXv%2BG0PqGrx2sDO2N%2Fi98A3DdQyry%2Fs1%2Bb8mid6w7g5mptwhx561baq1syBSrGSJLqcDAutTh8uXZYvVXbFVzmxfLpAxsR898NHK51FkzqvkxeaNnYbCkC19jhJaslZ1E0vdpidtMzv1uwHCp986mNDT3qK4nWbwOpG52kVtkmac18T9g428D%2BeyJW82GG1hJmGV%2F39FlEB5hxbyFZINNLLAfNwG08itW25ATJ7QxZ%2FAX8zoz%2FT7oLugeHUeMBtvBF%2Bt40Wh2n%2FvjehShTKyMYUvlDZTTzBq34hcaBhCNCHTEHV8bRzoBK3%2Fx0qmeTW2l8vG7KCizhl8VoxALJiY84Isnu1OAS8vKw35FHVUWXDfXLUJw0WooJ%2BdxHnwkxlGBfeNGdWY0zJyRe3CgvsBiGlxC5nABF4pFYBMEOIGR6ev%2F3rrkXL34LdvKr2PkRuMr1gjvb8gGszxhBS40uxdOoWZLRyLA5OZ07W5nHTFbL5l6wKfJrIbrl8ZRamKdD5IXHETRJZq%2BlF3KOS0Jug3R8cjVTtBWYH4QDRXEym7uWNetxnlA5tTOlLine truncated

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.4.1">
+        <a href="v0.2.1">
             <img class="demonstration-gif" style="width:640px;height:480px;image-rendering:pixelated" src="img/technotunnel.png"></img>
         </a>
     </div>

src/filewatcher.rs

@@ -1,13 +1,9 @@
 use anyhow::{anyhow, bail, Result};
-use notify_debouncer_mini::{
-    new_debouncer,
-    notify::{self, RecommendedWatcher},
-    DebouncedEvent, DebouncedEventKind, Debouncer,
-};
+use notify::{DebouncedEvent, RecommendedWatcher, Watcher};
 use std::{collections::BTreeSet, path::PathBuf, sync::mpsc, time::Duration};
 
 pub struct FileWatcher {
-    debouncer: Debouncer<RecommendedWatcher>,
+    watcher: RecommendedWatcher,
     watched_files: BTreeSet<PathBuf>,
     directories: BTreeSet<PathBuf>,
     rx: mpsc::Receiver<DebouncedEvent>,
@@ -16,18 +12,9 @@ pub struct FileWatcher {
 impl FileWatcher {
     pub fn new() -> Result<FileWatcher> {
         let (tx, rx) = mpsc::channel();
-        let debouncer = new_debouncer(Duration::from_millis(100), move |res| match res {
-            Ok(events) => {
-                for event in events {
-                    let _ = tx.send(event);
-                }
-            }
-            Err(err) => {
-                eprintln!("Error watching for file changes: {err}");
-            }
-        })?;
+        let watcher = notify::watcher(tx, Duration::from_millis(100))?;
         Ok(FileWatcher {
-            debouncer,
+            watcher,
             watched_files: BTreeSet::new(),
             directories: BTreeSet::new(),
             rx,
@@ -39,8 +26,7 @@ impl FileWatcher {
         let parent = path.parent().ok_or_else(|| anyhow!("File has no parent"))?;
 
         if !self.directories.contains(parent) {
-            self.debouncer
-                .watcher()
+            self.watcher
                 .watch(parent, notify::RecursiveMode::NonRecursive)?;
             self.directories.insert(parent.to_path_buf());
         }
@@ -50,18 +36,16 @@ impl FileWatcher {
     }
 
     pub fn poll_changed_file(&self) -> Result<Option<PathBuf>> {
-        match self.rx.try_recv() {
-            Ok(event) => match event.kind {
-                DebouncedEventKind::Any => {
-                    let handle = same_file::Handle::from_path(&event.path)?;
+        let event = self.rx.try_recv();
+        match event {
+            Ok(DebouncedEvent::Create(path) | DebouncedEvent::Write(path)) => {
+                let handle = same_file::Handle::from_path(&path)?;
                 for file in &self.watched_files {
                     if handle == same_file::Handle::from_path(file)? {
-                            return Ok(Some(event.path));
+                        return Ok(Some(path));
                     }
                 }
             }
-                _ => (),
-            },
             Err(mpsc::TryRecvError::Disconnected) => bail!("File watcher disconnected"),
             _ => (),
         }

src/run-web.html

@@ -1 +1 @@
-<!doctype html><html><head><meta charset="utf8"><title>uw8-run</title><style>html,body,canvas{background-color:#202024;margin:0;padding:0}html{height:100%}body{grid-template-rows:1fr;height:100%;display:grid}#screen{image-rendering:pixelated;border:4px solid #303040;place-self:center}#message{color:#c64;z-index:2;background-color:#0006;width:calc(100% - 16px);padding:8px;font:700 12pt sans-serif;position:absolute}@media (width>=648px) and (height>=488px){#screen{width:640px;height:480px}}@media (width>=968px) and (height>=728px){#screen{width:960px;height:720px}}</style></head><body> <canvas id="screen" width="320" height="240" tabindex="1"> </canvas> <div id="message"></div> </body><script type="module">function e(e){return e&&e.__esModule?e.default:e}var t={};t="data:application/wasm;base64,AGFzbQEAAAABFQRgAX8Bf2ACf38Bf2ADf39%2FAGAAAAIPAQNlbnYGbWVtb3J5AgAEAwkIAAABAgEAAAMGEAN%2FAUEAC38BQQALfwFBAAsHGQIIbG9hZF91dzgAAAp1bmNvbXByZXNzAAQIAQcKngUIxwEBB39BAC0AAEEBayIBQQBIBEAgAA8LQYDAByAAaiECIAFBAXEEQEEBQYHABxAEIQIFQYDAB0EAIAAQAwtBAEGAhA9BCBADQYiEDyEDQQghBEGBwAchBQNAIAUgAkggAyMATiAFLQAAIAMtAABMcnEEQCAEIAQgBRACIgZqIQQgAyMASCAFLQAAIAMtAABGcQRAIAMgAxABaiEDCyAFIAZqIQUMAQsgAyMASARAIAQgBCADEAIiB2ohBCADIAdqIQMMAQsLIAQLPAEEfyAAIQEDQCACIAFBAWoiAS0AACIEQf8AcSADdHIhAiADQQdqIQMgBEEHdQ0ACyABQQFqIABrIAJqCxIBAX8gACABIAEQASICEAMgAgskAANAIAJBAEoEQCAAIAJBAWsiAmogASACai0AADoAAAwBCwsLqQEBBn8gACQBQQAkAgNAIANBgAE6AICADyADQQFqIgNBgQNIDQALAkADQEEAEAYiBQRAIAQEf0EBBUGAAhAGCwRAQYECEAVBAWsiAkUNAwtBwQIQBSEGA0AgASABIAJrLQAAOgAAIAFBAWohASAGQQFrIgYNAAsFQQEhBwNAIAdBAXQgBxAGciIHQYACSA0ACyABIAc6AAAgAUEBaiEBCyAFIQQMAAsLIAELNAECfwNAIAAgAmoQBgRAIAEgACACakEgahAGIAJ0ciEBIAJBAWohAgwBCwsgAUEBIAJ0cgtxAQR%2FA0AjAkGAIEgEQCMCQQh0IwEtAAByJAIjAUEBaiQBDAELCyMCQf8BcSICIAAtAICADyIBIwJBCHUiA2xBgAIgAWsgA2wgAWsgAiABSCIEG2okAiAAIAFBByAEQYECbGogAWtBBHVqOgCAgA8gBAsMAEEAQYCEDxAEJAALC60EAQBBAAumBBf%2FyMx3cvbPLfDyK1Bb4IburZYc9i%2BGTsS3j6O4M0o%2Bl2NUQ%2B88SSzybjKLNViVnmhuM%2FZ6LyqKG10doX6mhidmH1yW84EJfcqSXy6pUuF8h7prEGKBJPbIG0yhSUUWuzMrdRxzE4okeNRo4cs%2FsVhtCh4Vai9OQbuu9AZbIpuNDXWOFbj927WcryfPy4dsdT0B%2BA3x1gqXPq2rgI2fI0dNid3EJDTBr3SZWQObkiDldI5YJ17KFwjme3ofejUZT6xP3cNY2XdcosNxULga5hpnvQxV%2F1YKYfeYBVnZ6mAPyIx6Ayl4uxPFNpFdkNv28D%2Bv4X4QS%2BMYgr%2BrLsNAjif5Pz0lVPDBHkx%2BuqJN9SHrb6uRHqvwoVNuRbgn4alMggAWdV0rqmwCXlsmJyzwX%2BrWtH7BoosSlavxs%2BMUTI%2BFXunhVtt5mz3HYy3%2BxBJXF%2FhLWKUPw8vHxoEt%2BBpGDuMK8%2B1ew3pagPiQ7PV7YPWeoHyEKBM92UbyjbJx7HBp7Gh31ZwL9x%2B1sj0ogjs4HLke4hPdXR2o%2F%2BO67SYnX8CPp6YygTuddCxYwU6eHzYFFpwQuzKCVNPXyJKX4HVPJnysHBj5ygPItuS0NZqGlhpzEbgDf%2FJbIQgHzmNotsi6ErQdaigmn0dopO1ybwjbUWZ1kcZmOiBxcoNYSZVtW9mWKfn52kTNDn0QlwZz1slXrqIcx%2BMVVGeIZ9Y5hThIK3lyj%2BL9o%2Fo%3D";var B={};B="data:;base64,AiHfzO34vaTkrd2eAWsXmnk6O0saNxyBOKpKJ4gIZgTFyYLQaErZlwVOzFHSIEwVOdwimalCVY189KvAjT1MA27zTIMgHP7UatKxjcsK5BFbXOHvjhm%2FLesv0gorLh3%2Bp4VSOVvsomIiXDlLL175jQw%2FbY3NPCAhv3e8gH24nzYFr4u3WeQHbVbcFOTxKFGLYMNOsU2QjF2XaPOdZFP32e58qAST0gBwmSKO6tuZq7JVC68uBldt4wWCJEbQqqENSUe5rtcAfyaSRf3gzZ3t3PgnwZHp6%2Fr0cjPo8rqIhvmzkLWI2m4jPwHc8k4s87Gjgpc4YQeipZW9q4PGqym6pnlfUAA8lRaqIo9U%2BnyqAMiI37LAL%2FqtHCi8JG1ByCyw6d9Pf7TLrazkjNNHPa5IJV%2BD8KUJQcCDLquYfrU2baSeirg4QH64Pxevmuo5j9pF97P%2FrfT18mBqcFoba%2Bc1jAeWPRoOSmD9M%2FPIsO1a%2F4bjFd0Uuru95ilanB4yFg4tk9FRqP2zJPk0T4LAzWMXzSX8%2F0VBgOogv%2BniB0XHFmaXv%2BG0PqGrx2sDO2N%2Fi98A3DdQyry%2Fs1%2Bb8mid6w7g5mptwhx561baq1syBSrGSJLqcDAutTh8uXZYvVXbFVzmxfLpAxsR898NHK51FkzqvkxeaNnYbCkC19jhJaslZ1E0vdpidtMzv1uwHCp986mNDT3qK4nWbwOpG52kVtkmac18T9g428D%2BeyJW82GG1hJmGV%2F39FlEB5hxbyFZINNLLAfNwG08itW25ATJ7QxZ%2FAX8zoz%2FT7oLugeHUeMBtvBF%2Bt40Wh2n%2FvjehShTKyMYUvlDZTTzBq34hcaBhCNCHTEHV8bRzoBK3%2Fx0qmeTW2l8vG7KCizhl8VoxALJiY84Isnu1OAS8vKw35FHVUWXDfXLUJw0WooJ%2BdxHnwkxlGBfeNGdWY0zJyRe3CgvsBiGlxC5nABF4pFYBMEOIGR6ev%2F3rrkXL34LdvKr2PkRuMr1gjvb8gGszxhBS40uxdOoWZLRyLA5OZ07W5nHTFbL5l6wKfJrIbrl8ZRamKdD5IXHETRJZq%2BlF3KOS0Jug3R8cjVTtBWYH4QDRXEym7uWNetxnlA5tTOl9kl811ZJeAM2A8TwUY%2FZdnIoPSqf5gUCE%2BcUvdRo55HwOX%2FONuPrPGxNEYIklsAJJlz0ElYqE3NVSphMj3u7re%2F5b%2Fpdf2kWhkJNIdLvvXng6YXb5RM4%2BtqFvQDNV%2FYrEnk4RuFORPr2gwu6%2FllhKTq8RPiV%2FblJi2QsxJnwlFraEsbG3l4E%2FXsovrzL38DcEhBo7wfBSc8JHfs4tMYKHDxzrkUp0Ge01YMKzvvWjrpXrS0Dszq5B5WUA3JOuIBrq6GPuOdFhrJ6Fj7kX3iuWhGxpXrxiyMP%2BE4ax9UTCBGnvV7Nz1wE1gHFVe%2FN%2FoVjMZqV4vhzuVyf%2FEifKcdy1P4dVr6JG6Dw%2FcYvPlvqTtfCo1Khl5In1IrxmO5Hhq8ytKIKG9vTeeCqFXjVMCR9vfkCGyMi%2FbOdvNj6b%2Bq0ijT%2FyxZEp0kb7RSaN%2BihR75CGv7qkh8fy5qZmNYTNxFB5K%2F95iN70AZ8xZwKmOMJ7qbBzNj4j7fyl2zFz2SBLEWrSxhsGXkGjJ7OJmKJhLv8YQNTZij5u4F%2BUGB8GQhVZxmd381jEs4J2fsfbymks0lLC9BhIuCjK%2FTD28z1r7Kw%2Fnk97YXukMfBrNql3Bgh84neyaijJtxmMtuY6rb3CxPYBBQ0xMF%2FI7y6GqQL3xC9SuH5T0q%2FUjPliNfNsZEPgQ7o33%2BM80WMQELh8YeQsBIagyeql1ifqUUZ7hbSygRpIw76Fi7cVCJtaSZzH%2F8CzuoIjbHHWASBtQfLFB2vboh6UuhkyQB4igq0JskQIpQUMQB3wfXs%2BX4La3LtcQfiLkrMDRuqEn0LBhq8pktJvJZvpDtTShpTWpe0F6N43zx0Tk7lxF1awWFSz%2Bw%2B8PR%2BDd70VPEdaOWGxaSXZfnvo5R5wGccKJl0xsCkCZPuh%2BoK5OSHSOQr4eKb561cvGfpj0oO2dpCuIgaDs0r%2B%2BiDwdP2FQkQjyLZKE%2F4OF%2BuzbR9U47GeWrcF0n%2FBUd1VmNDibVX9Fue6C6ssuz8DeiRfXr1gy1w6MeBFXipcCqPm4tDpLbjyncb1A6tXEpAG4kJff0WFLsALine truncated
+<!doctype html><html><head><meta charset="utf8"><title>uw8-run</title><style>html,body,canvas{background-color:#202024;margin:0;padding:0}html{height:100%}body{height:100%;grid-template-rows:1fr;display:grid}#screen{image-rendering:pixelated;border:4px solid #303040;place-self:center}#message{width:calc(100% - 16px);color:#c64;z-index:2;background-color:#0006;padding:8px;font:700 12pt sans-serif;position:absolute}@media (min-width:648px) and (min-height:488px){#screen{width:640px;height:480px}}@media (min-width:968px) and (min-height:728px){#screen{width:960px;height:720px}}</style></head><body> <canvas id="screen" width="320" height="240" tabindex="1"> </canvas> <div id="message"></div> </body><script type="module">function e(e){return e&&e.__esModule?e.default:e}class t extends AudioWorkletNode{constructor(e){super(e,"apu",{outputChannelCount:[2]})}}let s=(...e)=>new Uint8Array(...e),A=(...e)=>new Uint32Array(...e);let a=function(a,n={}){n.setMessage||(n.setMessage=(e,t)=>{t&&console.log("error: "+t)});let B,o,r,i,l,F,d,C,D=a.getContext("2d"),g=D.createImageData(320,240),u=n.devkitMode,c=0,w=null==n.keyboardElement?a:n.keyboardElement;if(w){let e=e=>{let t,s="keydown"==e.type;switch(e.code){case"ArrowUp":t=1;break;case"ArrowDown":t=2;break;case"ArrowLeft":t=4;break;case"ArrowRight":t=8;break;case"KeyZ":t=16;break;case"KeyX":t=32;break;case"KeyA":t=64;break;case"KeyS":t=128;break;case"KeyR":s&&h(o,!0);break;case"F9":s&&a.toBlob((e=>{f(e,".png")})),e.preventDefault();break;case"F10":s&&function(){if(l)return l.stop(),l=null,d.disconnect(C),d=null,void(C=null);let e=a.captureStream();C=r.createMediaStreamDestination(),d=i,i.connect(C),e.addTrack(C.stream.getAudioTracks()[0]),l=new MediaRecorder(e,{mimeType:"video/webm",videoBitsPerSecond:25e6});let t=[];l.ondataavailable=e=>{t.push(e.data)};let s=n.timerElement;s&&(s.hidden=!1,s.innerText="00:00");function A(){if(F){if(s){let e=Math.floor((Date.now()-F)/1e3);s.innerText=Math.floor(e/60).toString().padStart(2,"0")+":"+(e%60).toString().padStart(2,"0")}setTimeout(A,1e3)}}l.onstop=()=>{s&&(s.hidden=!0),f(new Blob(t,{type:"video/webm"}),".webm")},l.start(),F=Date.now(),setTimeout(A,1e3)}(),e.preventDefault()}s?c|=t:c&=~t};w.onkeydown=e,w.onkeyup=e}async function h(l,F){B&&(B(),B=null),r=new AudioContext({sampleRate:44100});let d=!0,C=new AbortController;B=()=>{r.close(),d=!1,C.abort()};let w=l.byteLength;if(n.setMessage(w),0==w)return;await r.audioWorklet.addModule(e("data:application/javascript,let%20e%3D%28...e%29%3D%3Enew%20Uint8Array%28...e%29%3Bclass%20s%20extends%20AudioWorkletProcessor%7Bconstructor%28%29%7Bsuper%28%29%2Cthis.sampleIndex%3D0%2Cthis.currentTime%3D0%2Cthis.isFirstMessage%3D%210%2Cthis.pendingUpdates%3D%5B%5D%2Cthis.port.onmessage%3De%3D%3E%7Bthis.memory%3F%28this.isFirstMessage%26%26%28this.currentTime%2B%3D%28e.data.t-this.currentTime%29%2F8%2Cthis.isFirstMessage%3D%211%29%2Cthis.pendingUpdates.push%28e.data%29%29%3Athis.load%28e.data%5B0%5D%2Ce.data%5B1%5D%29%7D%7Dasync%20load%28e%2Cs%29%7Blet%20t%3Dnew%20WebAssembly.Memory%28%7Binitial%3A4%2Cmaximum%3A4%7D%29%2Ci%3D%7Benv%3A%7Bmemory%3At%7D%7D%3Bfor%28let%20e%20of%5B%22acos%22%2C%22asin%22%2C%22atan%22%2C%22atan2%22%2C%22cos%22%2C%22exp%22%2C%22log%22%2C%22sin%22%2C%22tan%22%2C%22pow%22%5D%29i.env%5Be%5D%3DMath%5Be%5D%3Bfor%28let%20e%3D9%3Be%3C64%3B%2B%2Be%29i.env%5B%22reserved%22%2Be%5D%3D%28%29%3D%3E%7B%7D%3Blet%20r%3D%22%22%3Bi.env.logChar%3De%3D%3E%7B10%3D%3De%3F%28console.log%28r%29%2Cr%3D%22%22%29%3Ar%2B%3DString.fromCharCode%28e%29%7D%3Bfor%28let%20e%3D0%3Be%3C16%3B%2B%2Be%29i.env%5B%22g_reserved%22%2Be%5D%3D0%3Blet%20n%3Dasync%20e%3D%3E%28await%20WebAssembly.instantiate%28e%2Ci%29%29.instance%2Ca%3Dawait%20n%28e%29%3Bfor%28let%20e%20in%20a.exports%29i.env%5Be%5D%3Da.exports%5Be%5D%3Blet%20o%3Dawait%20n%28s%29%3Bthis.memory%3Dt%2Cthis.snd%3Do.exports.snd%7C%7Ca.exports.sndGes%2Cthis.port.postMessage%282%29%7Dprocess%28s%2Ct%2Ci%29%7Bif%28this.isFirstMessage%3D%210%2Cthis.snd%29%7Bfor%28%3Bthis.pendingUpdates.length%3E0%26%26this.pendingUpdates%5B0%5D.t%3C%3Dthis.currentTime%3B%29e%28this.memory.buffer%2C80%2C32%29.set%28e%28this.pendingUpdates.shift%28%29.r%29%29%3Bnew%20Uint32Array%28this.memory.buffer%29%5B16%5D%3Dthis.currentTime%3Blet%20s%3Dt%5B0%5D%2Ci%3Dthis.sampleIndex%2Cr%3Ds%5B0%5D.length%3Bfor%28let%20e%3D0%3Be%3Cr%3B%2B%2Be%29s%5B0%5D%5Be%5D%3Dthis.snd%28i%2B%2B%29%2Cs%5B1%5D%5Be%5D%3Dthis.snd%28i%2B%2B%29%3Bthis.sampleIndex%3D4294967295%26i%2Cthis.currentTime%2B%3Dr%2F44.1%7Dreturn%210%7D%7DregisterProcessor%28%22apu%22%2Cs%29%3B")),i=new t(r);let f,y=0,Q=new Promise((e=>f=e)),m=e=>{y|=e,3==y&&f&&(f(!0),f=null)},p=()=>{"suspended"==r.state?(n.startButton&&(n.startButton.style="",a.style="display:none"),(n.startButton||a).onclick=()=>{r.resume()}):(n.startButton&&(n.startButton.style="display:none",a.style=""),m(1))};r.onstatechange=p,p(),o=l;let E=window.location.pathname;if(w<=1024&&!F){let e="";for(let t of s(l))e+=String.fromCharCode(t);E+="#"+btoa(e),E!=window.locLine truncated

src/run_native.rs

@@ -2,12 +2,12 @@ use std::sync::{mpsc, Arc, Mutex};
 use std::time::Duration;
 use std::{thread, time::Instant};
 
-use anyhow::{anyhow, bail, Result};
+use anyhow::{anyhow, Result};
 use cpal::traits::*;
 use rubato::Resampler;
 use uw8_window::{Window, WindowConfig};
 use wasmtime::{
-    Engine, Func, GlobalType, Memory, MemoryType, Module, Mutability, Store, TypedFunc, ValType,
+    Engine, GlobalType, Memory, MemoryType, Module, Mutability, Store, TypedFunc, ValType,
 };
 
 pub struct MicroW8 {
@@ -27,7 +27,6 @@ struct UW8Instance {
     end_frame: TypedFunc<(), ()>,
     update: Option<TypedFunc<(), ()>>,
     start_time: Instant,
-    frame_counter: u32,
     watchdog: Arc<Mutex<UW8WatchDog>>,
     sound_tx: Option<mpsc::SyncSender<RegisterUpdate>>,
 }
@@ -91,10 +90,10 @@ impl super::Runtime for MicroW8 {
         let memory = wasmtime::Memory::new(&mut store, MemoryType::new(4, Some(4)))?;
 
         let mut linker = wasmtime::Linker::new(&self.engine);
-        linker.define(&store, "env", "memory", memory)?;
+        linker.define("env", "memory", memory)?;
 
         let loader_instance = linker.instantiate(&mut store, &self.loader_module)?;
-        let load_uw8 = loader_instance.get_typed_func::<i32, i32>(&mut store, "load_uw8")?;
+        let load_uw8 = loader_instance.get_typed_func::<i32, i32, _>(&mut store, "load_uw8")?;
 
         let platform_data = include_bytes!("../platform/bin/platform.uw8");
         memory.data_mut(&mut store)[..platform_data.len()].copy_from_slice(platform_data);
@@ -132,12 +131,8 @@ impl super::Runtime for MicroW8 {
         }
 
         let instance = linker.instantiate(&mut store, &module)?;
-        let end_frame = platform_instance.get_typed_func::<(), ()>(&mut store, "endFrame")?;
-        let update = instance.get_typed_func::<(), ()>(&mut store, "upd").ok();
-
-        if let Some(start) = instance.get_typed_func::<(), ()>(&mut store, "start").ok() {
-            start.call(&mut store, ())?;
-        }
+        let end_frame = platform_instance.get_typed_func::<(), (), _>(&mut store, "endFrame")?;
+        let update = instance.get_typed_func::<(), (), _>(&mut store, "upd").ok();
 
         let (sound_tx, stream) = if self.disable_audio {
             (None, None)
@@ -160,7 +155,6 @@ impl super::Runtime for MicroW8 {
             end_frame,
             update,
             start_time: Instant::now(),
-            frame_counter: 0,
             watchdog,
             sound_tx,
         });
@@ -193,11 +187,8 @@ impl super::Runtime for MicroW8 {
                 let mem = instance.memory.data_mut(&mut instance.store);
                 mem[64..68].copy_from_slice(&time.to_le_bytes());
                 mem[68..72].copy_from_slice(&input.gamepads);
-                mem[72..76].copy_from_slice(&instance.frame_counter.to_le_bytes());
             }
 
-            instance.frame_counter = instance.frame_counter.wrapping_add(1);
-
             instance.store.set_epoch_deadline(self.timeout as u64);
             if let Some(ref update) = instance.update {
                 if let Err(err) = update.call(&mut instance.store, ()) {
@@ -260,12 +251,15 @@ fn add_native_functions(
         }
     })?;
     for i in 0..16 {
-        let global = wasmtime::Global::new(
+        linker.define(
+            "env",
+            &format!("g_reserved{}", i),
+            wasmtime::Global::new(
                 &mut *store,
                 GlobalType::new(ValType::I32, Mutability::Const),
                 0.into(),
+            )?,
         )?;
-        linker.define(&store, "env", &format!("g_reserved{}", i), global)?;
     }
 
     Ok(())
@@ -278,18 +272,14 @@ fn instantiate_platform(
 ) -> Result<wasmtime::Instance> {
     let platform_instance = linker.instantiate(&mut *store, &platform_module)?;
 
-    let exports: Vec<(String, Func)> = platform_instance
-        .exports(&mut *store)
-        .map(|e| {
-            (
-                e.name().to_owned(),
-                e.into_func()
+    for export in platform_instance.exports(&mut *store) {
+        linker.define(
+            "env",
+            export.name(),
+            export
+                .into_func()
                 .expect("platform surely only exports functions"),
-            )
-        })
-        .collect();
-    for (name, func) in exports {
-        linker.define(&store, "env", &name, func)?;
+        )?;
     }
 
     Ok(platform_instance)
@@ -316,15 +306,15 @@ fn init_sound(
     let memory = wasmtime::Memory::new(&mut store, MemoryType::new(4, Some(4)))?;
 
     let mut linker = wasmtime::Linker::new(engine);
-    linker.define(&store, "env", "memory", memory)?;
+    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, "sndGes"))?;
+        .get_typed_func::<(i32,), f32, _>(&mut store, "snd")
+        .or_else(|_| platform_instance.get_typed_func::<(i32,), f32, _>(&mut store, "sndGes"))?;
 
     let host = cpal::default_host();
     let device = host
@@ -333,37 +323,23 @@ fn init_sound(
     let mut configs: Vec<_> = device
         .supported_output_configs()?
         .filter(|config| {
-            config.sample_format() == cpal::SampleFormat::F32
-                || config.sample_format() == cpal::SampleFormat::I16
+            config.channels() == 2 && config.sample_format() == cpal::SampleFormat::F32
         })
         .collect();
-
-    if configs.is_empty() {
-        eprintln!(
-            "No suitable audio output config found on device \"{}\", available configs:",
-            device.name()?
-        );
-        for config in device.supported_output_configs()? {
-            eprintln!("  {}ch {}", config.channels(), config.sample_format());
-        }
-        bail!("Failed to configure audio out");
-    }
-
     configs.sort_by_key(|config| {
         let rate = 44100
             .max(config.min_sample_rate().0)
             .min(config.max_sample_rate().0);
-        let rate_prio = if rate >= 44100 {
+        if rate >= 44100 {
             rate - 44100
         } else {
             (44100 - rate) * 1000
-        };
-        let format_prio = (config.sample_format() == cpal::SampleFormat::I16) as u32;
-        let channels_prio = (config.channels() != 2) as u32 * 16777216;
-        rate_prio + format_prio + channels_prio
+        }
     });
-    let config = configs.into_iter().next().unwrap();
-
+    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())
         .min(config.max_sample_rate());
@@ -374,8 +350,6 @@ fn init_sound(
             cpal::BufferSize::Fixed(256.max(min).min(max))
         }
     };
-    let sample_format = config.sample_format();
-    let num_channels = config.channels();
     let config = cpal::StreamConfig {
         buffer_size,
         ..config.config()
@@ -408,8 +382,9 @@ fn init_sound(
     let mut sample_index = 0;
     let mut pending_updates: Vec<RegisterUpdate> = Vec::with_capacity(30);
     let mut current_time = 0;
-
-    let mut callback = move |mut outer_buffer: &mut [f32]| {
+    let stream = device.build_output_stream(
+        &config,
+        move |mut outer_buffer: &mut [f32], _| {
             let mut first_update = true;
             while let Ok(update) = rx.try_recv() {
                 if first_update {
@@ -482,7 +457,8 @@ fn init_sound(
                             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] =
+                                    resampler.output_buffers[0][resampler.output_index + i];
                                 buffer[i * 2 + 1] =
                                     resampler.output_buffers[1][resampler.output_index + i];
                             }
@@ -498,130 +474,14 @@ fn init_sound(
                 }
 
                 outer_buffer = &mut outer_buffer[step_size..];
-            current_time = current_time.wrapping_add((step_size * 500 / sample_rate).max(1) as i32);
+                current_time =
+                    current_time.wrapping_add((step_size * 500 / sample_rate).max(1) as i32);
             }
-    };
-
-    fn f32_to_i16<F>(mut buffer: &mut [i16], callback: &mut F)
-    where
-        F: FnMut(&mut [f32]),
-    {
-        let mut float_buffer = [0f32; 256];
-
-        while !buffer.is_empty() {
-            let step_size = buffer.len().min(float_buffer.len());
-            let step_buffer = &mut float_buffer[..step_size];
-            callback(step_buffer);
-            for (dest, src) in buffer.iter_mut().take(step_size).zip(step_buffer.iter()) {
-                *dest = (src.max(-1.0).min(1.0) * 32767.0) as i16;
-            }
-            buffer = &mut buffer[step_size..];
-        }
-    }
-
-    fn stereo_to_mono<F>(mut buffer: &mut [f32], callback: &mut F)
-    where
-        F: FnMut(&mut [f32]),
-    {
-        let mut in_buffer = [0f32; 256];
-
-        while !buffer.is_empty() {
-            let step_size = buffer.len().min(in_buffer.len() / 2);
-            let step_buffer = &mut in_buffer[..step_size * 2];
-            callback(step_buffer);
-            for (index, dest) in buffer.iter_mut().take(step_size).enumerate() {
-                *dest = (step_buffer[index * 2] + step_buffer[index * 2 + 1]) * 0.5;
-            }
-            buffer = &mut buffer[step_size..];
-        }
-    }
-
-    fn stereo_to_surround<F>(mut buffer: &mut [f32], num_channels: usize, callback: &mut F)
-    where
-        F: FnMut(&mut [f32]),
-    {
-        let mut in_buffer = [0f32; 256];
-        buffer.fill(0.);
-
-        while !buffer.is_empty() {
-            let step_size = (buffer.len() / num_channels).min(in_buffer.len() / 2);
-            let step_buffer = &mut in_buffer[..step_size * 2];
-            callback(step_buffer);
-            for index in 0..step_size {
-                buffer[index * num_channels + 0] = step_buffer[index * 2 + 0];
-                buffer[index * num_channels + 1] = step_buffer[index * 2 + 1];
-            }
-            buffer = &mut buffer[step_size * num_channels..];
-        }
-    }
-
-    let stream = if sample_format == cpal::SampleFormat::F32 {
-        if num_channels == 2 {
-            device.build_output_stream(
-                &config,
-                move |buffer: &mut [f32], _| callback(buffer),
-                move |err| {
-                    dbg!(err);
-                },
-                None,
-            )?
-        } else if num_channels == 1 {
-            device.build_output_stream(
-                &config,
-                move |buffer: &mut [f32], _| stereo_to_mono(buffer, &mut callback),
-                move |err| {
-                    dbg!(err);
-                },
-                None,
-            )?
-        } else {
-            device.build_output_stream(
-                &config,
-                move |buffer: &mut [f32], _| {
-                    stereo_to_surround(buffer, num_channels as usize, &mut callback)
         },
         move |err| {
             dbg!(err);
         },
-                None,
-            )?
-        }
-    } else {
-        if num_channels == 2 {
-            device.build_output_stream(
-                &config,
-                move |buffer: &mut [i16], _| f32_to_i16(buffer, &mut callback),
-                move |err| {
-                    dbg!(err);
-                },
-                None,
-            )?
-        } else if num_channels == 1 {
-            device.build_output_stream(
-                &config,
-                move |buffer: &mut [i16], _| {
-                    f32_to_i16(buffer, &mut |b| stereo_to_mono(b, &mut callback))
-                },
-                move |err| {
-                    dbg!(err);
-                },
-                None,
-            )?
-        } else {
-            device.build_output_stream(
-                &config,
-                move |buffer: &mut [i16], _| {
-                    f32_to_i16(buffer, &mut |b| {
-                        stereo_to_surround(b, num_channels as usize, &mut callback)
-                    })
-                },
-                move |err| {
-                    dbg!(err);
-                },
-                None,
-            )?
-        }
-    };
+    )?;
 
     Ok(Uw8Sound { stream, tx })
 }

src/run_web.rs

@@ -11,7 +11,6 @@ use warp::{http::Response, Filter};
 pub struct RunWebServer {
     cart: Arc<Mutex<Vec<u8>>>,
     tx: broadcast::Sender<()>,
-    socket_addr: SocketAddr,
 }
 
 impl RunWebServer {
@@ -19,13 +18,8 @@ impl RunWebServer {
         let cart = Arc::new(Mutex::new(Vec::new()));
         let (tx, _) = broadcast::channel(1);
 
-        let socket_addr = "127.0.0.1:3030"
-            .parse::<SocketAddr>()
-            .expect("Failed to parse socket address");
-
         let server_cart = cart.clone();
         let server_tx = tx.clone();
-        let server_addr = socket_addr.clone();
         thread::spawn(move || {
             let rt = tokio::runtime::Builder::new_current_thread()
                 .enable_io()
@@ -53,26 +47,24 @@ impl RunWebServer {
                     warp::sse::reply(warp::sse::keep_alive().stream(event_stream(&server_tx)))
                 });
 
-                let server_future = warp::serve(html.or(cart).or(events)).bind(server_addr);
+                let socket_addr = "127.0.0.1:3030"
+                    .parse::<SocketAddr>()
+                    .expect("Failed to parse socket address");
+
+                let server_future = warp::serve(html.or(cart).or(events)).bind(socket_addr);
+                println!("Point browser at http://{}", socket_addr);
+                let _ignore_result = webbrowser::open(&format!("http://{}", socket_addr));
                 server_future.await
             });
         });
 
-        RunWebServer {
-            cart,
-            tx,
-            socket_addr,
-        }
+        RunWebServer { cart, tx }
     }
 }
 
 impl super::Runtime for RunWebServer {
     fn load(&mut self, module_data: &[u8]) -> Result<()> {
         if let Ok(mut lock) = self.cart.lock() {
-            if lock.is_empty() && !module_data.is_empty() {
-                println!("Point browser at http://{}", self.socket_addr);
-                let _ignore_result = webbrowser::open(&format!("http://{}", self.socket_addr));
-            }
             lock.clear();
             lock.extend_from_slice(module_data);
         }

syntax/SublimeText/CurlyWASM.sublime-completions

@@ -1,789 +0,0 @@
-{
-    "scope": "source.curlywasm",
-    "completions": [
-        // Keywords
-        {
-            "trigger": "if",
-            "contents": "if ${1:condition} {\n\t${2:// Your start code here}\n}",
-            "details": "if (condition) { block }",
-            "kind": "keyword"
-        },
-        {
-            "trigger": "else",
-            "contents": "else {\n\t${1:// Your start code here}\n}",
-            "details": "else { block }",
-            "kind": "keyword"
-        },
-        {
-            "trigger": "loop",
-            "contents": "loop ${1:label} {\n\t${2:// Your start code here}\n}",
-            "details": "loop label { block }",
-            "kind": "keyword"
-        },
-        {
-            "trigger": "fn",
-            "contents": "fn ${1:name}(${2:params}) {\n\t${3:// Your start code here}\n}",
-            "details": "fn name(params) [-> return_type] { block }",
-            "kind": "keyword"
-        },
-        {
-            "trigger": "let",
-            "contents": "let ${1:variable} = ${2:value};",
-            "details": "let variable[: type] = value;",
-            "kind": "keyword"
-        },
-        {
-            "trigger": "const",
-            "contents": "const ${1:name} = ${2:value};",
-            "details": "const name[: type] = value;",
-            "kind": "keyword"
-        },
-        {
-            "trigger": "branch_if",
-            "contents": "branch_if ${1:condition}: ${2:label};",
-            "details": "branch_if (condition): label;",
-            "kind": "keyword"
-        },
-        {
-            "trigger": "global",
-            "contents": "global mut ${1:name} = ${2:value};",
-            "details": "global mut name[: type] = value;",
-            "kind": "keyword"
-        },
-        {
-            "trigger": "import",
-            "contents": "import \"${1:module.name}\" ${2:|memory(min_pages)|global var_name: type|fn fun_name(param_types) [-> return_type]};",
-            "details": "import \"module.name\" memory(min_pages); import \"module.name\" global var_name: type; import \"module.name\" fn fun_name(param_types) [-> return_type];",
-            "kind": "keyword"
-        },
-        {
-            "trigger": "include",
-            "contents": "include \"${1:path}\"",
-            "details": "include \"path\"",
-            "kind": "keyword"
-        },
-        {
-            "trigger": "api",
-            "contents": "include \"../include/microw8-api.cwa\"",
-            "details": "include \"path\"",
-            "kind": "keyword"
-        },
-        {
-            "trigger": "common",
-            "contents": "include \"../include/common.cwa\"",
-            "details": "include \"path\"",
-            "kind": "keyword"
-        },
-        {
-            "trigger": "export",
-            "contents": "export fn ${1:name}(${2:params}) ${3:-> ${4:return_type}} { ${5:block} }",
-            "details": "export fn name(params) [-> return_type] { block }",
-            "kind": "keyword"
-        },
-        {
-            "trigger": "block",
-            "contents": "block ${1:label} {\n\t${2://content}\n}",
-            "details": "block label { block }",
-            "kind": "keyword"
-        },
-        {
-            "trigger": "branch",
-            "contents": "branch ${1:label};",
-            "details": "branch label;",
-            "kind": "keyword"
-        },
-        {
-            "trigger": "data",
-            "contents": "data ${1:address} {\n\t${2:type}(\n\t\t${3:values}\n\t)\n}",
-            "details": "data address { content }",
-            "kind": "keyword"
-        },
-        {
-            "trigger": "mut",
-            "contents": "mut",
-            "details": "Mutable variable modifier",
-            "kind": "storage.modifier"
-        },
-        {
-            "trigger": "lazy",
-            "contents": "lazy",
-            "details": "Lazy variable modifier",
-            "kind": "storage.modifier"
-        },
-        {
-            "trigger": "inline",
-            "contents": "inline",
-            "details": "Inline variable modifier",
-            "kind": "storage.modifier"
-        },
-
-        // Operators
-        {
-            "trigger": "as",
-            "contents": "as",
-            "details": "Type cast",
-            "kind": "keyword.operator.type"
-        },
-        {
-            "trigger": "?",
-            "contents": "?",
-            "details": "Load byte",
-            "kind": "keyword.operator.memory"
-        },
-        {
-            "trigger": "!",
-            "contents": "!",
-            "details": "Load word",
-            "kind": "keyword.operator.memory"
-        },
-        {
-            "trigger": "$",
-            "contents": "$",
-            "details": "Load float",
-            "kind": "keyword.operator.memory"
-        },
-        {
-            "trigger": "<|",
-            "contents": "<|",
-            "details": "Take first (sequencing operator)",
-            "kind": "keyword.operator.misc"
-        },
-
-        // Memory access intrinsic functions (i32 and f32 only)
-        {
-            "trigger": "i32.load",
-            "contents": "i32.load(${1:base}, ${2:offset}${3:, ${4:align}})",
-            "details": "i32.load(base: i32, offset: i32 = 0, align: i32 = 2) -> i32: Load 32-bit word",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "i32.load8_u",
-            "contents": "i32.load8_u(${1:base}, ${2:offset}${3:, ${4:align}})",
-            "details": "i32.load8_u(base: i32, offset: i32 = 0, align: i32 = 0) -> i32: Load 8-bit unsigned",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "i32.load8_s",
-            "contents": "i32.load8_s(${1:base}, ${2:offset}${3:, ${4:align}})",
-            "details": "i32.load8_s(base: i32, offset: i32 = 0, align: i32 = 0) -> i32: Load 8-bit signed",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "i32.load16_u",
-            "contents": "i32.load16_u(${1:base}, ${2:offset}${3:, ${4:align}})",
-            "details": "i32.load16_u(base: i32, offset: i32 = 0, align: i32 = 1) -> i32: Load 16-bit unsigned",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "i32.load16_s",
-            "contents": "i32.load16_s(${1:base}, ${2:offset}${3:, ${4:align}})",
-            "details": "i32.load16_s(base: i32, offset: i32 = 0, align: i32 = 1) -> i32: Load 16-bit signed",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "i32.store",
-            "contents": "i32.store(${1:value}, ${2:base}, ${3:offset}${4:, ${5:align}});",
-            "details": "i32.store(value: i32, base: i32, offset: i32 = 0, align: i32 = 2): Store 32-bit word",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "i32.store8",
-            "contents": "i32.store8(${1:value}, ${2:base}, ${3:offset}${4:, ${5:align}});",
-            "details": "i32.store8(value: i32, base: i32, offset: i32 = 0, align: i32 = 0): Store 8-bit",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "i32.store16",
-            "contents": "i32.store16(${1:value}, ${2:base}, ${3:offset}${4:, ${5:align}});",
-            "details": "i32.store16(value: i32, base: i32, offset: i32 = 0, align: i32 = 1): Store 16-bit",
-            "kind": "support.function"
-        },
-         {
-            "trigger": "f32.load",
-            "contents": "f32.load(${1:base}, ${2:offset}${3:, ${4:align}})",
-            "details": "f32.load(base: i32, offset: i32 = 0, align: i32 = 2) -> f32: Load 32-bit float",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "f32.store",
-            "contents": "f32.store(${1:value}, ${2:base}, ${3:offset}${4:, ${5:align}});",
-            "details": "f32.store(value: f32, base: i32, offset: i32 = 0, align: i32 = 2): Store 32-bit float",
-            "kind": "support.function"
-        },
-
-        // API functions
-        {
-            "trigger": "sin",
-            "contents": "sin(${1:x})",
-            "details": "sin(x: f32) -> f32: Returns the sine of x (radians)",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "cos",
-            "contents": "cos(${1:x})",
-            "details": "cos(x: f32) -> f32: Returns the cosine of x (radians)",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "tan",
-            "contents": "tan(${1:x})",
-            "details": "tan(x: f32) -> f32: Returns the tangent of x (radians)",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "asin",
-            "contents": "asin(${1:x})",
-            "details": "asin(x: f32) -> f32: Returns the arcsine of x (radians)",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "acos",
-            "contents": "acos(${1:x})",
-            "details": "acos(x: f32) -> f32: Returns the arccosine of x (radians)",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "atan",
-            "contents": "atan(${1:x})",
-            "details": "atan(x: f32) -> f32: Returns the arctangent of x (radians)",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "atan2",
-            "contents": "atan2(${1:y}, ${2:x})",
-            "details": "atan2(y: f32, x: f32) -> f32: Returns the angle in radians of the point (x, y)",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "pow",
-            "contents": "pow(${1:x}, ${2:y})",
-            "details": "pow(x: f32, y: f32) -> f32: Returns x raised to the power of y",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "log",
-            "contents": "log(${1:x})",
-            "details": "log(x: f32) -> f32: Returns the natural logarithm of x",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "fmod",
-            "contents": "fmod(${1:x}, ${2:y})",
-            "details": "fmod(x: f32, y: f32) -> f32: Returns the remainder of x/y",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "random",
-            "contents": "random()",
-            "details": "random() -> i32: Returns a random 32-bit integer",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "randomf",
-            "contents": "randomf()",
-            "details": "randomf() -> f32: Returns a random float [0, 1)",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "randomSeed",
-            "contents": "randomSeed(${1:seed});",
-            "details": "randomSeed(seed: i32): Seeds the random number generator",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "cls",
-            "contents": "cls(${1:color});",
-            "details": "cls(color: i32): Clears the screen with the given color, resets cursor to 0,0, disables graphics mode",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "setPixel",
-            "contents": "setPixel(${1:x}, ${2:y}, ${3:color});",
-            "details": "setPixel(x: i32, y: i32, color: i32): Sets the pixel at (x, y) to color",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "getPixel",
-            "contents": "getPixel(${1:x}, ${2:y})",
-            "details": "getPixel(x: i32, y: i32) -> i32: Gets the color of the pixel at (x, y) (returns 0 if out of bounds)",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "hline",
-            "contents": "hline(${1:left}, ${2:right}, ${3:y}, ${4:color});",
-            "details": "hline(left: i32, right: i32, y: i32, color: i32): Fills the horizontal line [left, right), y",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "rectangle",
-            "contents": "rectangle(${1:x}, ${2:y}, ${3:width}, ${4:height}, ${5:color});",
-            "details": "rectangle(x: f32, y: f32, w: f32, h: f32, color: i32): Fills the rectangle x,y - x+w,y+h",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "circle",
-            "contents": "circle(${1:cx}, ${2:cy}, ${3:radius}, ${4:color});",
-            "details": "circle(cx: f32, cy: f32, radius: f32, color: i32): Fills the circle at cx, cy with radius",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "line",
-            "contents": "line(${1:x1}, ${2:y1}, ${3:x2}, ${4:y2}, ${5:color});",
-            "details": "line(x1: f32, y1: f32, x2: f32, y2: f32, color: i32): Draws a line from x1,y1 to x2,y2",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "time",
-            "contents": "time()",
-            "details": "time() -> f32: Returns the current time in seconds",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "isButtonPressed",
-            "contents": "isButtonPressed(${1:button})",
-            "details": "isButtonPressed(button: i32) -> bool: Checks if a button is pressed this frame (returns i32)",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "isButtonTriggered",
-            "contents": "isButtonTriggered(${1:button})",
-            "details": "isButtonTriggered(button: i32) -> bool: Checks if a button is newly pressed this frame (returns i32)",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "printChar",
-            "contents": "printChar(${1:char});",
-            "details": "printChar(char: i32): Prints the character in the lower 8 bits",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "printString",
-            "contents": "printString(${1:ptr});",
-            "details": "printString(ptr: i32): Prints the zero-terminated string at memory address ptr",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "printInt",
-            "contents": "printInt(${1:value});",
-            "details": "printInt(value: i32): Prints an integer as a signed decimal number",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "setTextColor",
-            "contents": "setTextColor(${1:color});",
-            "details": "setTextColor(color: i32): Sets the text color",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "setBackgroundColor",
-            "contents": "setBackgroundColor(${1:color});",
-            "details": "setBackgroundColor(color: i32): Sets the background color",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "setCursorPosition",
-            "contents": "setCursorPosition(${1:x}, ${2:y});",
-            "details": "setCursorPosition(x: i32, y: i32): Sets the cursor position (character or pixel coords depending on mode)",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "rectangleOutline",
-            "contents": "rectangleOutline(${1:x}, ${2:y}, ${3:width}, ${4:height}, ${5:color});",
-            "details": "rectangleOutline(x: f32, y: f32, w: f32, h: f32, color: i32): Draws a rectangle outline",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "circleOutline",
-            "contents": "circleOutline(${1:cx}, ${2:cy}, ${3:radius}, ${4:color});",
-            "details": "circleOutline(cx: f32, cy: f32, radius: f32, color: i32): Draws a circle outline",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "exp",
-            "contents": "exp(${1:x})",
-            "details": "exp(x: f32) -> f32: Returns e raised to the power of x",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "playNote",
-            "contents": "playNote(${1:channel}, ${2:note}${3:, ${4:duration}${5:, ${6:volume}}});",
-            "details": "playNote(channel: i32, note: i32): Triggers a note on the given channel (note 0 stops, 128-255 triggers attack+release)",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "sndGes",
-            "contents": "sndGes(${1:sampleIndex})",
-            "details": "sndGes(sampleIndex: i32) -> f32: Sound generator function (uses 32 bytes at 0x50 by default)",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "blitSprite",
-            "contents": "blitSprite(${1:spriteData}, ${2:size}, ${3:x}, ${4:y}, ${5:control});",
-            "details": "blitSprite(spriteData: i32, size: i32, x: i32, y: i32, control: i32): Copies sprite data to screen",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "grabSprite",
-            "contents": "grabSprite(${1:spriteData}, ${2:size}, ${3:x}, ${4:y}, ${5:control});",
-            "details": "grabSprite(spriteData: i32, size: i32, x: i32, y: i32, control: i32): Copies screen data to sprite",
-            "kind": "support.function"
-        },
-
-        // Built-in functions (or commonly used intrinsics)
-        {
-            "trigger": "start",
-            "contents": "export fn start() {\n\t${1:// Your start code here}\n}",
-            "details": "export fn start(): Called once after module is loaded",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "upd",
-            "contents": "export fn upd() {\n\t${1:// Your update code here}\n}",
-            "details": "export fn upd(): Called once per frame",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "memory.fill",
-            "contents": "memory.fill(${1:dest}, ${2:value}, ${3:size});",
-            "details": "memory.fill(dest: i32, value: i32, size: i32): Fills a memory area",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "memory.copy",
-            "contents": "memory.copy(${1:dest}, ${2:src}, ${3:size});",
-            "details": "memory.copy(dest: i32, src: i32, size: i32): Copies a memory block",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "sqrt",
-            "contents": "sqrt(${1:x})",
-            "details": "sqrt(x: f32) -> f32: Returns the square root of x",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "min",
-            "contents": "min(${1:x}, ${2:y})",
-            "details": "min(x: f32, y: f32) -> f32: Returns the minimum of x and y",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "max",
-            "contents": "max(${1:x}, ${2:y})",
-            "details": "max(x: f32, y: f32) -> f32: Returns the maximum of x and y",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "ceil",
-            "contents": "ceil(${1:x})",
-            "details": "ceil(x: f32) -> f32: Returns the smallest integer >= x",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "floor",
-            "contents": "floor(${1:x})",
-            "details": "floor(x: f32) -> f32: Returns the largest integer <= x",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "trunc",
-            "contents": "trunc(${1:x})",
-            "details": "trunc(x: f32) -> f32: Returns the nearest integer to x toward zero",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "nearest",
-            "contents": "nearest(${1:x})",
-            "details": "nearest(x: f32) -> f32: Returns the nearest integer to x (round to nearest, ties to even)",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "abs",
-            "contents": "abs(${1:x})",
-            "details": "abs(x: f32) -> f32: Returns the absolute value of x",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "copysign",
-            "contents": "copysign(${1:x}, ${2:y})",
-            "details": "copysign(x: f32, y: f32) -> f32: Returns x with the sign of y",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "select",
-            "contents": "select(${1:a}, ${2:b}, ${3:c})",
-            "details": "select(a: f32, b: f32, c: f32) -> f32: Selects b if a is non-zero, otherwise selects c (equivalent to a != 0 ? b : c)",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "i32.clz",
-            "contents": "i32.clz(${1:value})",
-            "details": "i32.clz(value: i32) -> i32: Count Leading Zeros",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "i32.ctz",
-            "contents": "i32.ctz(${1:value})",
-            "details": "i32.ctz(value: i32) -> i32: Count Trailing Zeros",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "i32.popcnt",
-            "contents": "i32.popcnt(${1:value})",
-            "details": "i32.popcnt(value: i32) -> i32: Population Count (number of set bits)",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "i32.bswap",
-            "contents": "i32.bswap(${1:value})",
-            "details": "i32.bswap(value: i32) -> i32: Byte Swap",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "i32.trunc_sat_f32_u",
-            "contents": "i32.trunc_sat_f32_u(${1:value})",
-            "details": "i32.trunc_sat_f32_u(value: f32) -> i32: Truncate f32 to i32 unsigned, saturating",
-            "kind": "support.function"
-        },
-        {
-            "trigger": "i32.trunc_sat_f32_s",
-            "contents": "i32.trunc_sat_f32_s(${1:value})",
-            "details": "i32.trunc_sat_f32_s(value: f32) -> i32: Truncate f32 to i32 signed, saturating",
-            "kind": "support.function"
-        },
-        // Added Constants
-        {
-            "trigger": "TIME_MS",
-            "contents": "TIME_MS",
-            "details": "0x40 Time since module start in ms",
-            "kind": "constant"
-        },
-        {
-            "trigger": "GAMEPAD",
-            "contents": "GAMEPAD",
-            "details": "0x44 Gamepad state",
-            "kind": "constant"
-        },
-        {
-            "trigger": "FRAMEBUFFER",
-            "contents": "FRAMEBUFFER",
-            "details": "0x78 Frame buffer address",
-            "kind": "constant"
-        },
-        {
-            "trigger": "PALETTE",
-            "contents": "PALETTE",
-            "details": "0x13000 Palette address",
-            "kind": "constant"
-        },
-        {
-            "trigger": "FONT",
-            "contents": "FONT",
-            "details": "0x13400 Font address",
-            "kind": "constant"
-        },
-        {
-            "trigger": "USER_MEM",
-            "contents": "USER_MEM",
-            "details": "0x14000 Start of general user memory",
-            "kind": "constant"
-        },
-        {
-            "trigger": "BUTTON_UP",
-            "contents": "BUTTON_UP",
-            "details": "0x00 Gamepad button Up",
-            "kind": "constant"
-        },
-        {
-            "trigger": "BUTTON_DOWN",
-            "contents": "BUTTON_DOWN",
-            "details": "0x01 Gamepad button Down",
-            "kind": "constant"
-        },
-        {
-            "trigger": "BUTTON_LEFT",
-            "contents": "BUTTON_LEFT",
-            "details": "0x02 Gamepad button Left",
-            "kind": "constant"
-        },
-        {
-            "trigger": "BUTTON_RIGHT",
-            "contents": "BUTTON_RIGHT",
-            "details": "0x03 Gamepad button Right",
-            "kind": "constant"
-        },
-        {
-            "trigger": "BUTTON_A",
-            "contents": "BUTTON_A",
-            "details": "0x04 Gamepad button A (Z on keyboard)",
-            "kind": "constant"
-        },
-        {
-            "trigger": "BUTTON_B",
-            "contents": "BUTTON_B",
-            "details": "0x05 Gamepad button B (X on keyboard)",
-            "kind": "constant"
-        },
-        {
-            "trigger": "BUTTON_X",
-            "contents": "BUTTON_X",
-            "details": "0x06 Gamepad button X (A on keyboard)",
-            "kind": "constant"
-        },
-        {
-            "trigger": "BUTTON_Y",
-            "contents": "BUTTON_Y",
-            "details": "0x07 Gamepad button Y (S on keyboard)",
-            "kind": "constant"
-        },
-        {
-            "trigger": "PI",
-            "contents": "PI",
-            "details": "Mathematical constant π",
-            "kind": "constant"
-        },
-        {
-            "trigger": "RAD",
-            "contents": "RAD",
-            "details": "One radian value",
-            "kind": "constant"
-        },
-        {
-            "trigger": "SCR_X",
-            "contents": "SCR_X",
-            "details": "Screen width in pixels",
-            "kind": "constant"
-        },
-        {
-            "trigger": "SCR_Y",
-            "contents": "SCR_Y",
-            "details": "Screen height in pixels",
-            "kind": "constant"
-        },
-        {
-            "trigger": "SCR_W",
-            "contents": "SCR_W",
-            "details": "Screen width in chars (40)",
-            "kind": "constant"
-        },
-        {
-            "trigger": "SCR_H",
-            "contents": "SCR_H",
-            "details": "Screen height in chars (30)",
-            "kind": "constant"
-        },
-        {
-            "trigger": "CENTER_X",
-            "contents": "CENTER_X",
-            "details": "X-coordinate of the screen center (160)",
-            "kind": "constant"
-        },
-        {
-            "trigger": "CENTER_Y",
-            "contents": "CENTER_Y",
-            "details": "Y-coordinate of the screen center (120)",
-            "kind": "constant"
-        },
-        {
-            "trigger": "SCR_SIZE",
-            "contents": "SCR_SIZE",
-            "details": "Total screen size in pixels (76800)",
-            "kind": "constant"
-        },
-        {
-            "trigger": "MEM_END",
-            "contents": "MEM_END",
-            "details": "End of available memory",
-            "kind": "constant"
-        },
-        {
-            "trigger": "CUSTOM_FONT",
-            "contents": "CUSTOM_FONT",
-            "details": "Address for a custom font",
-            "kind": "constant"
-        },
-        {
-            "trigger": "COLOR_BLACK",
-            "contents": "COLOR_BLACK",
-            "details": "0x00 Black",
-            "kind": "constant"
-        },
-        {
-            "trigger": "COLOR_DARK_BLUE",
-            "contents": "COLOR_DARK_BLUE",
-            "details": "0x17 Dark Blue",
-            "kind": "constant"
-        },
-        {
-            "trigger": "COLOR_DARK_PURPLE",
-            "contents": "COLOR_DARK_PURPLE",
-            "details": "0x27 Dark Purple",
-            "kind": "constant"
-        },
-        {
-            "trigger": "COLOR_CYAN",
-            "contents": "COLOR_CYAN",
-            "details": "0x37 Cyan",
-            "kind": "constant"
-        },
-        {
-            "trigger": "COLOR_BRIGHT_RED",
-            "contents": "COLOR_BRIGHT_RED",
-            "details": "0x47 Bright Red",
-            "kind": "constant"
-        },
-        {
-            "trigger": "COLOR_MAGENTA",
-            "contents": "COLOR_MAGENTA",
-            "details": "0x57 Magenta",
-            "kind": "constant"
-        },
-        {
-            "trigger": "COLOR_ORANGE",
-            "contents": "COLOR_ORANGE",
-            "details": "0x58 Orange",
-            "kind": "constant"
-        },
-        {
-            "trigger": "COLOR_BRIGHT_YELLOW",
-            "contents": "COLOR_BRIGHT_YELLOW",
-            "details": "0x67 Bright Yellow",
-            "kind": "constant"
-        },
-        {
-            "trigger": "COLOR_MEDIUM_GREY",
-            "contents": "COLOR_MEDIUM_GREY",
-            "details": "0x78 Medium Grey",
-            "kind": "constant"
-        },
-        {
-            "trigger": "COLOR_LIGHT_GREY",
-            "contents": "COLOR_LIGHT_GREY",
-            "details": "0x7C Light Grey",
-            "kind": "constant"
-        },
-        {
-            "trigger": "COLOR_WHITE",
-            "contents": "COLOR_WHITE",
-            "details": "0xF8 White",
-            "kind": "constant"
-        },
-        {
-            "trigger": "COLOR_BRIGHT_GREEN",
-            "contents": "COLOR_BRIGHT_GREEN",
-            "details": "0x87 Bright Green",
-            "kind": "constant"
-        },
-        {
-            "trigger": "COLOR_BROWN",
-            "contents": "COLOR_BROWN",
-            "details": "0xD4 Brown",
-            "kind": "constant"
-        },
-        {
-            "trigger": "COLOR_DARK_GREY",
-            "contents": "COLOR_DARK_GREY",
-            "details": "0xE1 Dark Grey",
-            "kind": "constant"
-        }
-    ]
-}

syntax/SublimeText/CurlyWASM.sublime-syntax

@@ -1,234 +0,0 @@
-%YAML 1.2
----
-# ==========================================================
-# http://www.sublimetext.com/docs/syntax.html
-# created by: zbyti & various AI
-# ==========================================================
-# For best results, use with Rust-themed color schemes like:
-# - "RustEnhanced"
-# - "Atomized"
-# - "Solarized Rust"
-# ==========================================================
-name: CurlyWASM
-file_extensions: [cwa]
-scope: source.curlywasm
-
-contexts:
-  main:
-    # Comments
-    - match: /\*
-      scope: comment.block.curlywasm
-      push: block_comment
-    - match: //
-      scope: comment.line.curlywasm
-      push: line_comment
-
-    # Module system
-    - match: \b(import|include|export)\b
-      scope: keyword.control.import.curlywasm
-
-    # Declarations and definitions
-    - match: \b(fn)\b
-      scope: keyword.declaration.function.curlywasm
-
-    - match: \b(const)\b
-      scope: storage.modifier.const.curlywasm
-
-    - match: \b(global|mut|let|lazy|inline)\b
-      scope: storage.modifier.curlywasm
-
-    # Control flow
-    - match: \b(if|else|block|loop|branch|branch_if)\b
-      scope: keyword.control.flow.curlywasm
-
-    # Type conversion
-    - match: \b(as)\b
-      scope: keyword.operator.type.curlywasm
-
-    # WASM memory access operators
-    - match: \b(load|store)\b
-      scope: keyword.operator.memory.curlywasm
-
-    # API functions
-    - match: \b(sin|cos|tan|asin|acos|atan|atan2|pow|log|fmod|random|randomf|randomSeed|cls|setPixel|getPixel|hline|rectangle|circle|line|time|isButtonPressed|isButtonTriggered|printChar|printString|printInt|setTextColor|setBackgroundColor|setCursorPosition|rectangleOutline|circleOutline|exp|playNote|sndGes|blitSprite|grabSprite)\b
-      scope: support.function.curlywasm
-
-    # Built-in functions
-    - match: \b(start|upd|sqrt|min|max|ceil|floor|trunc|nearest|abs|copysign|select)\b
-      scope: support.function.curlywasm
-
-    # Data blocks - Match 'data {' together and push context
-    - match: \b(data)\s*(\{)
-      captures:
-        1: storage.type.data.curlywasm
-        2: punctuation.section.block.begin.curlywasm
-      push: data_content
-
-    # Base types
-    - match: \b(i8|i16|i32|i64|f32|f64)\b
-      scope: storage.type.primitive.curlywasm
-
-    # Memory access operators
-    - match: (\?|\$|\!)
-      scope: keyword.operator.memory.curlywasm
-
-    # Operators
-    - match: (->)
-      scope: keyword.operator.arrow.curlywasm
-
-    # Assignment operators
-    - match: (=|:=|\+=|-=|\*=|/=|%=|&=|\|=|\^=|#/=)
-      scope: keyword.operator.assignment.curlywasm
-
-    # Arithmetic operators
-    - match: (\+|-|\*|/|%|#/|#%)
-      scope: keyword.operator.arithmetic.curlywasm
-
-    # Bitwise operators
-    - match: (\&|\||\^|<<|>>|#>>)
-      scope: keyword.operator.bitwise.curlywasm
-
-    # Comparison operators
-    - match: (<|>|<=|>=|#<|#<=|#>|#>=|==|!=)
-      scope: keyword.operator.comparison.curlywasm
-
-    # Other operators
-    - match: (<\|)
-      scope: keyword.operator.misc.curlywasm
-
-    # Numeric literals
-    - match: \b(0x[0-9a-fA-F]+)\b
-      scope: constant.numeric.hex.curlywasm
-
-    - match: '\b\d+(_f)\b'
-      scope: constant.numeric.float.curlywasm
-
-    - match: \b0x[0-9a-fA-F]+_f\b
-      scope: constant.numeric.float.curlywasm
-
-    - match: \b([0-9]+\.[0-9]+)\b
-      scope: constant.numeric.float.curlywasm
-
-    - match: \b([0-9]+)\b
-      scope: constant.numeric.integer.curlywasm
-
-    # String literals
-    - match: \"
-      scope: punctuation.definition.string.begin.curlywasm
-      push: double_quoted_string
-    - match: \'
-      scope: punctuation.definition.string.begin.curlywasm
-      push: single_quoted_string
-
-    # Function calls
-    - match: \b([a-zA-Z_][a-zA-Z0-9_]*)\s*\(
-      captures:
-        1: entity.name.function.call.curlywasm
-
-    # Function declarations
-    - match: \bfn\s+([a-zA-Z_][a-zA-Z0-9_]*)\b
-      captures:
-        1: entity.name.function.declaration.curlywasm
-
-    # Constants (Upper case convention)
-    - match: \b([A-Z_][A-Z0-9_]*)\b
-      scope: constant.other.curlywasm
-
-    # Variables (Lower case convention)
-    - match: \b([a-z_][a-zA-Z0-9_]*)\b
-      scope: variable.other.curlywasm
-
-    # Punctuation
-    - match: \{
-      scope: punctuation.section.block.begin.curlywasm
-    - match: \}
-      scope: punctuation.section.block.end.curlywasm
-    - match: \(
-      scope: punctuation.section.group.begin.curlywasm
-    - match: \)
-      scope: punctuation.section.group.end.curlywasm
-    - match: \[
-      scope: punctuation.section.brackets.begin.curlywasm
-    - match: \]
-      scope: punctuation.section.brackets.end.curlywasm
-    - match: ;
-      scope: punctuation.terminator.curlywasm
-    - match: \,
-      scope: punctuation.separator.curlywasm
-    - match: ':'
-      scope: punctuation.separator.type.curlywasm
-
-  # Context for /* ... */ block comments
-  block_comment:
-    - meta_scope: comment.block.curlywasm
-    - match: \*/
-      scope: punctuation.definition.comment.end.curlywasm
-      pop: true
-
-  # Context for // ... line comments
-  line_comment:
-    - meta_scope: comment.line.double-slash.curlywasm
-    - match: $ # Pop at the end of the line
-      pop: true
-
-  # Context for "..." strings
-  double_quoted_string:
-    - meta_scope: string.quoted.double.curlywasm
-    - match: \"
-      scope: punctuation.definition.string.end.curlywasm
-      pop: true
-    - match: \\. # Escape sequences
-      scope: constant.character.escape.curlywasm
-
-  # Context for '...' strings
-  single_quoted_string:
-    - meta_scope: string.quoted.single.curlywasm
-    - match: \'
-      scope: punctuation.definition.string.end.curlywasm
-      pop: true
-    - match: \\. # Escape sequences
-      scope: constant.character.escape.curlywasm
-
-  # Context for the content inside data { ... }
-  data_content:
-    - meta_scope: meta.data.content.curlywasm
-    # Match the closing brace to pop the context
-    - match: \}
-      scope: punctuation.section.block.end.curlywasm
-      pop: true
-    # Include rules for literals within the data block
-    - include: literals
-    # Specific types/keywords allowed inside data blocks
-    - match: \b(i8|i16|i32|i64|f32|f64)\b
-      scope: storage.type.primitive.curlywasm
-    - match: \b(file)\b
-      scope: keyword.control.curlywasm
-    # Punctuation inside data blocks
-    - match: \(
-      scope: punctuation.section.group.begin.curlywasm
-    - match: \)
-      scope: punctuation.section.group.end.curlywasm
-    - match: \,
-      scope: punctuation.separator.curlywasm
-    # Potentially allow comments inside data blocks
-    - include: block_comment
-    - include: line_comment
-
-  # Reusable patterns for literals (used via include)
-  literals:
-    # Numeric literals
-    - match: \b(0x[0-9a-fA-F]+)\b
-      scope: constant.numeric.hex.curlywasm
-    - match: '\b\d+(_f)\b'
-      scope: constant.numeric.float.curlywasm
-    - match: \b([0-9]+\.[0-9]+)\b
-      scope: constant.numeric.float.curlywasm
-    - match: \b([0-9]+)\b
-      scope: constant.numeric.integer.curlywasm
-    # String literals
-    - match: \"
-      scope: punctuation.definition.string.begin.curlywasm
-      push: double_quoted_string
-    - match: \'
-      scope: punctuation.definition.string.begin.curlywasm
-      push: single_quoted_string

syntax/SublimeText/data-block.sublime-snippet

@@ -1,11 +0,0 @@
-<snippet>
-    <content><![CDATA[
-data ${1:address} {
-    ${2:type}(
-        ${3:values}
-    )
-}
-]]></content>
-    <tabTrigger>datatype</tabTrigger>
-    <description>Data block definition</description>
-</snippet>

syntax/SublimeText/fn-export.sublime-snippet

@@ -1,9 +0,0 @@
-<snippet>
-    <content><![CDATA[
-export fn ${1:name}(${2:params}) -> ${3:return_type} {
-    ${4:// Function body}
-}
-]]></content>
-    <tabTrigger>fnexport</tabTrigger>
-    <description>Exported function definition</description>
-</snippet>

syntax/SublimeText/if-else.sublime-snippet

@@ -1,11 +0,0 @@
-<snippet>
-    <content><![CDATA[
-if ${1:condition} {
-    ${2:// Your if code here}
-} else {
-    ${3:// Your else code here}
-}
-]]></content>
-    <tabTrigger>ifelse</tabTrigger>
-    <description>If-else statement</description>
-</snippet>

syntax/SublimeText/let-inline.sublime-snippet

@@ -1,7 +0,0 @@
-<snippet>
-    <content><![CDATA[
-let inline ${1:variable} = ${2:value};
-]]></content>
-    <tabTrigger>letinline</tabTrigger>
-    <description>Lazy variable declaration</description>
-</snippet>

syntax/SublimeText/let-lazy.sublime-snippet

@@ -1,7 +0,0 @@
-<snippet>
-    <content><![CDATA[
-let lazy ${1:variable} = ${2:value};
-]]></content>
-    <tabTrigger>letlazy</tabTrigger>
-    <description>Lazy variable declaration</description>
-</snippet>

syntax/SublimeText/loop-branch_if.sublime-snippet

@@ -1,11 +0,0 @@
-<snippet>
-    <content><![CDATA[
-${1:label} = 0;
-loop ${1:label} {
-    ${2:// Your loop code here}
-    branch_if ${3:condition}: ${1:label};
-}
-]]></content>
-    <tabTrigger>loopbr</tabTrigger>
-    <description>Loop with branch_if</description>
-</snippet>

test.cwa

@@ -0,0 +1,13 @@
+import "env.memory" memory(4);
+import "env.printString" fn print(i32);
+
+export fn upd() {
+}
+
+start fn start() {
+    print(0);
+}
+
+data 0 {
+    "Press " i8(0xe0) " and " i8(0xe1) " to adjust, " i8(0xcc) " to commit." i8(0)
+}

test/ges_test.cwa

@@ -2,18 +2,17 @@ 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.exp" fn exp(f32) -> f32;
 import "env.rectangle" fn rectangle(f32, f32, f32, f32, i32);
 
 include "../platform/src/ges.cwa"
 
 export fn snd(t: i32) -> f32 {
-    sndGes(t)
+    gesSnd(t)
 }
 
 export fn upd() {
     80?0 = 32!32 / 200 & 2 | 0x41;
-    80?3 = (32!32 / 400)%8*12/7 + 40;
+    80?3 = (32!32 / 400)%7*12/7 + 40;
     let pulse = (32!32 * 256 / 2000) & 511;
     if pulse >= 256 {
         pulse = 511 - pulse;

test/start_fn.cwa

@@ -1,5 +0,0 @@
-include "../examples/include/microw8-api.cwa"
-
-export fn start() {
-	printChar('Test');
-}

test/text_modes.cwa

@@ -1,13 +0,0 @@
-include "../examples/include/microw8-api.cwa"
-
-export fn upd() {
-	printString(USER_MEM);
-}
-
-data USER_MEM {
-	i8(12, 31, 5, 6) "Text mode"
-	i8(5, 31, 4, 5) "Graphics mode"
-	i8(6) "Console output\nSecond line\n"
-	i8(4, 31, 4, 12) "Back to text mode"
-	i8(0)
-}

uw8-tool/Cargo.lock

@@ -4,27 +4,21 @@ version = 3
 
 [[package]]
 name = "anyhow"
-version = "1.0.81"
+version = "1.0.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
+checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
-
-[[package]]
-name = "bitflags"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "cc"
-version = "1.0.92"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41"
+checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
 
 [[package]]
 name = "cdivsufsort"
@@ -37,55 +31,31 @@ dependencies = [
 ]
 
 [[package]]
-name = "crossbeam-channel"
-version = "0.5.12"
+name = "cfg-if"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
 dependencies = [
+ "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.19"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "fallible-iterator"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
-
-[[package]]
-name = "gimli"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
+checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
 dependencies = [
- "fallible-iterator",
- "indexmap 1.9.3",
- "stable_deref_trait",
+ "cfg-if",
+ "lazy_static",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "hashbrown"
-version = "0.14.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
-
 [[package]]
 name = "heck"
 version = "0.3.3"
@@ -102,24 +72,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005"
 
 [[package]]
-name = "indexmap"
-version = "1.9.3"
+name = "lazy_static"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
-dependencies = [
- "equivalent",
- "hashbrown 0.14.3",
-]
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "leb128"
@@ -127,64 +83,62 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
 
-[[package]]
-name = "lexopt"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478ee9e62aaeaf5b140bd4138753d1f109765488581444218d3ddda43234f3e8"
-
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.112"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+dependencies = [
+ "cfg-if",
+]
 
 [[package]]
 name = "num-traits"
-version = "0.2.18"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "pbr"
-version = "1.1.1"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed5827dfa0d69b6c92493d6c38e633bbaa5937c153d0d7c28bf12313f8c6d514"
+checksum = "ff5751d87f7c00ae6403eb1fcbba229b9c76c9a30de8c1cf87182177b168cea2"
 dependencies = [
  "crossbeam-channel",
  "libc",
+ "time",
  "winapi",
 ]
 
 [[package]]
 name = "pico-args"
-version = "0.5.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
+checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.79"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
 dependencies = [
- "unicode-ident",
+ "unicode-xid",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d"
 dependencies = [
  "proc-macro2",
 ]
@@ -198,81 +152,49 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "semver"
-version = "1.0.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "1.0.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+checksum = "ecb2e6da8ee5eb9a61068762a32fa9619cc591ceb055b3687f4cd4051ec2e06b"
 dependencies = [
  "proc-macro2",
  "quote",
- "unicode-ident",
+ "unicode-xid",
 ]
 
 [[package]]
-name = "syn"
-version = "2.0.58"
+name = "time"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
 dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
+ "libc",
+ "wasi",
+ "winapi",
 ]
 
-[[package]]
-name = "thiserror"
-version = "1.0.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.58",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
 [[package]]
 name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
 
 [[package]]
 name = "upkr"
-version = "0.2.1"
-source = "git+https://github.com/exoticorn/upkr.git?rev=080db40d0088bbee2bdf3c5c75288ac7853d6b7a#080db40d0088bbee2bdf3c5c75288ac7853d6b7a"
+version = "0.1.0"
+source = "git+https://github.com/exoticorn/upkr.git?rev=d93aec186c9fb91d962c488682a2db125c61306c#d93aec186c9fb91d962c488682a2db125c61306c"
 dependencies = [
  "anyhow",
  "cdivsufsort",
- "lexopt",
- "thiserror",
+ "pbr",
+ "pico-args",
 ]
 
 [[package]]
@@ -284,24 +206,22 @@ dependencies = [
  "pico-args",
  "upkr",
  "walrus",
- "wasm-encoder 0.201.0",
- "wasmparser 0.201.0",
+ "wasm-encoder",
+ "wasmparser 0.81.0",
 ]
 
 [[package]]
 name = "walrus"
-version = "0.20.3"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c03529cd0c4400a2449f640d2f27cd1b48c3065226d15e26d98e4429ab0adb7"
+checksum = "4eb08e48cde54c05f363d984bb54ce374f49e242def9468d2e1b6c2372d291f8"
 dependencies = [
  "anyhow",
- "gimli",
  "id-arena",
  "leb128",
  "log",
  "walrus-macro",
- "wasm-encoder 0.29.0",
- "wasmparser 0.80.2",
+ "wasmparser 0.77.0",
 ]
 
 [[package]]
@@ -313,43 +233,35 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
-name = "wasm-encoder"
-version = "0.29.0"
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881"
-dependencies = [
- "leb128",
-]
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
 [[package]]
 name = "wasm-encoder"
-version = "0.201.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9c7d2731df60006819b013f64ccc2019691deccf6e11a1804bc850cd6748f1a"
+checksum = "db0c351632e46cc06a58a696a6c11e4cf90cad4b9f8f07a0b59128d616c29bb0"
 dependencies = [
  "leb128",
 ]
 
 [[package]]
 name = "wasmparser"
-version = "0.80.2"
+version = "0.77.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "449167e2832691a1bff24cde28d2804e90e09586a448c8e76984792c44334a6b"
+checksum = "b35c86d22e720a07d954ebbed772d01180501afe7d03d464f413bb5f8914a8d6"
 
 [[package]]
 name = "wasmparser"
-version = "0.201.0"
+version = "0.81.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84e5df6dba6c0d7fafc63a450f1738451ed7a0b52295d83e868218fa286bf708"
-dependencies = [
- "bitflags",
- "indexmap 2.2.6",
- "semver",
-]
+checksum = "98930446519f63d00a836efdc22f67766ceae8dbcc1571379f2bcabc6b2b9abc"
 
 [[package]]
 name = "winapi"

uw8-tool/Cargo.toml

@@ -6,10 +6,10 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-wasmparser = "0.201"
-wasm-encoder = "0.201"
-walrus = { version = "0.20.3", default-features = false }
+wasmparser = "0.81"
+wasm-encoder = "0.8"
+walrus = "0.19"
 anyhow = "1"
-pico-args = "0.5"
-upkr = { git = "https://github.com/exoticorn/upkr.git", rev = "080db40d0088bbee2bdf3c5c75288ac7853d6b7a" }
+pico-args = "0.4"
+upkr = { git = "https://github.com/exoticorn/upkr.git", rev = "d93aec186c9fb91d962c488682a2db125c61306c" }
 pbr = "1"

uw8-tool/src/base_module.rs

@@ -3,7 +3,7 @@ use std::{collections::HashMap, fs::File, path::Path};
 use anyhow::{bail, Result};
 use std::io::prelude::*;
 use wasm_encoder::{
-    CodeSection, EntityType, ExportKind, ExportSection, Function, FunctionSection, ImportSection,
+    CodeSection, EntityType, Export, ExportSection, Function, FunctionSection, ImportSection,
     Instruction, MemoryType, Module, TypeSection, ValType,
 };
 use ValType::*;
@@ -37,7 +37,7 @@ impl BaseModule {
 
         let mut types = vec![];
         let mut type_map = HashMap::new();
-        for num_params in 0..8 {
+        for num_params in 0..6 {
             for num_f32 in 0..=num_params {
                 for &result in &[None, Some(ValType::I32), Some(ValType::F32)] {
                     let mut params = vec![];
@@ -152,14 +152,14 @@ impl BaseModule {
         add_function(
             &mut functions,
             &type_map,
-            "rectangleOutline",
+            "rectangle_outline",
             &[F32, F32, F32, F32, I32],
             None,
         );
         add_function(
             &mut functions,
             &type_map,
-            "circleOutline",
+            "circle_outline",
             &[F32, F32, F32, I32],
             None,
         );
@@ -169,21 +169,6 @@ impl BaseModule {
         add_function(&mut functions, &type_map, "playNote", &[I32, I32], None);
         add_function(&mut functions, &type_map, "sndGes", &[I32], Some(F32));
 
-        add_function(
-            &mut functions,
-            &type_map,
-            "blitSprite",
-            &[I32, I32, I32, I32, I32],
-            None,
-        );
-        add_function(
-            &mut functions,
-            &type_map,
-            "grabSprite",
-            &[I32, I32, I32, I32, I32],
-            None,
-        );
-
         for i in functions.len()..64 {
             add_function(
                 &mut functions,
@@ -233,13 +218,13 @@ impl BaseModule {
             let mut imports = ImportSection::new();
 
             for (module, name, type_) in &self.function_imports {
-                imports.import(*module, name.as_str(), EntityType::Function(*type_));
+                imports.import(*module, Some(name.as_str()), EntityType::Function(*type_));
             }
 
             for (module, name, import) in &self.global_imports {
                 imports.import(
                     *module,
-                    name.as_str(),
+                    Some(name.as_str()),
                     EntityType::Global(wasm_encoder::GlobalType {
                         val_type: import.type_,
                         mutable: import.mutable,
@@ -249,12 +234,11 @@ impl BaseModule {
 
             imports.import(
                 "env",
-                "memory",
+                Some("memory"),
                 MemoryType {
                     minimum: self.memory as u64,
                     maximum: None,
                     memory64: false,
-                    shared: false,
                 },
             );
 
@@ -275,7 +259,7 @@ impl BaseModule {
             let mut exports = ExportSection::new();
 
             for (name, fnc) in &self.exports {
-                exports.export(*name, ExportKind::Func, *fnc);
+                exports.export(*name, Export::Function(*fnc));
             }
 
             module.section(&exports);
@@ -303,7 +287,7 @@ impl BaseModule {
 
     pub fn create_binary(path: &Path) -> Result<()> {
         let base1 = BaseModule::for_format_version(1)?.to_wasm();
-        let data = upkr::pack(&base1, 4, &upkr::Config::default(), None);
+        let data = upkr::pack(&base1, 4, false, None);
         File::create(path)?.write_all(&data)?;
         Ok(())
     }

uw8-tool/src/filter_exports.rs

@@ -1,17 +1,13 @@
-use anyhow::Result;
 use std::path::Path;
+use anyhow::Result;
 
 pub fn filter_exports(in_path: &Path, out_path: &Path) -> Result<()> {
     let mut module = walrus::Module::from_file(in_path)?;
 
-    let exports_to_delete: Vec<_> = module
-        .exports
-        .iter()
-        .filter_map(|export| match export.name.as_str() {
-            "start" | "upd" | "snd" => None,
-            _ => Some(export.id()),
-        })
-        .collect();
+    let exports_to_delete: Vec<_> = module.exports.iter().filter_map(|export| match export.name.as_str() {
+        "upd" => None,
+        _ => Some(export.id())
+    }).collect();
 
     for id in exports_to_delete {
         module.exports.delete(id);

uw8-tool/src/pack.rs

@@ -10,7 +10,7 @@ use std::{
 use wasm_encoder as enc;
 use wasmparser::{
     BinaryReader, ExportSectionReader, ExternalKind, FunctionBody, FunctionSectionReader,
-    ImportSectionReader, TableSectionReader, TypeRef, TypeSectionReader,
+    ImportSectionEntryType, ImportSectionReader, TableSectionReader, TypeSectionReader,
 };
 
 pub struct PackConfig {
@@ -63,7 +63,7 @@ pub fn pack(data: &[u8], config: &PackConfig) -> Result<Vec<u8>> {
         uw8.extend_from_slice(&upkr::pack(
             &result[8..],
             level,
-            &upkr::Config::default(),
+            false,
             Some(&mut |pos| {
                 pb.set(pos as u64);
             }),
@@ -90,10 +90,7 @@ pub fn unpack(data: Vec<u8>) -> Result<Vec<u8>> {
     let (version, data) = match data[0] {
         0 => return Ok(data),
         1 => (1, data[1..].to_vec()),
-        2 => (
-            1,
-            upkr::unpack(&data[1..], &upkr::Config::default(), 4 * 1024 * 1024)?,
-        ),
+        2 => (1, upkr::unpack(&data[1..], false)),
         other => bail!("Uknown format version {}", other),
     };
 
@@ -136,8 +133,8 @@ pub fn unpack(data: Vec<u8>) -> Result<Vec<u8>> {
     Ok(dest)
 }
 
-fn to_val_type(type_: &wasmparser::ValType) -> Result<ValType> {
-    use wasmparser::ValType::*;
+fn to_val_type(type_: &wasmparser::Type) -> Result<ValType> {
+    use wasmparser::Type::*;
     Ok(match *type_ {
         I32 => ValType::I32,
         I64 => ValType::I64,
@@ -147,7 +144,7 @@ fn to_val_type(type_: &wasmparser::ValType) -> Result<ValType> {
     })
 }
 
-fn to_val_type_vec(types: &[wasmparser::ValType]) -> Result<Vec<ValType>> {
+fn to_val_type_vec(types: &[wasmparser::Type]) -> Result<Vec<ValType>> {
     types.into_iter().map(to_val_type).collect()
 }
 
@@ -205,7 +202,7 @@ impl<'a> ParsedModule<'a> {
                     import_section = Some(Section::new(range, ImportSection::parse(reader)?));
                 }
                 Payload::GlobalSection(reader) => {
-                    global_section = Some(Section::new(range, reader.count()));
+                    global_section = Some(Section::new(range, reader.get_count()));
                 }
                 Payload::FunctionSection(reader) => {
                     function_section = Some(Section::new(range, read_function_section(reader)?));
@@ -224,21 +221,21 @@ impl<'a> ParsedModule<'a> {
                     table_section = Some(Section::new(range, ()));
                 }
                 Payload::MemorySection(reader) => {
-                    if reader.count() != 0 {
+                    if reader.get_count() != 0 {
                         bail!("Found non-empty MemorySection. Memory has to be imported!");
                     }
                 }
-                Payload::ElementSection(reader) => {
-                    let mut elements = Vec::with_capacity(reader.count() as usize);
-                    for element in reader {
-                        elements.push(Element::parse(element?)?);
+                Payload::ElementSection(mut reader) => {
+                    let mut elements = Vec::with_capacity(reader.get_count() as usize);
+                    for _ in 0..reader.get_count() {
+                        elements.push(Element::parse(reader.read()?)?);
                     }
                     element_section = Some(elements);
                 }
                 Payload::CodeSectionStart { .. } => (),
                 Payload::CodeSectionEntry(body) => function_bodies.push(body),
                 Payload::CustomSection { .. } => (),
-                Payload::End(..) => break,
+                Payload::End => break,
                 other => bail!("Unsupported section: {:?}", other),
             }
 
@@ -466,7 +463,7 @@ impl<'a> ParsedModule<'a> {
             {
                 let mut export_section = enc::ExportSection::new();
                 for (name, fnc) in my_exports {
-                    export_section.export(&name, enc::ExportKind::Func, fnc);
+                    export_section.export(&name, enc::Export::Function(fnc));
                 }
                 module.section(&export_section);
             }
@@ -489,7 +486,8 @@ impl<'a> ParsedModule<'a> {
                 }
                 element_section.active(
                     None,
-                    &wasm_encoder::ConstExpr::i32_const(element.start_index as i32),
+                    &wasm_encoder::Instruction::I32Const(element.start_index as i32),
+                    ValType::FuncRef,
                     wasm_encoder::Elements::Functions(&functions),
                 );
             }
@@ -535,32 +533,30 @@ fn copy_section(module: &mut wasm_encoder::Module, data: &[u8]) -> Result<()> {
 fn read_type_section(reader: TypeSectionReader) -> Result<Vec<base_module::FunctionType>> {
     let mut function_types = vec![];
 
-    for rec_group in reader {
-        for sub_type in rec_group?.into_types() {
-            match sub_type.composite_type {
-                wasmparser::CompositeType::Func(fnc) => {
-                    if fnc.results().len() > 1 {
+    for type_def in reader {
+        match type_def? {
+            wasmparser::TypeDef::Func(fnc) => {
+                if fnc.returns.len() > 1 {
                     bail!("Multi-value not supported");
                 }
-                    let params = to_val_type_vec(fnc.params())?;
-                    let result = to_val_type_vec(fnc.results())?.into_iter().next();
+                let params = to_val_type_vec(&fnc.params)?;
+                let result = to_val_type_vec(&fnc.returns)?.into_iter().next();
                 function_types.push(FunctionType { params, result });
             }
-                _ => bail!("Only function types are supported"),
-            }
+            t => bail!("Unsupported type def {:?}", t),
         }
     }
 
     Ok(function_types)
 }
 
-fn validate_table_section(reader: TableSectionReader) -> Result<()> {
-    if reader.count() != 1 {
+fn validate_table_section(mut reader: TableSectionReader) -> Result<()> {
+    if reader.get_count() != 1 {
         bail!("Only up to one table supported");
     }
 
-    let table = reader.into_iter().next().unwrap()?;
-    if !table.ty.element_type.is_func_ref() {
+    let type_ = reader.read()?;
+    if type_.element_type != wasmparser::Type::FuncRef {
         bail!("Only one funcref table is supported");
     }
 
@@ -594,20 +590,21 @@ impl ImportSection {
 
         for import in reader {
             let import = import?;
+            if let Some(field) = import.field {
                 match import.ty {
-                TypeRef::Func(type_) => {
+                    ImportSectionEntryType::Function(type_) => {
                         functions.push(FunctionImport {
                             module: import.module.to_string(),
-                        field: import.name.to_string(),
+                            field: field.to_string(),
                             type_,
                         });
                     }
-                TypeRef::Memory(mem) => {
-                    if import.module != "env" || import.name != "memory" {
+                    ImportSectionEntryType::Memory(mem) => {
+                        if import.module != "env" || field != "memory" {
                             bail!(
                                 "Wrong name of memory import {}.{}, should be env.memory",
                                 import.module,
-                            import.name
+                                field
                             );
                         }
                         if mem.memory64 || mem.shared {
@@ -615,10 +612,10 @@ impl ImportSection {
                         }
                         memory = mem.maximum.unwrap_or(mem.initial) as u32;
                     }
-                TypeRef::Global(glbl) => {
+                    ImportSectionEntryType::Global(glbl) => {
                         globals.push(GlobalImport {
                             module: import.module.to_string(),
-                        field: import.name.to_string(),
+                            field: field.to_string(),
                             type_: GlobalType {
                                 type_: to_val_type(&glbl.content_type)?,
                                 mutable: glbl.mutable,
@@ -627,6 +624,12 @@ impl ImportSection {
                     }
                     _ => bail!("Unsupported import item {:?}", import.ty),
                 }
+            } else {
+                bail!(
+                    "Found import without field, only module '{}'",
+                    import.module
+                );
+            }
         }
 
         Ok(ImportSection {
@@ -645,20 +648,17 @@ struct Element {
 
 impl Element {
     fn parse(element: wasmparser::Element) -> Result<Element> {
-        match element.items {
-            wasmparser::ElementItems::Functions(funcs_reader) => {
+        if element.ty != wasmparser::Type::FuncRef {
+            bail!("Table element type is not FuncRef");
+        }
+
         let start_index = if let wasmparser::ElementKind::Active {
-                    offset_expr,
-                    table_index,
+            init_expr,
+            table_index: 0,
         } = element.kind
         {
-                    if table_index.map(|i| i > 0).unwrap_or(false) {
-                        bail!("Only function table with index 0 is supported");
-                    }
-                    let mut init_reader = offset_expr.get_operators_reader();
-                    if let wasmparser::Operator::I32Const { value: start_index } =
-                        init_reader.read()?
-                    {
+            let mut init_reader = init_expr.get_operators_reader();
+            if let wasmparser::Operator::I32Const { value: start_index } = init_reader.read()? {
                 start_index as u32
             } else {
                 bail!("Table element start index is not a integer constant");
@@ -667,9 +667,15 @@ impl Element {
             bail!("Unsupported table element kind");
         };
 
-                let mut functions = Vec::with_capacity(funcs_reader.count() as usize);
-                for index in funcs_reader {
-                    functions.push(index?);
+        let mut items_reader = element.items.get_items_reader()?;
+
+        let mut functions = Vec::with_capacity(items_reader.get_count() as usize);
+        for _ in 0..items_reader.get_count() {
+            if let wasmparser::ElementItem::Func(index) = items_reader.read()? {
+                functions.push(index);
+            } else {
+                bail!("Table element item is not a function");
+            }
         }
 
         Ok(Element {
@@ -677,9 +683,6 @@ impl Element {
             functions,
         })
     }
-            _ => bail!("Table element type is not FuncRef"),
-        }
-    }
 }
 
 #[derive(Debug)]
@@ -709,8 +712,8 @@ fn read_export_section(reader: ExportSectionReader) -> Result<Vec<(String, u32)>
     for export in reader {
         let export = export?;
         match export.kind {
-            ExternalKind::Func => {
-                function_exports.push((export.name.to_string(), export.index));
+            ExternalKind::Function => {
+                function_exports.push((export.field.to_string(), export.index));
             }
             _ => (), // just ignore all other kinds since MicroW8 doesn't expect any exports other than functions
         }
@@ -731,11 +734,13 @@ fn remap_function(
     }
     let mut function = enc::Function::new(locals);
 
-    let block_type = |ty: wasmparser::BlockType| -> Result<enc::BlockType> {
+    let block_type = |ty: wasmparser::TypeOrFuncType| -> Result<enc::BlockType> {
         Ok(match ty {
-            wasmparser::BlockType::Empty => enc::BlockType::Empty,
-            wasmparser::BlockType::Type(ty) => enc::BlockType::Result(to_val_type(&ty)?),
-            wasmparser::BlockType::FuncType(ty) => enc::BlockType::FunctionType(
+            wasmparser::TypeOrFuncType::Type(wasmparser::Type::EmptyBlockType) => {
+                enc::BlockType::Empty
+            }
+            wasmparser::TypeOrFuncType::Type(ty) => enc::BlockType::Result(to_val_type(&ty)?),
+            wasmparser::TypeOrFuncType::FuncType(ty) => enc::BlockType::FunctionType(
                 *type_map
                     .get(&ty)
                     .ok_or_else(|| anyhow!("Function type index out of range: {}", ty))?,
@@ -749,7 +754,7 @@ fn remap_function(
             .ok_or_else(|| anyhow!("Global index out of range: {}", idx))?)
     };
 
-    fn mem(m: wasmparser::MemArg) -> enc::MemArg {
+    fn mem(m: wasmparser::MemoryImmediate) -> enc::MemArg {
         enc::MemArg {
             offset: m.offset,
             align: m.align as u32,
@@ -764,31 +769,24 @@ fn remap_function(
         function.instruction(&match op? {
             De::Unreachable => En::Unreachable,
             De::Nop => En::Nop,
-            De::Block { blockty } => En::Block(block_type(blockty)?),
-            De::Loop { blockty } => En::Loop(block_type(blockty)?),
-            De::If { blockty } => En::If(block_type(blockty)?),
+            De::Block { ty } => En::Block(block_type(ty)?),
+            De::Loop { ty } => En::Loop(block_type(ty)?),
+            De::If { ty } => En::If(block_type(ty)?),
             De::Else => En::Else,
             De::Try { .. } | De::Catch { .. } | De::Throw { .. } | De::Rethrow { .. } => todo!(),
             De::End => En::End,
             De::Br { relative_depth } => En::Br(relative_depth),
             De::BrIf { relative_depth } => En::BrIf(relative_depth),
-            De::BrTable { targets } => En::BrTable(
-                targets.targets().collect::<Result<Vec<u32>, _>>()?.into(),
-                targets.default(),
-            ),
+            De::BrTable { .. } => todo!(),
             De::Return => En::Return,
             De::Call { function_index } => En::Call(
                 *function_map
                     .get(&function_index)
                     .ok_or_else(|| anyhow!("Function index out of range: {}", function_index))?,
             ),
-            De::CallIndirect {
-                type_index,
-                table_index,
-                table_byte: _, // what is this supposed to be?
-            } => En::CallIndirect {
+            De::CallIndirect { index, table_index } => En::CallIndirect {
                 ty: *type_map
-                    .get(&type_index)
+                    .get(&index)
                     .ok_or_else(|| anyhow!("Unknown function type in call indirect"))?,
                 table: table_index,
             },
@@ -808,16 +806,16 @@ fn remap_function(
             De::I64Load { memarg } => En::I64Load(mem(memarg)),
             De::F32Load { memarg } => En::F32Load(mem(memarg)),
             De::F64Load { memarg } => En::F64Load(mem(memarg)),
-            De::I32Load8S { memarg } => En::I32Load8S(mem(memarg)),
-            De::I32Load8U { memarg } => En::I32Load8U(mem(memarg)),
-            De::I32Load16S { memarg } => En::I32Load16S(mem(memarg)),
-            De::I32Load16U { memarg } => En::I32Load16U(mem(memarg)),
-            De::I64Load8S { memarg } => En::I64Load8S(mem(memarg)),
-            De::I64Load8U { memarg } => En::I64Load8U(mem(memarg)),
-            De::I64Load16S { memarg } => En::I64Load16S(mem(memarg)),
-            De::I64Load16U { memarg } => En::I64Load16U(mem(memarg)),
-            De::I64Load32S { memarg } => En::I64Load32S(mem(memarg)),
-            De::I64Load32U { memarg } => En::I64Load32U(mem(memarg)),
+            De::I32Load8S { memarg } => En::I32Load8_S(mem(memarg)),
+            De::I32Load8U { memarg } => En::I32Load8_U(mem(memarg)),
+            De::I32Load16S { memarg } => En::I32Load16_S(mem(memarg)),
+            De::I32Load16U { memarg } => En::I32Load16_U(mem(memarg)),
+            De::I64Load8S { memarg } => En::I64Load8_S(mem(memarg)),
+            De::I64Load8U { memarg } => En::I64Load8_U(mem(memarg)),
+            De::I64Load16S { memarg } => En::I64Load16_S(mem(memarg)),
+            De::I64Load16U { memarg } => En::I64Load16_U(mem(memarg)),
+            De::I64Load32S { memarg } => En::I64Load32_S(mem(memarg)),
+            De::I64Load32U { memarg } => En::I64Load32_U(mem(memarg)),
             De::I32Store { memarg } => En::I32Store(mem(memarg)),
             De::I64Store { memarg } => En::I64Store(mem(memarg)),
             De::F32Store { memarg } => En::F32Store(mem(memarg)),
@@ -836,7 +834,7 @@ fn remap_function(
             De::RefNull { .. } | De::RefIsNull { .. } | De::RefFunc { .. } => todo!(),
             De::I32Eqz => En::I32Eqz,
             De::I32Eq => En::I32Eq,
-            De::I32Ne => En::I32Ne,
+            De::I32Ne => En::I32Neq,
             De::I32LtS => En::I32LtS,
             De::I32LtU => En::I32LtU,
             De::I32GtS => En::I32GtS,
@@ -847,7 +845,7 @@ fn remap_function(
             De::I32GeU => En::I32GeU,
             De::I64Eqz => En::I64Eqz,
             De::I64Eq => En::I64Eq,
-            De::I64Ne => En::I64Ne,
+            De::I64Ne => En::I64Neq,
             De::I64LtS => En::I64LtS,
             De::I64LtU => En::I64LtU,
             De::I64GtS => En::I64GtS,
@@ -857,13 +855,13 @@ fn remap_function(
             De::I64GeS => En::I64GeS,
             De::I64GeU => En::I64GeU,
             De::F32Eq => En::F32Eq,
-            De::F32Ne => En::F32Ne,
+            De::F32Ne => En::F32Neq,
             De::F32Lt => En::F32Lt,
             De::F32Gt => En::F32Gt,
             De::F32Le => En::F32Le,
             De::F32Ge => En::F32Ge,
             De::F64Eq => En::F64Eq,
-            De::F64Ne => En::F64Ne,
+            De::F64Ne => En::F64Neq,
             De::F64Lt => En::F64Lt,
             De::F64Gt => En::F64Gt,
             De::F64Le => En::F64Le,
@@ -970,7 +968,7 @@ fn remap_function(
             De::I64TruncSatF32U => En::I64TruncSatF32U,
             De::I64TruncSatF64S => En::I64TruncSatF64S,
             De::I64TruncSatF64U => En::I64TruncSatF64U,
-            De::MemoryCopy { src_mem, dst_mem } => En::MemoryCopy { src_mem, dst_mem },
+            De::MemoryCopy { src, dst } => En::MemoryCopy { src, dst },
             De::MemoryFill { mem } => En::MemoryFill(mem),
             other => bail!("Unsupported instruction {:?}", other),
         });

uw8-window/Cargo.toml

@@ -6,13 +6,13 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-env_logger = "0.11.3"
-winit = "0.28.6"
+winit = "0.26.1"
+env_logger = "0.9"
 log = "0.4"
-pico-args = "0.5"
-wgpu = "0.17"
-pollster = "0.3.0"
-bytemuck = { version = "1.15", features = [ "derive" ] }
+pico-args = "0.4"
+wgpu = "0.13.1"
+pollster = "0.2"
+bytemuck = { version = "1.4", features = [ "derive" ] }
 anyhow = "1"
-minifb = { version = "0.25.0", default-features = false, features = ["x11"] }
-winapi = { version = "0.3.9", features = [ "timeapi" ] }
+minifb = { version = "0.23.0", default-features = false, features = ["x11"] }
+winapi = { version = "0.3.9", features = ["std"] }

uw8-window/src/gpu/crt.rs

@@ -1,7 +1,7 @@
 use wgpu::util::DeviceExt;
 use winit::dpi::PhysicalSize;
 
-use super::{scale_mode::ScaleMode, Filter};
+use super::Filter;
 
 pub struct CrtFilter {
     uniform_buffer: wgpu::Buffer,
@@ -15,10 +15,9 @@ impl CrtFilter {
         screen: &wgpu::TextureView,
         resolution: PhysicalSize<u32>,
         surface_format: wgpu::TextureFormat,
-        scale_mode: ScaleMode,
     ) -> CrtFilter {
         let uniforms = Uniforms {
-            texture_scale: scale_mode.texture_scale_from_resolution(resolution),
+            texture_scale: texture_scale_from_resolution(resolution),
         };
 
         let uniform_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
@@ -113,9 +112,9 @@ impl CrtFilter {
 }
 
 impl Filter for CrtFilter {
-    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>, scale_mode: ScaleMode) {
+    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>) {
         let uniforms = Uniforms {
-            texture_scale: scale_mode.texture_scale_from_resolution(new_size),
+            texture_scale: texture_scale_from_resolution(new_size),
         };
         queue.write_buffer(&self.uniform_buffer, 0, bytemuck::cast_slice(&[uniforms]));
     }
@@ -127,6 +126,16 @@ impl Filter for CrtFilter {
     }
 }
 
+fn texture_scale_from_resolution(res: PhysicalSize<u32>) -> [f32; 4] {
+    let scale = ((res.width as f32) / 160.0).min((res.height as f32) / 120.0);
+    [
+        res.width as f32 / scale,
+        res.height as f32 / scale,
+        2.0 / scale,
+        0.0,
+    ]
+}
+
 #[repr(C)]
 #[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
 struct Uniforms {

uw8-window/src/gpu/crt.wgsl

@@ -17,7 +17,7 @@ fn vs_main(
     let i = in_vertex_index / 3u + in_vertex_index % 3u;
     let x = -1.0 + f32(i % 2u) * 322.0;
     let y = -1.0 + f32(i / 2u) * 242.0;
-    out.clip_position = vec4<f32>((vec2<f32>(x, y) - vec2<f32>(160.0, 120.0)) * uniforms.texture_scale.xy, 0.0, 1.0);
+    out.clip_position = vec4<f32>((vec2<f32>(x, y) - vec2<f32>(160.0, 120.0)) / uniforms.texture_scale.xy, 0.0, 1.0);
     out.tex_coords = vec2<f32>(x, y);
     return out;
 }
@@ -36,36 +36,36 @@ fn sample_pixel(coords: vec2<i32>, offset: vec4<f32>) -> vec3<f32> {
 
 @fragment
 fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
-    let pixelf = floor(in.tex_coords);
-    let o = vec2<f32>(0.5) - (in.tex_coords - pixelf);
-    let pixel = vec2<i32>(pixelf);
+    let pixel = floor(in.tex_coords);
+    let o = vec2<f32>(0.5) - (in.tex_coords - pixel);
+    let pixel = vec2<i32>(pixel);
     
     let offset_x = o.xxxx + vec4<f32>(-0.125, 0.375, 0.125, -0.375) * uniforms.texture_scale.z;
     let offset_y = o.yyyy + vec4<f32>(-0.375, -0.125, 0.375, 0.125) * uniforms.texture_scale.z;
     
-    var offset_x0 = max(abs(offset_x + vec4<f32>(-1.0)) - vec4<f32>(0.5), vec4<f32>(0.0));
-    var offset_x1 = max(abs(offset_x) - vec4<f32>(0.5), vec4<f32>(0.0));
-    var offset_x2 = max(abs(offset_x + vec4<f32>(1.0)) - vec4<f32>(0.5), vec4<f32>(0.0));
+    let offset_x0 = max(abs(offset_x + vec4<f32>(-1.0)) - vec4<f32>(0.5), vec4<f32>(0.0));
+    let offset_x1 = max(abs(offset_x) - vec4<f32>(0.5), vec4<f32>(0.0));
+    let offset_x2 = max(abs(offset_x + vec4<f32>(1.0)) - vec4<f32>(0.5), vec4<f32>(0.0));
     
-    offset_x0 = offset_x0 * offset_x0;
-    offset_x1 = offset_x1 * offset_x1;
-    offset_x2 = offset_x2 * offset_x2;
+    let offset_x0 = offset_x0 * offset_x0;
+    let offset_x1 = offset_x1 * offset_x1;
+    let offset_x2 = offset_x2 * offset_x2;
     
-    var offset_yr = offset_y + vec4<f32>(-1.0);
-    offset_yr = vec4<f32>(0.02) + offset_yr * offset_yr;
+    let offset_yr = offset_y + vec4<f32>(-1.0);
+    let offset_yr = vec4<f32>(0.02) + offset_yr * offset_yr;
     
     var acc = sample_pixel(pixel + vec2<i32>(-1, -1), offset_x0 + offset_yr);
     acc = acc + sample_pixel(pixel + vec2<i32>(0, -1), offset_x1 + offset_yr);
     acc = acc + sample_pixel(pixel + vec2<i32>(1, -1), offset_x2 + offset_yr);
 
-    offset_yr = vec4<f32>(0.02) + offset_y * offset_y;
+    let offset_yr = vec4<f32>(0.02) + offset_y * offset_y;
     
     acc = acc + sample_pixel(pixel + vec2<i32>(-1, 0), offset_x0 + offset_yr);
     acc = acc + sample_pixel(pixel, offset_x1 + offset_yr);
     acc = acc + sample_pixel(pixel + vec2<i32>(1, 0), offset_x2 + offset_yr);
 
-    offset_yr = offset_y + vec4<f32>(1.0);
-    offset_yr = vec4<f32>(0.02) + offset_yr * offset_yr;
+    let offset_yr = offset_y + vec4<f32>(1.0);
+    let offset_yr = vec4<f32>(0.02) + offset_yr * offset_yr;
     
     acc = acc + sample_pixel(pixel + vec2<i32>(-1, 1), offset_x0 + offset_yr);
     acc = acc + sample_pixel(pixel + vec2<i32>(0, 1), offset_x1 + offset_yr);

uw8-window/src/gpu/fast_crt.rs

@@ -1,7 +1,7 @@
 use wgpu::util::DeviceExt;
 use winit::dpi::PhysicalSize;
 
-use super::{scale_mode::ScaleMode, Filter};
+use super::Filter;
 
 pub struct FastCrtFilter {
     uniform_buffer: wgpu::Buffer,
@@ -16,10 +16,9 @@ impl FastCrtFilter {
         resolution: PhysicalSize<u32>,
         surface_format: wgpu::TextureFormat,
         chromatic: bool,
-        scale_mode: ScaleMode,
     ) -> FastCrtFilter {
         let uniforms = Uniforms {
-            texture_scale: scale_mode.texture_scale_from_resolution(resolution),
+            texture_scale: texture_scale_from_resolution(resolution),
         };
 
         let uniform_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
@@ -132,9 +131,9 @@ impl FastCrtFilter {
 }
 
 impl Filter for FastCrtFilter {
-    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>, scale_mode: ScaleMode) {
+    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>) {
         let uniforms = Uniforms {
-            texture_scale: scale_mode.texture_scale_from_resolution(new_size),
+            texture_scale: texture_scale_from_resolution(new_size),
         };
         queue.write_buffer(&self.uniform_buffer, 0, bytemuck::cast_slice(&[uniforms]));
     }
@@ -146,6 +145,16 @@ impl Filter for FastCrtFilter {
     }
 }
 
+fn texture_scale_from_resolution(res: PhysicalSize<u32>) -> [f32; 4] {
+    let scale = ((res.width as f32) / 160.0).min((res.height as f32) / 120.0);
+    [
+        scale / res.width as f32,
+        scale / res.height as f32,
+        2.0 / scale,
+        0.0,
+    ]
+}
+
 #[repr(C)]
 #[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
 struct Uniforms {

uw8-window/src/gpu/fast_crt.wgsl

@@ -30,8 +30,8 @@ fn row_factor(offset: f32) -> f32 {
 }
 
 fn col_factor(offset: f32) -> f32 {
-    let o = max(0.0, abs(offset) - 0.4);
-    return 1.0 / (1.0 + o * o * 16.0);
+    let offset = max(0.0, abs(offset) - 0.4);
+    return 1.0 / (1.0 + offset * offset * 16.0);
 }
 
 fn sample_screen(tex_coords: vec2<f32>) -> vec4<f32> {

uw8-window/src/gpu/mod.rs

@@ -1,7 +1,6 @@
 use crate::{Input, WindowConfig, WindowImpl};
 use anyhow::{anyhow, Result};
-use scale_mode::ScaleMode;
-use std::time::Instant;
+use std::{num::NonZeroU32, time::Instant};
 
 use winit::{
     dpi::PhysicalSize,
@@ -14,7 +13,6 @@ use winit::platform::run_return::EventLoopExtRunReturn;
 
 mod crt;
 mod fast_crt;
-pub mod scale_mode;
 mod square;
 
 use crt::CrtFilter;
@@ -36,7 +34,6 @@ pub struct Window {
     next_frame: Instant,
     is_fullscreen: bool,
     is_open: bool,
-    scale_mode: ScaleMode,
 }
 
 impl Window {
@@ -44,10 +41,7 @@ impl Window {
         async fn create(window_config: WindowConfig) -> Result<Window> {
             let event_loop = EventLoop::new();
             let window = WindowBuilder::new()
-                .with_inner_size(PhysicalSize::new(
-                    (320. * window_config.scale).round() as u32,
-                    (240. * window_config.scale).round() as u32,
-                ))
+                .with_inner_size(PhysicalSize::new(640u32, 480))
                 .with_min_inner_size(PhysicalSize::new(320u32, 240))
                 .with_title("MicroW8")
                 .with_fullscreen(if window_config.fullscreen {
@@ -59,8 +53,8 @@ impl Window {
 
             window.set_cursor_visible(false);
 
-            let instance = wgpu::Instance::new(Default::default());
-            let surface = unsafe { instance.create_surface(&window) }?;
+            let instance = wgpu::Instance::new(wgpu::Backends::all());
+            let surface = unsafe { instance.create_surface(&window) };
             let adapter = instance
                 .request_adapter(&wgpu::RequestAdapterOptions {
                     power_preference: wgpu::PowerPreference::LowPower,
@@ -77,14 +71,11 @@ impl Window {
             let palette_screen_mode = PaletteScreenMode::new(&device);
 
             let surface_config = wgpu::SurfaceConfiguration {
+                usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
+                format: surface.get_supported_formats(&adapter)[0],
+                width: window.inner_size().width,
+                height: window.inner_size().height,
                 present_mode: wgpu::PresentMode::AutoNoVsync,
-                ..surface
-                    .get_default_config(
-                        &adapter,
-                        window.inner_size().width,
-                        window.inner_size().height,
-                    )
-                    .expect("Surface incompatible with adapter")
             };
 
             let filter: Box<dyn Filter> = create_filter(
@@ -93,7 +84,6 @@ impl Window {
                 window.inner_size(),
                 surface_config.format,
                 window_config.filter,
-                window_config.scale_mode,
             );
 
             surface.configure(&device, &surface_config);
@@ -113,7 +103,6 @@ impl Window {
                 next_frame: Instant::now(),
                 is_fullscreen: window_config.fullscreen,
                 is_open: true,
-                scale_mode: window_config.scale_mode,
             })
         }
 
@@ -133,7 +122,7 @@ impl WindowImpl for Window {
                         self.surface_config.width = new_size.width;
                         self.surface_config.height = new_size.height;
                         self.surface.configure(&self.device, &self.surface_config);
-                        self.filter.resize(&self.queue, new_size, self.scale_mode);
+                        self.filter.resize(&self.queue, new_size);
                     }
                     WindowEvent::CloseRequested => {
                         self.is_open = false;
@@ -170,20 +159,6 @@ impl WindowImpl for Window {
                                     self.is_fullscreen = fullscreen.is_some();
                                     self.window.set_fullscreen(fullscreen);
                                 }
-                                Some(VirtualKeyCode::M) => {
-                                    self.scale_mode = match self.scale_mode {
-                                        ScaleMode::Fit => ScaleMode::Fill,
-                                        ScaleMode::Fill => ScaleMode::Fit,
-                                    };
-                                    self.filter.resize(
-                                        &self.queue,
-                                        PhysicalSize {
-                                            width: self.surface_config.width,
-                                            height: self.surface_config.height,
-                                        },
-                                        self.scale_mode,
-                                    );
-                                }
                                 Some(VirtualKeyCode::R) => reset = true,
                                 Some(VirtualKeyCode::Key1) => new_filter = Some(1),
                                 Some(VirtualKeyCode::Key2) => new_filter = Some(2),
@@ -217,7 +192,6 @@ impl WindowImpl for Window {
                     self.window.inner_size(),
                     self.surface_config.format,
                     new_filter,
-                    self.scale_mode,
                 );
             }
         });
@@ -280,7 +254,6 @@ fn create_filter(
     window_size: PhysicalSize<u32>,
     surface_format: wgpu::TextureFormat,
     filter: u32,
-    scale_mode: ScaleMode,
 ) -> Box<dyn Filter> {
     match filter {
         1 => Box::new(SquareFilter::new(
@@ -288,7 +261,6 @@ fn create_filter(
             screen_texture,
             window_size,
             surface_format,
-            scale_mode,
         )),
         2 => Box::new(FastCrtFilter::new(
             device,
@@ -296,14 +268,12 @@ fn create_filter(
             window_size,
             surface_format,
             false,
-            scale_mode,
         )),
         3 => Box::new(CrtFilter::new(
             device,
             screen_texture,
             window_size,
             surface_format,
-            scale_mode,
         )),
         4 => Box::new(FastCrtFilter::new(
             device,
@@ -311,20 +281,18 @@ fn create_filter(
             window_size,
             surface_format,
             true,
-            scale_mode,
         )),
         _ => Box::new(AutoCrtFilter::new(
             device,
             screen_texture,
             window_size,
             surface_format,
-            scale_mode,
         )),
     }
 }
 
 trait Filter {
-    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>, scale_mode: ScaleMode);
+    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>);
     fn render<'a>(&'a self, render_pass: &mut wgpu::RenderPass<'a>);
 }
 
@@ -340,11 +308,9 @@ impl AutoCrtFilter {
         screen: &wgpu::TextureView,
         resolution: PhysicalSize<u32>,
         surface_format: wgpu::TextureFormat,
-        scale_mode: ScaleMode,
     ) -> AutoCrtFilter {
-        let small = CrtFilter::new(device, screen, resolution, surface_format, scale_mode);
-        let large =
-            FastCrtFilter::new(device, screen, resolution, surface_format, true, scale_mode);
+        let small = CrtFilter::new(device, screen, resolution, surface_format);
+        let large = FastCrtFilter::new(device, screen, resolution, surface_format, true);
         AutoCrtFilter {
             small,
             large,
@@ -354,9 +320,9 @@ impl AutoCrtFilter {
 }
 
 impl Filter for AutoCrtFilter {
-    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>, scale_mode: ScaleMode) {
-        self.small.resize(queue, new_size, scale_mode);
-        self.large.resize(queue, new_size, scale_mode);
+    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>) {
+        self.small.resize(queue, new_size);
+        self.large.resize(queue, new_size);
         self.resolution = new_size;
     }
 
@@ -391,7 +357,6 @@ impl PaletteScreenMode {
             format: wgpu::TextureFormat::R8Uint,
             usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,
             label: None,
-            view_formats: &[],
         });
 
         let palette_texture = device.create_texture(&wgpu::TextureDescriptor {
@@ -406,7 +371,6 @@ impl PaletteScreenMode {
             format: wgpu::TextureFormat::Rgba8UnormSrgb,
             usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,
             label: None,
-            view_formats: &[],
         });
 
         let screen_texture = device.create_texture(&wgpu::TextureDescriptor {
@@ -421,7 +385,6 @@ impl PaletteScreenMode {
             format: wgpu::TextureFormat::Rgba8UnormSrgb,
             usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::RENDER_ATTACHMENT,
             label: None,
-            view_formats: &[],
         });
 
         let framebuffer_texture_view =
@@ -528,7 +491,7 @@ impl PaletteScreenMode {
             &bytemuck::cast_slice(pixels),
             wgpu::ImageDataLayout {
                 offset: 0,
-                bytes_per_row: Some(320),
+                bytes_per_row: NonZeroU32::new(320),
                 rows_per_image: None,
             },
             wgpu::Extent3d {
@@ -550,7 +513,7 @@ impl PaletteScreenMode {
             &bytemuck::cast_slice(palette),
             wgpu::ImageDataLayout {
                 offset: 0,
-                bytes_per_row: Some(256 * 4),
+                bytes_per_row: NonZeroU32::new(256 * 4),
                 rows_per_image: None,
             },
             wgpu::Extent3d {

uw8-window/src/gpu/scale_mode.rs

@@ -1,28 +0,0 @@
-use winit::dpi::PhysicalSize;
-
-#[derive(Debug, Copy, Clone)]
-pub enum ScaleMode {
-    Fit,
-    Fill,
-}
-
-impl Default for ScaleMode {
-    fn default() -> ScaleMode {
-        ScaleMode::Fit
-    }
-}
-
-impl ScaleMode {
-    pub fn texture_scale_from_resolution(&self, res: PhysicalSize<u32>) -> [f32; 4] {
-        let scale = match self {
-            ScaleMode::Fit => ((res.width as f32) / 160.0).min((res.height as f32) / 120.0),
-            ScaleMode::Fill => ((res.width as f32) / 160.0).max((res.height as f32) / 120.0),
-        };
-        [
-            scale / res.width as f32,
-            scale / res.height as f32,
-            2.0 / scale,
-            0.0,
-        ]
-    }
-}

uw8-window/src/gpu/square.rs

@@ -1,7 +1,7 @@
 use wgpu::util::DeviceExt;
 use winit::dpi::PhysicalSize;
 
-use super::{scale_mode::ScaleMode, Filter};
+use super::Filter;
 
 pub struct SquareFilter {
     uniform_buffer: wgpu::Buffer,
@@ -15,10 +15,9 @@ impl SquareFilter {
         screen: &wgpu::TextureView,
         resolution: PhysicalSize<u32>,
         surface_format: wgpu::TextureFormat,
-        scale_mode: ScaleMode,
     ) -> SquareFilter {
         let uniforms = Uniforms {
-            texture_scale: scale_mode.texture_scale_from_resolution(resolution),
+            texture_scale: texture_scale_from_resolution(resolution),
         };
 
         let uniform_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
@@ -127,9 +126,9 @@ impl SquareFilter {
 }
 
 impl Filter for SquareFilter {
-    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>, scale_mode: ScaleMode) {
+    fn resize(&mut self, queue: &wgpu::Queue, new_size: PhysicalSize<u32>) {
         let uniforms = Uniforms {
-            texture_scale: scale_mode.texture_scale_from_resolution(new_size),
+            texture_scale: texture_scale_from_resolution(new_size),
         };
         queue.write_buffer(&self.uniform_buffer, 0, bytemuck::cast_slice(&[uniforms]));
     }
@@ -141,6 +140,16 @@ impl Filter for SquareFilter {
     }
 }
 
+fn texture_scale_from_resolution(res: PhysicalSize<u32>) -> [f32; 4] {
+    let scale = ((res.width as f32) / 160.0).min((res.height as f32) / 120.0);
+    [
+        scale / res.width as f32,
+        scale / res.height as f32,
+        2.0 / scale,
+        0.0,
+    ]
+}
+
 #[repr(C)]
 #[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
 struct Uniforms {

uw8-window/src/lib.rs

@@ -1,5 +1,4 @@
 use anyhow::Result;
-use gpu::scale_mode::ScaleMode;
 use std::time::Instant;
 
 mod cpu;
@@ -16,7 +15,7 @@ struct FpsCounter {
 }
 
 impl Window {
-    pub fn new(mut config: WindowConfig) -> Result<Window> {
+    pub fn new(config: WindowConfig) -> Result<Window> {
         let fps_counter = if config.fps_counter {
             Some(FpsCounter {
                 start: Instant::now(),
@@ -25,7 +24,6 @@ impl Window {
         } else {
             None
         };
-        config.scale = config.scale.max(1.).min(20.);
         if config.enable_gpu {
             match gpu::Window::new(config) {
                 Ok(window) => {
@@ -73,8 +71,6 @@ pub struct WindowConfig {
     filter: u32,
     fullscreen: bool,
     fps_counter: bool,
-    scale: f32,
-    scale_mode: ScaleMode,
 }
 
 impl Default for WindowConfig {
@@ -84,8 +80,6 @@ impl Default for WindowConfig {
             filter: 5,
             fullscreen: false,
             fps_counter: false,
-            scale: 2.,
-            scale_mode: ScaleMode::Fit,
         }
     }
 }
@@ -108,13 +102,6 @@ impl WindowConfig {
         }
         self.fullscreen = args.contains("--fullscreen");
         self.fps_counter = args.contains("--fps");
-        self.scale = args
-            .opt_value_from_str("--scale")
-            .unwrap()
-            .unwrap_or(self.scale);
-        if args.contains("--scale-fill") {
-            self.scale_mode = ScaleMode::Fill;
-        }
     }
 }
 

web/package.json

@@ -4,6 +4,5 @@
     "@parcel/optimizer-data-url": "^2.0.0",
     "@parcel/transformer-inline-string": "^2.0.0",
     "parcel": "^2.0.0"
-  },
-  "dependencies": {}
+  }
 }

web/src/index.html

@@ -10,7 +10,7 @@
     </head>
     <body>
         <div id="uw8">
-            <a href="https://exoticorn.github.io/microw8">MicroW8</a> 0.4.1
+            <a href="https://exoticorn.github.io/microw8">MicroW8</a> 0.2.1
         </div>
         <div id="centered">
             <canvas class="screen" id="screen" width="320" height="240">

web/src/microw8.js

@@ -240,7 +240,6 @@ export default function MicroW8(screen, config = {}) {
             await audioReadyPromise;
     
             let startTime = Date.now();
-            let frameCounter = 0;
     
             const timePerFrame = 1000 / 60;
 
@@ -264,10 +263,6 @@ export default function MicroW8(screen, config = {}) {
             window.addEventListener('blur', () => updateVisibility(false), { signal: abortController.signal });
             updateVisibility(document.hasFocus());
 
-            if (instance.exports.start) {
-                instance.exports.start();
-            }
-
             function mainloop() {
                 if (!keepRunning) {
                     return;
@@ -307,7 +302,6 @@ export default function MicroW8(screen, config = {}) {
                         let time = Date.now() - startTime;
                         u32Mem[16] = time;
                         u32Mem[17] = pad | gamepad;
-                        u32Mem[18] = frameCounter++;
                         if(instance.exports.upd) {
                             instance.exports.upd();
                         }