fix build?

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: Rust
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, testing ]
 
 env:
   CARGO_TERM_COLOR: always
@@ -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@v3
+      uses: actions/upload-artifact@v2
       with:
         name: uw8-${{ matrix.build }}
         path: target/release/${{ matrix.exe }}

.github/workflows/main.yml

@@ -8,11 +8,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
-      - name: Add safe directory /github/workspace
-        run: git config --global --add safe.directory /github/workspace
       - name: build_and_deploy
-        uses: shalzz/zola-deploy-action@v0.16.1
+        uses: shalzz/zola-deploy-action@v0.14.1
         env:
           # Target branch
           PAGES_BRANCH: gh-pages

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "uw8"
-version = "0.2.2"
+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 = { version = "5.0.0", optional = true }
+wasmtime = { version = "0.37.0", optional = true }
 anyhow = "1"
-env_logger = "0.10"
+env_logger = "0.9"
 log = "0.4"
 uw8-window = { path = "uw8-window", optional = true }
-notify-debouncer-mini = { version = "0.2.1", default-features = false }
+notify = "4"
-pico-args = "0.5"
+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.3", optional = true }
+warp = { version = "0.3.2", optional = true }
-tokio = { version = "1.24.0", features = ["sync", "rt"], optional = true }
+tokio = { version = "1.17.0", features = ["sync", "rt"], optional = true }
-tokio-stream = { version = "0.1.11", features = ["sync"], optional = true }
+tokio-stream = { version = "0.1.8", features = ["sync"], optional = true }
-webbrowser = { version = "0.8.6", optional = true }
+webbrowser = { version = "0.6.0", optional = true }
 ansi_term = "0.12.1"
-cpal = { version = "0.14.2", optional = true }
+cpal = { version = "0.13.5", optional = true }
-rubato = { version = "0.12.0", 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.2.2/microw8-0.2.2-linux.tgz)
+* [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.2.2/microw8-0.2.2-macos.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.2.2/microw8-0.2.2-windows.zip)
+* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.1.2/microw8-0.1.2-windows.zip)
 
 The download includes
 

examples/include/microw8-api.cwa

@@ -34,7 +34,6 @@ 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;
 
 const TIME_MS = 0x40;
 const GAMEPAD = 0x44;

examples/include/microw8-api.wat

@@ -34,7 +34,6 @@
 (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)))
 
 ;; to use defines, include this file with a preprocessor
 ;; like gpp (https://logological.org/gpp).

platform/Cargo.lock

@@ -110,9 +110,9 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836"
 dependencies = [
  "cfg-if",
 ]
@@ -151,39 +151,32 @@ dependencies = [
  "anyhow",
  "ariadne",
  "chumsky",
- "pico-args 0.4.2",
+ "pico-args",
  "wasm-encoder 0.10.0",
  "wasmparser 0.83.0",
 ]
 
 [[package]]
 name = "fallible_collections"
-version = "0.4.6"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f57ccc32870366ae684be48b32a1a2e196f98a42a9b4361fe77e13fd4a34755"
+checksum = "52db5973b6a19247baf19b30f41c23a1bfffc2e9ce0a5db2f60e3cd5dc8895f7"
 dependencies = [
  "hashbrown",
 ]
 
 [[package]]
 name = "flate2"
-version = "1.0.25"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
+checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
 dependencies = [
+ "cfg-if",
  "crc32fast",
+ "libc",
  "miniz_oxide",
 ]
 
-[[package]]
-name = "form_urlencoded"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
-dependencies = [
- "percent-encoding",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.3"
@@ -197,9 +190,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.12.3"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
 dependencies = [
  "ahash 0.7.6",
 ]
@@ -219,26 +212,6 @@ version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005"
 
-[[package]]
-name = "idna"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
-dependencies = [
- "autocfg",
- "hashbrown",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -251,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.139"
+version = "0.2.112"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
 
 [[package]]
 name = "lodepng"
-version = "3.7.2"
+version = "3.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0ad39f75bbaa4b10bb6f2316543632a8046a5bcf9c785488d79720b21f044f8"
+checksum = "24844d5c0b922ddd52fb5bf0964a4c7f8e799a946ec01bb463771eb04fc1a323"
 dependencies = [
- "crc32fast",
  "fallible_collections",
  "flate2",
  "libc",
@@ -287,11 +253,12 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.6.2"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
 dependencies = [
  "adler",
+ "autocfg",
 ]
 
 [[package]]
@@ -321,24 +288,12 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "percent-encoding"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
-
 [[package]]
 name = "pico-args"
 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"
@@ -375,9 +330,9 @@ dependencies = [
 
 [[package]]
 name = "rgb"
-version = "0.8.34"
+version = "0.8.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3603b7d71ca82644f79b5a06d1220e9a58ede60bd32255f698cb1af8838b8db3"
+checksum = "9a374af9a0e5fdcdd98c1c7b64f05004f9ea2555b6c75f211daa81268a3c50f1"
 dependencies = [
  "bytemuck",
 ]
@@ -402,26 +357,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "thiserror"
-version = "1.0.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "time"
 version = "0.1.43"
@@ -441,36 +376,6 @@ dependencies = [
  "crunchy",
 ]
 
-[[package]]
-name = "tinyvec"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
-dependencies = [
- "tinyvec",
-]
-
 [[package]]
 name = "unicode-segmentation"
 version = "1.9.0"
@@ -485,24 +390,13 @@ checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
 
 [[package]]
 name = "upkr"
-version = "0.2.1"
+version = "0.1.0"
-source = "git+https://github.com/exoticorn/upkr.git?rev=080db40d0088bbee2bdf3c5c75288ac7853d6b7a#080db40d0088bbee2bdf3c5c75288ac7853d6b7a"
+source = "git+https://github.com/exoticorn/upkr.git?rev=2e7983fc#2e7983fc650788d98da2eecef2d16f63e849e4a0"
 dependencies = [
  "anyhow",
  "cdivsufsort",
- "lexopt",
+ "pbr",
- "thiserror",
+ "pico-args",
-]
-
-[[package]]
-name = "url"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
 ]
 
 [[package]]
@@ -511,11 +405,11 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "pbr",
- "pico-args 0.5.0",
+ "pico-args",
  "upkr",
  "walrus",
- "wasm-encoder 0.22.0",
+ "wasm-encoder 0.8.0",
- "wasmparser 0.99.0",
+ "wasmparser 0.81.0",
 ]
 
 [[package]]
@@ -558,18 +452,18 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
 [[package]]
 name = "wasm-encoder"
-version = "0.10.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa9d9bf45fc46f71c407837c9b30b1e874197f2dc357588430b21e5017d290ab"
+checksum = "db0c351632e46cc06a58a696a6c11e4cf90cad4b9f8f07a0b59128d616c29bb0"
 dependencies = [
  "leb128",
 ]
 
 [[package]]
 name = "wasm-encoder"
-version = "0.22.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef126be0e14bdf355ac1a8b41afc89195289e5c7179f80118e3abddb472f0810"
+checksum = "aa9d9bf45fc46f71c407837c9b30b1e874197f2dc357588430b21e5017d290ab"
 dependencies = [
  "leb128",
 ]
@@ -582,19 +476,15 @@ checksum = "b35c86d22e720a07d954ebbed772d01180501afe7d03d464f413bb5f8914a8d6"
 
 [[package]]
 name = "wasmparser"
-version = "0.83.0"
+version = "0.81.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a"
+checksum = "98930446519f63d00a836efdc22f67766ceae8dbcc1571379f2bcabc6b2b9abc"
 
 [[package]]
 name = "wasmparser"
-version = "0.99.0"
+version = "0.83.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ef3b717afc67f848f412d4f02c127dd3e35a0eecd58c684580414df4fde01d3"
+checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a"
-dependencies = [
- "indexmap",
- "url",
-]
 
 [[package]]
 name = "winapi"

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/ges.cwa

@@ -10,7 +10,7 @@ const GesState.Size = GesState.Filter + 8*4;
 const GesStateOffset = 32;
 const GesBufferOffset = 32 + GesState.Size;
 
-export fn sndGes(t: i32) -> f32 {
+export fn gesSnd(t: i32) -> f32 {
     let baseAddr = 0!0x12c78;
     if !(t & 127) {
         let i: i32;

platform/src/platform.cwa

@@ -372,7 +372,16 @@ export fn printChar(char: i32) {
 global mut controlCodeLength = 0;
 
 fn printSingleChar(char: i32) {
-    if outputChannel >= 2 & (char < 4 | char > 6) {
+    if char >= 4 & char <= 6 {
+        outputChannel = char - 4;
+        if !outputChannel {
+            textCursorX = 0;
+            textCursorY = 0;
+        }
+        return;
+    }
+
+    if outputChannel >= 2 {
         logChar(char);
         return;
     }
@@ -390,15 +399,6 @@ 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;

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,33 +29,6 @@ Examplers for older versions:
 
 ## Versions
 
-### 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)

site/content/docs.md

@@ -12,9 +12,6 @@ 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
 
 ```

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.2.2">
+        <a href="v0.2.0">
             <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::{
+use notify::{DebouncedEvent, RecommendedWatcher, Watcher};
-    new_debouncer,
-    notify::{self, RecommendedWatcher},
-    DebouncedEvent, DebouncedEventKind, Debouncer,
-};
 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,20 +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), None, move |res| match res {
+        let watcher = notify::watcher(tx, Duration::from_millis(100))?;
-            Ok(events) => {
-                for event in events {
-                    let _ = tx.send(event);
-                }
-            }
-            Err(errs) => {
-                for err in errs {
-                    eprintln!("Error watching for file changes: {err}");
-                }
-            }
-        })?;
         Ok(FileWatcher {
-            debouncer,
+            watcher,
             watched_files: BTreeSet::new(),
             directories: BTreeSet::new(),
             rx,
@@ -41,8 +26,7 @@ impl FileWatcher {
         let parent = path.parent().ok_or_else(|| anyhow!("File has no parent"))?;
 
         if !self.directories.contains(parent) {
-            self.debouncer
+            self.watcher
-                .watcher()
                 .watch(parent, notify::RecursiveMode::NonRecursive)?;
             self.directories.insert(parent.to_path_buf());
         }
@@ -52,18 +36,16 @@ impl FileWatcher {
     }
 
     pub fn poll_changed_file(&self) -> Result<Option<PathBuf>> {
-        match self.rx.try_recv() {
+        let event = self.rx.try_recv();
-            Ok(event) => match event.kind {
+        match event {
-                DebouncedEventKind::Any => {
+            Ok(DebouncedEvent::Create(path) | DebouncedEvent::Write(path)) => {
-                    let handle = same_file::Handle::from_path(&event.path)?;
+                let handle = same_file::Handle::from_path(&path)?;
-                    for file in &self.watched_files {
+                for file in &self.watched_files {
-                        if handle == same_file::Handle::from_path(file)? {
+                    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/main.rs

@@ -81,12 +81,11 @@ fn run(mut args: Arguments) -> Result<()> {
     #[cfg(not(feature = "native"))]
     let run_browser = args.contains(["-b", "--browser"]) || true;
 
-    #[allow(unused)]
     let disable_audio = args.contains(["-m", "--no-audio"]);
 
     #[cfg(feature = "native")]
     let window_config = {
-        let mut config = uw8_window::WindowConfig::default();
+        let mut config = WindowConfig::default();
         if !run_browser {
             config.parse_arguments(&mut args);
         }
@@ -99,6 +98,8 @@ fn run(mut args: Arguments) -> Result<()> {
 
     use std::process::exit;
 
+    use uw8_window::WindowConfig;
+
     let mut runtime: Box<dyn Runtime> = if !run_browser {
         #[cfg(not(feature = "native"))]
         unimplemented!();

src/run_native.rs

@@ -93,7 +93,7 @@ impl super::Runtime for MicroW8 {
         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);
@@ -131,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 end_frame = platform_instance.get_typed_func::<(), (), _>(&mut store, "endFrame")?;
-        let update = instance.get_typed_func::<(), ()>(&mut store, "upd").ok();
+        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 (sound_tx, stream) = if self.disable_audio {
             (None, None)
@@ -317,8 +313,8 @@ fn init_sound(
     let instance = linker.instantiate(&mut store, module)?;
 
     let snd = instance
-        .get_typed_func::<(i32,), f32>(&mut store, "snd")
+        .get_typed_func::<(i32,), f32, _>(&mut store, "snd")
-        .or_else(|_| platform_instance.get_typed_func::<(i32,), f32>(&mut store, "sndGes"))?;
+        .or_else(|_| platform_instance.get_typed_func::<(i32,), f32, _>(&mut store, "gesSnd"))?;
 
     let host = cpal::default_host();
     let device = host
@@ -346,7 +342,7 @@ fn init_sound(
         .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());
+        .max(config.max_sample_rate());
     let config = config.with_sample_rate(sample_rate);
     let buffer_size = match *config.buffer_size() {
         cpal::SupportedBufferSize::Unknown => cpal::BufferSize::Default,

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 {
+        RunWebServer { cart, tx }
-            cart,
-            tx,
-            socket_addr,
-        }
     }
 }
 
 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);
         }

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

@@ -56,21 +56,6 @@ dependencies = [
  "lazy_static",
 ]
 
-[[package]]
-name = "form_urlencoded"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
 [[package]]
 name = "heck"
 version = "0.3.3"
@@ -86,26 +71,6 @@ version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005"
 
-[[package]]
-name = "idna"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
-dependencies = [
- "autocfg",
- "hashbrown",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -118,12 +83,6 @@ 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.112"
@@ -160,17 +119,11 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "percent-encoding"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
-
 [[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"
@@ -210,26 +163,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "thiserror"
-version = "1.0.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "time"
 version = "0.1.44"
@@ -241,36 +174,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "tinyvec"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
-dependencies = [
- "tinyvec",
-]
-
 [[package]]
 name = "unicode-segmentation"
 version = "1.8.0"
@@ -285,24 +188,13 @@ checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
 
 [[package]]
 name = "upkr"
-version = "0.2.1"
+version = "0.1.0"
-source = "git+https://github.com/exoticorn/upkr.git?rev=080db40d0088bbee2bdf3c5c75288ac7853d6b7a#080db40d0088bbee2bdf3c5c75288ac7853d6b7a"
+source = "git+https://github.com/exoticorn/upkr.git?rev=d93aec186c9fb91d962c488682a2db125c61306c#d93aec186c9fb91d962c488682a2db125c61306c"
 dependencies = [
  "anyhow",
  "cdivsufsort",
- "lexopt",
+ "pbr",
- "thiserror",
+ "pico-args",
-]
-
-[[package]]
-name = "url"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
 ]
 
 [[package]]
@@ -315,7 +207,7 @@ dependencies = [
  "upkr",
  "walrus",
  "wasm-encoder",
- "wasmparser 0.99.0",
+ "wasmparser 0.81.0",
 ]
 
 [[package]]
@@ -352,9 +244,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
 [[package]]
 name = "wasm-encoder"
-version = "0.22.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef126be0e14bdf355ac1a8b41afc89195289e5c7179f80118e3abddb472f0810"
+checksum = "db0c351632e46cc06a58a696a6c11e4cf90cad4b9f8f07a0b59128d616c29bb0"
 dependencies = [
  "leb128",
 ]
@@ -367,13 +259,9 @@ checksum = "b35c86d22e720a07d954ebbed772d01180501afe7d03d464f413bb5f8914a8d6"
 
 [[package]]
 name = "wasmparser"
-version = "0.99.0"
+version = "0.81.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ef3b717afc67f848f412d4f02c127dd3e35a0eecd58c684580414df4fde01d3"
+checksum = "98930446519f63d00a836efdc22f67766ceae8dbcc1571379f2bcabc6b2b9abc"
-dependencies = [
- "indexmap",
- "url",
-]
 
 [[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.99"
+wasmparser = "0.81"
-wasm-encoder = "0.22"
+wasm-encoder = "0.8"
 walrus = "0.19"
 anyhow = "1"
-pico-args = "0.5"
+pico-args = "0.4"
-upkr = { git = "https://github.com/exoticorn/upkr.git", rev = "080db40d0088bbee2bdf3c5c75288ac7853d6b7a" }
+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::*;
@@ -167,7 +167,6 @@ impl BaseModule {
         add_function(&mut functions, &type_map, "exp", &[F32], Some(F32));
 
         add_function(&mut functions, &type_map, "playNote", &[I32, I32], None);
-        add_function(&mut functions, &type_map, "sndGes", &[I32], Some(F32));
 
         for i in functions.len()..64 {
             add_function(
@@ -218,13 +217,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,
@@ -234,12 +233,11 @@ impl BaseModule {
 
             imports.import(
                 "env",
-                "memory",
+                Some("memory"),
                 MemoryType {
                     minimum: self.memory as u64,
                     maximum: None,
                     memory64: false,
-                    shared: false,
                 },
             );
 
@@ -260,7 +258,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);
@@ -288,7 +286,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/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 => (
+        2 => (1, upkr::unpack(&data[1..], false)),
-            1,
-            upkr::unpack(&data[1..], &upkr::Config::default(), 4 * 1024 * 1024)?,
-        ),
         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> {
+fn to_val_type(type_: &wasmparser::Type) -> Result<ValType> {
-    use wasmparser::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)?));
@@ -223,22 +220,17 @@ impl<'a> ParsedModule<'a> {
                     validate_table_section(reader)?;
                     table_section = Some(Section::new(range, ()));
                 }
-                Payload::MemorySection(reader) => {
+                Payload::ElementSection(mut reader) => {
-                    if reader.count() != 0 {
+                    let mut elements = Vec::with_capacity(reader.get_count() as usize);
-                        bail!("Found non-empty MemorySection. Memory has to be imported!");
+                    for _ in 0..reader.get_count() {
-                    }
+                        elements.push(Element::parse(reader.read()?)?);
-                }
-                Payload::ElementSection(reader) => {
-                    let mut elements = Vec::with_capacity(reader.count() as usize);
-                    for element in reader {
-                        elements.push(Element::parse(element?)?);
                     }
                     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 +458,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 +481,7 @@ 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),
                 );
@@ -538,27 +530,28 @@ fn read_type_section(reader: TypeSectionReader) -> Result<Vec<base_module::Funct
 
     for type_def in reader {
         match type_def? {
-            wasmparser::Type::Func(fnc) => {
+            wasmparser::TypeDef::Func(fnc) => {
-                if fnc.results().len() > 1 {
+                if fnc.returns.len() > 1 {
                     bail!("Multi-value not supported");
                 }
-                let params = to_val_type_vec(fnc.params())?;
+                let params = to_val_type_vec(&fnc.params)?;
-                let result = to_val_type_vec(fnc.results())?.into_iter().next();
+                let result = to_val_type_vec(&fnc.returns)?.into_iter().next();
                 function_types.push(FunctionType { params, result });
             }
+            t => bail!("Unsupported type def {:?}", t),
         }
     }
 
     Ok(function_types)
 }
 
-fn validate_table_section(reader: TableSectionReader) -> Result<()> {
+fn validate_table_section(mut reader: TableSectionReader) -> Result<()> {
-    if reader.count() != 1 {
+    if reader.get_count() != 1 {
         bail!("Only up to one table supported");
     }
 
-    let type_ = reader.into_iter().next().unwrap()?;
+    let type_ = reader.read()?;
-    if type_.element_type != wasmparser::ValType::FuncRef {
+    if type_.element_type != wasmparser::Type::FuncRef {
         bail!("Only one funcref table is supported");
     }
 
@@ -592,38 +585,45 @@ impl ImportSection {
 
         for import in reader {
             let import = import?;
-            match import.ty {
+            if let Some(field) = import.field {
-                TypeRef::Func(type_) => {
+                match import.ty {
-                    functions.push(FunctionImport {
+                    ImportSectionEntryType::Function(type_) => {
-                        module: import.module.to_string(),
+                        functions.push(FunctionImport {
-                        field: import.name.to_string(),
+                            module: import.module.to_string(),
-                        type_,
+                            field: field.to_string(),
-                    });
+                            type_,
-                }
+                        });
-                TypeRef::Memory(mem) => {
-                    if import.module != "env" || import.name != "memory" {
-                        bail!(
-                            "Wrong name of memory import {}.{}, should be env.memory",
-                            import.module,
-                            import.name
-                        );
                     }
-                    if mem.memory64 || mem.shared {
+                    ImportSectionEntryType::Memory(mem) => {
-                        bail!("Wrong memory import options: {:?}", import.ty);
+                        if import.module != "env" || field != "memory" {
+                            bail!(
+                                "Wrong name of memory import {}.{}, should be env.memory",
+                                import.module,
+                                field
+                            );
+                        }
+                        if mem.memory64 || mem.shared {
+                            bail!("Wrong memory import options: {:?}", import.ty);
+                        }
+                        memory = mem.maximum.unwrap_or(mem.initial) as u32;
                     }
-                    memory = mem.maximum.unwrap_or(mem.initial) as u32;
+                    ImportSectionEntryType::Global(glbl) => {
+                        globals.push(GlobalImport {
+                            module: import.module.to_string(),
+                            field: field.to_string(),
+                            type_: GlobalType {
+                                type_: to_val_type(&glbl.content_type)?,
+                                mutable: glbl.mutable,
+                            },
+                        });
+                    }
+                    _ => bail!("Unsupported import item {:?}", import.ty),
                 }
-                TypeRef::Global(glbl) => {
+            } else {
-                    globals.push(GlobalImport {
+                bail!(
-                        module: import.module.to_string(),
+                    "Found import without field, only module '{}'",
-                        field: import.name.to_string(),
+                    import.module
-                        type_: GlobalType {
+                );
-                            type_: to_val_type(&glbl.content_type)?,
-                            mutable: glbl.mutable,
-                        },
-                    });
-                }
-                _ => bail!("Unsupported import item {:?}", import.ty),
             }
         }
 
@@ -643,37 +643,40 @@ struct Element {
 
 impl Element {
     fn parse(element: wasmparser::Element) -> Result<Element> {
-        match element.items {
+        if element.ty != wasmparser::Type::FuncRef {
-            wasmparser::ElementItems::Functions(funcs_reader) => {
+            bail!("Table element type is not FuncRef");
-                let start_index = if let wasmparser::ElementKind::Active {
-                    offset_expr,
-                    table_index: 0,
-                } = element.kind
-                {
-                    let mut init_reader = offset_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");
-                    }
-                } else {
-                    bail!("Unsupported table element kind");
-                };
-
-                let mut functions = Vec::with_capacity(funcs_reader.count() as usize);
-                for index in funcs_reader {
-                    functions.push(index?);
-                }
-
-                Ok(Element {
-                    start_index,
-                    functions,
-                })
-            }
-            _ => bail!("Table element type is not FuncRef"),
         }
+
+        let start_index = if let wasmparser::ElementKind::Active {
+            init_expr,
+            table_index: 0,
+        } = element.kind
+        {
+            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");
+            }
+        } else {
+            bail!("Unsupported table element kind");
+        };
+
+        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 {
+            start_index,
+            functions,
+        })
     }
 }
 
@@ -704,8 +707,8 @@ fn read_export_section(reader: ExportSectionReader) -> Result<Vec<(String, u32)>
     for export in reader {
         let export = export?;
         match export.kind {
-            ExternalKind::Func => {
+            ExternalKind::Function => {
-                function_exports.push((export.name.to_string(), export.index));
+                function_exports.push((export.field.to_string(), export.index));
             }
             _ => (), // just ignore all other kinds since MicroW8 doesn't expect any exports other than functions
         }
@@ -726,11 +729,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::TypeOrFuncType::Type(wasmparser::Type::EmptyBlockType) => {
-            wasmparser::BlockType::Type(ty) => enc::BlockType::Result(to_val_type(&ty)?),
+                enc::BlockType::Empty
-            wasmparser::BlockType::FuncType(ty) => enc::BlockType::FunctionType(
+            }
+            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))?,
@@ -744,7 +749,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,
@@ -759,9 +764,9 @@ fn remap_function(
         function.instruction(&match op? {
             De::Unreachable => En::Unreachable,
             De::Nop => En::Nop,
-            De::Block { blockty } => En::Block(block_type(blockty)?),
+            De::Block { ty } => En::Block(block_type(ty)?),
-            De::Loop { blockty } => En::Loop(block_type(blockty)?),
+            De::Loop { ty } => En::Loop(block_type(ty)?),
-            De::If { blockty } => En::If(block_type(blockty)?),
+            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,
@@ -774,13 +779,9 @@ fn remap_function(
                     .get(&function_index)
                     .ok_or_else(|| anyhow!("Function index out of range: {}", function_index))?,
             ),
-            De::CallIndirect {
+            De::CallIndirect { index, table_index } => En::CallIndirect {
-                type_index,
-                table_index,
-                table_byte: _, // what is this supposed to be?
-            } => En::CallIndirect {
                 ty: *type_map
-                    .get(&type_index)
+                    .get(&index)
                     .ok_or_else(|| anyhow!("Unknown function type in call indirect"))?,
                 table: table_index,
             },
@@ -800,16 +801,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::I32Load8S { memarg } => En::I32Load8_S(mem(memarg)),
-            De::I32Load8U { memarg } => En::I32Load8U(mem(memarg)),
+            De::I32Load8U { memarg } => En::I32Load8_U(mem(memarg)),
-            De::I32Load16S { memarg } => En::I32Load16S(mem(memarg)),
+            De::I32Load16S { memarg } => En::I32Load16_S(mem(memarg)),
-            De::I32Load16U { memarg } => En::I32Load16U(mem(memarg)),
+            De::I32Load16U { memarg } => En::I32Load16_U(mem(memarg)),
-            De::I64Load8S { memarg } => En::I64Load8S(mem(memarg)),
+            De::I64Load8S { memarg } => En::I64Load8_S(mem(memarg)),
-            De::I64Load8U { memarg } => En::I64Load8U(mem(memarg)),
+            De::I64Load8U { memarg } => En::I64Load8_U(mem(memarg)),
-            De::I64Load16S { memarg } => En::I64Load16S(mem(memarg)),
+            De::I64Load16S { memarg } => En::I64Load16_S(mem(memarg)),
-            De::I64Load16U { memarg } => En::I64Load16U(mem(memarg)),
+            De::I64Load16U { memarg } => En::I64Load16_U(mem(memarg)),
-            De::I64Load32S { memarg } => En::I64Load32S(mem(memarg)),
+            De::I64Load32S { memarg } => En::I64Load32_S(mem(memarg)),
-            De::I64Load32U { memarg } => En::I64Load32U(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)),
@@ -828,7 +829,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,
@@ -839,7 +840,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,
@@ -849,13 +850,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,
@@ -962,7 +963,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]
-winit = "0.27.5"
+winit = "0.26.1"
-env_logger = "0.10"
+env_logger = "0.9"
 log = "0.4"
-pico-args = "0.5"
+pico-args = "0.4"
-wgpu = "0.15"
+wgpu = "0.13.1"
-pollster = "0.2.5"
+pollster = "0.2"
-bytemuck = { version = "1.13", features = [ "derive" ] }
+bytemuck = { version = "1.4", features = [ "derive" ] }
 anyhow = "1"
 minifb = { version = "0.23.0", default-features = false, features = ["x11"] }
-winapi = { version = "0.3.9", features = [ "timeapi" ] }
+winapi = "0.3.9"

uw8-window/src/gpu/crt.wgsl

@@ -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 pixel = floor(in.tex_coords);
-    let o = vec2<f32>(0.5) - (in.tex_coords - pixelf);
+    let o = vec2<f32>(0.5) - (in.tex_coords - pixel);
-    let pixel = vec2<i32>(pixelf);
+    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));
+    let 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));
+    let 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_x2 = max(abs(offset_x + vec4<f32>(1.0)) - vec4<f32>(0.5), vec4<f32>(0.0));
     
-    offset_x0 = offset_x0 * offset_x0;
+    let offset_x0 = offset_x0 * offset_x0;
-    offset_x1 = offset_x1 * offset_x1;
+    let offset_x1 = offset_x1 * offset_x1;
-    offset_x2 = offset_x2 * offset_x2;
+    let offset_x2 = offset_x2 * offset_x2;
     
-    var offset_yr = offset_y + vec4<f32>(-1.0);
+    let offset_yr = offset_y + vec4<f32>(-1.0);
-    offset_yr = vec4<f32>(0.02) + offset_yr * offset_yr;
+    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);
+    let offset_yr = offset_y + vec4<f32>(1.0);
-    offset_yr = vec4<f32>(0.02) + offset_yr * offset_yr;
+    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/mod.rs

@@ -53,8 +53,8 @@ impl Window {
 
             window.set_cursor_visible(false);
 
-            let instance = wgpu::Instance::new(Default::default());
+            let instance = wgpu::Instance::new(wgpu::Backends::all());
-            let surface = unsafe { instance.create_surface(&window) }?;
+            let surface = unsafe { instance.create_surface(&window) };
             let adapter = instance
                 .request_adapter(&wgpu::RequestAdapterOptions {
                     power_preference: wgpu::PowerPreference::LowPower,
@@ -71,8 +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(
@@ -354,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 {
@@ -369,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 {
@@ -384,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 =

uw8-window/src/lib.rs

@@ -4,64 +4,31 @@ use std::time::Instant;
 mod cpu;
 mod gpu;
 
-pub struct Window {
+pub struct Window(Box<dyn WindowImpl>);
-    inner: Box<dyn WindowImpl>,
-    fps_counter: Option<FpsCounter>,
-}
-
-struct FpsCounter {
-    start: Instant,
-    num_frames: u32,
-}
 
 impl Window {
     pub fn new(config: WindowConfig) -> Result<Window> {
-        let fps_counter = if config.fps_counter {
-            Some(FpsCounter {
-                start: Instant::now(),
-                num_frames: 0,
-            })
-        } else {
-            None
-        };
         if config.enable_gpu {
             match gpu::Window::new(config) {
-                Ok(window) => {
+                Ok(window) => return Ok(Window(Box::new(window))),
-                    return Ok(Window {
-                        inner: Box::new(window),
-                        fps_counter,
-                    })
-                }
                 Err(err) => eprintln!(
                     "Failed to create gpu window: {}\nFalling back tp cpu window",
                     err
                 ),
             }
         }
-        cpu::Window::new().map(|window| Window {
+        cpu::Window::new().map(|window| Window(Box::new(window)))
-            inner: Box::new(window),
-            fps_counter,
-        })
     }
 
     pub fn begin_frame(&mut self) -> Input {
-        self.inner.begin_frame()
+        self.0.begin_frame()
     }
     pub fn end_frame(&mut self, framebuffer: &[u8], palette: &[u8], next_frame: Instant) {
-        self.inner.end_frame(framebuffer, palette, next_frame);
+        self.0.end_frame(framebuffer, palette, next_frame)
-        if let Some(ref mut fps_counter) = self.fps_counter {
-            fps_counter.num_frames += 1;
-            let elapsed = fps_counter.start.elapsed().as_secs_f32();
-            if elapsed >= 1.0 {
-                println!("fps: {:.1}", fps_counter.num_frames as f32 / elapsed);
-                fps_counter.num_frames = 0;
-                fps_counter.start = Instant::now();
-            }
-        }
     }
 
     pub fn is_open(&self) -> bool {
-        self.inner.is_open()
+        self.0.is_open()
     }
 }
 
@@ -70,7 +37,6 @@ pub struct WindowConfig {
     enable_gpu: bool,
     filter: u32,
     fullscreen: bool,
-    fps_counter: bool,
 }
 
 impl Default for WindowConfig {
@@ -79,7 +45,6 @@ impl Default for WindowConfig {
             enable_gpu: true,
             filter: 5,
             fullscreen: false,
-            fps_counter: false,
         }
     }
 }
@@ -101,7 +66,6 @@ impl WindowConfig {
             }
         }
         self.fullscreen = args.contains("--fullscreen");
-        self.fps_counter = args.contains("--fps");
     }
 }
 

web/src/audiolet.js

@@ -63,7 +63,7 @@ class APU extends AudioWorkletProcessor {
 
         this.memory = memory;
 
-        this.snd = instance.exports.snd || platform_instance.exports.sndGes;
+        this.snd = instance.exports.snd || platform_instance.exports.gesSnd;
 
         this.port.postMessage(2);
     }

web/src/index.html

@@ -10,7 +10,7 @@
     </head>
     <body>
         <div id="uw8">
-            <a href="https://exoticorn.github.io/microw8">MicroW8</a> 0.2.2
+            <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

@@ -263,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;